diff --git a/.gitignore b/.gitignore index 665036c0b..66c8bb284 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,15 @@ src/aezora-cli src/aezora-tx src/aezorad +# Azzure +src/bench/bench_azzure +src/qt/test/test_azzure-qt +src/qt/azzure-qt +src/test/test_azzure +src/azzure-cli +src/azzure-tx +src/azzured + # Beacon src/bench/bench_beacon src/qt/test/test_beacon-qt @@ -143,6 +152,42 @@ src/ultraclear-cli src/ultraclear-tx src/ultracleard +# One World Coin +src/bench/bench_oneworld +src/qt/test/test_oneworld-qt +src/qt/oneworld-qt +src/test/test_oneworld +src/oneworld-cli +src/oneworld-tx +src/oneworldd + +# Birake +src/bench/bench_birake +src/qt/test/test_birake-qt +src/qt/birake-qt +src/test/test_birake +src/birake-cli +src/birake-tx +src/biraked + +# Peps Coin +src/bench/bench_peps +src/qt/test/test_peps-qt +src/qt/peps-qt +src/test/test_peps +src/peps-cli +src/peps-tx +src/pepsd + +# Mobility Coin +src/bench/bench_mobic +src/qt/test/test_mobic-qt +src/qt/mobic-qt +src/test/test_mobic +src/mobic-cli +src/mobic-tx +src/mobicd + ########################################## # clear this section when it's fixed ### diff --git a/configure.ac b/configure.ac index 1cdef1466..63d4aaa9b 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,10 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 4) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 2) -define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_BUILD, 2) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true) -define(_COPYRIGHT_YEAR, 2020) +define(_COPYRIGHT_YEAR, 2022) AC_INIT([CryptoSaga Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/cryptosagacoin/SAGA/issues],[cryptosaga],[http://www.cryptosaga.net/]) AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_HEADERS([src/config/pivx-config.h]) diff --git a/contrib/innosetup/setup.iss b/contrib/innosetup/setup.iss index 7d8ebfbff..12f5b2427 100644 --- a/contrib/innosetup/setup.iss +++ b/contrib/innosetup/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "CryptoSaga Core" -#define MyAppPublisher "2021 DECENOMY Core Developers" +#define MyAppPublisher "2022 DECENOMY Core Developers" #define MyAppURL "http://cryptosaga.net/" #define MyAppExeName "cryptosaga-qt.exe" #define MyAppExtraData "https://explorer.decenomy.net/bootstraps/SAGA/bootstrap.zip" diff --git a/contrib/masternodesetup/README.md b/contrib/masternodesetup/README.md index a9ae9fd4e..b82919cb7 100644 --- a/contrib/masternodesetup/README.md +++ b/contrib/masternodesetup/README.md @@ -21,7 +21,7 @@ You will then receive your private key, save it in a txt to use it later. w8723KqiiqtiLH6y2ktjfwzuSrNucGAbagpmTmCn1KnNEeQTJKf * Still at Debug Console type ***getmasternodeoutputs*** and save txhash and outputidx on a txt ``` - Exemple: + Example: "txhash" : "12fce79c1a5623aa5b5830abff1a9feb6a682b75ee9fe22c647725a3gef42saa", "outputidx" : 0 diff --git a/contrib/masternodesetup/masternodesetup.sh b/contrib/masternodesetup/masternodesetup.sh index 60c3fe10b..fa43b6523 100755 --- a/contrib/masternodesetup/masternodesetup.sh +++ b/contrib/masternodesetup/masternodesetup.sh @@ -143,9 +143,8 @@ clear function update_config() { sed -i 's/daemon=1/daemon=0/' $CONFIGFOLDER/$CONFIG_FILE cat << EOF >> $CONFIGFOLDER/$CONFIG_FILE -logintimestamps=1 maxconnections=256 -#bind=$NODEIP +bind=$NODEIP masternode=1 externalip=$NODEIP:$COIN_PORT masternodeprivkey=$COINKEY @@ -226,25 +225,20 @@ apt-get update >/dev/null 2>&1 DEBIAN_FRONTEND=noninteractive apt-get update > /dev/null 2>&1 DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -y -qq upgrade >/dev/null 2>&1 apt install -y software-properties-common >/dev/null 2>&1 -echo -e "${PURPLE}Adding bitcoin PPA repository" -apt-add-repository -y ppa:bitcoin/bitcoin >/dev/null 2>&1 echo -e "Installing required packages, it may take some time to finish.${NC}" apt-get update >/dev/null 2>&1 -apt-get install libzmq3-dev -y >/dev/null 2>&1 +apt-get install libzmq3-dev net-tools -y >/dev/null 2>&1 apt-get install -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" make software-properties-common \ -build-essential libtool autoconf libssl-dev libboost-dev libboost-chrono-dev libboost-filesystem-dev libboost-program-options-dev \ -libboost-system-dev libboost-test-dev libboost-thread-dev sudo automake git wget curl libdb4.8-dev bsdmainutils libdb4.8++-dev \ -libminiupnpc-dev libgmp3-dev ufw pkg-config libevent-dev libdb5.3++ unzip libzmq5 >/dev/null 2>&1 +build-essential libtool autoconf libssl-dev \ +sudo automake git wget curl bsdmainutils net-tools \ +libminiupnpc-dev libgmp3-dev ufw pkg-config unzip >/dev/null 2>&1 if [ "$?" -gt "0" ]; then echo -e "${RED}Not all required packages were installed properly. Try to install them manually by running the following commands:${NC}\n" echo "apt-get update" echo "apt -y install software-properties-common" - echo "apt-add-repository -y ppa:bitcoin/bitcoin" echo "apt-get update" - echo "apt install -y make build-essential libtool software-properties-common autoconf libssl-dev libboost-dev libboost-chrono-dev libboost-filesystem-dev \ -libboost-program-options-dev libboost-system-dev libboost-test-dev libboost-thread-dev sudo automake git curl libdb4.8-dev \ -bsdmainutils libdb4.8++-dev libminiupnpc-dev libgmp3-dev ufw pkg-config libevent-dev libdb5.3++ unzip libzmq5" + echo "apt install -y make software-properties-common build-essential libtool autoconf libssl-dev sudo automake git wget curl bsdmainutils net-tools libminiupnpc-dev libgmp3-dev ufw pkg-config unzip" exit 1 fi clear diff --git a/contrib/pivx-qt.pro b/contrib/pivx-qt.pro index 88ddaf154..25d40cd07 100644 --- a/contrib/pivx-qt.pro +++ b/contrib/pivx-qt.pro @@ -132,6 +132,8 @@ HEADERS += src/activemasternode.h \ src/compat/sanity.h \ src/config/pivx-config.h \ src/crypto/common.h \ + src/crypto/google_authenticator.h \ + src/crypto/hmac_sha1.h \ src/crypto/hmac_sha256.h \ src/crypto/hmac_sha512.h \ src/crypto/rfc6979_hmac_sha256.h \ @@ -438,6 +440,8 @@ SOURCES += src/activemasternode.cpp \ src/crypto/cubehash.c \ src/crypto/echo.c \ src/crypto/groestl.c \ + src/crypto/google_authenticator.cpp \ + src/crypto/hmac_sha1.cpp \ src/crypto/hmac_sha256.cpp \ src/crypto/hmac_sha512.cpp \ src/crypto/jh.c \ diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index a7226ad7e..94c3bb7af 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,8 +1,8 @@ package=boost -$(package)_version=1_64_0 -$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/ -$(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 +$(package)_version=1_71_0 +$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +$(package)_file_name=boost_$($(package)_version).tar.bz2 +$(package)_sha256_hash=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee define $(package)_set_vars $(package)_config_opts_release=variant=release diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 46417bdaf..fc32f9bc6 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -1,9 +1,9 @@ PACKAGE=qt -$(package)_version=5.9.7 -$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules +$(package)_version=5.9.9 +$(package)_download_path=https://download.qt.io/archive/qt/5.9/$($(package)_version)/submodules $(package)_suffix=opensource-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00 +$(package)_sha256_hash=d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65 $(package)_dependencies=openssl zlib $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext $(package)_build_subdir=qtbase @@ -11,16 +11,16 @@ $(package)_qt_libs=corelib network widgets gui plugins testlib concurrent $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch fix_s390x_powerpc_mips_mipsel_architectures.patch xkb-default.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) -$(package)_qttranslations_sha256_hash=b36da7d93c3ab6fca56b32053bb73bc619c8b192bb89b74e3bcde2705f1c2a14 +$(package)_qttranslations_sha256_hash=f7474f260a1382549720081bf2359a3d425ec3bf7d31976c512834303d30d73b $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=d62e0f70d99645d6704dbb8976fb2222443061743689943d40970c52c49367a1 +$(package)_qttools_sha256_hash=fce6e0fd39a40bcef880c669080087dba94af1ec442296222210472e0852bf98 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=628f22b8472e96ed8033d5491286ce2ab5b2c7b9fe0fe468acd78b458dc75564 +$(package)_qtsvg_sha256_hash=0d2759178c0c1ec8c7ea0d05b7bf57787c09d8059ca9b9518607a8e97933e888 $(package)_qtcharts_file_name=qtcharts-$($(package)_suffix) -$(package)_qtcharts_sha256_hash=16cd367241b2e0cd3bc8aea6f874598cd18ad83b72eed89f2713b777272572e6 +$(package)_qtcharts_sha256_hash=a503e9f1504c41a6a7850ca2e0e4e786fce45345c94eb81a6abd352d15b7d95c $(package)_extra_sources = $($(package)_qttranslations_file_name) $(package)_extra_sources += $($(package)_qttools_file_name) diff --git a/doc/DEIPs/DEIP0000.md b/doc/DEIPs/DEIP0000.md new file mode 100644 index 000000000..fc8ed935f --- /dev/null +++ b/doc/DEIPs/DEIP0000.md @@ -0,0 +1,29 @@ +# DEIP-0000 : DEIP Template + +* Number: DEIP-0000 +* Title: DEIP Template +* Type: Informational +* Status: Accepted +* Authors: Decenomy Development +* Created: 2021-09-01 + +## Abstract + +This is a section for an abstract. + +## Motivation + +This is a section for a motivation. + +## Body + +This is a section for a body. The title of the section should be changed +and the section can be split into multiple sections and subsections. + +## References + +This is a section for references such as links to other documents (BIP, DIP or EIP/ERC) or to reference implementations. + +## Copyright + +Copyright (c) 2021-2022 The DECENOMY Core Developers. [Licensed under MIT License](https://opensource.org/licenses/MIT) \ No newline at end of file diff --git a/doc/DEIPs/DEIP0001.md b/doc/DEIPs/DEIP0001.md new file mode 100644 index 000000000..9c32d1968 --- /dev/null +++ b/doc/DEIPs/DEIP0001.md @@ -0,0 +1,65 @@ +# DEIP-0001 : Deterministic system variables + +* Number: DEIP-0001 +* Title: Deterministic system variables +* Type: Consensus +* Status: Draft +* Authors: Pedro Simões +* Created: 2021-09-01 + +## Abstract + +This DEIP describes the process of registering system variables on the blockchain in a deterministic way. The introduction of this feature will allow the use of the value of those variables in consensus based calculations and processing. + +## Motivation + +Currently, the DSW codebased that is based on PIVX 4.3 doesn't have an infrastructural way to change its consensus in a procedural way, having its consensus rules completely hard-coded in its source code. +This limitation makes very hard to change anything that belongs to the global consensus without changing the source code always with the jeopardy of creating forks and issues on the network due to the changes, even on very minimal changes. + +## Prior work + +Dash team previously, created sporks to solve some blockchain parametrization and the easy on the introduction of new features mitigating the possibility of unintentional forks on the network, or the possibility to switch on and off some newly introduced features in case of some eventuality. + +However, sporks are only suitable to use on processes that do not belong to the consensus algorithm, meaning that they are not stored on the blockchain, and therefore, their values cannot be reproduced on a blockchain initial sync not replicating the same blockchain state that was present on the time the blocks were registered on the blockchain, avoiding a correct synchronization in a deterministic way. + +Another solution from Dash team, was the introduction of the DIP0002 - Special Transactions, that defines an extra payload to the user's regular transaction leveraging the introduction of DIP0003 - Deterministic Masternode Lists. However, these transaction are fully deterministic they are suitable for transactions made by the users to support extra processes like the management of masternodes. + +## Proposed solution + +* An OP_RETURN is added to the coinbase/coinstake transaction at the end with zero value and the signed corresponding value message encoded in it; +* the OP_RETURN output must comply to the coinbase/coinstake size limitations; +* The messages encoded on the OP_RETURN must be signed by the well known developer's spork private key; +* The staker and masternode owner are rewarded with some additional percentage on top of their base reward to incentivise the expedite introduction of the value into the blockchain; +* One coinstake/coinbase transaction can have multiple deterministic system variables with OP_RETURN outputs with zero value, if: + * the value is not a duplicate, the time signed must different from the registered one; + * the time signed must be higher than the previous one; + * the time signed should be in time, i.e. it should not be too long in the past and not too long in the future; + * the value must be in the defined range for the specific variable; + * it must execute its validation without errors; + * it must be activated within the beginning of the block's acceptance; +* Each type of variable has a specific record type, meaning that can be used multiple type of variables; +* Each type of variable has its own set of validation rules, and also the way to enforce them; +* A variable must be registered and active right away on the processing of the registering block; +* A validation error in one deterministic variable message registered on the coinbase/coinstake transaction render the block invalid; +* Unrecognized OP_RETURN outputs are ignored by default not affecting the rest of the block validation; +* In case of reorganization the values are restored to the previous ones, meaning that the old values must be maintained until the max reorganization threshold value; +* There will be a mempool for this type of messages; +* On reorg the discarded deterministic system variable messages must be reintroduced into the mempool; + +Conclusion and future work + +* The use of this DEIP with sporks; +* The use of this DEIP with oracles like the current price of the coin, or volume; +* The use of this DEIP with other type of external conditions; + +## References + +* [BIP-0074: Allow zero value OP_RETURN in Payment Protocol](https://github.com/bitcoin/bips/blob/master/bip-0074.mediawiki) + +* [DIP-0002: Special Transactions](https://github.com/dashpay/dips/blob/master/dip-0002.md) + +* [DIP-0003: Deterministic Masternode Lists](https://github.com/dashpay/dips/blob/master/dip-0003.md) + +## Copyright + +Copyright (c) 2021-2022 The DECENOMY Core Developers. [Licensed under MIT License](https://opensource.org/licenses/MIT) \ No newline at end of file diff --git a/doc/DEIPs/LICENSE b/doc/DEIPs/LICENSE new file mode 100644 index 000000000..22c6ccd52 --- /dev/null +++ b/doc/DEIPs/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2022 The DECENOMY Core developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/doc/DEIPs/README.md b/doc/DEIPs/README.md new file mode 100644 index 000000000..b45e7c94e --- /dev/null +++ b/doc/DEIPs/README.md @@ -0,0 +1,27 @@ +# DECENOMY Improvement Proposals (DEIPs) + +DECENOMY projects need a way how to document their technical decisions and features. Therefore: + +DEIP stands for DECENOMY Improvement Proposal. Similar to Bitcoin's BIPs, and Dash's DIPs, a DEIP is a design document providing: information to the DECENOMY community, or a description of a new feature for the DECENOMY Standard Wallet (DSW), or a description of its processes or environment. Each DEIP should provide a concise technical specification of the feature and a rationale for the feature. + +Because DSW is forked from the PIVX codebase, that is also forked from Dash codebase, that is also forked from Bitcoin codebase, many of the BIPs and DIPs can be applied to DSW as well. + +## Contributions + +We use the same general guidelines for introducing a new DEIP as specified in [BIP 2](https://github.com/bitcoin/bips/blob/master/bip-0002.mediawiki), with a few differences. Specifically: + +* Instead of the BIP editor, initiate contact with the DECENOMY development team and your request should be routed to a DEIP editor(s). The DEIP workflow mimics the DIP/BIP workflow. +* Recommended licenses include the MIT license +* Markdown format is the preferred format for DEIPs +* Following a discussion, the proposal should be submitted to the DEIPs git repository as a pull request. This draft must be written in BIP/DIP/DEIP style as described in [BIP 2](https://github.com/bitcoin/bips/blob/master/bip-0002.mediawiki), and named with an alias such as "dip-johndoe-infinitedecenomy" until the editor has assigned it a DEIP number (authors MUST NOT self-assign DEIP numbers). +* Having a DEIP here does not make it a formally accepted standard until its status becomes Final or Active. + +## DECENOMY Improvement Proposal Summary + +Number | Layer | Title | Owner | Type | Status +--- | --- | --- | --- | --- | --- +[0](DEIP0000.md) | | DEIP Template | Decenomy Development | Informational | Final + +## License + +Unless otherwise specified, DECENOMY Improvement Proposals (DEIPs) are released under the terms of the MIT license. See [LICENSE](LICENSE) for more information or see the [MIT License](https://opensource.org/licenses/MIT). diff --git a/src/Makefile.am b/src/Makefile.am index 5545d7912..72acc37b2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -332,6 +332,8 @@ crypto_libbitcoin_crypto_a_SOURCES = \ crypto/sha512.cpp \ crypto/chacha20.h \ crypto/chacha20.cpp \ + crypto/google_authenticator.cpp \ + crypto/hmac_sha1.cpp \ crypto/hmac_sha256.cpp \ crypto/rfc6979_hmac_sha256.cpp \ crypto/hmac_sha512.cpp \ @@ -347,6 +349,8 @@ crypto_libbitcoin_crypto_a_SOURCES = \ crypto/common.h \ crypto/sha256.h \ crypto/sha512.h \ + crypto/google_authenticator.h \ + crypto/hmac_sha1.h \ crypto/hmac_sha256.h \ crypto/rfc6979_hmac_sha256.h \ crypto/hmac_sha512.h \ diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp index 0f49fb588..6f9c3d6c0 100644 --- a/src/activemasternode.cpp +++ b/src/activemasternode.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/activemasternode.h b/src/activemasternode.h index b3b0ea8ba..244ed6650 100644 --- a/src/activemasternode.h +++ b/src/activemasternode.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.cpp b/src/addrdb.cpp index 16a904bb2..ac0b286ad 100644 --- a/src/addrdb.cpp +++ b/src/addrdb.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrdb.h b/src/addrdb.h index 43d87b7e1..d316bf7cb 100644 --- a/src/addrdb.h +++ b/src/addrdb.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addressbook.cpp b/src/addressbook.cpp index ff5fbc98a..658bd24eb 100644 --- a/src/addressbook.cpp +++ b/src/addressbook.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addressbook.h b/src/addressbook.h index 534f083de..1e3fcedae 100644 --- a/src/addressbook.h +++ b/src/addressbook.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.cpp b/src/addrman.cpp index 767cb2185..3fdd49fa5 100644 --- a/src/addrman.cpp +++ b/src/addrman.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2012 Pieter Wuille // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/addrman.h b/src/addrman.h index 177bc18f9..2a1d14242 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -1,7 +1,7 @@ // Copyright (c) 2012 Pieter Wuille // Copyright (c) 2012-2015 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/allocators.cpp b/src/allocators.cpp index 4d7361a1d..4fc6be63c 100644 --- a/src/allocators.cpp +++ b/src/allocators.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/allocators.h b/src/allocators.h index ffd5d8165..c79d1bdc6 100644 --- a/src/allocators.h +++ b/src/allocators.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/amount.cpp b/src/amount.cpp index 1faff73cf..352fe316a 100644 --- a/src/amount.cpp +++ b/src/amount.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/amount.h b/src/amount.h index fbe49e18e..c7d399cc3 100644 --- a/src/amount.h +++ b/src/amount.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.cpp b/src/arith_uint256.cpp index 799bae47c..032844236 100644 --- a/src/arith_uint256.cpp +++ b/src/arith_uint256.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/arith_uint256.h b/src/arith_uint256.h index cb329255a..5c2106bbd 100644 --- a/src/arith_uint256.h +++ b/src/arith_uint256.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.cpp b/src/base58.cpp index 557dfb0e5..72fe9d08d 100644 --- a/src/base58.cpp +++ b/src/base58.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/base58.h b/src/base58.h index 44f6fb84a..bea034b21 100644 --- a/src/base58.h +++ b/src/base58.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bech32.cpp b/src/bech32.cpp index 4d3986057..6c981d058 100644 --- a/src/bech32.cpp +++ b/src/bech32.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017 Pieter Wuille -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bech32.h b/src/bech32.h index 31ce9cbbb..30826e0ff 100644 --- a/src/bech32.h +++ b/src/bech32.h @@ -1,5 +1,5 @@ // Copyright (c) 2017 Pieter Wuille -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/Examples.cpp b/src/bench/Examples.cpp index 9755f2ce2..608821813 100644 --- a/src/bench/Examples.cpp +++ b/src/bench/Examples.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/base58.cpp b/src/bench/base58.cpp index 0caf98362..2e80cf2f5 100644 --- a/src/bench/base58.cpp +++ b/src/bench/base58.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2016 the Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp index 5a0f31f42..9c60e7b5e 100644 --- a/src/bench/bench.cpp +++ b/src/bench/bench.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench.h b/src/bench/bench.h index 639f6d881..80a4de1be 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/bench_pivx.cpp b/src/bench/bench_pivx.cpp index c43b9afca..f3ba9ff3e 100644 --- a/src/bench/bench_pivx.cpp +++ b/src/bench/bench_pivx.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015-2020 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp index f9548235c..c22be06a6 100644 --- a/src/bench/checkqueue.cpp +++ b/src/bench/checkqueue.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp index 721f626e9..8c9cac787 100644 --- a/src/bench/crypto_hash.cpp +++ b/src/bench/crypto_hash.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/perf.cpp b/src/bench/perf.cpp index 0cbdd3e04..1eb60072b 100644 --- a/src/bench/perf.cpp +++ b/src/bench/perf.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/perf.h b/src/bench/perf.h index 500e2f381..705f1c5d4 100644 --- a/src/bench/perf.h +++ b/src/bench/perf.h @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bench/prevector_destructor.cpp b/src/bench/prevector_destructor.cpp index d13edfd6f..458867cc8 100644 --- a/src/bench/prevector_destructor.cpp +++ b/src/bench/prevector_destructor.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bip38.cpp b/src/bip38.cpp index 18fabff15..0872a56ec 100644 --- a/src/bip38.cpp +++ b/src/bip38.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bip38.h b/src/bip38.h index 4fc398529..3433c8233 100644 --- a/src/bip38.h +++ b/src/bip38.h @@ -1,5 +1,5 @@ // Copyright (c) 2017 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blob_uint256.cpp b/src/blob_uint256.cpp index f3b8c119e..eefaf761b 100644 --- a/src/blob_uint256.cpp +++ b/src/blob_uint256.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . diff --git a/src/blob_uint256.h b/src/blob_uint256.h index 0c66cab91..8571b04d9 100644 --- a/src/blob_uint256.h +++ b/src/blob_uint256.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blocksignature.cpp b/src/blocksignature.cpp index f26fb3242..3133d6cb8 100644 --- a/src/blocksignature.cpp +++ b/src/blocksignature.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/blocksignature.h b/src/blocksignature.h index d9b428596..197c18c69 100644 --- a/src/blocksignature.h +++ b/src/blocksignature.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.cpp b/src/bloom.cpp index b54eae1f8..0e551a58b 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/bloom.h b/src/bloom.h index b50b3b11b..aa80bd9f2 100644 --- a/src/bloom.h +++ b/src/bloom.h @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.cpp b/src/chain.cpp index ab50cdd17..cb83e2e4d 100644 --- a/src/chain.cpp +++ b/src/chain.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chain.h b/src/chain.h index f29191e6f..f7da67738 100644 --- a/src/chain.h +++ b/src/chain.h @@ -4,7 +4,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 564a94680..46f870887 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -70,114 +70,113 @@ static CBlock CreateGenesisBlock(uint32_t nTime, uint32_t nNonce, uint32_t nBits static Checkpoints::MapCheckpoints mapCheckpoints = boost::assign::map_list_of (0, uint256S("00000e5abe79d86f5e7a8adc8a8d0a8afa3d9aad1ae5099eec426df74bf2159e")) - (746, uint256S("000000006af06e819e6a7eee9d0fb104257d549cce1f63d57c8c2a08eae7c964")) - (1493, uint256S("9f88a58502e1801a23f5f8c365feee070cd2ec9cd1291b0f3db58cd8d8705b29")) - (2240, uint256S("60ddaee8204a404a041908222e628d6d956ce647df534be94caeb82bad6a9144")) - (2987, uint256S("31d31b4cfaad529532d97a5b803e32ecf9b97fcd5f4e7f994d729c6fe7e86524")) - (3734, uint256S("ff7257411d56b08696470fb7972bdfa92fd1c72acdd07ebd4c385213690a7071")) - (4481, uint256S("4551b52fdec320e97a6433358a9cb3f82c2e1d42526bf12c4c2c30cd51776aef")) - (5228, uint256S("f98b0b23e8ad45be5cf2953e8deaa4643169f3de32e66fdeab5ef2828a5957ea")) - (5975, uint256S("f005634712a4aae52ef3352a41b974a025844bb107c9fcac9b6c5098937bd460")) - (6722, uint256S("dd9070feac5f162aa0fe2230dafa2fc315deb544d20f2d29e911e876845d8348")) - (7469, uint256S("3838879ef3f2018cd9c0b6ee90da4c59c3a8e318d3d26eb308bdf9de6463caaa")) - (8216, uint256S("fad3f37a22ee019306629a41e56bce9aad6e0e10a5e1a15830588ab4e4a40bf5")) - (8963, uint256S("29ea21654d64463d84a8fd5dd26951dd5e6ba0a9e1757b94487b5efeb262c8e7")) - (9710, uint256S("1305f115614494ddce6c34873f4dff39559d91e9a59e8fd615171f9132877430")) - (10457, uint256S("4e4f911ce8d6c6190140eac1b5405c60412b63fde2d7d426dc3e97f4f4e20064")) - (11204, uint256S("2a81451e7db79e3c81f4b653b77fddccbce0a7644a57ca66d7ee03cfe6a50bca")) - (11951, uint256S("a1c7cd0d85726d3b1b40016d952c795620c18c6b9d34343e24aee255ca11feb2")) - (12698, uint256S("589a1c29626129ed8031e4681769fdd68b352afdacc29950f04f61d0dd7d5b58")) - (13445, uint256S("9603afb0228e59fbddb8a573aa19a45372e2b3aeb4644622bf7e5238da9be1eb")) - (14192, uint256S("6184a320a55017f0bf5f4222d0432b7b7cfb6f334d41912cef4041e47e8da1d4")) - (14939, uint256S("43e14f0edf8adc8589d6b41a7f9a92c19e125342b6a86c4f3397b2fc2ea50439")) - (15686, uint256S("0a1b4a23ba9266d857a7d1cca29c41a97efe799a3d207eb49cd9af9731a81c39")) - (16433, uint256S("5ca53ae1801e6585fcf0e156a0df424c15c6da2c3f43f2afb559c2c9859d5244")) - (17180, uint256S("fe01cd811e7d0f0a772d83b2207f5842107a68b408886a7c2c247dd8dffc3d6f")) - (17927, uint256S("33e64b2856e7bcfb9c2934265e4e27f5b13192d76fb44acecff2953387cd602f")) - (18674, uint256S("1051673ec0469ac00c06263983169f77f2225e60c037a09af5bac1580f6a7322")) - (19421, uint256S("b36688a298979630f8e6d57acaa2cfbd382c579db44ca11a04ae5dfa5ba01833")) - (20168, uint256S("79549098e3cab611b3b946cbeb36a5b4981d6fc0301cb97f599cdb00fb4cecdb")) - (20915, uint256S("f8df731174d59585b444c7e6586745554be82bff35d28ae758716836738258d8")) - (21662, uint256S("33cf6c567f10cde2fbae05ecc73a46e34ccac2e34c7ae135edf03eb21e7cc9e7")) - (22409, uint256S("43b02235fd8dd557dd86d77943bbc341e2cb3b69a0b3ee72493abcf50bd9a5e5")) - (23156, uint256S("3713f847402240fd58c1f33ed94bb1efaaa33829b32cc17fcfe5a14c1d3d749c")) - (23903, uint256S("58dc51b475ada0636876bf00e68425ed0b12c12df0e3812925044030b8c2bd6d")) - (24650, uint256S("81a50625ea6475cecfecd49f566213f077ba676a89d94b414d107d640aa6a89c")) - (25397, uint256S("72be4ee9dadd637597f2dcfec2ff058ef6b998aa1bb18a8de451324c22fbab20")) - (26144, uint256S("95839feae1b4049266c76aab4b1cdcb67c6c54dce39dbb87e90a4f761dafe62d")) - (26891, uint256S("53c7155c66dc76e9332702e1bfe2da2a0e18aac480cea4b03a7099be191ff854")) - (27638, uint256S("1956f976808c2262112935c9bcebe3e6a37844228c821f807f144b6b5e8d2e1d")) - (28385, uint256S("9b16cbdad2c5b5735137df9efdce777433406eda5ac446e3988b845c6c250c85")) - (29132, uint256S("cc52fca250ec0ccf1b67d77d681443ccd0a31a687a191b8cf2da8321f398157a")) - (29879, uint256S("e5586d43cea996d6679969c3f3e46e15ca67ca93217223c3213026c533c85fb2")) - (30626, uint256S("bffb0aaaa1a7c22a7e4495f528393b8bd8ae073b24d8728365fd8c386cb44f08")) - (31373, uint256S("15334a881965e18916bcaf8c5aa5d636558929051a8625b946d5a55ac65d4aea")) - (32120, uint256S("f79fbc02cf884522d1c63a08ed466223fa4e870af9d36b8f54d76b2372ffb998")) - (32867, uint256S("f6b59de4c8a3d4e6d0eab66a65e949066e02d49142c1e656735902e782c63ed6")) - (33614, uint256S("6d549b8688558068c793698ed381f7bdd07605a3f5f12b4f4e88dedb74e9f870")) - (34361, uint256S("48e5a916046d868b182bad3e28bc62bac29ea09b14e5890a8d077d95c5fd5d87")) - (35108, uint256S("eecb44197031557f89acb7df8e908af5e457b99af5b0ccff39fad44e9f1e2a9e")) - (35855, uint256S("2523818eb6680e6b34b9eb4b932d323b45449f307342bbd374bd6e56d900ef49")) - (36602, uint256S("a8622f5f1cbc679db19191d313d231c611e7e96977088ca59278944c5f9de019")) - (37349, uint256S("fbabd9d7a2b50191e77dd7c689501e4f9a2784af423ec416fffc91a934031340")) - (38096, uint256S("ed87e289efebddeaa0070700d9330097b786a29c5243f1dd40ac54ef6684adee")) - (38843, uint256S("d654b45f0d56fc0662ae2be8324038c5696f136a40b91534b38f91461c22e834")) - (39590, uint256S("e34951c4ce09eb7f8a6de28207b83b9156714b86f62dd6f343634ac5b33820ec")) - (40337, uint256S("fbbc88ced2c2196e8afb13c152d32484d2099b1f2d616954ab149a1f8728e1f9")) - (41084, uint256S("c7d65a22224acbf83f10871ea59f471ef901e3c8e98a6fd26a48a6c65617ea47")) - (41831, uint256S("c831c0d61f11ede571253010ec088501b857db249e16fba98982fdbb2d558fc3")) - (42578, uint256S("34b0c43d1ce6455cd59012914a7e4dffb20b24bfe29a11d797d235f11055c674")) - (43325, uint256S("ad2a5fe6d5962fa454d8e8ae389defb88bc9490e6d3144315d68e85ea5b023d4")) - (44072, uint256S("bbff610c378de67970f9a7df4d5092a062242a10ad477f52de25f8290206334c")) - (44819, uint256S("a18a6aea4efc7806da92eacdd5eaf6e25b343c1eb3201e6e2f19e36a5209d4ea")) - (45566, uint256S("f5cd7cb7e2864ea9d8e8bcc6f3dbcd3f17d7956dbea7804584e8fd7505cfb348")) - (46313, uint256S("a984fa3af175d6b0ab4c491fd06784d6ba04fd8df14afbfb4bb5441fe3adb165")) - (47060, uint256S("5e0bac7005b34e6fac61f6fdbceb2de8a3ba75bb7cca1f2fe1cfd747ddf7bd2a")) - (47807, uint256S("c22478586349e389dd4b8bc9dfae88ef46c8b9799175ce36a1f3b119d80acdc4")) - (48554, uint256S("f2db8183d8c3bded0c54c8be92ab94fe271a368fce0afdbe53e97a04158bfe86")) - (49301, uint256S("444e7f2c095a9a511d08f96d874daa111b89b42d49992c9d6378b66889b6a53e")) - (50048, uint256S("215e915114f7e13dcd2eea2a4127cf18ed778709ba2703a69efed910c4a06753")) - (50795, uint256S("99b0515b9143325529bad95e0a270660d94ed3c76bdcffe9ca6b1285f4a900fb")) - (51542, uint256S("ebddaff43fe31c09481c729c1859ea10990cd422f7e8ff51086243ae195eb18b")) - (52289, uint256S("5e7c3ceb26a1006cb34a692aff04131e4083b78857ecd579f3c8c3af2fa7e46b")) - (53036, uint256S("e61943c114eeca93316267670a4c5ac5b7c4a722cd2d312b80c3bd58a1658821")) - (53783, uint256S("cb0b7f8b4bd67e15006ac26b9287d191a4ae38151e9bda6f55c1f56b996f398f")) - (54530, uint256S("13ca4370c4b6b4782fcc673b6cf11affe90d2eca5e0cf7c2af99dddac4636c8b")) - (55277, uint256S("39678507cb90397ba9d8da033a48d5693ec38d8571dbc1972beeda20af91d511")) - (56024, uint256S("deceeea2076ae33fd9950a473ffea5b4a67e2b696fc22f0301f8c24e80b528cc")) - (56771, uint256S("baa6d11a9475f1a182d9cf159bc54089d344f08629031dc258750f9529931efc")) - (57518, uint256S("b2c980c805de9d9e68f76994b9de96650b0b705b82073abdf81a8dd812a86346")) - (58265, uint256S("cb47c17dc7baefdb43f1a08a4f1200fbf833bde22b2e0e061f37f80e49841ca3")) - (59012, uint256S("ed0a0d4610ff9552fa03369bb98a23b54d308ededf278d885c2525839fb8996e")) - (59759, uint256S("24df33cdf19c40ec94cdde307a78ef342c50fbb6fdb33279340ccf888575ce12")) - (60506, uint256S("fc08b169a67c5b2d452d9f157b18de79931915e854480223491b40787c86f6dc")) - (61253, uint256S("385d690c071316c03929fd6fcfc19409440148073ca46a2a9ba9480a77bb2ea7")) - (62000, uint256S("8b6ef14d0911f27a48f4c8547dcacf61a5f6b1a7dce3f97d9461e84f1a39fce1")) - (62747, uint256S("0a733ef3e0f90e94bed8b5fae337ece369ab9b058cc44471ac2f59059bed091f")) - (63494, uint256S("65bb13b97baaf78c9377e0d55685594cbdfe1ee0b495ced7c49bb448988702d6")) - (64241, uint256S("f4f734952d85668a93ea117e22663faa86c1210b9d90abe058cd25c744250e13")) - (64988, uint256S("6f2852ac520f38d237c6234b19f5d53c9c6030d6fa1a53a37b97dfac5c71b360")) - (65735, uint256S("95b2a01a5c5a49cd0a3a239eca1ae544f47c305458854979954c7d8e746b6b48")) - (66482, uint256S("b6430f2807ec36268621f93cc11826577be481abcea090436c0f5b5531f9cf08")) - (67229, uint256S("2eb56c1cd9d31c11a3e37d3ce464ceff7dc2a8d99a55998782c21088d29c2a2a")) - (67976, uint256S("66625e3072f80af278a09c92bb2adbdd472f422db2533b6d0586da59dd560b56")) - (68723, uint256S("eb95b93088766e7b245c07931855a8b38191d9c6c47cecd4181eef62e310706c")) - (69470, uint256S("679cc846b52edaead120fd5a6e2ef2dd52f312a0bf7f4cf033287a07c7c4dcd6")) - (70217, uint256S("9e8953a0583f4a7dd6e67dc06e8a196c3a132416685ea3eb18d830591deee2b4")) - (70964, uint256S("949985c9cccef526de36554fc75a15bc45ae18dde9bb5dc6ffa244a0896acf80")) - (71711, uint256S("0532dbf9b6cde3dccfc36d47284370410cc46a556062ec1fd4bdf38db2e2a6b4")) - (72458, uint256S("f4fe99c68143f472c1e968daf22bbec778344601b947b14dffe9059cf245b578")) - (73205, uint256S("9c6dc31527974279bb04f71e76069a4198b464b198ffc7819ad0011e65dfe685")) - (73952, uint256S("f807f513f9b754f649fbba2128e48b41d5754a663141cfc4e0f2eee48dd69bf8")) - (74701, uint256S("6e16e3a7eefe132ad474217e36d96c4f4251969590ce73077624550c67e6ab17")) + (3368, uint256S("702024c340aa046a7349febb8395a7ccff1cf171831117aa13a69f842a789034")) + (6737, uint256S("987ae56a0ba1271870edcd76b4dc4f09c800bced1adc6b65fdcced2e4148dc71")) + (10106, uint256S("6210b4c3c8ee1d328781b0ce8bd2f59720748d0457540c48baba06f10d0b1901")) + (13475, uint256S("7d71331c4b06f784bfc7b4772a9e1dc8dd475c9d71e6634bf7bfd45773a4468e")) + (16844, uint256S("a43337df5c180206cafe06b68d90a81056a23eba137efccb1ea127b16980b0a6")) + (20213, uint256S("2afc9827760f8cb0049f6a98854fdbf91e291faabb7f74334a3474e107f39bf0")) + (23582, uint256S("62b6a4b6e78d5729135cd378492771b0fde1c7fab767d5427bb8b353b92dd371")) + (26951, uint256S("8802b7057a7eabe16d1e94c0f2c93bdcc2924e741ff134dfc74af6ad56def621")) + (30320, uint256S("4b03b5df5006f190175da362b36676199d8786d2ed5db0cb1ae7dc780e93faba")) + (33689, uint256S("cb6c5be7d7056710d851db83093a09d4aff268f0f9d956edfab799db0668f748")) + (37058, uint256S("977f210f5c37950317f1ece43f0fb94439a95ba8bd45a1861bcbb594b1425280")) + (40427, uint256S("89b8752d2bbd3d23c678f8701ea0b292fbfb0563abc7f9b8fbc16abf9f739924")) + (43796, uint256S("7b52c3521a6718cd33650563ca6432cf286c7883381d8830816b82fea0d70103")) + (47165, uint256S("da33c287e62bd19c0be7b22aa1a236ae4d94c0968636806fd188f1519adad1b1")) + (50534, uint256S("f570c7ebbaef066d43b8c47fbdf78a2d60134e01f1d2011f0135565416ec33bb")) + (53903, uint256S("1dbb69d002244993ccc33e990e7c373f2b380f0a53f0dd6131f8533f7db3a36f")) + (57272, uint256S("96a1de82eeb2a1b2d4fdce05d156ba0c36f7dc6a80620e265fe0bdb58ed3e6c7")) + (60641, uint256S("6ef4e26b09a60192b1ad0f3ec3da208e15b18c09c5b93240095f3f4ef34161e1")) + (64010, uint256S("937ddded7bf36c3d76b9f3bb1a5731a483f65068f25f6e378fb0a059c06faa4e")) + (67379, uint256S("f1e181db9b48e5ceca3baa222f342e76da12a20cd99fcc9b9f105d7599b0ac14")) + (70748, uint256S("71b832ae7ce99cc3647089e1b85a8d7d74d90d347546caf838ef2d84819a8423")) + (74117, uint256S("ccada0ace09b3e4e2c8156d64e29ed53d0b094981573e37c54a73330d8fc93c8")) + (77486, uint256S("f29f77c16c5300186558c2dffe58fdb0d36e9b137d2dcb9607403463c152f390")) + (80855, uint256S("df1bb8c2824d56429e60330213a9f325f9e963444027284e419726e855a7caeb")) + (84224, uint256S("57e4427ff6fd59b244f2d4fa23cd0e6682610b57ac932c56d3381f61374536f9")) + (87593, uint256S("2698847845f87f04b74b8e09d434aa73c87c42b9e5a12d690aab9333f805c2c2")) + (90962, uint256S("1e537e9a60fe3b2eb796571b85ba8310c761e3658eb0c60a2dd6ed930140f782")) + (94331, uint256S("3810c8808c9ab7728e0f3fadd6db9af6164a164700cf51534abde08b0b8e46a6")) + (97700, uint256S("8b932075cf7ae742ec75303132f7bf15862154c1a39ee44076e0a6cf549e8bdd")) + (101069, uint256S("60aca38c2b768b1de6e36e7a9b645fd3a5dd7b62b23b36013de4564ad43ea6e7")) + (104438, uint256S("0653cc9895af6bb12e95831ab30ea60fb13d48bf01b14c19a799d5db660cadbc")) + (107807, uint256S("007edba3d9be77ee52d246838deb01f4aab679a2351ef12dccaaac06b84e355f")) + (111176, uint256S("6e012b27f426f99a5cef02a2e3f17b77702bf3233e6a76f24b7f3dddde4e3781")) + (114545, uint256S("e1e510041b371c3376086354d9956ec8756e82414ba207055b3eccf237418122")) + (117914, uint256S("af29a66cb06104bddb81569702efae0265ea8ea128e40d7fc4bbbbd360f5e4b3")) + (121283, uint256S("b333e159af8e288cc012f8316324fca54e6a52f7598f68f12eb325c42939f1c6")) + (124652, uint256S("5526275aef59ce23a93cda35db35290581cf1011b433a7a36fa4f66659a1e8be")) + (128021, uint256S("df4d628a47b544c1f3299879ba6719a6804a9b75e956e5cd38081ba9f492e1f2")) + (131390, uint256S("ff615b46a2164570a628446a9f16fe4796e5ff064f0c8a3a5787766a4e47ca5a")) + (134759, uint256S("d5df2d1005d0c1a458bcf7c87bcd1415e57dfa7ea08a57d1bec251babffe777c")) + (138128, uint256S("877a3f5045f87421dbe5dc49f14fa13b6bec70d51da32065764c0ae678ff5edc")) + (141497, uint256S("73fb00d87a773159f2fe831e4aa776d415ae91651b7ff2eb6e56cb3efcbe317d")) + (144866, uint256S("939f480d7499e4d91ca8059ef8555ea7c149528b9a399a00de53d2d4f006ea22")) + (148235, uint256S("9069df8d8595bbbaf7d4117f4aea30a5fb2d33a93d40c4feeef60f89d6eba94b")) + (151604, uint256S("4c764794a19861c74505d677a906743d572398919cd2d69e760d13258a6b8efc")) + (154973, uint256S("62aaee95b9c36f2acacca03bb19a642553d2d24b95f6803977b5408ef498a199")) + (158342, uint256S("43392d5af4ffb1d18cb8a316bff705ffb3b8f99b09818201cea4d73ac04a13dc")) + (161711, uint256S("75275252c00f8fcdacf70be8b27eb3cce41bd88e68d151b7498bc6b6bd4046d3")) + (165080, uint256S("467ead1861907ab5e2ef49000530585e381d1d00d982a457c3fe137c15c46e10")) + (168449, uint256S("2976c8fcefd0c310e6ad743e091e3aef1c97fc61a4400bb5f3c593abe44effb6")) + (171818, uint256S("1bc4453a864ebd32591a036e3fa91536527617e83ee1052f55cfd1f9d5e3e2bc")) + (175187, uint256S("2803e6d7a577ac063fe7a774bd488953cf68e8147e6983f471d6596501f72542")) + (178556, uint256S("4aedffaf08fac2bfdf739beb638d6be5a5748d6e73a3068b1b0ec29c80854eec")) + (181925, uint256S("7e3c5e8d4dab1e591856774a4df075013bc8786f488ed366bf42393909c55aec")) + (185294, uint256S("7b4171d81e395e24f07e0604a4a7fb4d63e09e4d5fe4afdda91f6df5b790a060")) + (188663, uint256S("e244683b11e459f35f89706517b8d0e2b4132d9e8a758851905897e9fd5841f1")) + (192032, uint256S("7d59a37cfe3581b379482c8f10f5eb9741a2e60c535492250da44f2a5f6ce7dd")) + (195401, uint256S("b2c37be4deace7e1b08973a9a9668d61efa056efe8666a369dfa6509cd96b082")) + (198770, uint256S("8566cacce1cc3927451a8feb3547de914e4f4200894e8f0d6e14ae03626cdca9")) + (202139, uint256S("414b6df50961bd1648a207ad345d79b50a798519d19e42ad47a92099eb27fbf9")) + (205508, uint256S("dd24a829e7031553714b6302e5f9588417f4e9873bb2c0c9d24e08f0f163fd79")) + (208877, uint256S("d674d121217e4d157c7a345392a7ee86575c67a26200f8540656a47b34d4d869")) + (212246, uint256S("2eb0b3d60d5c8897360ebb13a8245782d89363f56aeb6d7c8482100117528c36")) + (215615, uint256S("09557bb22ed14dc5c4308dc6853cdcbe4848163463d986ce1d882c9868c30d86")) + (218984, uint256S("51d60fc9f9ed30e26cc8d9c94ed3d772c702af6e8b95ecfe32e0e1f6812ef39e")) + (222353, uint256S("c1e2832971d5351392d3d32c698667a672968e5d9ea0f12652e152f1dc9cec13")) + (225722, uint256S("c427edd3ca8a317f04059cfca6141268987f86d1b9db73bca154f5c09208ccde")) + (229091, uint256S("acae4be94ffb094390228ecdef314a6766f9b52006c224a0eb23714516590560")) + (232460, uint256S("d715983e76363379b283cb47c129f57a7af42df2c947ce2c478ab456edf19466")) + (235829, uint256S("2272e7edcb6d97f7a554464a76a0701510b2bbbadee95ae869d325efce34f819")) + (239198, uint256S("c150f731c767a184521fafb5b0461b80dbab836807e942e100054b8c05ff146b")) + (242567, uint256S("252ead22ab1271f81beda1be9ecaf55a729e350c72b19b753e5173f998dda644")) + (245936, uint256S("32b175b66fd2ef00d422bb3785710b0a02d1d21eddcfd51a97ffc71271d84560")) + (249305, uint256S("d19bb236d27da37de1f05b79d8ceff365d825fdf4d2dcf64a0ce5bf51780892c")) + (252674, uint256S("b9281a8f6ed178b20fe0e8cb6d79e81d7f1a8efc2b4bc0e5de8d056930863b7d")) + (256043, uint256S("1abfb13093bcf99926da0f05041de0d14b76d482c34a911bad6bb55be571f22c")) + (259412, uint256S("92e995f16f9cd4e0b6cfbdbee6b66f929cf65224a88bb26ed24d57f979a03502")) + (262781, uint256S("cc8907175893869f6cf1426633b05a3e2f5375ae7859bc4665ed41d1d8609e7a")) + (266150, uint256S("30f11b3421652408f88a2f4177957b5c9e03c01a7634274234bdc389a26f87e1")) + (269519, uint256S("82f2a64a7600b97ceef7d5ae2dcaa55f6969d0a3cf0db54b23f6b7f515538f02")) + (272888, uint256S("a9ada77f83a734e61526addc697d14248262258d90245db99040d53de2ddc2d8")) + (276257, uint256S("a04e4615443b210d0e5296c95e56ff5485fa48f80616174957695538550d9cc8")) + (279626, uint256S("94b69dd5d7ea09246f6b1da1ce3e885cbd233e6145656f7660fde8d67be8cccb")) + (282995, uint256S("2a1fa0421274008efcc23caec129b0520cfff29bc56152de7e27928905c085ed")) + (286364, uint256S("efcf6bcc34d6f38141a3f39d78ac3ebb69bad371f5ba39853ee215c9138e4888")) + (289733, uint256S("5190834b055fb7e125d3152176a7660da22d3908b973eff5f00b0b1e8c92f85f")) + (293102, uint256S("d00272571bd7efc1edec19286ccf26b4ac08880addeb24139cfd163e36f39b0d")) + (296471, uint256S("e3164d331dd73f114c1bd896e900425239c875f565d204b173410583df7eebab")) + (299840, uint256S("07686a57313744d2b14410ccdbb8776209588c7e9fdfd3d8bf315e41dc9da31d")) + (303209, uint256S("093ae8cc9978b90f93efee586559f7546b9d4c3832a2e1c5a6c9911efdb956c6")) + (306578, uint256S("d740c7ee7dee0751c3207bdab1ba7d753877630b85f36083682de7c508e8b7e3")) + (309947, uint256S("d51d10e815c729dfeea97131342846ee6e15c55cf2da9e5518ff742f1caf3d8b")) + (313316, uint256S("ec04e1d540fd9f175520bf63720f58fcacea4c40b2a0d20ae7602181c62e6f25")) + (316685, uint256S("be4a3f17d11a056fb97925b0fa7826af179966df393c34a581b694ebe43b3c6e")) + (320054, uint256S("d97de2044c624cfb4e1123681e7155914f819030a46b03c4780aacc756ed55f1")) + (323423, uint256S("094aeee88af871d88d0da4155b799c18513e888b7314356fe9bc5abbaae203bf")) + (326792, uint256S("e57a0c891dfad72619eedcfe47bfcb448ad471a1eae6c0a9d65547008a675ef7")) + (330161, uint256S("0a86056978470c7fb4a8015cea78c4187a73c1b2c8bd9a1a69001b2486683bca")) + (333530, uint256S("4f1db55fe1ce7d7983e4136dbeb5527816ee1b64905ba62ded7c7b6c8f1a8728")) ; static const Checkpoints::CCheckpointData data = { &mapCheckpoints, - 1626645975, // * UNIX timestamp of last checkpoint block - 152089, // * total number of transactions between genesis and last checkpoint + 1642563690, // * UNIX timestamp of last checkpoint block + 715920, // * total number of transactions between genesis and last checkpoint // (the tx=... number in the UpdateTip debug.log lines) - 2988 // * estimated number of transactions per day after checkpoint + 2928 // * estimated number of transactions per day after checkpoint }; static Checkpoints::MapCheckpoints mapCheckpointsTestnet = @@ -221,8 +220,7 @@ class CMainParams : public CChainParams consensus.nCoinbaseMaturity = 100; consensus.nFutureTimeDriftPoW = 7200; consensus.nFutureTimeDriftPoS = 180; - consensus.nMasternodeCountDrift = 20; // num of MN we allow the see-saw payments to be off by - consensus.nMaxMoneyOut = 300000000 * COIN; + consensus.nMaxMoneyOut = 9999999999 * COIN; consensus.nPoolMaxTransactions = 3; consensus.nProposalEstablishmentTime = 60 * 60 * 24; // must be at least a day old to make it into a budget consensus.nStakeMinAge = 60 * 60; // 1h @@ -239,6 +237,11 @@ class CMainParams : public CChainParams consensus.nTime_EnforceNewSporkKey = 0; consensus.nTime_RejectOldSporkKey = 0; + // burn addresses + consensus.mBurnAddresses = { + { "sXXXXXXXXXXXXXXXXXXXXXXXXXXXVpr7nX", 0 } + }; + // height-based activations consensus.height_last_ZC_AccumCheckpoint = DISABLED; consensus.height_last_ZC_WrappedSerials = DISABLED; @@ -284,7 +287,7 @@ class CMainParams : public CChainParams consensus.vUpgrades[Consensus::UPGRADE_TIME_PROTOCOL_V2].hashActivationBlock = uint256S("0f2a78cae02903adaee9b7e43a91b86725980e9ef3bb49303a722a48bf9a32f6"); consensus.vUpgrades[Consensus::UPGRADE_P2PKH_BLOCK_SIGNATURES].hashActivationBlock = uint256S("a70f1ced0cda9854854bda729aa9c93e5867fd583158f033fb16b50daa258a71"); consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].hashActivationBlock = uint256S("3142c02979abdf5e8e8f6d0f5d68e04caee93fe720d401a806e5e074e50ed5c6"); - consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].hashActivationBlock = uint256S("0x0"); + consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].hashActivationBlock = uint256S("be026155f0d3fce0b28ba5e0153555b34fe850beb0244803e27c64dd895a8938"); /** * The message start string is designed to be unlikely to occur in normal data. @@ -352,7 +355,6 @@ class CTestNetParams : public CMainParams consensus.nCoinbaseMaturity = 15; consensus.nFutureTimeDriftPoW = 7200; consensus.nFutureTimeDriftPoS = 180; - consensus.nMasternodeCountDrift = 4; // num of MN we allow the see-saw payments to be off by consensus.nMaxMoneyOut = 43199500 * COIN; consensus.nPoolMaxTransactions = 2; consensus.nProposalEstablishmentTime = 60 * 5; // at least 5 min old to make it into a budget @@ -478,7 +480,6 @@ class CRegTestParams : public CTestNetParams consensus.nCoinbaseMaturity = 100; consensus.nFutureTimeDriftPoW = 7200; consensus.nFutureTimeDriftPoS = 180; - consensus.nMasternodeCountDrift = 4; // num of MN we allow the see-saw payments to be off by consensus.nMaxMoneyOut = 43199500 * COIN; consensus.nPoolMaxTransactions = 2; consensus.nProposalEstablishmentTime = 60 * 5; // at least 5 min old to make it into a budget diff --git a/src/chainparams.h b/src/chainparams.h index 11d8c4dad..5e327ec24 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -21,6 +21,7 @@ #include "uint256.h" #include +#include struct CDNSSeedData { std::string name, host; diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index fdd4b0515..ebd872a38 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h index a9ff66c2a..581ceb2eb 100644 --- a/src/chainparamsbase.h +++ b/src/chainparamsbase.h @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 60b871ba5..6015f3b33 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkpoints.h b/src/checkpoints.h index a0b5e9c46..4c7907491 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/checkqueue.h b/src/checkqueue.h index 1baf0c45d..a80a1039d 100644 --- a/src/checkqueue.h +++ b/src/checkqueue.h @@ -1,5 +1,5 @@ // Copyright (c) 2012-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/clientversion.cpp b/src/clientversion.cpp index 69abf3c36..54f58ea8b 100644 --- a/src/clientversion.cpp +++ b/src/clientversion.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2017 The Bitcoin Core developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -14,7 +14,7 @@ * for both cryptosagad and cryptosaga-qt, to make it harder for attackers to * target servers or GUI users specifically. */ -const std::string CLIENT_NAME("CryptoSaga"); +const std::string CLIENT_NAME("CryptoSaga Core"); /** * Client version number diff --git a/src/clientversion.h b/src/clientversion.h index 3c1a87038..d8ed25a44 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coincontrol.h b/src/coincontrol.h index bd522e01a..7aab41925 100644 --- a/src/coincontrol.h +++ b/src/coincontrol.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.cpp b/src/coins.cpp index b0a57a131..27a93b31c 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/coins.h b/src/coins.h index 327bef57d..d33d91d10 100644 --- a/src/coins.h +++ b/src/coins.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat.h b/src/compat.h index c9fac775d..3f24005ba 100644 --- a/src/compat.h +++ b/src/compat.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/byteswap.h b/src/compat/byteswap.h index 88446752d..7188e2f79 100644 --- a/src/compat/byteswap.h +++ b/src/compat/byteswap.h @@ -1,5 +1,5 @@ // Copyright (c) 2014-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/endian.h b/src/compat/endian.h index 00edfa5b7..9b51cf76b 100644 --- a/src/compat/endian.h +++ b/src/compat/endian.h @@ -1,5 +1,5 @@ // Copyright (c) 2014-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp index 98187957b..d6078e13c 100644 --- a/src/compat/glibc_compat.cpp +++ b/src/compat/glibc_compat.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibc_sanity.cpp b/src/compat/glibc_sanity.cpp index 8667487ca..02eed22d6 100644 --- a/src/compat/glibc_sanity.cpp +++ b/src/compat/glibc_sanity.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/glibcxx_sanity.cpp b/src/compat/glibcxx_sanity.cpp index c6a778708..6ca2504ad 100644 --- a/src/compat/glibcxx_sanity.cpp +++ b/src/compat/glibcxx_sanity.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/sanity.h b/src/compat/sanity.h index c790bb9a1..488d8e53e 100644 --- a/src/compat/sanity.h +++ b/src/compat/sanity.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compat/strnlen.cpp b/src/compat/strnlen.cpp index 2126c3180..c9677f591 100644 --- a/src/compat/strnlen.cpp +++ b/src/compat/strnlen.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2009-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.cpp b/src/compressor.cpp index 86cde0b82..a106e7a71 100644 --- a/src/compressor.cpp +++ b/src/compressor.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/compressor.h b/src/compressor.h index c6b5af17c..f219001ae 100644 --- a/src/compressor.h +++ b/src/compressor.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h index 88cd3ccc7..a11dc2f4a 100644 --- a/src/consensus/consensus.h +++ b/src/consensus/consensus.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp index 79a0e0187..cbe20d8f5 100644 --- a/src/consensus/merkle.cpp +++ b/src/consensus/merkle.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/merkle.h b/src/consensus/merkle.h index 84cea2d61..18bc7e7ac 100644 --- a/src/consensus/merkle.h +++ b/src/consensus/merkle.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp index de6cdeb4d..faedb1292 100644 --- a/src/consensus/params.cpp +++ b/src/consensus/params.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2019 The Zcash developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . diff --git a/src/consensus/params.h b/src/consensus/params.h index 4867a8325..6fa0d6252 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -98,7 +98,6 @@ struct Params { int nCoinbaseMaturity; int nFutureTimeDriftPoW; int nFutureTimeDriftPoS; - int nMasternodeCountDrift; CAmount nMaxMoneyOut; int nPoolMaxTransactions; int64_t nProposalEstablishmentTime; @@ -110,6 +109,9 @@ struct Params { int64_t nTargetSpacing; int nTimeSlotLength; + // burn addresses + std::map mBurnAddresses = {}; + // spork keys std::string strSporkPubKey; std::string strSporkPubKeyOld; @@ -163,6 +165,13 @@ struct Params { ); } + bool IsBurnAddress(const std::string strAddress, const int nHeight) + { + return + mBurnAddresses.find(strAddress) != mBurnAddresses.end() && + mBurnAddresses[strAddress] < nHeight; + } + /* * (Legacy) Zerocoin consensus params */ diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp index fee8597ae..bd71eeb75 100644 --- a/src/consensus/tx_verify.cpp +++ b/src/consensus/tx_verify.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/tx_verify.h b/src/consensus/tx_verify.h index 73e6dd22a..0b4d72130 100644 --- a/src/consensus/tx_verify.h +++ b/src/consensus/tx_verify.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp index 53d3b3744..593d31de4 100644 --- a/src/consensus/upgrades.cpp +++ b/src/consensus/upgrades.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2018 The Zcash developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/upgrades.h b/src/consensus/upgrades.h index 7f5cf32db..cab599f43 100644 --- a/src/consensus/upgrades.h +++ b/src/consensus/upgrades.h @@ -1,6 +1,6 @@ // Copyright (c) 2018 The Zcash developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/validation.h b/src/consensus/validation.h index 9c6ce3964..58ff6f94c 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/zerocoin_verify.cpp b/src/consensus/zerocoin_verify.cpp index b66b63b33..1613f7240 100644 --- a/src/consensus/zerocoin_verify.cpp +++ b/src/consensus/zerocoin_verify.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/consensus/zerocoin_verify.h b/src/consensus/zerocoin_verify.h index 0176f590c..da0fde70a 100644 --- a/src/consensus/zerocoin_verify.h +++ b/src/consensus/zerocoin_verify.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_io.h b/src/core_io.h index acf9481d1..b5a27a937 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_read.cpp b/src/core_read.cpp index 95306c301..a482c7880 100644 --- a/src/core_read.cpp +++ b/src/core_read.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/core_write.cpp b/src/core_write.cpp index 72e0d98ef..9123cb5b2 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypter.cpp b/src/crypter.cpp index d6bd20408..0bbfaaa8f 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypter.h b/src/crypter.h index 721ae7036..067abdf56 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp index 9e438906c..9b901b34d 100644 --- a/src/crypto/aes.cpp +++ b/src/crypto/aes.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/aes.h b/src/crypto/aes.h index 6231cff93..cbc7c74f1 100644 --- a/src/crypto/aes.h +++ b/src/crypto/aes.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/crypto/chacha20.cpp b/src/crypto/chacha20.cpp index 75715f033..9084c88a9 100644 --- a/src/crypto/chacha20.cpp +++ b/src/crypto/chacha20.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/chacha20.h b/src/crypto/chacha20.h index 5688f3593..3384d1fdc 100644 --- a/src/crypto/chacha20.h +++ b/src/crypto/chacha20.h @@ -1,5 +1,5 @@ // Copyright (c) 2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/common.h b/src/crypto/common.h index 6b6161907..7d6aa6ba9 100644 --- a/src/crypto/common.h +++ b/src/crypto/common.h @@ -1,5 +1,5 @@ // Copyright (c) 2014-2018 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/google_authenticator.cpp b/src/crypto/google_authenticator.cpp new file mode 100644 index 000000000..1a9c7ab75 --- /dev/null +++ b/src/crypto/google_authenticator.cpp @@ -0,0 +1,45 @@ +// Copyright (c) 2021-2022 The DECENOMY Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "crypto/google_authenticator.h" +#include "crypto/hmac_sha1.h" + +#include +#include +#include + +int GoogleAuthenticator::GeneratePin() { + + int64_t currentInterval = std::time(NULL) / INTERVAL_LENGHT; + + unsigned char counterBytes[8]; + + counterBytes[0] = (int)((currentInterval >> 56) & 0xFF); + counterBytes[1] = (int)((currentInterval >> 48) & 0xFF); + counterBytes[2] = (int)((currentInterval >> 40) & 0XFF); + counterBytes[3] = (int)((currentInterval >> 32) & 0XFF); + counterBytes[4] = (int)((currentInterval >> 24) & 0xFF); + counterBytes[5] = (int)((currentInterval >> 16) & 0xFF); + counterBytes[6] = (int)((currentInterval >> 8) & 0XFF); + counterBytes[7] = (int)(currentInterval & 0XFF); + + CHMAC_SHA1 h(key, len); + h.Write(counterBytes, 8); + unsigned char hash[20]; + h.Finalize(hash); + + unsigned char selectBytes[4]; + std::memcpy(selectBytes, hash + (hash[19] & 0xF), 4); + + int pin = + (selectBytes[0] << 24) + + (selectBytes[1] << 16) + + (selectBytes[2] << 8) + + selectBytes[3]; + + pin &= 0x7FFFFFFF; + pin %= (int) std::pow(10, PIN_LENGHT); + + return pin; +} \ No newline at end of file diff --git a/src/crypto/google_authenticator.h b/src/crypto/google_authenticator.h new file mode 100644 index 000000000..6853b836e --- /dev/null +++ b/src/crypto/google_authenticator.h @@ -0,0 +1,25 @@ +// Copyright (c) 2021-2022 The DECENOMY Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef DECENOMY_CRYPTO_GOOGLE_AUTHENTICATOR_H +#define DECENOMY_CRYPTO_GOOGLE_AUTHENTICATOR_H + +#include + +/** A Google Authenticator support class. */ +class GoogleAuthenticator +{ +private: + static const int INTERVAL_LENGHT = 30; + static const int PIN_LENGHT = 6; + + const unsigned char* key; + const int len; +public: + GoogleAuthenticator(const unsigned char* key, const int len) : key(key), len(len) {} + + int GeneratePin(); +}; + +#endif // DECENOMY_CRYPTO_GOOGLE_AUTHENTICATOR_H diff --git a/src/crypto/hmac_sha1.cpp b/src/crypto/hmac_sha1.cpp new file mode 100644 index 000000000..e31bdb584 --- /dev/null +++ b/src/crypto/hmac_sha1.cpp @@ -0,0 +1,35 @@ +// Copyright (c) 2014 The Bitcoin developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#include "crypto/hmac_sha1.h" + +#include + +CHMAC_SHA1::CHMAC_SHA1(const unsigned char* key, size_t keylen) +{ + unsigned char rkey[64]; + if (keylen <= 64) { + memcpy(rkey, key, keylen); + memset(rkey + keylen, 0, 64 - keylen); + } else { + CSHA1().Write(key, keylen).Finalize(rkey); + memset(rkey + 32, 0, 32); + } + + for (int n = 0; n < 64; n++) + rkey[n] ^= 0x5c; + outer.Write(rkey, 64); + + for (int n = 0; n < 64; n++) + rkey[n] ^= 0x5c ^ 0x36; + inner.Write(rkey, 64); +} + +void CHMAC_SHA1::Finalize(unsigned char hash[OUTPUT_SIZE]) +{ + unsigned char temp[OUTPUT_SIZE]; + inner.Finalize(temp); + outer.Write(temp, OUTPUT_SIZE).Finalize(hash); +} diff --git a/src/crypto/hmac_sha1.h b/src/crypto/hmac_sha1.h new file mode 100644 index 000000000..bcc4f318f --- /dev/null +++ b/src/crypto/hmac_sha1.h @@ -0,0 +1,33 @@ +// Copyright (c) 2014 The Bitcoin developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers +// Distributed under the MIT software license, see the accompanying +// file COPYING or http://www.opensource.org/licenses/mit-license.php. + +#ifndef BITCOIN_CRYPTO_HMAC_SHA1_H +#define BITCOIN_CRYPTO_HMAC_SHA1_H + +#include "crypto/sha1.h" + +#include +#include + +/** A hasher class for HMAC-SHA1. */ +class CHMAC_SHA1 +{ +private: + CSHA1 outer; + CSHA1 inner; + +public: + static const size_t OUTPUT_SIZE = 20; + + CHMAC_SHA1(const unsigned char* key, size_t keylen); + CHMAC_SHA1& Write(const unsigned char* data, size_t len) + { + inner.Write(data, len); + return *this; + } + void Finalize(unsigned char hash[OUTPUT_SIZE]); +}; + +#endif // BITCOIN_CRYPTO_HMAC_SHA1_H diff --git a/src/crypto/hmac_sha256.cpp b/src/crypto/hmac_sha256.cpp index 9f62ac1c7..ce12eeb03 100644 --- a/src/crypto/hmac_sha256.cpp +++ b/src/crypto/hmac_sha256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha256.h b/src/crypto/hmac_sha256.h index 7ddb8023d..7d07f0c55 100644 --- a/src/crypto/hmac_sha256.h +++ b/src/crypto/hmac_sha256.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.cpp b/src/crypto/hmac_sha512.cpp index a32e72f50..89b518b7b 100644 --- a/src/crypto/hmac_sha512.cpp +++ b/src/crypto/hmac_sha512.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/hmac_sha512.h b/src/crypto/hmac_sha512.h index 1aae3bd12..04a6cef78 100644 --- a/src/crypto/hmac_sha512.h +++ b/src/crypto/hmac_sha512.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/rfc6979_hmac_sha256.cpp b/src/crypto/rfc6979_hmac_sha256.cpp index 7962b434e..3261a7664 100644 --- a/src/crypto/rfc6979_hmac_sha256.cpp +++ b/src/crypto/rfc6979_hmac_sha256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/rfc6979_hmac_sha256.h b/src/crypto/rfc6979_hmac_sha256.h index 86a919b0b..f1b7d1f51 100644 --- a/src/crypto/rfc6979_hmac_sha256.h +++ b/src/crypto/rfc6979_hmac_sha256.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp index 62057836c..09dd86257 100644 --- a/src/crypto/ripemd160.cpp +++ b/src/crypto/ripemd160.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/ripemd160.h b/src/crypto/ripemd160.h index dd1d30e2d..cc833d00d 100644 --- a/src/crypto/ripemd160.h +++ b/src/crypto/ripemd160.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp index e78ff9b4d..857de66e4 100644 --- a/src/crypto/sha1.cpp +++ b/src/crypto/sha1.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha1.h b/src/crypto/sha1.h index 52bbb8b24..a2c2f1514 100644 --- a/src/crypto/sha1.h +++ b/src/crypto/sha1.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp index 35f426bf7..388cc4971 100644 --- a/src/crypto/sha256.cpp +++ b/src/crypto/sha256.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha256.h b/src/crypto/sha256.h index 39f941b77..c5b2b9c90 100644 --- a/src/crypto/sha256.h +++ b/src/crypto/sha256.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp index 129c4d558..64bdd6e0a 100644 --- a/src/crypto/sha512.cpp +++ b/src/crypto/sha512.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/crypto/sha512.h b/src/crypto/sha512.h index 54e5c00b7..e888119db 100644 --- a/src/crypto/sha512.h +++ b/src/crypto/sha512.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/cuckoocache.h b/src/cuckoocache.h index 42b76d685..9f0655bdc 100644 --- a/src/cuckoocache.h +++ b/src/cuckoocache.h @@ -1,5 +1,5 @@ // Copyright (c) 2016 Jeremy Rubin -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp index 0a91a0675..30cf92501 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/dbwrapper.h b/src/dbwrapper.h index d6e5f50c8..c3997e12d 100644 --- a/src/dbwrapper.h +++ b/src/dbwrapper.h @@ -1,5 +1,5 @@ // Copyright (c) 2012-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/denomination_functions.cpp b/src/denomination_functions.cpp index c37d2eb5f..883a6ceea 100644 --- a/src/denomination_functions.cpp +++ b/src/denomination_functions.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/denomination_functions.h b/src/denomination_functions.h index 3a5b4e226..50ca20fca 100644 --- a/src/denomination_functions.h +++ b/src/denomination_functions.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/fs.cpp b/src/fs.cpp index f51311e8a..d47732dec 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2017-2020 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/fs.h b/src/fs.h index 1ef5b7587..933c18056 100644 --- a/src/fs.h +++ b/src/fs.h @@ -1,6 +1,6 @@ // Copyright (c) 2017-2020 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/guiinterface.h b/src/guiinterface.h index 4972e4cfb..e5c888d4d 100644 --- a/src/guiinterface.h +++ b/src/guiinterface.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/guiinterfaceutil.h b/src/guiinterfaceutil.h index cfdd2dfdd..443ba1264 100644 --- a/src/guiinterfaceutil.h +++ b/src/guiinterfaceutil.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.cpp b/src/hash.cpp index d9dd830c3..b4393d35a 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2013-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/hash.h b/src/hash.h index 2d04eae9f..281c8c194 100644 --- a/src/hash.h +++ b/src/hash.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.cpp b/src/httprpc.cpp index 467e2035b..a80415560 100644 --- a/src/httprpc.cpp +++ b/src/httprpc.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015-2017 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httprpc.h b/src/httprpc.h index 1151e4c70..7677f3870 100644 --- a/src/httprpc.h +++ b/src/httprpc.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.cpp b/src/httpserver.cpp index cd11a5bc6..83a7049fb 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/httpserver.h b/src/httpserver.h index f167ac61d..dcaabb490 100644 --- a/src/httpserver.h +++ b/src/httpserver.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/init.cpp b/src/init.cpp index 7ca7d50d2..19c0e3a7c 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -5,7 +5,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -943,7 +943,7 @@ bool AppInit2() // Make sure enough file descriptors are available int nBind = std::max((int)mapArgs.count("-bind") + (int)mapArgs.count("-whitebind"), 1); int nUserMaxConnections = GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS); - int nMaxConnections = std::max(nUserMaxConnections, 2 * MAX_OUTBOUND_CONNECTIONS); + int nMaxConnections = std::max(nUserMaxConnections, 4 * MAX_OUTBOUND_CONNECTIONS); // Trim requested connection counts, to fit into system limitations nMaxConnections = std::max(std::min(nMaxConnections, (int)(FD_SETSIZE - nBind - MIN_CORE_FILEDESCRIPTORS)), 0); @@ -1861,7 +1861,7 @@ bool AppInit2() connOptions.nLocalServices = nLocalServices; connOptions.nRelevantServices = nRelevantServices; connOptions.nMaxConnections = nMaxConnections; - connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections); + connOptions.nMaxOutbound = std::min(MAX_OUTBOUND_CONNECTIONS, connOptions.nMaxConnections / 2); connOptions.nMaxFeeler = 1; connOptions.nBestHeight = chainActive.Height(); connOptions.uiInterface = &uiInterface; diff --git a/src/init.h b/src/init.h index 417307c4d..f1ef0246d 100644 --- a/src/init.h +++ b/src/init.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/interface/wallet.cpp b/src/interface/wallet.cpp index 0b155e3a0..43fa643d5 100644 --- a/src/interface/wallet.cpp +++ b/src/interface/wallet.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2018-2020 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. diff --git a/src/interface/wallet.h b/src/interface/wallet.h index 2c82ed291..5b64d2c44 100644 --- a/src/interface/wallet.h +++ b/src/interface/wallet.h @@ -1,6 +1,6 @@ // Copyright (c) 2018-2020 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. diff --git a/src/invalid.cpp b/src/invalid.cpp index a8ea598db..1b089c74d 100644 --- a/src/invalid.cpp +++ b/src/invalid.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/invalid.h b/src/invalid.h index 00e7e1379..d6a985490 100644 --- a/src/invalid.h +++ b/src/invalid.h @@ -1,5 +1,5 @@ // Copyright (c) 2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/kernel.cpp b/src/kernel.cpp index c84bc42e6..b74bec98d 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -132,23 +132,24 @@ bool Stake(const CBlockIndex* pindexPrev, CStakeInput* stakeInput, unsigned int // Get the new time slot (and verify it's not the same as previous block) const bool fRegTest = Params().IsRegTestNet(); const bool fTimeProtocolV2 = Params().GetConsensus().IsTimeProtocolV2(nHeightTx) && !fRegTest; - nTimeTx = (fTimeProtocolV2 ? GetCurrentTimeSlot() : GetAdjustedTime()); - - if (nTimeTx <= pindexPrev->nTime && !fRegTest) return false; + const int nTimeSlotLength = Params().GetConsensus().nTimeSlotLength; + nTimeTx = fTimeProtocolV2 ? pindexPrev->MinPastBlockTime() : GetAdjustedTime(); if (!stakeInput || !stakeInput->ContextCheck(nHeightTx, nTimeTx)) return false; - int slotRange = fTimeProtocolV2 ? 1 : Params().GetConsensus().nFutureTimeDriftPoS; + int slotStep = fTimeProtocolV2 ? nTimeSlotLength : 1; + + nTimeTx = (nTimeTx / slotStep) * slotStep; + + while(nTimeTx <= pindexPrev->MinPastBlockTime()) { + nTimeTx += slotStep; + } - for(int i = 0; i < slotRange; i++) - { + while(nTimeTx <= (fTimeProtocolV2 ? pindexPrev->MaxFutureBlockTime() : pindexPrev->GetBlockTime() + HASH_DRIFT)) { // Verify Proof Of Stake CStakeKernel stakeKernel(pindexPrev, stakeInput, nBits, nTimeTx); - if(stakeKernel.CheckKernelHash(true)) - { - return true; - } - nTimeTx++; + if(stakeKernel.CheckKernelHash(true)) return true; + nTimeTx += slotStep; } return false; diff --git a/src/kernel.h b/src/kernel.h index 2b5f2bca3..067b7ad35 100644 --- a/src/kernel.h +++ b/src/kernel.h @@ -2,7 +2,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,6 +12,8 @@ #include "main.h" #include "stakeinput.h" +#define HASH_DRIFT 45 + class CStakeKernel { public: /** diff --git a/src/key.cpp b/src/key.cpp index e0b00428c..06f4d72c5 100644 --- a/src/key.cpp +++ b/src/key.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2017 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key.h b/src/key.h index c079295da..4f0d25716 100644 --- a/src/key.h +++ b/src/key.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.cpp b/src/key_io.cpp index 0c2e99a37..94ecb74b5 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014-2019 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/key_io.h b/src/key_io.h index a612b0327..674bafc72 100644 --- a/src/key_io.h +++ b/src/key_io.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.cpp b/src/keystore.cpp index b32877a81..f167d12f4 100644 --- a/src/keystore.cpp +++ b/src/keystore.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/keystore.h b/src/keystore.h index 54d8a5d8c..ceda22f15 100644 --- a/src/keystore.h +++ b/src/keystore.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/legacy/stakemodifier.cpp b/src/legacy/stakemodifier.cpp index 101c97da4..b597bbcc1 100644 --- a/src/legacy/stakemodifier.cpp +++ b/src/legacy/stakemodifier.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/legacy/stakemodifier.h b/src/legacy/stakemodifier.h index f18e7a0af..0bb7caf71 100644 --- a/src/legacy/stakemodifier.h +++ b/src/legacy/stakemodifier.h @@ -2,7 +2,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/legacy/validation_zerocoin_legacy.cpp b/src/legacy/validation_zerocoin_legacy.cpp index 088edb8ba..4297719dd 100644 --- a/src/legacy/validation_zerocoin_legacy.cpp +++ b/src/legacy/validation_zerocoin_legacy.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. #include "legacy/validation_zerocoin_legacy.h" diff --git a/src/legacy/validation_zerocoin_legacy.h b/src/legacy/validation_zerocoin_legacy.h index ba05353c8..01e1a1a83 100644 --- a/src/legacy/validation_zerocoin_legacy.h +++ b/src/legacy/validation_zerocoin_legacy.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/CoinRandomnessSchnorrSignature.cpp b/src/libzerocoin/CoinRandomnessSchnorrSignature.cpp index 5c41b030b..81d5e5744 100644 --- a/src/libzerocoin/CoinRandomnessSchnorrSignature.cpp +++ b/src/libzerocoin/CoinRandomnessSchnorrSignature.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/CoinRandomnessSchnorrSignature.h b/src/libzerocoin/CoinRandomnessSchnorrSignature.h index ba46a5479..f6fea575b 100644 --- a/src/libzerocoin/CoinRandomnessSchnorrSignature.h +++ b/src/libzerocoin/CoinRandomnessSchnorrSignature.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/Denominations.cpp b/src/libzerocoin/Denominations.cpp index 315a2ee2c..66688160a 100644 --- a/src/libzerocoin/Denominations.cpp +++ b/src/libzerocoin/Denominations.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/Denominations.h b/src/libzerocoin/Denominations.h index e31ed4051..cf76c844f 100644 --- a/src/libzerocoin/Denominations.h +++ b/src/libzerocoin/Denominations.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/SpendType.h b/src/libzerocoin/SpendType.h index da40c7dd7..45d363048 100644 --- a/src/libzerocoin/SpendType.h +++ b/src/libzerocoin/SpendType.h @@ -1,5 +1,5 @@ // Copyright (c) 2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/bignum.cpp b/src/libzerocoin/bignum.cpp index 2ec5916df..5bb3fb879 100644 --- a/src/libzerocoin/bignum.cpp +++ b/src/libzerocoin/bignum.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/bignum.h b/src/libzerocoin/bignum.h index c6fe0117b..df83a04b7 100755 --- a/src/libzerocoin/bignum.h +++ b/src/libzerocoin/bignum.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/bignum_gmp.cpp b/src/libzerocoin/bignum_gmp.cpp index 223b9c175..c8079e446 100644 --- a/src/libzerocoin/bignum_gmp.cpp +++ b/src/libzerocoin/bignum_gmp.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/libzerocoin/bignum_openssl.cpp b/src/libzerocoin/bignum_openssl.cpp index b238ad203..032248dff 100644 --- a/src/libzerocoin/bignum_openssl.cpp +++ b/src/libzerocoin/bignum_openssl.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/limitedmap.h b/src/limitedmap.h index 677206ae4..c1b6fd5d6 100644 --- a/src/limitedmap.h +++ b/src/limitedmap.h @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.cpp b/src/logging.cpp index 9e13deeca..ce8e623f2 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/logging.h b/src/logging.h index 02ce1640f..a86fc769d 100644 --- a/src/logging.h +++ b/src/logging.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/main.cpp b/src/main.cpp index 8930d3118..8bd2319ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,7 +5,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -877,6 +877,24 @@ bool AcceptToMemoryPoolWorker(CTxMemPool& pool, CValidationState &state, const C return state.Invalid(false, REJECT_ALREADY_KNOWN, "txn-already-in-mempool"); } + // ----------- burn address scanning ----------- + if (!consensus.mBurnAddresses.empty()) { + for (unsigned int i = 0; i < tx.vin.size(); ++i) { + uint256 hashBlock; + CTransaction txPrev; + if (GetTransaction(tx.vin[i].prevout.hash, txPrev, hashBlock, true)) { // get the vin's previous transaction + CTxDestination source; + if (ExtractDestination(txPrev.vout[tx.vin[i].prevout.n].scriptPubKey, source)) { // extract the destination of the previous transaction's vout[n] + const std::string addr = EncodeDestination(source); + if (consensus.mBurnAddresses.find(addr) != consensus.mBurnAddresses.end() && + consensus.mBurnAddresses.at(addr) < chainHeight) { + return state.DoS(0, false, REJECT_INVALID, "bad-txns-invalid-outputs"); + } + } + } + } + } + bool hasZcSpendInputs = tx.HasZerocoinSpendInputs(); // Check for conflicts with in-memory transactions @@ -3557,12 +3575,36 @@ bool IsTransactionInChain(const uint256& txId, int& nHeightTx) bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIndex* const pindexPrev) { const int nHeight = pindexPrev == nullptr ? 0 : pindexPrev->nHeight + 1; + const Consensus::Params& consensus = Params().GetConsensus(); // Check that all transactions are finalized - for (const CTransaction& tx : block.vtx) + for (const CTransaction& tx : block.vtx) { if (!IsFinalTx(tx, nHeight, block.GetBlockTime())) { return state.DoS(10, false, REJECT_INVALID, "bad-txns-nonfinal", false, "non-final transaction"); } + } + + // ----------- burn address scanning ----------- + if (!consensus.mBurnAddresses.empty()) { + for (const CTransaction& tx : block.vtx) { + if (!tx.IsCoinBase()) { + for (unsigned int i = 0; i < tx.vin.size(); ++i) { + uint256 hashBlock; + CTransaction txPrev; + if (GetTransaction(tx.vin[i].prevout.hash, txPrev, hashBlock, true)) { // get the vin's previous transaction + CTxDestination source; + if (ExtractDestination(txPrev.vout[tx.vin[i].prevout.n].scriptPubKey, source)) { // extract the destination of the previous transaction's vout[n] + const std::string addr = EncodeDestination(source); + if (consensus.mBurnAddresses.find(addr) != consensus.mBurnAddresses.end() && + consensus.mBurnAddresses.at(addr) < nHeight) { + return state.DoS(100, error("%s : Burned address %s tried to send a transaction %s (rejecting it).", __func__, addr.c_str(), txPrev.GetHash().ToString().c_str()), REJECT_INVALID, "bad-txns-banned"); + } + } + } + } + } + } + } // // Enforce block.nVersion=2 rule that the coinbase starts with serialized block height // if (pindexPrev) { // pindexPrev is only null on the first block which is a version 1 block. @@ -5106,7 +5148,21 @@ bool static ProcessMessage(CNode* pfrom, std::string strCommand, CDataStream& vR pfrom->cleanSubVer = cleanSubVer; } - if (pfrom->cleanSubVer.find(CLIENT_NAME) == std::string::npos) { + auto shortFromName = pfrom->cleanSubVer.substr(0, pfrom->cleanSubVer.find(':')).substr(0, pfrom->cleanSubVer.find(' ')); + auto shortName = CLIENT_NAME.substr(0, CLIENT_NAME.find(' ')); + + for (auto & c: shortFromName) c = toupper(c); + for (auto & c: shortName) c = toupper(c); + + shortFromName.erase( + std::remove_if( + shortFromName.begin(), + shortFromName.end(), + []( char const& c ) -> bool { return !std::isalnum(c); }), + shortFromName.end() + ); + + if (shortName.find(shortFromName) == std::string::npos) { LOCK(cs_main); Misbehaving(pfrom->GetId(), 100); pfrom->fDisconnect = true; diff --git a/src/main.h b/src/main.h index 9951c44df..859ef99ca 100644 --- a/src/main.h +++ b/src/main.h @@ -5,7 +5,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index 2f27337c8..4591c5bd5 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-budget.h b/src/masternode-budget.h index f7895a19d..a75091956 100644 --- a/src/masternode-budget.h +++ b/src/masternode-budget.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index 17fbb5ab5..915e11460 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-payments.h b/src/masternode-payments.h index 966a9ef94..4b453c252 100644 --- a/src/masternode-payments.h +++ b/src/masternode-payments.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp index 5f4a04320..c3ed86aaa 100644 --- a/src/masternode-sync.cpp +++ b/src/masternode-sync.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode-sync.h b/src/masternode-sync.h index 46d5a6693..1691431ed 100644 --- a/src/masternode-sync.h +++ b/src/masternode-sync.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode.cpp b/src/masternode.cpp index e6164d3d9..3f9954e8f 100644 --- a/src/masternode.cpp +++ b/src/masternode.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternode.h b/src/masternode.h index 6caec34d9..c66a6c08c 100644 --- a/src/masternode.h +++ b/src/masternode.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp index 05860193e..8240e5e4a 100644 --- a/src/masternodeconfig.cpp +++ b/src/masternodeconfig.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternodeconfig.h b/src/masternodeconfig.h index b2249cc7d..af2ef8658 100644 --- a/src/masternodeconfig.h +++ b/src/masternodeconfig.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 3975a4eae..e8af65529 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/masternodeman.h b/src/masternodeman.h index d158922a0..384527b0a 100644 --- a/src/masternodeman.h +++ b/src/masternodeman.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/memusage.h b/src/memusage.h index ad3848ff3..8060f5fac 100644 --- a/src/memusage.h +++ b/src/memusage.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.cpp b/src/merkleblock.cpp index 8513eeb12..3df46f151 100644 --- a/src/merkleblock.cpp +++ b/src/merkleblock.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/merkleblock.h b/src/merkleblock.h index 6268d2191..78e368c63 100644 --- a/src/merkleblock.h +++ b/src/merkleblock.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp index e8b0ec71e..9d7e8b0b3 100644 --- a/src/messagesigner.cpp +++ b/src/messagesigner.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2018 The Dash Core developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/messagesigner.h b/src/messagesigner.h index d24d578bd..458602e60 100644 --- a/src/messagesigner.h +++ b/src/messagesigner.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2018 The Dash Core developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.cpp b/src/miner.cpp index 43ef41b21..6583000a8 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -5,7 +5,7 @@ // Copyright (c) 2013-2014 The NovaCoin Developers // Copyright (c) 2014-2018 The BlackCoin Developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/miner.h b/src/miner.h index 78b4c5984..7f8d1c19c 100644 --- a/src/miner.h +++ b/src/miner.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/net.cpp b/src/net.cpp index 6801dcb8b..5e657b145 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -20,6 +20,7 @@ #include "guiinterface.h" #include "hash.h" #include "main.h" +#include "masternodeman.h" #include "miner.h" #include "netmessagemaker.h" #include "primitives/transaction.h" @@ -39,12 +40,18 @@ #include #endif - #include +#include +#include // Dump addresses to peers.dat and banlist.dat every 15 minutes (900s) #define DUMP_ADDRESSES_INTERVAL 900 +// Query the DNS seeds at every 10 minutes (600s) +#define DNS_SEEDS_INTERVAL 600 + +#define MAX_MASTERNODES_SEEDED_AT_ONCE 10 + // We add a random period time (0 to 1 seconds) to feeler connections to prevent synchronization. #define FEELER_SLEEP_WINDOW 1 @@ -929,12 +936,12 @@ void CheckOffsetDisconnectedPeers(const CNetAddr& ip) LogPrintf("*** Warning: %s %s\n", strWarn1, strWarn2); - static int64_t nLastGUINotif = 0; - int64_t now = GetTime(); - if (nLastGUINotif + 40 < now) { // Notify the GUI if needed. - nLastGUINotif = now; - uiInterface.ThreadSafeMessageBox(strprintf("%s\n\n%s", strWarn1, strWarn2), _("Warning"), CClientUIInterface::MSG_ERROR); - } + // static int64_t nLastGUINotif = 0; + // int64_t now = GetTime(); + // if (nLastGUINotif + 40 < now) { // Notify the GUI if needed. + // nLastGUINotif = now; + // uiInterface.ThreadSafeMessageBox(strprintf("%s\n\n%s", strWarn1, strWarn2), _("Warning"), CClientUIInterface::MSG_ERROR); + // } } } @@ -1090,13 +1097,21 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) { return; } - if (nInbound >= nMaxConnections - MAX_OUTBOUND_CONNECTIONS) { - if (!AttemptToEvictConnection(whitelisted)) { - // No connection to evict, disconnect the new connection - LogPrint(BCLog::NET, "failed to find an eviction candidate - connection dropped (full)\n"); - CloseSocket(hSocket); - return; + if (nInbound >= nMaxConnections - nMaxOutbound) { + // try to evict 10% of the inbound connections + int n = std::max(1, (nMaxConnections - nMaxOutbound) / 10); + int evicted = 0; + for(int i = 0; i < n; i++) { + if (!AttemptToEvictConnection(whitelisted) && evicted == 0) { + // No connection to evict, disconnect the new connection + LogPrint(BCLog::NET, "failed to find an eviction candidate - connection dropped (full)\n"); + CloseSocket(hSocket); + return; + } else { + evicted++; + } } + LogPrint(BCLog::NET, "%d connections evicted\n", evicted); } NodeId id = GetNewNodeId(); @@ -1529,13 +1544,38 @@ void CConnman::ThreadDNSAddressSeed() return; } } + + std::vector vPeers(Params().DNSSeeds()); + std::vector vMasternodes = mnodeman.GetFullMasternodeVector(); - const std::vector& vSeeds = Params().DNSSeeds(); - int found = 0; + std::random_device rd; + std::mt19937 g(rd()); + + std::shuffle(vMasternodes.begin(), vMasternodes.end(), g); + + int ipV4Count = 0; + int ipV6Count = 0; + + for(const CMasternode& mn : vMasternodes) { + + if(mn.addr.IsIPv4() && ipV4Count < MAX_MASTERNODES_SEEDED_AT_ONCE) { + vPeers.push_back(CDNSSeedData(mn.addr.ToStringIP(), mn.addr.ToStringIP())); + ipV4Count++; + } + + if(mn.addr.IsIPv6() && ipV6Count < MAX_MASTERNODES_SEEDED_AT_ONCE) { + vPeers.push_back(CDNSSeedData(mn.addr.ToStringIP(), mn.addr.ToStringIP())); + ipV6Count++; + } + + if(ipV4Count >= ipV6Count >= MAX_MASTERNODES_SEEDED_AT_ONCE) break; + } LogPrintf("Loading addresses from DNS seeds (could take a while)\n"); - for (const CDNSSeedData& seed : vSeeds) { + int found = 0; + + for (const CDNSSeedData& seed : vPeers) { if(stopping) return; if (HaveNameProxy()) { AddOneShot(seed.host); @@ -2168,6 +2208,9 @@ bool CConnman::Start(CScheduler& scheduler, std::string& strNodeError, Options c // Dump network addresses scheduler.scheduleEvery(boost::bind(&CConnman::DumpData, this), DUMP_ADDRESSES_INTERVAL); + // Query DNS seeds + scheduler.scheduleEvery(boost::bind(&CConnman::ThreadDNSAddressSeed, this), DNS_SEEDS_INTERVAL); + return true; } diff --git a/src/net.h b/src/net.h index cee0d5685..a635fe9ef 100644 --- a/src/net.h +++ b/src/net.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -71,12 +71,12 @@ static const bool DEFAULT_LISTEN = true; #ifdef USE_UPNP static const bool DEFAULT_UPNP = USE_UPNP; #else -static const bool DEFAULT_UPNP = false; +static const bool DEFAULT_UPNP = true; #endif /** The maximum number of entries in mapAskFor */ static const size_t MAPASKFOR_MAX_SZ = MAX_INV_SZ; /** The maximum number of peer connections to maintain. */ -static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 125; +static const unsigned int DEFAULT_MAX_PEER_CONNECTIONS = 256; /** Disconnected peers are added to setOffsetDisconnectedPeers only if node has less than ENOUGH_CONNECTIONS */ #define ENOUGH_CONNECTIONS 2 /** Maximum number of peers added to setOffsetDisconnectedPeers before triggering a warning */ diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 4fb0af5c1..f1eb7db3f 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netaddress.h b/src/netaddress.h index 09a31e713..e1cbe4a76 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.cpp b/src/netbase.cpp index 1e63b4431..80d63335c 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netbase.h b/src/netbase.h index 019083363..5714cd2d2 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/netmessagemaker.h b/src/netmessagemaker.h index db1f0af95..0020ab68b 100644 --- a/src/netmessagemaker.h +++ b/src/netmessagemaker.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.cpp b/src/noui.cpp index 17993aae9..074500e75 100644 --- a/src/noui.cpp +++ b/src/noui.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/noui.h b/src/noui.h index a4e18ffbc..47efb70f5 100644 --- a/src/noui.h +++ b/src/noui.h @@ -1,5 +1,5 @@ // Copyright (c) 2013-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/optional.h b/src/optional.h index abc8cd63d..d73fba7d5 100644 --- a/src/optional.h +++ b/src/optional.h @@ -1,5 +1,5 @@ // Copyright (c) 2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pairresult.h b/src/pairresult.h index 6718be5a7..ba172c7e1 100644 --- a/src/pairresult.h +++ b/src/pairresult.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pivx-cli.cpp b/src/pivx-cli.cpp index ed177a748..a7d965ebc 100644 --- a/src/pivx-cli.cpp +++ b/src/pivx-cli.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2009-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pivx-tx.cpp b/src/pivx-tx.cpp index 63aab282d..c33a15a0e 100644 --- a/src/pivx-tx.cpp +++ b/src/pivx-tx.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 887dcd221..27490e018 100644 --- a/src/policy/fees.cpp +++ b/src/policy/fees.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/fees.h b/src/policy/fees.h index 10b709b86..57f566d9a 100644 --- a/src/policy/fees.h +++ b/src/policy/fees.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_POLICYESTIMATOR_H diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index f796121b0..97fed828d 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/policy/policy.h b/src/policy/policy.h index b16fdc61c..d92c4b559 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.cpp b/src/pow.cpp index e0db9af36..12a9ce8a9 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pow.h b/src/pow.h index 6647913c0..f19e2d604 100644 --- a/src/pow.h +++ b/src/pow.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/prevector.h b/src/prevector.h index efd79f2e3..7476c9d6b 100644 --- a/src/prevector.h +++ b/src/prevector.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index f53a146c1..349b04c60 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/block.h b/src/primitives/block.h index 03a955e40..97e6a4b82 100644 --- a/src/primitives/block.h +++ b/src/primitives/block.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp index 96d1158a4..a2a2d9adc 100644 --- a/src/primitives/transaction.cpp +++ b/src/primitives/transaction.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index da1d2399d..afcea1c1a 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.cpp b/src/protocol.cpp index c76a9af3c..919f74151 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/protocol.h b/src/protocol.h index dac8b71fe..db1a3967d 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.cpp b/src/pubkey.cpp index cbade6c69..db0f8c37e 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/pubkey.h b/src/pubkey.h index 0b8d787c9..863eb77d5 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index e2d7cd63c..f200ae510 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h index 4ab0b6ae0..ffa0eb462 100644 --- a/src/qt/addressbookpage.h +++ b/src/qt/addressbookpage.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp index 09da7f077..c53ef27a0 100644 --- a/src/qt/addresstablemodel.cpp +++ b/src/qt/addresstablemodel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/addresstablemodel.h b/src/qt/addresstablemodel.h index 2957d22b1..5bc837b9f 100644 --- a/src/qt/addresstablemodel.h +++ b/src/qt/addresstablemodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index 80b78667b..48d61b8aa 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index 2f5d552aa..4f47764bc 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp index 2dd67e1e8..5137ad473 100644 --- a/src/qt/bantablemodel.cpp +++ b/src/qt/bantablemodel.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2015 The Bitcoin Core developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bantablemodel.h b/src/qt/bantablemodel.h index 29c1315c5..51b995b58 100644 --- a/src/qt/bantablemodel.h +++ b/src/qt/bantablemodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp index efae58e57..68b59a368 100644 --- a/src/qt/bitcoinaddressvalidator.cpp +++ b/src/qt/bitcoinaddressvalidator.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2017 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h index 33ca478b6..0824e0c68 100644 --- a/src/qt/bitcoinaddressvalidator.h +++ b/src/qt/bitcoinaddressvalidator.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 9d891e2e3..3c31b2da4 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/bitcoinunits.h b/src/qt/bitcoinunits.h index 990023470..3593fc0a4 100644 --- a/src/qt/bitcoinunits.h +++ b/src/qt/bitcoinunits.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 843ac0891..331fe5b59 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h index 5ca7e5b80..a2a83ecfb 100644 --- a/src/qt/clientmodel.h +++ b/src/qt/clientmodel.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index a0d2acc77..54952dd82 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index 920de2c32..ae31e1e16 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.cpp b/src/qt/coincontroltreewidget.cpp index 891fbbe0e..426e9b39e 100644 --- a/src/qt/coincontroltreewidget.cpp +++ b/src/qt/coincontroltreewidget.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/coincontroltreewidget.h b/src/qt/coincontroltreewidget.h index 15e79d2b1..7a208c7b1 100644 --- a/src/qt/coincontroltreewidget.h +++ b/src/qt/coincontroltreewidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.cpp b/src/qt/csvmodelwriter.cpp index d8a4052a3..c1097a413 100644 --- a/src/qt/csvmodelwriter.cpp +++ b/src/qt/csvmodelwriter.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/csvmodelwriter.h b/src/qt/csvmodelwriter.h index f71de26e5..6bfc69f08 100644 --- a/src/qt/csvmodelwriter.h +++ b/src/qt/csvmodelwriter.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp index ba841b80d..405eb6a5f 100644 --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2017 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h index fbec2a51e..f34bbfa28 100644 --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index b2a8a0ea0..52614610c 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index efd497d51..ec00807a8 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 8858a2e8d..7d58994ea 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 17f6a5285..6b21fb032 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/intro.h b/src/qt/intro.h index 871f8b36d..43090028f 100644 --- a/src/qt/intro.h +++ b/src/qt/intro.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/locale/pivx_fr_FR.ts b/src/qt/locale/pivx_fr_FR.ts index 580458fa2..3b3fae2d0 100644 --- a/src/qt/locale/pivx_fr_FR.ts +++ b/src/qt/locale/pivx_fr_FR.ts @@ -4789,7 +4789,7 @@ sauvegarde sera créée. Masternode Reward - Récompense Matsernode + Récompense Masternode Received from @@ -6317,4 +6317,4 @@ Portefeuille CryptoSaga Réinitialiser les valeurs par défaut - \ No newline at end of file + diff --git a/src/qt/macdockiconhandler.h b/src/qt/macdockiconhandler.h index fe4e501b2..b3ac8b628 100644 --- a/src/qt/macdockiconhandler.h +++ b/src/qt/macdockiconhandler.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2020 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 3635e9301..c9f090f19 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -1,5 +1,5 @@ // Copyright (c) 2011-2020 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macnotificationhandler.h b/src/qt/macnotificationhandler.h index 6b1539912..022143d37 100644 --- a/src/qt/macnotificationhandler.h +++ b/src/qt/macnotificationhandler.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/macnotificationhandler.mm b/src/qt/macnotificationhandler.mm index 51f9c9533..18a77409a 100644 --- a/src/qt/macnotificationhandler.mm +++ b/src/qt/macnotificationhandler.mm @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2015-2017 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index f7bbbab28..b49ac8931 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h index cdff50056..708f730c7 100644 --- a/src/qt/networkstyle.h +++ b/src/qt/networkstyle.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 59f9293f1..0afca4196 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/notificator.h b/src/qt/notificator.h index c993b6045..abb49de05 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index b975267c0..3ed9438d0 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h index 469d604d2..aacbbb4c4 100644 --- a/src/qt/openuridialog.h +++ b/src/qt/openuridialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp index 4f9c8181f..f735a4877 100644 --- a/src/qt/optionsdialog.cpp +++ b/src/qt/optionsdialog.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsdialog.h b/src/qt/optionsdialog.h index 8bd8cce1e..e1e2adeac 100644 --- a/src/qt/optionsdialog.h +++ b/src/qt/optionsdialog.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 2eb12c48d..be847cd61 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h index ad973924b..2361ba4b6 100644 --- a/src/qt/optionsmodel.h +++ b/src/qt/optionsmodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp index 10a4229c1..0c5a49aa2 100644 --- a/src/qt/paymentrequestplus.cpp +++ b/src/qt/paymentrequestplus.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h index ac682f28a..8abef47bf 100644 --- a/src/qt/paymentrequestplus.h +++ b/src/qt/paymentrequestplus.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 50639bd3e..e5e3591e1 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h index dbe2afa09..b5295bb67 100644 --- a/src/qt/paymentserver.h +++ b/src/qt/paymentserver.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp index dbc56f335..3b903bb6c 100644 --- a/src/qt/peertablemodel.cpp +++ b/src/qt/peertablemodel.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/peertablemodel.h b/src/qt/peertablemodel.h index cfe84b239..5831d3684 100644 --- a/src/qt/peertablemodel.h +++ b/src/qt/peertablemodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp index 2c07c5e44..b7b51be28 100644 --- a/src/qt/pivx.cpp +++ b/src/qt/pivx.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addnewaddressdialog.cpp b/src/qt/pivx/addnewaddressdialog.cpp index 2769bc97b..5d0551233 100644 --- a/src/qt/pivx/addnewaddressdialog.cpp +++ b/src/qt/pivx/addnewaddressdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addnewaddressdialog.h b/src/qt/pivx/addnewaddressdialog.h index 8a30f40ce..81abec754 100644 --- a/src/qt/pivx/addnewaddressdialog.h +++ b/src/qt/pivx/addnewaddressdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addnewcontactdialog.cpp b/src/qt/pivx/addnewcontactdialog.cpp index 5f346ff63..0938b78b4 100644 --- a/src/qt/pivx/addnewcontactdialog.cpp +++ b/src/qt/pivx/addnewcontactdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addnewcontactdialog.h b/src/qt/pivx/addnewcontactdialog.h index 5b9b05983..be28d8230 100644 --- a/src/qt/pivx/addnewcontactdialog.h +++ b/src/qt/pivx/addnewcontactdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addresseswidget.cpp b/src/qt/pivx/addresseswidget.cpp index 1b7543680..df74f64ba 100644 --- a/src/qt/pivx/addresseswidget.cpp +++ b/src/qt/pivx/addresseswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addresseswidget.h b/src/qt/pivx/addresseswidget.h index 8214bf25f..6d1b1d3d0 100644 --- a/src/qt/pivx/addresseswidget.h +++ b/src/qt/pivx/addresseswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addressfilterproxymodel.cpp b/src/qt/pivx/addressfilterproxymodel.cpp index 40ab8edc0..9823c77fd 100644 --- a/src/qt/pivx/addressfilterproxymodel.cpp +++ b/src/qt/pivx/addressfilterproxymodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addressfilterproxymodel.h b/src/qt/pivx/addressfilterproxymodel.h index a426479fb..32ecb6e34 100644 --- a/src/qt/pivx/addressfilterproxymodel.h +++ b/src/qt/pivx/addressfilterproxymodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addressholder.cpp b/src/qt/pivx/addressholder.cpp index 9f96e20d3..de5e96f61 100644 --- a/src/qt/pivx/addressholder.cpp +++ b/src/qt/pivx/addressholder.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addressholder.h b/src/qt/pivx/addressholder.h index 85178a093..3f041ff67 100644 --- a/src/qt/pivx/addressholder.h +++ b/src/qt/pivx/addressholder.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addresslabelrow.cpp b/src/qt/pivx/addresslabelrow.cpp index acbbff2cf..83743991a 100644 --- a/src/qt/pivx/addresslabelrow.cpp +++ b/src/qt/pivx/addresslabelrow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/addresslabelrow.h b/src/qt/pivx/addresslabelrow.h index 5b81b87d4..c22204bf6 100644 --- a/src/qt/pivx/addresslabelrow.h +++ b/src/qt/pivx/addresslabelrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/contactdropdownrow.cpp b/src/qt/pivx/contactdropdownrow.cpp index 067243f69..9297534be 100644 --- a/src/qt/pivx/contactdropdownrow.cpp +++ b/src/qt/pivx/contactdropdownrow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/contactdropdownrow.h b/src/qt/pivx/contactdropdownrow.h index 82f8d5427..ec436a3fc 100644 --- a/src/qt/pivx/contactdropdownrow.h +++ b/src/qt/pivx/contactdropdownrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/contactsdropdown.cpp b/src/qt/pivx/contactsdropdown.cpp index f03fd6aca..7cf2953c9 100644 --- a/src/qt/pivx/contactsdropdown.cpp +++ b/src/qt/pivx/contactsdropdown.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/contactsdropdown.h b/src/qt/pivx/contactsdropdown.h index f9b667583..a24d1f006 100644 --- a/src/qt/pivx/contactsdropdown.h +++ b/src/qt/pivx/contactsdropdown.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/pivx/dashboardwidget.cpp index f47b97385..dde211197 100644 --- a/src/qt/pivx/dashboardwidget.cpp +++ b/src/qt/pivx/dashboardwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -190,14 +190,14 @@ void DashboardWidget::loadWalletModel() // Read filter settings QSettings settings; - int filterByType = settings.value("transactionType", TransactionFilterProxy::ALL_TYPES).toInt(); + int filterByType = TransactionFilterProxy::ALL_TYPES; filter->setTypeFilter(filterByType); // Set filter int filterIndex = ui->comboBoxSortType->findData(filterByType); // Find index ui->comboBoxSortType->setCurrentIndex(filterIndex); // Set item in ComboBox // Read sort settings - changeSort(settings.value("transactionSort", SortTx::DATE_DESC).toInt()); + changeSort(SortTx::DATE_DESC); txHolder->setFilter(filter); ui->listTransactions->setModel(filter); @@ -313,10 +313,6 @@ void DashboardWidget::changeSort(int nSortIndex) ui->comboBoxSort->setCurrentIndex(nSortIndex); filter->sort(nColumnIndex, order); ui->listTransactions->update(); - - // Store settings - QSettings settings; - settings.setValue("transactionSort", nSortIndex); } void DashboardWidget::onSortTypeChanged(const QString& value) @@ -334,10 +330,6 @@ void DashboardWidget::onSortTypeChanged(const QString& value) } else { showList(); } - - // Store settings - QSettings settings; - settings.setValue("transactionType", filterByType); } void DashboardWidget::walletSynced(bool sync) @@ -675,7 +667,7 @@ void DashboardWidget::onChartRefreshed() set0 = new QBarSet(CURRENCY_UNIT.c_str()); set1 = new QBarSet("MN_" + QString(CURRENCY_UNIT.c_str())); set0->setColor(QColor(252,188,86)); - set1->setColor(QColor(0,221,128)); + set1->setColor(QColor(0,199,115)); if (!series) { series = new QBarSeries(); diff --git a/src/qt/pivx/dashboardwidget.h b/src/qt/pivx/dashboardwidget.h index b593814f0..b468cbe53 100644 --- a/src/qt/pivx/dashboardwidget.h +++ b/src/qt/pivx/dashboardwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/defaultdialog.cpp b/src/qt/pivx/defaultdialog.cpp index 0e9bc6ecc..2bf7ca512 100644 --- a/src/qt/pivx/defaultdialog.cpp +++ b/src/qt/pivx/defaultdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/defaultdialog.h b/src/qt/pivx/defaultdialog.h index b97553b60..507021194 100644 --- a/src/qt/pivx/defaultdialog.h +++ b/src/qt/pivx/defaultdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/expandablebutton.cpp b/src/qt/pivx/expandablebutton.cpp index f206ff13e..7527cd94b 100644 --- a/src/qt/pivx/expandablebutton.cpp +++ b/src/qt/pivx/expandablebutton.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/expandablebutton.h b/src/qt/pivx/expandablebutton.h index 2b666c03c..019de1450 100644 --- a/src/qt/pivx/expandablebutton.h +++ b/src/qt/pivx/expandablebutton.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/focuseddialog.cpp b/src/qt/pivx/focuseddialog.cpp index 52c818d51..a914ffb60 100644 --- a/src/qt/pivx/focuseddialog.cpp +++ b/src/qt/pivx/focuseddialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/focuseddialog.h b/src/qt/pivx/focuseddialog.h index d23ee1018..8b247ab24 100644 --- a/src/qt/pivx/focuseddialog.h +++ b/src/qt/pivx/focuseddialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/furabstractlistitemdelegate.cpp b/src/qt/pivx/furabstractlistitemdelegate.cpp index 7ea3de54a..ba3aa5d30 100644 --- a/src/qt/pivx/furabstractlistitemdelegate.cpp +++ b/src/qt/pivx/furabstractlistitemdelegate.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/furabstractlistitemdelegate.h b/src/qt/pivx/furabstractlistitemdelegate.h index b22c31527..3d72a607c 100644 --- a/src/qt/pivx/furabstractlistitemdelegate.h +++ b/src/qt/pivx/furabstractlistitemdelegate.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/furlistrow.h b/src/qt/pivx/furlistrow.h index a4c74c7a8..9db0fe990 100644 --- a/src/qt/pivx/furlistrow.h +++ b/src/qt/pivx/furlistrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/guitransactionsutils.cpp b/src/qt/pivx/guitransactionsutils.cpp index 1d55d5283..f20fe94b0 100644 --- a/src/qt/pivx/guitransactionsutils.cpp +++ b/src/qt/pivx/guitransactionsutils.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/guitransactionsutils.h b/src/qt/pivx/guitransactionsutils.h index 725e793d5..3f3e299f9 100644 --- a/src/qt/pivx/guitransactionsutils.h +++ b/src/qt/pivx/guitransactionsutils.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/loadingdialog.cpp b/src/qt/pivx/loadingdialog.cpp index 351be79b8..257cca2d8 100644 --- a/src/qt/pivx/loadingdialog.cpp +++ b/src/qt/pivx/loadingdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/loadingdialog.h b/src/qt/pivx/loadingdialog.h index 693ca0ce4..d22c16558 100644 --- a/src/qt/pivx/loadingdialog.h +++ b/src/qt/pivx/loadingdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/lockunlock.cpp b/src/qt/pivx/lockunlock.cpp index 4611a6819..fa55f8486 100644 --- a/src/qt/pivx/lockunlock.cpp +++ b/src/qt/pivx/lockunlock.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/lockunlock.h b/src/qt/pivx/lockunlock.h index 354085417..54d5b20d1 100644 --- a/src/qt/pivx/lockunlock.h +++ b/src/qt/pivx/lockunlock.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp index e1e0be82b..ac375833e 100644 --- a/src/qt/pivx/masternodeswidget.cpp +++ b/src/qt/pivx/masternodeswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/masternodeswidget.h b/src/qt/pivx/masternodeswidget.h index 90f4534ce..9744dd2ec 100644 --- a/src/qt/pivx/masternodeswidget.h +++ b/src/qt/pivx/masternodeswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/masternodewizarddialog.cpp b/src/qt/pivx/masternodewizarddialog.cpp index f79835f8d..383510c3b 100644 --- a/src/qt/pivx/masternodewizarddialog.cpp +++ b/src/qt/pivx/masternodewizarddialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/masternodewizarddialog.h b/src/qt/pivx/masternodewizarddialog.h index 9fe6fe5b5..cd7f75280 100644 --- a/src/qt/pivx/masternodewizarddialog.h +++ b/src/qt/pivx/masternodewizarddialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mninfodialog.cpp b/src/qt/pivx/mninfodialog.cpp index 922007142..e03a2bd05 100644 --- a/src/qt/pivx/mninfodialog.cpp +++ b/src/qt/pivx/mninfodialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mninfodialog.h b/src/qt/pivx/mninfodialog.h index b43bc058c..ca151cdb5 100644 --- a/src/qt/pivx/mninfodialog.h +++ b/src/qt/pivx/mninfodialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/pivx/mnmodel.cpp index 7842c307c..c03ae7998 100644 --- a/src/qt/pivx/mnmodel.cpp +++ b/src/qt/pivx/mnmodel.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mnmodel.h b/src/qt/pivx/mnmodel.h index c2b448342..2f0becff7 100644 --- a/src/qt/pivx/mnmodel.h +++ b/src/qt/pivx/mnmodel.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mnrow.cpp b/src/qt/pivx/mnrow.cpp index bbfbd1f69..0fa4f2de6 100644 --- a/src/qt/pivx/mnrow.cpp +++ b/src/qt/pivx/mnrow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/mnrow.h b/src/qt/pivx/mnrow.h index f492dd329..0a30882ee 100644 --- a/src/qt/pivx/mnrow.h +++ b/src/qt/pivx/mnrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/myaddressrow.cpp b/src/qt/pivx/myaddressrow.cpp index a9333f79e..2c3823d3e 100644 --- a/src/qt/pivx/myaddressrow.cpp +++ b/src/qt/pivx/myaddressrow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/myaddressrow.h b/src/qt/pivx/myaddressrow.h index 9cb79b81c..ee5c8dcf1 100644 --- a/src/qt/pivx/myaddressrow.h +++ b/src/qt/pivx/myaddressrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/navmenuwidget.cpp b/src/qt/pivx/navmenuwidget.cpp index f9a205082..2395c2e25 100644 --- a/src/qt/pivx/navmenuwidget.cpp +++ b/src/qt/pivx/navmenuwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/navmenuwidget.h b/src/qt/pivx/navmenuwidget.h index 33510dfe9..f40427058 100644 --- a/src/qt/pivx/navmenuwidget.h +++ b/src/qt/pivx/navmenuwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/optionbutton.cpp b/src/qt/pivx/optionbutton.cpp index 2c9465331..8fde846e0 100644 --- a/src/qt/pivx/optionbutton.cpp +++ b/src/qt/pivx/optionbutton.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/optionbutton.h b/src/qt/pivx/optionbutton.h index 2785d03a6..5226e4fd4 100644 --- a/src/qt/pivx/optionbutton.h +++ b/src/qt/pivx/optionbutton.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/pfborderimage.h b/src/qt/pivx/pfborderimage.h index aef3c2a20..268036e13 100644 --- a/src/qt/pivx/pfborderimage.h +++ b/src/qt/pivx/pfborderimage.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivx/pivxgui.cpp index 7ecde8053..f8aa0c752 100644 --- a/src/qt/pivx/pivxgui.cpp +++ b/src/qt/pivx/pivxgui.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/pivxgui.h b/src/qt/pivx/pivxgui.h index 0fd55a584..7d6bf0325 100644 --- a/src/qt/pivx/pivxgui.h +++ b/src/qt/pivx/pivxgui.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/prunnable.h b/src/qt/pivx/prunnable.h index 157280f0a..bb27f809b 100644 --- a/src/qt/pivx/prunnable.h +++ b/src/qt/pivx/prunnable.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/pwidget.cpp b/src/qt/pivx/pwidget.cpp index 2c2ed8729..5917ad506 100644 --- a/src/qt/pivx/pwidget.cpp +++ b/src/qt/pivx/pwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/pwidget.h b/src/qt/pivx/pwidget.h index f61652257..e101cc7c8 100644 --- a/src/qt/pivx/pwidget.h +++ b/src/qt/pivx/pwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/qtutils.cpp b/src/qt/pivx/qtutils.cpp index 167d2d0b5..a83b2e14f 100644 --- a/src/qt/pivx/qtutils.cpp +++ b/src/qt/pivx/qtutils.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/qtutils.h b/src/qt/pivx/qtutils.h index ba74509c9..476d40b99 100644 --- a/src/qt/pivx/qtutils.h +++ b/src/qt/pivx/qtutils.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/receivedialog.cpp b/src/qt/pivx/receivedialog.cpp index 8bd77393d..7442c944c 100644 --- a/src/qt/pivx/receivedialog.cpp +++ b/src/qt/pivx/receivedialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/receivedialog.h b/src/qt/pivx/receivedialog.h index 442f7f5bc..71c730cfd 100644 --- a/src/qt/pivx/receivedialog.h +++ b/src/qt/pivx/receivedialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/pivx/receivewidget.cpp index 6e6624572..d84a2e723 100644 --- a/src/qt/pivx/receivewidget.cpp +++ b/src/qt/pivx/receivewidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/receivewidget.h b/src/qt/pivx/receivewidget.h index 6e2ab91ff..a565ec7be 100644 --- a/src/qt/pivx/receivewidget.h +++ b/src/qt/pivx/receivewidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/requestdialog.cpp b/src/qt/pivx/requestdialog.cpp index 3575fc5a0..8afc2df1b 100644 --- a/src/qt/pivx/requestdialog.cpp +++ b/src/qt/pivx/requestdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/requestdialog.h b/src/qt/pivx/requestdialog.h index 90b9436b9..599f2d645 100644 --- a/src/qt/pivx/requestdialog.h +++ b/src/qt/pivx/requestdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/res/css/style_dark.css b/src/qt/pivx/res/css/style_dark.css index 869572ce2..19bf6b8d9 100644 --- a/src/qt/pivx/res/css/style_dark.css +++ b/src/qt/pivx/res/css/style_dark.css @@ -17,23 +17,23 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="container-border-light"] { background-color: #121723; - border: 1px solid #00dd80; + border: 1px solid #00c773; border-radius: 2px; } *[cssClass="container_right"] { background-color: #121723; - border-left: 1px solid #00dd80; + border-left: 1px solid #00c773; } *[cssClass="container-right"] { background-color: #121723; - border-left: 1px solid #00dd80; + border-left: 1px solid #00c773; } *[cssClass="container-square"] { background-color: #121723; - border: 1px solid #00dd80; + border: 1px solid #00c773; } *[cssClass="container-options"] { @@ -42,7 +42,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="container-divider"] { - background-color: #00dd80; + background-color: #00c773; } *[cssClass="container-purple"] { @@ -87,13 +87,13 @@ QPushButton[cssClass="img-nav-logo"] { *[cssClass="btn-nav-receive"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-receive"]:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-receive-active"] { @@ -101,7 +101,7 @@ QPushButton[cssClass="img-nav-logo"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } /***** @@ -143,13 +143,13 @@ QPushButton[cssClass="btn-check-console"] { *[cssClass="btn-nav-settings"]:checked { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-settings"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-settings"]:hover { @@ -157,7 +157,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-settings-active"] { @@ -165,7 +165,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-dash"] { @@ -179,13 +179,13 @@ QPushButton[cssClass="btn-check-console"] { *[cssClass="btn-nav-dash"]:checked { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-dash"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-dash"]:hover { @@ -193,7 +193,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-dash-active"] { @@ -201,7 +201,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-send"] { @@ -215,13 +215,13 @@ QPushButton[cssClass="btn-check-console"] { *[cssClass="btn-nav-send"]:checked { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-send"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-send"]:hover { @@ -229,7 +229,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-send-active"] { @@ -237,7 +237,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-address"] { @@ -251,13 +251,13 @@ QPushButton[cssClass="btn-check-console"] { *[cssClass="btn-nav-address"]:checked { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-address"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-address"]:hover { @@ -265,7 +265,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-address-active"] { @@ -273,7 +273,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-privacy"] { @@ -287,13 +287,13 @@ QPushButton[cssClass="btn-check-console"] { *[cssClass="btn-nav-privacy"]:checked { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-privacy"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-privacy"]:hover { @@ -301,7 +301,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-privacy-active"] { @@ -309,7 +309,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 40px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-master"] { @@ -324,13 +324,13 @@ QPushButton[cssClass="btn-check-console"] { qproperty-icon: url("://ic-nav-master-active"); background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-master"]:checked:hover { background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-master"]:hover { @@ -338,7 +338,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 30px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } *[cssClass="btn-nav-master-active"] { @@ -346,7 +346,7 @@ QPushButton[cssClass="btn-check-console"] { qproperty-iconSize: 24px 30px; background-color: #0b0f16; font-size: 12px; - color: #00dd80; + color: #00c773; } @@ -480,7 +480,7 @@ QPushButton[cssClass="btn-check-mint-inactive"] { qproperty-icon: url("://ic-check-mint-off"); qproperty-iconSize: 24px 24px; background-color: #0b0f16; - color: #00dd80; + color: #00c773; border-radius: 2px; } @@ -500,7 +500,7 @@ QPushButton[cssClass="btn-check-stack"] { QPushButton[cssClass="btn-check-stack-inactive"] { qproperty-icon: url("://ic-check-staking-off"); qproperty-iconSize: 24px 24px; - color: #00dd80; + color: #00c773; background-color: #0b0f16; border-radius: 2px; } @@ -521,7 +521,7 @@ QPushButton[cssClass="btn-check-connect"] { QPushButton[cssClass="btn-check-connect-inactive"] { qproperty-icon: url("://ic-check-connect-off"); qproperty-iconSize: 24px 24px; - color: #00dd80; + color: #00c773; background-color: #0b0f16; border-radius: 2px; } @@ -544,7 +544,7 @@ QPushButton[cssClass="btn-check-tor"] { QPushButton[cssClass="btn-check-tor-inactive"] { qproperty-icon: url("://ic-check-tor-off"); qproperty-iconSize: 24px 24px; - color: #00dd80; + color: #00c773; background-color: #0b0f16; border-radius: 2px; } @@ -646,7 +646,7 @@ QPushButton[cssClass="btn-check-peers"]:checked { QPushButton[cssClass="btn-check-peers-inactive"] { qproperty-icon: url("://ic-check-peers-off"); qproperty-iconSize: 24px 24px; - color: #00dd80; + color: #00c773; background-color: #0b0f16; border-radius: 2px; } @@ -664,17 +664,17 @@ QPushButton[cssClass="btn-check-lock-sub-menu-unlocked"] { } QPushButton[cssClass="btn-check-lock-sub-menu-unlocked"]:checked { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-unlocked"]:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-unlocked"]:checked:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } @@ -691,17 +691,17 @@ QPushButton[cssClass="btn-check-lock-sub-menu-locked"] { } QPushButton[cssClass="btn-check-lock-sub-menu-locked"]:checked { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-locked"]:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-locked"]:checked:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } @@ -718,17 +718,17 @@ QPushButton[cssClass="btn-check-lock-sub-menu-staking"] { } QPushButton[cssClass="btn-check-lock-sub-menu-staking"]:checked { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-staking"]:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } QPushButton[cssClass="btn-check-lock-sub-menu-staking"]:checked:hover { - background-color: rgba(153, 96, 28, 0.7); + background-color: rgba(0, 177, 102, 0.7); color: #ffffff; } @@ -751,7 +751,7 @@ QProgressBar[cssClass="progress-sync"]::chunk:horizontal { y1: 0.5, x2: 1, y2: 0.5, - stop: 0 #00dd80, + stop: 0 #00c773, stop: 1 #038e4f, stop: 2 #0b0f16 ); @@ -818,12 +818,12 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-list-caption"] { - color: #00dd80; + color: #00c773; font-size: 12px; } *[cssClass="text-list-caption-medium"] { - color: #00dd80; + color: #00c773; font-size: 14px; } @@ -906,7 +906,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-subtitle"] { - color: #00dd80; + color: #00c773; font-size: 14px; } @@ -926,7 +926,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-main-light"] { - color: #00dd80; + color: #00c773; font-size: 17px; } @@ -946,12 +946,12 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-main-purple"] { - color: #00dd80; + color: #00c773; font-size: 17px; } *[cssClass="text-title-purple"] { - color: #00dd80; + color: #00c773; font-size: 22px; } @@ -975,7 +975,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } QGroupBox::title { - color: #00dd80; + color: #00c773; font-size: 16px; padding-bottom: 9px; } @@ -1020,7 +1020,7 @@ QPushButton[cssClass="btn-switch"]:checked { background-color: #121723; text-align: left; font-size: 18px; - color: #00dd80; + color: #00c773; } QPushButton[cssClass="btn-check"] { @@ -1199,8 +1199,8 @@ QPushButton[cssClass="btn-check"]:unchecked { } QPushButton[cssClass="btn-primary"] { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; font-size: 18px; padding: 4px 10px; color: #ffffff; @@ -1230,7 +1230,7 @@ QPushButton[cssClass="btn-secundary"] { background-color: #121723; font-size: 18px; padding: 4px 10px; - color: #00dd80; + color: #00c773; border-radius: 2px; } @@ -1442,13 +1442,13 @@ QPushButton[cssClass="btn-secundary-new-address"] { } QPushButton[cssClass="btn-secundary-new-address"]:hover { - border: 1px solid #00dd80; + border: 1px solid #00c773; background-color: #121723; color: #ffffff; } QPushButton[cssClass="btn-secundary-new-address"]:pressed { - border: 1px solid #00dd80; + border: 1px solid #00c773; background-color: #121723; color: #ffffff; } @@ -1468,14 +1468,14 @@ QPushButton[cssClass="btn-secundary-label"] { } QPushButton[cssClass="btn-secundary-label"]:hover { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; color: #ffffff; } QPushButton[cssClass="btn-secundary-label"]:pressed { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; color: #ffffff; } @@ -1494,14 +1494,14 @@ QPushButton[cssClass="btn-secundary-copy"] { } QPushButton[cssClass="btn-secundary-copy"]:hover { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; color: #ffffff; } QPushButton[cssClass="btn-secundary-copy"]:pressed { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; color: #ffffff; } @@ -1521,13 +1521,13 @@ QPushButton[cssClass="btn-secundary-add"] { } QPushButton[cssClass="btn-secundary-add"]:hover { - border: 1px solid #00dd80; + border: 1px solid #00c773; background-color: #121723; color: #ffffff; } QPushButton[cssClass="btn-secundary-add"]:pressed { - border: 1px solid #00dd80; + border: 1px solid #00c773; background-color: #121723; color: #ffffff; } @@ -1540,15 +1540,15 @@ QPushButton[cssClass="btn-text-primary"] { padding-left: 4px; padding-bottom: 4px; padding-right: 4px; - color: #00dd80; + color: #00c773; } QPushButton[cssClass="btn-text-primary"]:hover { - color: #00dd80; + color: #00c773; } QPushButton[cssClass="btn-text-primary"]:pressed { - color: #00dd80; + color: #00c773; } /*HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH @@ -1669,10 +1669,10 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-stake-mnrewards"] { - color: #00dd80; + color: #00c773; font-size: 16px; padding: 10px; - border-bottom: 5px solid #00dd80; + border-bottom: 5px solid #00c773; } *[cssClass="text-stake-mnrewards-disable"] { @@ -1688,7 +1688,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-chart-mnrewards"] { - color: #00dd80; + color: #00c773; font-size: 16px; padding-left: 4px; } @@ -1700,7 +1700,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="square-chart-mnrewards"] { - background-color: #00dd80; + background-color: #00c773; border: none; } @@ -1727,11 +1727,11 @@ QPushButton[cssClass="btn-chart-arrow"] { } QPushButton[cssClass="btn-chart-arrow"]:hover { - background-color: #00dd80; + background-color: #00c773; } QPushButton[cssClass="btn-chart-arrow"]:pressed { - background-color: #00dd80; + background-color: #00c773; } QPushButton[cssClass="btn-chart-arrow-right"] { @@ -1743,11 +1743,11 @@ QPushButton[cssClass="btn-chart-arrow-right"] { } QPushButton[cssClass="btn-chart-arrow-right"]:hover { - background-color: #00dd80; + background-color: #00c773; } QPushButton[cssClass="btn-chart-arrow-right"]:pressed { - background-color: #00dd80; + background-color: #00c773; } QComboBox[cssClass="btn-combo-secundary"] { @@ -1783,10 +1783,10 @@ QComboBox[cssClass="btn-combo-chart"]::down-arrow { } QComboBox[cssClass="btn-combo-chart-selected"] { - background-color: #00dd80; + background-color: #00c773; padding: 6px 12px 6px 6px; font-size: 16px; - border: 1px solid #00dd80; + border: 1px solid #00c773; color: #ffffff; text-align: right; border-radius: 2px; @@ -1802,7 +1802,7 @@ QComboBox[cssClass="btn-combo-chart-selected"]::down-arrow { QComboBox[cssClass="btn-combo-chart-selected"]:on { padding-top: 10px; padding-left: 10px; - background-color: #00dd80; + background-color: #00c773; } QComboBox[cssClass="btn-combo-chart-selected"]:disabled { @@ -1833,7 +1833,7 @@ QPushButton[cssClass="btn-check-time"] { } QPushButton[cssClass="btn-check-time"]:checked { - background-color: #00dd80; + background-color: #00c773; border-radius: 2px; font-size: 14px; padding: 4px; @@ -1841,7 +1841,7 @@ QPushButton[cssClass="btn-check-time"]:checked { } QPushButton[cssClass="btn-check-time"]:hover { - background-color: #00dd80; + background-color: #00c773; border-radius: 2px; font-size: 14px; padding: 4px; @@ -1878,7 +1878,7 @@ QCheckBox { QCheckBox:checked { spacing: 5px; font-size: 18px; - color: #00dd80; + color: #00c773; } QCheckBox::indicator { @@ -1913,18 +1913,18 @@ HH REQUEST DIALOG HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ QComboBox[cssClass="btn-combo-coins"] { - background-color: #00dd80; + background-color: #00c773; padding: 10px 20px 10px 10px; font-size: 16px; - border: 1px solid #00dd80; + border: 1px solid #00c773; color: #ffffff; } QLabel[cssClass="btn-combo-coins"] { - background-color: #00dd80; + background-color: #00c773; padding: 10px 10px 10px 10px; font-size: 16px; - border: 1px solid #00dd80; + border: 1px solid #00c773; color: #ffffff; } @@ -1942,7 +1942,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="label-address-box"] { color: #ffffff; background-color: #969696; - font-size: 22px; + font-size: 20px; padding: 10px 10px; } @@ -2145,7 +2145,7 @@ HH RADIO BUTTON HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ QRadioButton:checked { - color: #00dd80; + color: #00c773; font-size: 20px; } @@ -2271,7 +2271,7 @@ QPushButton[cssClass="ic-step-confirm"] { background-repeat: no-repeat; border: 1px solid #038e4f; border-radius: 11px; - background-color: #00dd80; + background-color: #00c773; } /*HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH @@ -2402,7 +2402,7 @@ QComboBox[cssClass="btn-combo-dialog"] { padding: 10px 20px 10px 10px; font-size: 16px; border: 1px solid #121723; - color: #00dd80; + color: #00c773; text-align: right; } @@ -2418,7 +2418,7 @@ QComboBox[cssClass="btn-combo-edit-dialog"] { padding: 10px 20px 10px 10px; font-size: 16px; border: 1px solid #bababa; - color: #00dd80; + color: #00c773; text-align: right; } @@ -2551,7 +2551,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="container-faq-buttons"] { background: transparent; - border: 1px solid #00dd80; + border: 1px solid #00c773; border-radius: 5px; } @@ -2567,7 +2567,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="container-number-faq"] { color: #ffffff; - background-color: #00dd80; + background-color: #00c773; font-size: 14px; border-radius: 2px; } @@ -2580,7 +2580,7 @@ QPushButton[cssClass="btn-faq-exit"] { border: none; padding: 0 30px 0 0; font-size: 18px; - color: #00dd80; + color: #00c773; text-align: left; } @@ -2588,7 +2588,7 @@ QPushButton[cssClass="btn-faq-web"] { background-color: transparent; border: none; font-size: 16px; - color: #00dd80; + color: #00c773; text-align: left; } @@ -2596,7 +2596,7 @@ QPushButton[cssClass="btn-faq-options"] { background-color: transparent; border: none; font-size: 18px; - color: #00dd80; + color: #00c773; padding: 0 20px; text-align: left; } @@ -2605,7 +2605,7 @@ QPushButton[cssClass="btn-faq-options"]:checked { background-color: rgba(221, 221, 221, 0.2); border: none; font-size: 18px; - color: #00dd80; + color: #00c773; padding: 0 20px; text-align: left; } @@ -2708,7 +2708,7 @@ QPushButton[cssClass="ic-step-confirm-welcome"] { background-position: center; background-repeat: no-repeat; background-color: transparent; - border: 1px solid #00dd80; + border: 1px solid #00c773; border-radius: 4px; } @@ -2744,7 +2744,7 @@ QComboBox[cssClass="btn-combo-welcome"] { background-color: #262626; padding: 10px 20px 10px 10px; font-size: 18px; - border: 1px solid #00dd80; + border: 1px solid #00c773; color: #eeeeee; } @@ -2781,8 +2781,8 @@ QPushButton[cssClass="btn-welcome-number-check"] { } QPushButton[cssClass="btn-welcome-number-check"]:checked { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; font-size: 14px; border-radius: 11px; color: #ffffff; @@ -2808,7 +2808,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ QToolTip { color: white; - background-color: #00dd80; + background-color: #00c773; border: none; padding: 4px; border-radius: 3px; @@ -2849,7 +2849,7 @@ HH EMPTY LIST HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="text-empty"] { - color: #00dd80; + color: #00c773; font-size: 18px; } @@ -2912,11 +2912,11 @@ HH TREE WIDGET HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ #treeWidget { - border: 1px solid #00dd80; + border: 1px solid #00c773; background-color: #121723; background-position: center; background-repeat: no-repeat; - selection-background-color: #00dd80; + selection-background-color: #00c773; selection-color: white; font-size: 14px; border-radius: 0px; @@ -2950,7 +2950,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ #treeWidget::item { border: none; - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; border-radius: 0px; color: #eeeeee; padding-top: 6px; @@ -2962,26 +2962,26 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ border-image: none; background-color: #121723; image: url("://ic-arrow-drop-up"); - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; } #treeWidget::branch:closed:has-children:has-siblings { border-image: none; background-color: #121723; image: url("://ic-arrow-drop-up"); - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; } #treeWidget::branch:open:has-children:!has-siblings, #treeWidget::branch:open:has-children:has-siblings { border-image: none; image: url("://ic-arrow-drop-down"); - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; } #treeWidget::item:hover { border: none; - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; border-radius: 0px; color: #eeeeee; background-color: #038e4f; @@ -2989,7 +2989,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ #treeWidget::item:selected { border: none; - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; border-radius: 0px; color: #ffffff; background-color: #038e4f; @@ -2997,7 +2997,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ #treeWidget::item:hover:selected { border: none; - border-bottom: 1px solid #00dd80; + border-bottom: 1px solid #00c773; border-radius: 0px; color: #ffffff; background-color: #038e4f; @@ -3005,7 +3005,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ #treeWidget::branch { background-color: #121723; - selection-background-color: #00dd80; + selection-background-color: #00c773; } #treeWidget::branch:selected { @@ -3013,11 +3013,11 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } #treeWidget::branch:!selected { - background-color: #00dd80; + background-color: #00c773; } #treeWidget::branch:hover { - background-color: #00dd80; + background-color: #00c773; } #treeWidget::branch:!has-children { @@ -3064,7 +3064,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="btn-options-indicator"] { border: 0px; - background: #00dd80; + background: #00c773; border-radius: 5px; } @@ -3103,12 +3103,12 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH *[cssClass="text-intro-white"] { color: #eeeeee; - font-size: 16px; + font-size: 14px; } QPushButton[cssClass="btn-dots-welcome"] { - border: 1px solid #00dd80; - background-color: #00dd80; + border: 1px solid #00c773; + background-color: #00c773; font-size: 18px; padding: 8px; color: #eeeeee; @@ -3134,12 +3134,12 @@ QPushButton[cssClass="btn-dots-welcome"]:pressed { } *[cssClass="edit-primary-welcome"] { - border: 1px solid #00dd80; + border: 1px solid #00c773; border-right: 0px; background-color: #262626; font-size: 18px; border-radius: 2px; - padding: 8px; + padding: 4px; color: #eeeeee; } @@ -3164,29 +3164,29 @@ QPushButton[cssClass="btn-dots-welcome"]:pressed { background-color: #252525; font-size: 18px; border-radius: 2px; - padding: 8px; + padding: 4px; color: rgb(109, 109, 109); } QRadioButton[cssClass="radio-welcome"]:checked { color: #038e4f; - font-size: 20px; + font-size: 18px; } QRadioButton[cssClass="radio-welcome"]:unchecked { color: #bababa; - font-size: 20px; + font-size: 18px; } QRadioButton[cssClass="radio-welcome"] { color: #bababa; - font-size: 20px; - spacing: 20px; + font-size: 18px; + spacing: 18px; } QRadioButton[cssClass="radio-welcome"]::indicator { - width: 26px; - height: 26px; + width: 25px; + height: 25px; } QRadioButton[cssClass="radio-welcome"]::indicator:checked { @@ -3199,4 +3199,4 @@ QRadioButton[cssClass="radio-welcome"]::indicator:unchecked { background: url("://btn-radio-off"); background-repeat: no-repeat; background-position: center; -} \ No newline at end of file +} diff --git a/src/qt/pivx/res/css/style_light.css b/src/qt/pivx/res/css/style_light.css index c87e2d549..5f04921ab 100644 --- a/src/qt/pivx/res/css/style_light.css +++ b/src/qt/pivx/res/css/style_light.css @@ -755,7 +755,7 @@ QProgressBar[cssClass="progress-sync"]::chunk:horizontal { y1: 0.5, x2: 1, y2: 0.5, - stop: 0 #00dd80, + stop: 0 #00c773, stop: 1 #038e4f, stop: 2 #0b0f16 ); @@ -1010,7 +1010,7 @@ QPushButton[cssClass="btn-switch"]:checked { background-color: #ffffff; text-align: left; font-size: 18px; - color: #00dd80; + color: #00c773; } QPushButton[cssClass="btn-check"] { @@ -1190,7 +1190,7 @@ QPushButton[cssClass="btn-check"]:unchecked { QPushButton[cssClass="btn-primary"] { border: 1px solid #038e4f; - background-color: #00dd80; + background-color: #00c773; font-size: 18px; padding: 4px 10px; color: #ffffff; @@ -1244,7 +1244,7 @@ QPushButton[cssClass="btn-secundary"]:pressed { QPushButton[cssClass="btn-edit-primary"] { border: 1px solid #038e4f; - background-color: #00dd80; + background-color: #00c773; font-size: 18px; border-radius: 2px; padding: 8px; @@ -1653,10 +1653,10 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-stake-mnrewards"] { - color: #00dd80; + color: #00c773; font-size: 16px; padding: 10px; - border-bottom: 5px solid #00dd80; + border-bottom: 5px solid #00c773; } *[cssClass="text-stake-mnrewards-disable"] { @@ -1672,7 +1672,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="text-chart-mnrewards"] { - color: #00dd80; + color: #00c773; font-size: 16px; padding-left: 4px; } @@ -1684,7 +1684,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ } *[cssClass="square-chart-mnrewards"] { - background-color: #00dd80; + background-color: #00c773; border: none; } @@ -1897,18 +1897,18 @@ HH REQUEST DIALOG HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ QComboBox[cssClass="btn-combo-coins"] { - background-color: #262626; + background-color: #810890; padding: 10px 20px 10px 10px; font-size: 16px; - border: 1px solid #262626; + border: 1px solid #810890; color: #ffffff; } QLabel[cssClass="btn-combo-coins"] { - background-color: #262626; + background-color: #810890; padding: 10px 10px 10px 10px; font-size: 16px; - border: 1px solid #262626; + border: 1px solid #810890; color: #ffffff; } @@ -1926,7 +1926,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="label-address-box"] { color: #262626; background-color: #f2f2f2; - font-size: 22px; + font-size: 20px; padding: 10px 10px; } @@ -2274,7 +2274,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ qproperty-icon: url("://ic-coin-piv") off, url("://ic-coin-piv") on; qproperty-iconSize: 24px 24px; background-color: #ffffff; - border: 2px solid #00dd80; + border: 2px solid #00c773; border-radius: 12px; } @@ -2284,7 +2284,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ background-position: center; background-repeat: no-repeat; background-color: #ffffff; - border: 2px solid #00dd80; + border: 2px solid #00c773; border-radius: 12px; } @@ -2349,11 +2349,11 @@ QLineEdit[cssClass="edit-primary-dialog"] { } QLineEdit[cssClass="edit-primary-dialog"]:focus { - border: 1px solid #00dd80; + border: 1px solid #00c773; } QLineEdit[cssClass="edit-primary-dialog"]:focus:hover { - border: 1px solid #00dd80; + border: 1px solid #00c773; } QLineEdit[cssClass="edit-primary-dialog"]:hover { @@ -2536,7 +2536,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="container-faq-buttons"] { background: transparent; - border: 1px solid #00dd80; + border: 1px solid #00c773; border-radius: 5px; } @@ -2552,7 +2552,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ *[cssClass="container-number-faq"] { color: #ffffff; - background-color: #00dd80; + background-color: #00c773; font-size: 14px; border-radius: 2px; } @@ -2565,7 +2565,7 @@ QPushButton[cssClass="btn-faq-exit"] { border: none; padding: 0 30px 0 0; font-size: 18px; - color: #00dd80; + color: #00c773; text-align: left; } @@ -2573,7 +2573,7 @@ QPushButton[cssClass="btn-faq-web"] { background-color: transparent; border: none; font-size: 16px; - color: #00dd80; + color: #00c773; text-align: left; } @@ -2581,7 +2581,7 @@ QPushButton[cssClass="btn-faq-options"] { background-color: transparent; border: none; font-size: 18px; - color: #00dd80; + color: #00c773; padding: 0 20px; text-align: left; } @@ -2590,20 +2590,20 @@ QPushButton[cssClass="btn-faq-options"]:checked { background-color: rgba(156, 156, 156, 0.2); border: none; font-size: 18px; - color: #00dd80; + color: #00c773; padding: 0 20px; text-align: left; } #scrollAreaFaq QScrollBar:vertical { border: 0px solid #ececec; - background: #00dd80; + background: #00c773; width: 4px; margin: 0px 0px 0px 0px; } #scrollAreaFaq QScrollBar::handle:vertical { - background: #00dd80; + background: #00c773; min-height: 0px; } @@ -2753,7 +2753,7 @@ QPushButton[cssClass="btn-welcome-next"] { background-repeat: no-repeat; background-position: center; border: 1px solid #038e4f; - background-color: #00dd80; + background-color: #00c773; color: #ffffff; } @@ -2969,7 +2969,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ border-bottom: 1px solid #eeeeee; border-radius: 0px; color: #ffffff; - background-color: #00dd80; + background-color: #00c773; } #treeWidget::item:selected { @@ -2977,7 +2977,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ border-bottom: 1px solid #e6e6e6; border-radius: 0px; color: #ffffff; - background-color: #00dd80; + background-color: #00c773; } #treeWidget::item:hover:selected { @@ -2985,20 +2985,20 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH*/ border-bottom: 1px solid #e6e6e6; border-radius: 0px; color: #ffffff; - background-color: #00dd80; + background-color: #00c773; } #treeWidget::branch { background-color: #ffffff; - selection-background-color: #00dd80; + selection-background-color: #00c773; } #treeWidget::branch:selected { - background-color: #00dd80; + background-color: #00c773; } #treeWidget::branch:!selected { - background-color: #00dd80; + background-color: #00c773; } #treeWidget::branch:hover { @@ -3073,7 +3073,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH */ *[cssClass="container-loading"] { - background-color: #00dd80; + background-color: #00c773; } *[cssClass="text-loading"] { @@ -3088,7 +3088,7 @@ HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH *[cssClass="text-intro-white"] { color: #ffffff; - font-size: 16px; + font-size: 14px; } QPushButton[cssClass="btn-dots-welcome"] { @@ -3124,7 +3124,7 @@ QPushButton[cssClass="btn-dots-welcome"]:pressed { background-color: #eeeeee; font-size: 18px; border-radius: 2px; - padding: 8px; + padding: 4px; color: #262626; } @@ -3149,29 +3149,29 @@ QPushButton[cssClass="btn-dots-welcome"]:pressed { background-color: #333333; font-size: 18px; border-radius: 2px; - padding: 8px; + padding: 4px; color: rgb(131, 131, 131); } QRadioButton[cssClass="radio-welcome"]:checked { color: #ffffff; - font-size: 20px; + font-size: 18px; } QRadioButton[cssClass="radio-welcome"]:unchecked { color: #ececec; - font-size: 20px; + font-size: 18px; } QRadioButton[cssClass="radio-welcome"] { color: #ececec; - font-size: 20px; - spacing: 20px; + font-size: 18px; + spacing: 18px; } QRadioButton[cssClass="radio-welcome"]::indicator { - width: 26px; - height: 26px; + width: 25px; + height: 25px; } QRadioButton[cssClass="radio-welcome"]::indicator:checked { @@ -3184,4 +3184,4 @@ QRadioButton[cssClass="radio-welcome"]::indicator:unchecked { background: url("://btn-radio-off"); background-repeat: no-repeat; background-position: center; -} \ No newline at end of file +} diff --git a/src/qt/pivx/send.cpp b/src/qt/pivx/send.cpp index ecae0f235..9f4a386b2 100644 --- a/src/qt/pivx/send.cpp +++ b/src/qt/pivx/send.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/send.h b/src/qt/pivx/send.h index 5e6dcf870..3d36a5bce 100644 --- a/src/qt/pivx/send.h +++ b/src/qt/pivx/send.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendchangeaddressdialog.cpp b/src/qt/pivx/sendchangeaddressdialog.cpp index 1ae9ec7a2..920025b1c 100644 --- a/src/qt/pivx/sendchangeaddressdialog.cpp +++ b/src/qt/pivx/sendchangeaddressdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendchangeaddressdialog.h b/src/qt/pivx/sendchangeaddressdialog.h index 0f309542c..44644033d 100644 --- a/src/qt/pivx/sendchangeaddressdialog.h +++ b/src/qt/pivx/sendchangeaddressdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendconfirmdialog.cpp b/src/qt/pivx/sendconfirmdialog.cpp index 22d6f8b10..251d36358 100644 --- a/src/qt/pivx/sendconfirmdialog.cpp +++ b/src/qt/pivx/sendconfirmdialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendconfirmdialog.h b/src/qt/pivx/sendconfirmdialog.h index 219b0e6eb..66e905a16 100644 --- a/src/qt/pivx/sendconfirmdialog.h +++ b/src/qt/pivx/sendconfirmdialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendcustomfeedialog.cpp b/src/qt/pivx/sendcustomfeedialog.cpp index e0a0fc52f..30d71a052 100644 --- a/src/qt/pivx/sendcustomfeedialog.cpp +++ b/src/qt/pivx/sendcustomfeedialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendcustomfeedialog.h b/src/qt/pivx/sendcustomfeedialog.h index e7b1c995d..272f50853 100644 --- a/src/qt/pivx/sendcustomfeedialog.h +++ b/src/qt/pivx/sendcustomfeedialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendmultirow.cpp b/src/qt/pivx/sendmultirow.cpp index 79212d3ab..5eed881c7 100644 --- a/src/qt/pivx/sendmultirow.cpp +++ b/src/qt/pivx/sendmultirow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/sendmultirow.h b/src/qt/pivx/sendmultirow.h index fee9e1798..5d9a95202 100644 --- a/src/qt/pivx/sendmultirow.h +++ b/src/qt/pivx/sendmultirow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsbackupwallet.cpp b/src/qt/pivx/settings/settingsbackupwallet.cpp index e56926f46..041c1ee0a 100644 --- a/src/qt/pivx/settings/settingsbackupwallet.cpp +++ b/src/qt/pivx/settings/settingsbackupwallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsbackupwallet.h b/src/qt/pivx/settings/settingsbackupwallet.h index 30adb1c00..c98119e61 100644 --- a/src/qt/pivx/settings/settingsbackupwallet.h +++ b/src/qt/pivx/settings/settingsbackupwallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsbittoolwidget.cpp b/src/qt/pivx/settings/settingsbittoolwidget.cpp index 61859dd2d..b34f68ba4 100644 --- a/src/qt/pivx/settings/settingsbittoolwidget.cpp +++ b/src/qt/pivx/settings/settingsbittoolwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsbittoolwidget.h b/src/qt/pivx/settings/settingsbittoolwidget.h index 6b4c85050..623a5ced8 100644 --- a/src/qt/pivx/settings/settingsbittoolwidget.h +++ b/src/qt/pivx/settings/settingsbittoolwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsconsolewidget.cpp b/src/qt/pivx/settings/settingsconsolewidget.cpp index 4f7fed514..63b932a91 100644 --- a/src/qt/pivx/settings/settingsconsolewidget.cpp +++ b/src/qt/pivx/settings/settingsconsolewidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -365,9 +365,12 @@ void SettingsConsoleWidget::loadClientModel() for (size_t i = 0; i < commandList.size(); ++i) { wordList << commandList[i].c_str(); + wordList << ("help " + commandList[i]).c_str(); } + wordList.sort(); autoCompleter = new QCompleter(wordList, this); + autoCompleter->setModelSorting(QCompleter::CaseSensitivelySortedModel); ui->lineEdit->setCompleter(autoCompleter); // clear the lineEdit after activating from QCompleter @@ -422,7 +425,7 @@ void SettingsConsoleWidget::clear(bool clearHistory) QString clsKey = "Ctrl-L"; #endif - message(CMD_REPLY, (tr("Welcome to the SAGA RPC console.") + "
" + + messageInternal(CMD_REPLY, (tr("Welcome to the SAGA RPC console.") + "
" + tr("Use up and down arrows to navigate history, and %1 to clear screen.").arg(""+clsKey+"") + "
" + tr("Type help for an overview of available commands.") + "

" + @@ -431,7 +434,7 @@ void SettingsConsoleWidget::clear(bool clearHistory) true); } -void SettingsConsoleWidget::message(int category, const QString& message, bool html) +void SettingsConsoleWidget::messageInternal(int category, const QString& message, bool html) { QTime time = QTime::currentTime(); QString timeString = time.toString(); @@ -447,13 +450,31 @@ void SettingsConsoleWidget::message(int category, const QString& message, bool h ui->messagesWidget->append(out); } +static bool PotentiallyDangerousCommand(const QString& cmd) +{ + if (cmd.size() >= 12 && cmd.leftRef(10) == "dumpwallet") { + // at least one char for filename + return true; + } + if (cmd.size() >= 13 && cmd.leftRef(11) == "dumpprivkey") { + return true; + } + return false; +} + void SettingsConsoleWidget::on_lineEdit_returnPressed() { QString cmd = ui->lineEdit->text(); ui->lineEdit->clear(); if (!cmd.isEmpty()) { - message(CMD_REQUEST, cmd); + // ask confirmation before sending potentially dangerous commands + if (PotentiallyDangerousCommand(cmd) && + !ask("DANGER!", "Your coins will be STOLEN if you give\nthe info to anyone!\n\nAre you sure?\n")) { + return; + } + + messageInternal(CMD_REQUEST, cmd); Q_EMIT cmdCommandRequest(cmd); // Remove command, if already in history history.removeOne(cmd); @@ -490,7 +511,7 @@ void SettingsConsoleWidget::startExecutor() executor->moveToThread(thread); // Replies from executor object must go to this object - connect(executor, &RPCExecutor::reply, this, static_cast(&SettingsConsoleWidget::message)); + connect(executor, &RPCExecutor::reply, this, &SettingsConsoleWidget::response); // Requests from this object must go to executor connect(this, &SettingsConsoleWidget::cmdCommandRequest, executor, &RPCExecutor::requestCommand); @@ -519,22 +540,22 @@ void SettingsConsoleWidget::changeTheme(bool isLightTheme, QString &theme) // Set default style sheet if (isLightTheme) { ui->messagesWidget->document()->setDefaultStyleSheet( - "table { color: #707070; }" + "table { color: #A3A3A3; }" "td.time { color: #808080; padding-top: 3px; } " - "td.message { color: #707070;font-family: Courier, Courier New, Lucida Console, monospace; font-size: 12px; } " // Todo: Remove fixed font-size + "td.message { color: #A3A3A3;font-family: Courier, Courier New, Lucida Console, monospace; font-size: 12px; } " // Todo: Remove fixed font-size "td.cmd-request { color: #006060; } " "td.cmd-error { color: red; } " ".secwarning { color: red; }" - "b { color: #707070; } "); + "b { color: #A3A3A3; } "); } else { ui->messagesWidget->document()->setDefaultStyleSheet( - "table { color: #FFFFFF; }" + "table { color: #A3A3A3; }" "td.time { color: #808080; padding-top: 3px; } " - "td.message { color: #FFFFFF;font-family: Courier, Courier New, Lucida Console, monospace; font-size: 12px; } " // Todo: Remove fixed font-size + "td.message { color: #A3A3A3;font-family: Courier, Courier New, Lucida Console, monospace; font-size: 12px; } " // Todo: Remove fixed font-size "td.cmd-request { color: #006060; } " "td.cmd-error { color: red; } " ".secwarning { color: red; }" - "b { color: #FFFFFF; } "); + "b { color: #A3A3A3; } "); } updateStyle(ui->messagesWidget); } diff --git a/src/qt/pivx/settings/settingsconsolewidget.h b/src/qt/pivx/settings/settingsconsolewidget.h index 84d56a1ee..ed31bd2ed 100644 --- a/src/qt/pivx/settings/settingsconsolewidget.h +++ b/src/qt/pivx/settings/settingsconsolewidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -45,8 +45,8 @@ class SettingsConsoleWidget : public PWidget public Q_SLOTS: void clear(bool clearHistory = true); - void message(int category, const QString &msg) { message(category, msg, false); } - void message(int category, const QString &message, bool html); + void response(int category, const QString &message) { messageInternal(category, message); }; + void messageInternal(int category, const QString &message, bool html = false); /** Go forward or back in history */ void browseHistory(int offset); /** Scroll console view to end */ diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp b/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp index 078d5b825..56fd244c6 100644 --- a/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp +++ b/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.h b/src/qt/pivx/settings/settingsdisplayoptionswidget.h index ac12db88c..8b3090ae6 100644 --- a/src/qt/pivx/settings/settingsdisplayoptionswidget.h +++ b/src/qt/pivx/settings/settingsdisplayoptionswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsexportcsv.cpp b/src/qt/pivx/settings/settingsexportcsv.cpp index bf96e4dd6..e7a8c3bd6 100644 --- a/src/qt/pivx/settings/settingsexportcsv.cpp +++ b/src/qt/pivx/settings/settingsexportcsv.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsexportcsv.h b/src/qt/pivx/settings/settingsexportcsv.h index 091942ec1..8b36bb639 100644 --- a/src/qt/pivx/settings/settingsexportcsv.h +++ b/src/qt/pivx/settings/settingsexportcsv.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsfaqwidget.cpp b/src/qt/pivx/settings/settingsfaqwidget.cpp index 05cdc7a92..45e9fe2ce 100644 --- a/src/qt/pivx/settings/settingsfaqwidget.cpp +++ b/src/qt/pivx/settings/settingsfaqwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsfaqwidget.h b/src/qt/pivx/settings/settingsfaqwidget.h index f9fdc0792..b88a7f86e 100644 --- a/src/qt/pivx/settings/settingsfaqwidget.h +++ b/src/qt/pivx/settings/settingsfaqwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsinformationwidget.cpp b/src/qt/pivx/settings/settingsinformationwidget.cpp index 161208443..4b43cc25d 100644 --- a/src/qt/pivx/settings/settingsinformationwidget.cpp +++ b/src/qt/pivx/settings/settingsinformationwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsinformationwidget.h b/src/qt/pivx/settings/settingsinformationwidget.h index 4146c2203..6f088f809 100644 --- a/src/qt/pivx/settings/settingsinformationwidget.h +++ b/src/qt/pivx/settings/settingsinformationwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmainoptionswidget.cpp b/src/qt/pivx/settings/settingsmainoptionswidget.cpp index 4f9d16038..e50371897 100644 --- a/src/qt/pivx/settings/settingsmainoptionswidget.cpp +++ b/src/qt/pivx/settings/settingsmainoptionswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmainoptionswidget.h b/src/qt/pivx/settings/settingsmainoptionswidget.h index d8c44221b..4d0753a27 100644 --- a/src/qt/pivx/settings/settingsmainoptionswidget.h +++ b/src/qt/pivx/settings/settingsmainoptionswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmultisenddialog.cpp b/src/qt/pivx/settings/settingsmultisenddialog.cpp index 62058486a..bf4002cd2 100644 --- a/src/qt/pivx/settings/settingsmultisenddialog.cpp +++ b/src/qt/pivx/settings/settingsmultisenddialog.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmultisenddialog.h b/src/qt/pivx/settings/settingsmultisenddialog.h index 689c4181c..dc18691dd 100644 --- a/src/qt/pivx/settings/settingsmultisenddialog.h +++ b/src/qt/pivx/settings/settingsmultisenddialog.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmultisendwidget.cpp b/src/qt/pivx/settings/settingsmultisendwidget.cpp index d1da9e30e..d4f40a2b6 100644 --- a/src/qt/pivx/settings/settingsmultisendwidget.cpp +++ b/src/qt/pivx/settings/settingsmultisendwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsmultisendwidget.h b/src/qt/pivx/settings/settingsmultisendwidget.h index c404dce5d..45a1f708a 100644 --- a/src/qt/pivx/settings/settingsmultisendwidget.h +++ b/src/qt/pivx/settings/settingsmultisendwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsnetworkwidget.cpp b/src/qt/pivx/settings/settingsnetworkwidget.cpp index 390cc97a8..bfbfa0d63 100644 --- a/src/qt/pivx/settings/settingsnetworkwidget.cpp +++ b/src/qt/pivx/settings/settingsnetworkwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingsnetworkwidget.h b/src/qt/pivx/settings/settingsnetworkwidget.h index 4b7ba0994..741a1d56d 100644 --- a/src/qt/pivx/settings/settingsnetworkwidget.h +++ b/src/qt/pivx/settings/settingsnetworkwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.cpp b/src/qt/pivx/settings/settingssignmessagewidgets.cpp index 2e8c3020b..87030f20c 100644 --- a/src/qt/pivx/settings/settingssignmessagewidgets.cpp +++ b/src/qt/pivx/settings/settingssignmessagewidgets.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingssignmessagewidgets.h b/src/qt/pivx/settings/settingssignmessagewidgets.h index 691f0874f..e5f75aca4 100644 --- a/src/qt/pivx/settings/settingssignmessagewidgets.h +++ b/src/qt/pivx/settings/settingssignmessagewidgets.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.cpp b/src/qt/pivx/settings/settingswalletoptionswidget.cpp index d0b1b5eff..653a9238e 100644 --- a/src/qt/pivx/settings/settingswalletoptionswidget.cpp +++ b/src/qt/pivx/settings/settingswalletoptionswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.h b/src/qt/pivx/settings/settingswalletoptionswidget.h index 07a4fd8c8..de71b2aca 100644 --- a/src/qt/pivx/settings/settingswalletoptionswidget.h +++ b/src/qt/pivx/settings/settingswalletoptionswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingswalletrepairwidget.cpp b/src/qt/pivx/settings/settingswalletrepairwidget.cpp index 0d1228de0..1fb609e01 100644 --- a/src/qt/pivx/settings/settingswalletrepairwidget.cpp +++ b/src/qt/pivx/settings/settingswalletrepairwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingswalletrepairwidget.h b/src/qt/pivx/settings/settingswalletrepairwidget.h index e33198481..478a0f910 100644 --- a/src/qt/pivx/settings/settingswalletrepairwidget.h +++ b/src/qt/pivx/settings/settingswalletrepairwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/pivx/settings/settingswidget.cpp index c5b770e79..2c5ec788c 100644 --- a/src/qt/pivx/settings/settingswidget.cpp +++ b/src/qt/pivx/settings/settingswidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -166,6 +166,7 @@ SettingsWidget::SettingsWidget(PIVXGUI* parent) : connect(settingsWalletOptionsWidget, &SettingsWalletOptionsWidget::saveSettings, this, &SettingsWidget::onSaveOptionsClicked); connect(settingsWalletOptionsWidget, &SettingsWalletOptionsWidget::discardSettings, this, &SettingsWidget::onDiscardChanges); + connect(settingsConsoleWidget, &SettingsConsoleWidget::message,this, &SettingsWidget::message); /* Widget-to-option mapper */ mapper = new QDataWidgetMapper(this); mapper->setSubmitPolicy(QDataWidgetMapper::ManualSubmit); diff --git a/src/qt/pivx/settings/settingswidget.h b/src/qt/pivx/settings/settingswidget.h index 6e44caa27..a43a8d232 100644 --- a/src/qt/pivx/settings/settingswidget.h +++ b/src/qt/pivx/settings/settingswidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/snackbar.cpp b/src/qt/pivx/snackbar.cpp index 0e8f5ad96..5b63273b4 100644 --- a/src/qt/pivx/snackbar.cpp +++ b/src/qt/pivx/snackbar.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/snackbar.h b/src/qt/pivx/snackbar.h index 72b387f86..46dae46e1 100644 --- a/src/qt/pivx/snackbar.h +++ b/src/qt/pivx/snackbar.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/splash.cpp b/src/qt/pivx/splash.cpp index b298e6269..bf8beecd6 100644 --- a/src/qt/pivx/splash.cpp +++ b/src/qt/pivx/splash.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/splash.h b/src/qt/pivx/splash.h index 5b6a65f89..77ce973d8 100644 --- a/src/qt/pivx/splash.h +++ b/src/qt/pivx/splash.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/tooltipmenu.cpp b/src/qt/pivx/tooltipmenu.cpp index cae5dc01e..edd58e1ab 100644 --- a/src/qt/pivx/tooltipmenu.cpp +++ b/src/qt/pivx/tooltipmenu.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/tooltipmenu.h b/src/qt/pivx/tooltipmenu.h index 286aca1bc..3094d306e 100644 --- a/src/qt/pivx/tooltipmenu.h +++ b/src/qt/pivx/tooltipmenu.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp index e988cd24a..474573616 100644 --- a/src/qt/pivx/topbar.cpp +++ b/src/qt/pivx/topbar.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/topbar.h b/src/qt/pivx/topbar.h index 0ad413978..f90de2263 100644 --- a/src/qt/pivx/topbar.h +++ b/src/qt/pivx/topbar.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/txrow.cpp b/src/qt/pivx/txrow.cpp index d2b3e7803..a103644cb 100644 --- a/src/qt/pivx/txrow.cpp +++ b/src/qt/pivx/txrow.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/txrow.h b/src/qt/pivx/txrow.h index 9ada03845..637481b45 100644 --- a/src/qt/pivx/txrow.h +++ b/src/qt/pivx/txrow.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/txviewholder.cpp b/src/qt/pivx/txviewholder.cpp index bc6a47d48..8ad706e92 100644 --- a/src/qt/pivx/txviewholder.cpp +++ b/src/qt/pivx/txviewholder.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/txviewholder.h b/src/qt/pivx/txviewholder.h index 440a53a7a..67e48966c 100644 --- a/src/qt/pivx/txviewholder.h +++ b/src/qt/pivx/txviewholder.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/welcomecontentwidget.cpp b/src/qt/pivx/welcomecontentwidget.cpp index e2debf49f..8b8b71ebe 100644 --- a/src/qt/pivx/welcomecontentwidget.cpp +++ b/src/qt/pivx/welcomecontentwidget.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/pivx/welcomecontentwidget.h b/src/qt/pivx/welcomecontentwidget.h index fc4c1c9cb..5bb6231df 100644 --- a/src/qt/pivx/welcomecontentwidget.h +++ b/src/qt/pivx/welcomecontentwidget.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.cpp b/src/qt/platformstyle.cpp index 88d0d151b..c1df40415 100644 --- a/src/qt/platformstyle.cpp +++ b/src/qt/platformstyle.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/platformstyle.h b/src/qt/platformstyle.h index ec05497cf..dad993f59 100644 --- a/src/qt/platformstyle.h +++ b/src/qt/platformstyle.h @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp index 38a45138f..c4896bd9f 100644 --- a/src/qt/qvalidatedlineedit.cpp +++ b/src/qt/qvalidatedlineedit.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h index 8b637207d..31741216a 100644 --- a/src/qt/qvalidatedlineedit.h +++ b/src/qt/qvalidatedlineedit.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp index f34c10d15..cc1bcc736 100644 --- a/src/qt/qvaluecombobox.cpp +++ b/src/qt/qvaluecombobox.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/qvaluecombobox.h b/src/qt/qvaluecombobox.h index fda013c75..05bad021d 100644 --- a/src/qt/qvaluecombobox.h +++ b/src/qt/qvaluecombobox.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index cdb8eaec8..21deaf2cb 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h index c300600f8..1f95c788a 100644 --- a/src/qt/recentrequeststablemodel.h +++ b/src/qt/recentrequeststablemodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/res/css/default.css b/src/qt/res/css/default.css index fc8eed627..48df897e4 100755 --- a/src/qt/res/css/default.css +++ b/src/qt/res/css/default.css @@ -4,15 +4,15 @@ /* These color codes should be blanket replaced in every file of the build (including */ /* the .ui and .cpp files as they are occasionally hard coded in them. */ /* */ -/* standard lighter brand color: #00dd80 */ +/* standard lighter brand color: #00c773 */ /* standard darker brand color: #038e4f */ /* stardard darker brand color 70% transparency: rgba(153, 96, 28, 0.7) */ /* dark tinted background brand color: #0b0f16 */ /* */ /* staking chart POS color: #fcbc56 */ /* staking chart POS color as RGB: QColor(252,188,86) */ -/* staking chart MN color: #00dd80 */ -/* staking chart MN color as RGB: QColor(0,221,128) */ +/* staking chart MN color: #00c773 */ +/* staking chart MN color as RGB: QColor(0,199,115) */ /* */ /* dark theme background color: #000000 */ /****************************************************************************************/ @@ -225,10 +225,10 @@ background-color:#f2f2f2; /***************************** Global Qt Objects ***********************************************************/ QPushButton { /* Global Button Style */ -background-color: #00dd80; +background-color: #00c773; border-width: 1px; border-style: outset; -border-color: #00dd80; +border-color: #00c773; border-radius: 2px; color:#262626; font-size:12px; @@ -242,7 +242,7 @@ margin: 2px; } QPushButton:hover { -background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00dd80, stop: 0.1 #00dd80, stop: 0.101 #00dd80, stop: 0.9 #00dd80, stop: 0.901 #00dd80, stop: 1 #00dd80); +background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00c773, stop: 0.1 #00c773, stop: 0.101 #00c773, stop: 0.9 #00c773, stop: 0.901 #00c773, stop: 1 #00c773); } QPushButton:focus { @@ -253,7 +253,7 @@ QPushButton:focus { QPushButton:pressed { background-color: #038e4f; border:1px solid #038e4f; -background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00dd80, stop: 0.1 #00dd80, stop: 0.101 #00dd80, stop: 0.9 #00dd80, stop: 0.901 #00dd80, stop: 1 #00dd80); +background-color: qlineargradient(y1:0, y2: 1, stop: 0 #00c773, stop: 0.1 #00c773, stop: 0.101 #00c773, stop: 0.9 #00c773, stop: 0.901 #00c773, stop: 1 #00c773); } /* Special handling for statusbar-icons (which are partly QPushButtons) */ @@ -595,7 +595,7 @@ border-radius: 9px; } QSlider::handle:horizontal:hover { -background-color: qradialgradient(cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 0.7, stop: 0 #00dd80, stop: 0.7 #ffffff); +background-color: qradialgradient(cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 0.7, stop: 0 #00c773, stop: 0.7 #ffffff); border: 2px solid #038e4f; width: 16px; height: 16px; diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index d7687f834..69bc0be5a 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -479,9 +479,12 @@ void RPCConsole::setClientModel(ClientModel* model) for (size_t i = 0; i < commandList.size(); ++i) { wordList << commandList[i].c_str(); + wordList << ("help " + commandList[i]).c_str(); } + wordList.sort(); autoCompleter = new QCompleter(wordList, this); + autoCompleter->setModelSorting(QCompleter::CaseSensitivelySortedModel); ui->lineEdit->setCompleter(autoCompleter); // clear the lineEdit after activating from QCompleter diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h index c9877d6c6..51b82bc01 100644 --- a/src/qt/rpcconsole.h +++ b/src/qt/rpcconsole.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentrequestdata.h b/src/qt/test/paymentrequestdata.h index a3ba23491..21f393ffa 100644 --- a/src/qt/test/paymentrequestdata.h +++ b/src/qt/test/paymentrequestdata.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 5459e6c76..913810b66 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2018-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/paymentservertests.h b/src/qt/test/paymentservertests.h index bb40ecb9a..31923eb81 100644 --- a/src/qt/test/paymentservertests.h +++ b/src/qt/test/paymentservertests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index a26f0d5eb..5c622f73a 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/uritests.cpp b/src/qt/test/uritests.cpp index 7fc32c0c5..f05758295 100644 --- a/src/qt/test/uritests.cpp +++ b/src/qt/test/uritests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/test/uritests.h b/src/qt/test/uritests.h index 3393332b1..55f3443dc 100644 --- a/src/qt/test/uritests.h +++ b/src/qt/test/uritests.h @@ -1,5 +1,5 @@ // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.cpp b/src/qt/trafficgraphwidget.cpp index 942b54fa6..dfa4ec6ac 100644 --- a/src/qt/trafficgraphwidget.cpp +++ b/src/qt/trafficgraphwidget.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/trafficgraphwidget.h b/src/qt/trafficgraphwidget.h index cfb6c8e37..d41ab017f 100644 --- a/src/qt/trafficgraphwidget.h +++ b/src/qt/trafficgraphwidget.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index 1456e947d..821cb1687 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -13,6 +13,8 @@ #include +#define SKIP_ROWCOUNT_N_TIMES 10 + // Earliest date that can be represented (far in the past) const QDateTime TransactionFilterProxy::MIN_DATE = QDateTime::fromTime_t(0); // Last date that can be represented (far in the future) @@ -134,10 +136,17 @@ void TransactionFilterProxy::setOnlyStakesandMN(bool fOnlyStakesandMN) int TransactionFilterProxy::rowCount(const QModelIndex& parent) const { + static int entryCount = 0; + + int rowCount = + entryCount++ < SKIP_ROWCOUNT_N_TIMES ? + sourceModel()->rowCount() : + QSortFilterProxyModel::rowCount(parent); + if (limitRows != -1) { - return std::min(QSortFilterProxyModel::rowCount(parent), limitRows); + return std::min(rowCount, limitRows); } else { - return QSortFilterProxyModel::rowCount(parent); + return rowCount; } } diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h index 7a04d7f94..a3cc64674 100644 --- a/src/qt/transactionfilterproxy.h +++ b/src/qt/transactionfilterproxy.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index e43805a71..bcd492978 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h index 07aa70bf2..3f8f35218 100644 --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index b5cd7c82a..d00d52a97 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -30,13 +30,6 @@ #include #include -#define SINGLE_THREAD_MAX_TXES_SIZE 4000 - -// Maximum amount of loaded records in ram in the first load. -// If the user has more and want to load them: -// TODO, add load on demand in pages (not every tx loaded all the time into the records list). -#define MAX_AMOUNT_LOADED_RECORDS 20000 - // Amount column is right-aligned it contains numbers static int column_alignments[] = { Qt::AlignLeft | Qt::AlignVCenter, /* status */ @@ -88,6 +81,8 @@ class TransactionTablePriv QList cachedWallet; bool hasZcTxes = false; + mutable RecursiveMutex cs_cachedWallet; + /** * Time of the oldest transaction loaded into the model. * It can or not be the first tx in the wallet, the model only loads the last 20k txs. @@ -99,7 +94,11 @@ class TransactionTablePriv void refreshWallet() { qDebug() << "TransactionTablePriv::refreshWallet"; - cachedWallet.clear(); + + { + LOCK(cs_cachedWallet); + cachedWallet.clear(); + } std::vector walletTxes = wallet->getWalletTxs(); @@ -148,21 +147,43 @@ class TransactionTablePriv auto res = convertTxToRecords(this, wallet, std::vector(walletTxes.end() - remainingSize, walletTxes.end()) ); - cachedWallet.append(res.records); + + { + LOCK(cs_cachedWallet); + cachedWallet.append(res.records); + } + nFirstLoadedTxTime = res.nFirstLoadedTxTime; for (auto &future : tasks) { future.waitForFinished(); ConvertTxToVectorResult convertRes = future.result(); - cachedWallet.append(convertRes.records); + + { + LOCK(cs_cachedWallet); + cachedWallet.append(convertRes.records); + } + if (nFirstLoadedTxTime > convertRes.nFirstLoadedTxTime) { nFirstLoadedTxTime = convertRes.nFirstLoadedTxTime; } } + + // Now that all records have been cached, sort them by tx hash + { + LOCK(cs_cachedWallet); + std::sort(cachedWallet.begin(), cachedWallet.end(), TxLessThan()); + } + } else { // Single thread flow ConvertTxToVectorResult convertRes = convertTxToRecords(this, wallet, walletTxes); - cachedWallet.append(convertRes.records); + + { + LOCK(cs_cachedWallet); + cachedWallet.append(convertRes.records); + } + nFirstLoadedTxTime = convertRes.nFirstLoadedTxTime; } } @@ -213,14 +234,21 @@ class TransactionTablePriv { qDebug() << "TransactionTablePriv::updateWallet : " + QString::fromStdString(hash.ToString()) + " " + QString::number(status); - // Find bounds of this transaction in model - QList::iterator lower = std::lower_bound( - cachedWallet.begin(), cachedWallet.end(), hash, TxLessThan()); - QList::iterator upper = std::upper_bound( - cachedWallet.begin(), cachedWallet.end(), hash, TxLessThan()); - int lowerIndex = (lower - cachedWallet.begin()); - int upperIndex = (upper - cachedWallet.begin()); - bool inModel = (lower != upper); + QList::iterator lower; + QList::iterator upper; + int lowerIndex; + int upperIndex; + bool inModel = false; + { + LOCK(cs_cachedWallet); + + // Find bounds of this transaction in model + lower = std::lower_bound(cachedWallet.begin(), cachedWallet.end(), hash, TxLessThan()); + upper = std::upper_bound(cachedWallet.begin(), cachedWallet.end(), hash, TxLessThan()); + lowerIndex = (lower - cachedWallet.begin()); + upperIndex = (upper - cachedWallet.begin()); + inModel = (lower != upper); + } if (status == CT_UPDATED) { if (showTransaction && !inModel) @@ -249,25 +277,33 @@ class TransactionTablePriv } const CWalletTx& wtx = mi->second; - // As old transactions are still getting updated (+20k range), - // do not add them if we deliberately didn't load them at startup. - if (cachedWallet.size() >= MAX_AMOUNT_LOADED_RECORDS && wtx.GetTxTime() < nFirstLoadedTxTime) { - return; + { + LOCK(cs_cachedWallet); + + // As old transactions are still getting updated (+20k range), + // do not add them if we deliberately didn't load them at startup. + if (cachedWallet.size() >= MAX_AMOUNT_LOADED_RECORDS && wtx.GetTxTime() < nFirstLoadedTxTime) { + return; + } } // Added -- insert at the right position QList toInsert = TransactionRecord::decomposeTransaction(wallet, wtx); if (!toInsert.isEmpty()) { /* only if something to insert */ - parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex + toInsert.size() - 1); - int insert_idx = lowerIndex; - for (const TransactionRecord& rec : toInsert) { - cachedWallet.insert(insert_idx, rec); - if (!hasZcTxes) hasZcTxes = HasZcTxesIfNeeded(rec); - insert_idx += 1; - ret = rec; // Return record + { + LOCK(cs_cachedWallet); + + parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex + toInsert.size() - 1); + int insert_idx = lowerIndex; + for (const TransactionRecord& rec : toInsert) { + cachedWallet.insert(insert_idx, rec); + if (!hasZcTxes) hasZcTxes = HasZcTxesIfNeeded(rec); + insert_idx += 1; + ret = rec; // Return record + } + parent->endInsertRows(); } - parent->endInsertRows(); } } break; @@ -276,10 +312,13 @@ class TransactionTablePriv qWarning() << "TransactionTablePriv::updateWallet : Warning: Got CT_DELETED, but transaction is not in model"; break; } - // Removed -- remove entire transaction from table - parent->beginRemoveRows(QModelIndex(), lowerIndex, upperIndex - 1); - cachedWallet.erase(lower, upper); - parent->endRemoveRows(); + { + LOCK(cs_cachedWallet); + // Removed -- remove entire transaction from table + parent->beginRemoveRows(QModelIndex(), lowerIndex, upperIndex - 1); + cachedWallet.erase(lower, upper); + parent->endRemoveRows(); + } break; case CT_UPDATED: // Miscellaneous updates -- nothing to do, status update will take care of this, and is only computed for @@ -290,6 +329,8 @@ class TransactionTablePriv int size() { + LOCK(cs_cachedWallet); + return cachedWallet.size(); } @@ -300,9 +341,16 @@ class TransactionTablePriv TransactionRecord* index(int idx) { - if (idx >= 0 && idx < cachedWallet.size()) { - TransactionRecord* rec = &cachedWallet[idx]; + TransactionRecord* rec = NULL; + { + LOCK(cs_cachedWallet); + if (idx >= 0 && idx < cachedWallet.size()) { + rec = &cachedWallet[idx]; + } + } + + if (rec != NULL) { // Get required locks upfront. This avoids the GUI from getting // stuck if the core is holding the locks for a longer time - for // example, during a wallet rescan. diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index 392f46059..0a36b0149 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -12,6 +12,13 @@ #include #include +#define SINGLE_THREAD_MAX_TXES_SIZE 4000 + +// Maximum amount of loaded records in ram in the first load. +// If the user has more and want to load them: +// TODO, add load on demand in pages (not every tx loaded all the time into the records list). +#define MAX_AMOUNT_LOADED_RECORDS 100000 + class TransactionRecord; class TransactionTablePriv; class WalletModel; diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index d60572348..2f115d847 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h index 6b8498ec0..e1a587e18 100644 --- a/src/qt/utilitydialog.h +++ b/src/qt/utilitydialog.h @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 04b4e407f..e29577146 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index 697eb2fee..20c32f913 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -1,7 +1,7 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.cpp b/src/qt/walletmodeltransaction.cpp index af50b18b7..ac4003cf1 100644 --- a/src/qt/walletmodeltransaction.cpp +++ b/src/qt/walletmodeltransaction.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/walletmodeltransaction.h b/src/qt/walletmodeltransaction.h index e815c9a0b..67799d2d2 100644 --- a/src/qt/walletmodeltransaction.h +++ b/src/qt/walletmodeltransaction.h @@ -1,5 +1,5 @@ // Copyright (c) 2011-2013 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp index 98f226064..99df17a7b 100644 --- a/src/qt/winshutdownmonitor.cpp +++ b/src/qt/winshutdownmonitor.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/qt/winshutdownmonitor.h b/src/qt/winshutdownmonitor.h index fb90b3ced..5888beed9 100644 --- a/src/qt/winshutdownmonitor.h +++ b/src/qt/winshutdownmonitor.h @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.cpp b/src/random.cpp index 2bba068fb..5d7137311 100644 --- a/src/random.cpp +++ b/src/random.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/random.h b/src/random.h index 8840e583c..17e77defc 100644 --- a/src/random.h +++ b/src/random.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rest.cpp b/src/rest.cpp index fa0600455..ecfbcac89 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/reverse_iterate.h b/src/reverse_iterate.h index 8a8a88068..946d5564f 100644 --- a/src/reverse_iterate.h +++ b/src/reverse_iterate.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/reverselock.h b/src/reverselock.h index d8ab1c51e..c9dc1a308 100644 --- a/src/reverselock.h +++ b/src/reverselock.h @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 59af34134..b108df76a 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -628,6 +628,7 @@ static void ApplyStats(CCoinsStats &stats, CHashWriter& ss, const uint256& hash, //! Calculate statistics about the unspent transaction output set static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats) { + const Consensus::Params& consensus = Params().GetConsensus(); std::unique_ptr pcursor(view->Cursor()); CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION); @@ -644,6 +645,17 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats) COutPoint key; Coin coin; if (pcursor->GetKey(key) && pcursor->GetValue(coin)) { + // ----------- burn address scanning ----------- + CTxDestination source; + if (ExtractDestination(coin.out.scriptPubKey, source)) { + const std::string addr = EncodeDestination(source); + if (consensus.mBurnAddresses.find(addr) != consensus.mBurnAddresses.end() && + consensus.mBurnAddresses.at(addr) < stats.nHeight) + { + pcursor->Next(); + continue; + } + } if (!outputs.empty() && key.hash != prevkey) { ApplyStats(stats, ss, prevkey, outputs); outputs.clear(); @@ -663,6 +675,45 @@ static bool GetUTXOStats(CCoinsView *view, CCoinsStats &stats) return true; } +static std::map GetBurnStats(CCoinsView* view, bool fWithValues, int nHeight) +{ + std::map ret; + + const Consensus::Params& consensus = Params().GetConsensus(); + + for (const auto &p : consensus.mBurnAddresses ) { + if(p.second <= nHeight) { + ret[p.first] = 0; + } + } + + if(fWithValues) { + std::unique_ptr pcursor(view->Cursor()); + + while (pcursor->Valid()) { + boost::this_thread::interruption_point(); + COutPoint key; + Coin coin; + if (pcursor->GetKey(key) && pcursor->GetValue(coin)) { + CTxDestination source; + if (ExtractDestination(coin.out.scriptPubKey, source)) { + const std::string addr = EncodeDestination(source); + if (consensus.mBurnAddresses.find(addr) != consensus.mBurnAddresses.end() && + consensus.mBurnAddresses.at(addr) <= nHeight) { + ret[addr] = ret[addr] + coin.out.nValue; + } + } + } else { + error("%s: unable to read value", __func__); + } + + pcursor->Next(); + } + } + + return ret; +} + UniValue gettxoutsetinfo(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() != 0) @@ -781,6 +832,49 @@ UniValue gettxout(const JSONRPCRequest& request) return ret; } +UniValue getburnaddresses(const JSONRPCRequest& request) +{ + if (request.fHelp || request.params.size() > 1) + throw std::runtime_error( + "getburnaddresses ( withvalues )\n" + "\nReturns burn addresses. When an address is a burn address, it is also rejected from mempool and block inclusion, however a transaction to them is possible.\n" + + "\nArguments:\n" + "1. withvalues (boolean, optional) Whether to include address balance. Default = false\n" + + "\nResult:\n" + "[\n" + "{\n" + " \"address\": xxxxxx, (string) The burn address\n" + " \"amount\": 123.45 (numeric) The balance of the burn address\n" + "}\n" + "]\n" + + "\nExamples:\n" + + HelpExampleCli("getburnaddresses", "") + HelpExampleCli("getburnaddresses", "true") + HelpExampleRpc("getburnaddresses", "")); + + bool fWithValues = false; + if (request.params.size() > 0) + fWithValues = request.params[0].get_bool(); + + UniValue ret(UniValue::VARR); + int nHeight = WITH_LOCK(cs_main, return chainActive.Height()); + if (nHeight < 0) return "[]"; + + if (fWithValues) FlushStateToDisk(); + + for (const auto& kv : GetBurnStats(pcoinsTip, fWithValues, nHeight)) { + UniValue obj(UniValue::VOBJ); + obj.push_back(Pair("address", kv.first)); + if (fWithValues) { + obj.push_back(Pair("amount", ValueFromAmount(kv.second))); + } + ret.push_back(obj); + } + + return ret; +} + UniValue verifychain(const JSONRPCRequest& request) { if (request.fHelp || request.params.size() > 1) diff --git a/src/rpc/budget.cpp b/src/rpc/budget.cpp index 5bb047276..2a772d1a5 100644 --- a/src/rpc/budget.cpp +++ b/src/rpc/budget.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 1235f2d2c..2eeffc3f4 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -172,6 +172,7 @@ static const CRPCConvertParam vRPCConvertParams[] = {"getserials", 1}, {"getserials", 2}, {"getfeeinfo", 0}, + {"getburnaddresses", 0}, }; class CRPCConvertTable diff --git a/src/rpc/client.h b/src/rpc/client.h index b8255e44f..9f5143946 100644 --- a/src/rpc/client.h +++ b/src/rpc/client.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index 923ce06c1..1a9614644 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 6cd7f5e80..6d9e31563 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 59f8f49c7..366b1e505 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 4008fad48..d880ad121 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2015 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index ff3592f82..f14aaefd9 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h index 7dcd83dac..e6e68a946 100644 --- a/src/rpc/protocol.h +++ b/src/rpc/protocol.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 68d961065..e741d9c40 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 077ec5e47..f9ceb64f8 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -319,6 +319,7 @@ static const CRPCCommand vRPCCommands[] = {"blockchain", "invalidateblock", &invalidateblock, true }, {"blockchain", "reconsiderblock", &reconsiderblock, true }, {"blockchain", "verifychain", &verifychain, true }, + {"blockchain", "getburnaddresses", &getburnaddresses, true }, /* Mining */ {"mining", "getblocktemplate", &getblocktemplate, true }, @@ -568,6 +569,12 @@ std::string JSONRPCExecBatch(const UniValue& vReq) UniValue CRPCTable::execute(const JSONRPCRequest &request) const { + // Return immediately if in warmup + std::string strWarmupStatus; + if (RPCIsInWarmup(&strWarmupStatus)) { + throw JSONRPCError(RPC_IN_WARMUP, "RPC in warm-up: " + strWarmupStatus); + } + // Find method const CRPCCommand* pcmd = tableRPC[request.strMethod]; if (!pcmd) diff --git a/src/rpc/server.h b/src/rpc/server.h index 3b01fb7a7..9848ec267 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -1,7 +1,7 @@ // Copyright (c) 2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -271,6 +271,7 @@ extern UniValue invalidateblock(const JSONRPCRequest& request); extern UniValue reconsiderblock(const JSONRPCRequest& request); extern UniValue getblockindexstats(const JSONRPCRequest& request); extern UniValue getserials(const JSONRPCRequest& request); +extern UniValue getburnaddresses(const JSONRPCRequest& request); extern void validaterange(const UniValue& params, int& heightStart, int& heightEnd, int minHeightStart=1); // in rpc/masternode.cpp diff --git a/src/scheduler.cpp b/src/scheduler.cpp index 05a280da7..4b2ea1a1c 100644 --- a/src/scheduler.cpp +++ b/src/scheduler.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/scheduler.h b/src/scheduler.h index a335ca91d..eed5a9af4 100644 --- a/src/scheduler.h +++ b/src/scheduler.h @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/bitcoinconsensus.cpp b/src/script/bitcoinconsensus.cpp index c88170ab6..3161a81fe 100644 --- a/src/script/bitcoinconsensus.cpp +++ b/src/script/bitcoinconsensus.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2018-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index aab84bf9c..13fa184b6 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 126666f0e..d32085567 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/interpreter.h b/src/script/interpreter.h index b6d9fc26f..e9ec3f1b0 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin developers // Copyright (c) 2018-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index f789d6e28..3f88778b2 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/ismine.h b/src/script/ismine.h index 61a9540e7..40ffb263f 100644 --- a/src/script/ismine.h +++ b/src/script/ismine.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/keyorigin.h b/src/script/keyorigin.h index dde956499..7e7a230de 100644 --- a/src/script/keyorigin.h +++ b/src/script/keyorigin.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.cpp b/src/script/script.cpp index 2d6fa3818..4a2b51908 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script.h b/src/script/script.h index ba2b20156..789fb7384 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index f98957ff8..25586d09e 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/script_error.h b/src/script/script_error.h index 4c614f896..f6eb4a91f 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index cc157b3a7..3dafc5487 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2018-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sigcache.h b/src/script/sigcache.h index e66de54eb..c1a1a2ff3 100644 --- a/src/script/sigcache.h +++ b/src/script/sigcache.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 9c19137b3..3feb10421 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/sign.h b/src/script/sign.h index 930fa9772..80e68c254 100644 --- a/src/script/sign.h +++ b/src/script/sign.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/standard.cpp b/src/script/standard.cpp index a885988d3..a864ac880 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/script/standard.h b/src/script/standard.h index 9393f86d6..48931dae7 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/serialize.h b/src/serialize.h index fa3d9e96b..d09dab77f 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/spork.cpp b/src/spork.cpp index f07cdb1cc..c3e83e106 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/spork.h b/src/spork.h index 0206535f7..0923ca2e3 100644 --- a/src/spork.h +++ b/src/spork.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sporkdb.cpp b/src/sporkdb.cpp index 80cb670c6..63c69d45e 100644 --- a/src/sporkdb.cpp +++ b/src/sporkdb.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sporkdb.h b/src/sporkdb.h index 50458a57a..9b769d1a1 100644 --- a/src/sporkdb.h +++ b/src/sporkdb.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sporkid.h b/src/sporkid.h index 15f0f9496..df5c2e7e1 100644 --- a/src/sporkid.h +++ b/src/sporkid.h @@ -1,6 +1,6 @@ // Copyright (c) 2014-2016 The Dash developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/stakeinput.cpp b/src/stakeinput.cpp index 8f8c35ae9..abd1960c8 100644 --- a/src/stakeinput.cpp +++ b/src/stakeinput.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/stakeinput.h b/src/stakeinput.h index 263eb5ca0..82130c4a8 100644 --- a/src/stakeinput.h +++ b/src/stakeinput.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/streams.h b/src/streams.h index a22b54855..75b4499a6 100644 --- a/src/streams.h +++ b/src/streams.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.cpp b/src/support/cleanse.cpp index 15d6ed250..c6b633830 100644 --- a/src/support/cleanse.cpp +++ b/src/support/cleanse.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/support/cleanse.h b/src/support/cleanse.h index aec80fefb..be572c436 100644 --- a/src/support/cleanse.h +++ b/src/support/cleanse.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.cpp b/src/sync.cpp index c498cd9e0..a153f21e7 100644 --- a/src/sync.cpp +++ b/src/sync.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/sync.h b/src/sync.h index ae45c1864..c101c60be 100644 --- a/src/sync.h +++ b/src/sync.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2017 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp index dc7580bd6..3f7ec8efb 100644 --- a/src/test/Checkpoints_tests.cpp +++ b/src/test/Checkpoints_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 8b36da749..a82c89edc 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp index f153bf17a..5fc37e89a 100644 --- a/src/test/accounting_tests.cpp +++ b/src/test/accounting_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin Core developers // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index fe9db7f86..02117524b 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2015 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "addrman.h" diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index ecbb12d64..b8144437c 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2013 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index cd3506ef6..98d69a89a 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/arith_uint256_tests.cpp b/src/test/arith_uint256_tests.cpp index adb3867ca..e371985c1 100644 --- a/src/test/arith_uint256_tests.cpp +++ b/src/test/arith_uint256_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base32_tests.cpp b/src/test/base32_tests.cpp index aa8bc1a51..0439659b7 100644 --- a/src/test/base32_tests.cpp +++ b/src/test/base32_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 5cde072df..aeb68891f 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/base64_tests.cpp b/src/test/base64_tests.cpp index 9d66a6fce..480495cd4 100644 --- a/src/test/base64_tests.cpp +++ b/src/test/base64_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bech32_tests.cpp b/src/test/bech32_tests.cpp index 4481a2c5f..03dd0f548 100644 --- a/src/test/bech32_tests.cpp +++ b/src/test/bech32_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017 Pieter Wuille -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp index d6749705c..c3c2d80fe 100644 --- a/src/test/bip32_tests.cpp +++ b/src/test/bip32_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2013 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 19d6046f4..7cec24d7f 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/budget_tests.cpp b/src/test/budget_tests.cpp index 153a201e9..85bea4b02 100644 --- a/src/test/budget_tests.cpp +++ b/src/test/budget_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp index 45009ac9f..19ba4b995 100644 --- a/src/test/checkblock_tests.cpp +++ b/src/test/checkblock_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2013-2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 6aaebc1d7..6265a652a 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index 69c37d3e7..1b6dd11a7 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/convertbits_tests.cpp b/src/test/convertbits_tests.cpp index 1dc594705..5db424eac 100644 --- a/src/test/convertbits_tests.cpp +++ b/src/test/convertbits_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018 The Zcash developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp index 7c95458df..8fa99c4ad 100644 --- a/src/test/crypto_tests.cpp +++ b/src/test/crypto_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp index bd543b9d4..8be155128 100644 --- a/src/test/cuckoocache_tests.cpp +++ b/src/test/cuckoocache_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index 0888f80af..851317069 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index 2994692df..d6ee72c11 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2016 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/hash_tests.cpp b/src/test/hash_tests.cpp index 5f0785aca..67447ca5a 100644 --- a/src/test/hash_tests.cpp +++ b/src/test/hash_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 2fb101329..83a536551 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/main_tests.cpp b/src/test/main_tests.cpp index 7e33810f4..f8350b6aa 100644 --- a/src/test/main_tests.cpp +++ b/src/test/main_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 898cbf14a..89e488bb3 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp index 04eda7853..c6b70cde8 100644 --- a/src/test/merkle_tests.cpp +++ b/src/test/merkle_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 8db9150c3..6a3276215 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 616ad7bcd..4bdff91b4 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index efea9cece..cd390f565 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 377666d16..de5e5e3a1 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2012-2015 The Bitcoin Core developers // Copyright (c) 2014-2015 The Dash Core developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp index b986b8a83..cc4f76c9d 100644 --- a/src/test/pmt_tests.cpp +++ b/src/test/pmt_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index ed2265793..5c13fd29b 100644 --- a/src/test/policyestimator_tests.cpp +++ b/src/test/policyestimator_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index c9abcc8df..c7385cc64 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/random_tests.cpp b/src/test/random_tests.cpp index 20533dfd9..db3362a04 100644 --- a/src/test/random_tests.cpp +++ b/src/test/random_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/reverselock_tests.cpp b/src/test/reverselock_tests.cpp index 18fb51f49..96ab6f908 100644 --- a/src/test/reverselock_tests.cpp +++ b/src/test/reverselock_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2015 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 64f9ae7ee..0e0bb4295 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sanity_tests.cpp b/src/test/sanity_tests.cpp index 26153fdb2..264d8c909 100644 --- a/src/test/sanity_tests.cpp +++ b/src/test/sanity_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index 1f8256b96..0908f39b1 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 8a2813c9a..d27845dc9 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 39ec67c97..76f43882e 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/scriptnum_tests.cpp b/src/test/scriptnum_tests.cpp index fb3e47b47..f5651c143 100644 --- a/src/test/scriptnum_tests.cpp +++ b/src/test/scriptnum_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/serialize_tests.cpp b/src/test/serialize_tests.cpp index 11243aa61..390617815 100644 --- a/src/test/serialize_tests.cpp +++ b/src/test/serialize_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 636390eb9..cb3039905 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2013 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp index 05512046a..725db5ee8 100644 --- a/src/test/sigopcount_tests.cpp +++ b/src/test/sigopcount_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2013 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index fd8d81f8e..ae2ad91c2 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp index e3b2439ca..02773fae1 100644 --- a/src/test/streams_tests.cpp +++ b/src/test/streams_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/sync_tests.cpp b/src/test/sync_tests.cpp index 85043d000..b4e6acea4 100644 --- a/src/test/sync_tests.cpp +++ b/src/test/sync_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012-2020 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_pivx.cpp b/src/test/test_pivx.cpp index 1afbe0190..b18e9266c 100644 --- a/src/test/test_pivx.cpp +++ b/src/test/test_pivx.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_pivx.h b/src/test/test_pivx.h index 2a0a3fffd..5b2ae627a 100644 --- a/src/test/test_pivx.h +++ b/src/test/test_pivx.h @@ -1,5 +1,5 @@ // Copyright (c) 2015-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/test_zerocoin.cpp b/src/test/test_zerocoin.cpp index 7854f9674..b37fa9938 100644 --- a/src/test/test_zerocoin.cpp +++ b/src/test/test_zerocoin.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/timedata_tests.cpp b/src/test/timedata_tests.cpp index 39e381529..dbe8ab160 100644 --- a/src/test/timedata_tests.cpp +++ b/src/test/timedata_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/torcontrol_tests.cpp b/src/test/torcontrol_tests.cpp index dba43e44a..3c04b1908 100644 --- a/src/test/torcontrol_tests.cpp +++ b/src/test/torcontrol_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2017 The Zcash developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index e272f676e..a9e20353a 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/uint256_tests.cpp b/src/test/uint256_tests.cpp index 902ec4f4e..9c932e093 100644 --- a/src/test/uint256_tests.cpp +++ b/src/test/uint256_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2013 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp index 0f9e9fd25..21bad3b1d 100644 --- a/src/test/univalue_tests.cpp +++ b/src/test/univalue_tests.cpp @@ -1,6 +1,6 @@ // Copyright 2014 BitPay, Inc. // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/upgrades_tests.cpp b/src/test/upgrades_tests.cpp index 97b551b9d..f70d23a2e 100644 --- a/src/test/upgrades_tests.cpp +++ b/src/test/upgrades_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2017 The Zcash Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index 7c022e4a4..91e0a97a7 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2011-2014 The Bitcoin Core developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/zerocoin_bignum_tests.cpp b/src/test/zerocoin_bignum_tests.cpp index 9de78b46d..ba184f4df 100644 --- a/src/test/zerocoin_bignum_tests.cpp +++ b/src/test/zerocoin_bignum_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/zerocoin_denomination_tests.cpp b/src/test/zerocoin_denomination_tests.cpp index 9e54de610..3cf2f62bc 100644 --- a/src/test/zerocoin_denomination_tests.cpp +++ b/src/test/zerocoin_denomination_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/test/zerocoin_transactions_tests.cpp b/src/test/zerocoin_transactions_tests.cpp index a105bbc4c..1202e860f 100644 --- a/src/test/zerocoin_transactions_tests.cpp +++ b/src/test/zerocoin_transactions_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.cpp b/src/threadinterrupt.cpp index 75d6a078b..3c22166d1 100644 --- a/src/threadinterrupt.cpp +++ b/src/threadinterrupt.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadinterrupt.h b/src/threadinterrupt.h index efaf345f0..dffd8c9ff 100644 --- a/src/threadinterrupt.h +++ b/src/threadinterrupt.h @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/threadsafety.h b/src/threadsafety.h index 3daf5aa89..a2923af84 100644 --- a/src/threadsafety.h +++ b/src/threadsafety.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2012 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/timedata.cpp b/src/timedata.cpp index 3da59744e..674e70653 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014-2017 The Bitcoin developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -81,7 +81,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample, int nOffsetLimit) std::string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong CryptoSaga will not work properly."); strMiscWarning = strMessage; LogPrintf("*** %s\n", strMessage); - uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR); + //uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_INFORMATION); } if (!GetBoolArg("-shrinkdebugfile", g_logger->DefaultShrinkDebugFile())) { for (int64_t n : vSorted) diff --git a/src/timedata.h b/src/timedata.h index 3fb75e3f5..089fc7ebb 100644 --- a/src/timedata.h +++ b/src/timedata.h @@ -1,6 +1,6 @@ // Copyright (c) 2014 The Bitcoin developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index e77a83b72..74c76a102 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2015-2016 The Bitcoin Core developers // Copyright (c) 2017 The Zcash developers // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/torcontrol.h b/src/torcontrol.h index f3ec3e80a..d9c023b26 100644 --- a/src/torcontrol.h +++ b/src/torcontrol.h @@ -1,6 +1,6 @@ // Copyright (c) 2015-2017 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txdb.cpp b/src/txdb.cpp index 3eda83242..7206d2cf7 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -267,7 +267,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::functionGetValue(diskindex)) { // Construct block index object - CBlockIndex* pindexNew = insertBlockIndex(diskindex.GetBlockHash()); + CBlockIndex* pindexNew = insertBlockIndex(key.second); // use the hash already registered on the key index pindexNew->pprev = insertBlockIndex(diskindex.hashPrev); pindexNew->nHeight = diskindex.nHeight; pindexNew->nFile = diskindex.nFile; @@ -288,10 +288,10 @@ bool CBlockTreeDB::LoadBlockIndexGuts(boost::functionnFlags = diskindex.nFlags; pindexNew->vStakeModifier = diskindex.vStakeModifier; - if (!Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_POS)) { - if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits)) - return error("LoadBlockIndex() : CheckProofOfWork failed: %s", pindexNew->ToString()); - } + // if (!Params().GetConsensus().NetworkUpgradeActive(pindexNew->nHeight, Consensus::UPGRADE_POS)) { + // if (!CheckProofOfWork(pindexNew->GetBlockHash(), pindexNew->nBits)) + // return error("LoadBlockIndex() : CheckProofOfWork failed: %s", pindexNew->ToString()); + // } pcursor->Next(); } else { diff --git a/src/txdb.h b/src/txdb.h index b77dbcbdb..5b3957346 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 18403fe36..9dd00e42e 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/txmempool.h b/src/txmempool.h index 6505b82d3..38a223661 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.cpp b/src/uint256.cpp index 23383c64f..ae94a8f87 100644 --- a/src/uint256.cpp +++ b/src/uint256.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint256.h b/src/uint256.h index ce5f288b2..1e7fb08a9 100644 --- a/src/uint256.h +++ b/src/uint256.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/uint512.h b/src/uint512.h index 8d482e52c..39a6db220 100644 --- a/src/uint512.h +++ b/src/uint512.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/undo.h b/src/undo.h index 3187b1e62..fb8ae13c3 100644 --- a/src/undo.h +++ b/src/undo.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/include/univalue.h b/src/univalue/include/univalue.h index 2ebf67e09..e4921b61f 100644 --- a/src/univalue/include/univalue.h +++ b/src/univalue/include/univalue.h @@ -1,6 +1,6 @@ // Copyright 2014 BitPay Inc. // Copyright 2015 Bitcoin Core Developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/lib/univalue.cpp b/src/univalue/lib/univalue.cpp index a696a0cde..9deb3aee8 100644 --- a/src/univalue/lib/univalue.cpp +++ b/src/univalue/lib/univalue.cpp @@ -1,6 +1,6 @@ // Copyright 2014 BitPay Inc. // Copyright 2015 Bitcoin Core Developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/lib/univalue_read.cpp b/src/univalue/lib/univalue_read.cpp index 0d8167c0f..066bfc8b4 100644 --- a/src/univalue/lib/univalue_read.cpp +++ b/src/univalue/lib/univalue_read.cpp @@ -1,5 +1,5 @@ // Copyright 2014 BitPay Inc. -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/lib/univalue_utffilter.h b/src/univalue/lib/univalue_utffilter.h index 7357ea33b..f5db67350 100644 --- a/src/univalue/lib/univalue_utffilter.h +++ b/src/univalue/lib/univalue_utffilter.h @@ -1,5 +1,5 @@ // Copyright 2016 Wladimir J. van der Laan -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef UNIVALUE_UTFFILTER_H diff --git a/src/univalue/lib/univalue_write.cpp b/src/univalue/lib/univalue_write.cpp index 3fe048a30..547462d00 100644 --- a/src/univalue/lib/univalue_write.cpp +++ b/src/univalue/lib/univalue_write.cpp @@ -1,5 +1,5 @@ // Copyright 2014 BitPay Inc. -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/test/object.cpp b/src/univalue/test/object.cpp index e271ddd24..73cdcec54 100644 --- a/src/univalue/test/object.cpp +++ b/src/univalue/test/object.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2014 BitPay Inc. // Copyright (c) 2014-2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/univalue/test/unitester.cpp b/src/univalue/test/unitester.cpp index ed9a188ef..db6881a65 100644 --- a/src/univalue/test/unitester.cpp +++ b/src/univalue/test/unitester.cpp @@ -1,5 +1,5 @@ // Copyright 2014 BitPay Inc. -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.cpp b/src/util.cpp index 5360939d1..9856478e6 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util.h b/src/util.h index 851a1c5fc..f331cd0f8 100644 --- a/src/util.h +++ b/src/util.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/macros.h b/src/util/macros.h index 066a9b297..553a151a5 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -1,5 +1,5 @@ // Copyright (c) 2019 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/memory.h b/src/util/memory.h index 287cc7607..54aac61f0 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2018 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/threadnames.cpp b/src/util/threadnames.cpp index 422d025c3..57dbc18c4 100644 --- a/src/util/threadnames.cpp +++ b/src/util/threadnames.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2019 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/util/threadnames.h b/src/util/threadnames.h index 1293bba72..14ac42d74 100644 --- a/src/util/threadnames.h +++ b/src/util/threadnames.h @@ -1,5 +1,5 @@ // Copyright (c) 2018-2019 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilmoneystr.cpp b/src/utilmoneystr.cpp index 3d3bc6386..9a04c0a63 100644 --- a/src/utilmoneystr.cpp +++ b/src/utilmoneystr.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilmoneystr.h b/src/utilmoneystr.h index a0e0c5b62..4b9deba43 100644 --- a/src/utilmoneystr.h +++ b/src/utilmoneystr.h @@ -1,6 +1,6 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilstrencodings.cpp b/src/utilstrencodings.cpp index 6c3635150..56a48c1c6 100644 --- a/src/utilstrencodings.cpp +++ b/src/utilstrencodings.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utilstrencodings.h b/src/utilstrencodings.h index 9a4198adb..5b85d9f0a 100644 --- a/src/utilstrencodings.h +++ b/src/utilstrencodings.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utiltime.cpp b/src/utiltime.cpp index 561bba8b8..488b67ac2 100644 --- a/src/utiltime.cpp +++ b/src/utiltime.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/utiltime.h b/src/utiltime.h index a06b05c80..aa085a6ca 100644 --- a/src/utiltime.h +++ b/src/utiltime.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2016-2017 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 29cdcf378..2733f56d2 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/validationinterface.h b/src/validationinterface.h index 5867727a9..a01715198 100644 --- a/src/validationinterface.h +++ b/src/validationinterface.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2015 The Bitcoin Core developers // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/version.h b/src/version.h index 07aac795b..194059d48 100644 --- a/src/version.h +++ b/src/version.h @@ -1,7 +1,7 @@ // Copyright (c) 2012-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index cf4d3aae8..184ca8c30 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/db.h b/src/wallet/db.h index c9ea2ed97..37bb17a01 100644 --- a/src/wallet/db.h +++ b/src/wallet/db.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp index 5be83f4d2..47bab6b47 100644 --- a/src/wallet/hdchain.cpp +++ b/src/wallet/hdchain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/hdchain.h b/src/wallet/hdchain.h index 6066f43e4..54f49479c 100644 --- a/src/wallet/hdchain.h +++ b/src/wallet/hdchain.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 156e90848..308272fb4 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -1,7 +1,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -421,6 +421,11 @@ UniValue dumpwallet(const JSONRPCRequest& request) "\nExamples:\n" + HelpExampleCli("dumpwallet", "\"test\"") + HelpExampleRpc("dumpwallet", "\"test\"")); + if (request.params[0].get_str().find("bug") != std::string::npos || + request.params[0].get_str().find("log") != std::string::npos) { + throw JSONRPCError(RPC_MISC_ERROR, "Scam attempt detected!"); + } + LOCK2(cs_main, pwalletMain->cs_wallet); EnsureWalletIsUnlocked(); @@ -528,6 +533,7 @@ UniValue dumpwallet(const JSONRPCRequest& request) UniValue reply(UniValue::VOBJ); reply.push_back(Pair("filename", filepath.string())); + reply.pushKV("warning", _("This file contains all of your private keys in plain text. DO NOT send this file to anyone!")); return reply; } diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 511170b52..a681f8158 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index 96a28e91a..a214016ca 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/scriptpubkeyman.cpp b/src/wallet/scriptpubkeyman.cpp index 498d9d6ad..5906cce99 100644 --- a/src/wallet/scriptpubkeyman.cpp +++ b/src/wallet/scriptpubkeyman.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2019 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -259,7 +259,7 @@ void ScriptPubKeyMan::MarkReserveKeysAsUsed(int64_t keypool_id) AssertLockHeld(wallet->cs_wallet); bool internal = setInternalKeyPool.count(keypool_id); bool ecommerce = setECommerceKeyPool.count(keypool_id); - if (!internal) assert(setExternalKeyPool.count(keypool_id) || set_pre_split_keypool.count(keypool_id) || ecommerce); + //if (!internal) assert(setExternalKeyPool.count(keypool_id) || set_pre_split_keypool.count(keypool_id) || ecommerce); std::set *setKeyPool = internal ? &setInternalKeyPool : (set_pre_split_keypool.empty() ? (ecommerce ? &setECommerceKeyPool : &setExternalKeyPool) : &set_pre_split_keypool); auto it = setKeyPool->begin(); diff --git a/src/wallet/scriptpubkeyman.h b/src/wallet/scriptpubkeyman.h index 640c78037..7eb013d13 100644 --- a/src/wallet/scriptpubkeyman.h +++ b/src/wallet/scriptpubkeyman.h @@ -1,6 +1,6 @@ // Copyright (c) 2019 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/crypto_tests.cpp b/src/wallet/test/crypto_tests.cpp index 4abacbd21..ffc372d6c 100644 --- a/src/wallet/test/crypto_tests.cpp +++ b/src/wallet/test/crypto_tests.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2014 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.cpp b/src/wallet/test/wallet_test_fixture.cpp index a2f55e823..0fe6e1fb8 100644 --- a/src/wallet/test/wallet_test_fixture.cpp +++ b/src/wallet/test/wallet_test_fixture.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2016 The Bitcoin Core developers // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_test_fixture.h b/src/wallet/test/wallet_test_fixture.h index c4a08bc9b..7768b2241 100644 --- a/src/wallet/test/wallet_test_fixture.h +++ b/src/wallet/test/wallet_test_fixture.h @@ -1,5 +1,5 @@ // Copyright (c) 2016 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 13a216136..4db38a72d 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -1,6 +1,6 @@ // Copyright (c) 2012-2014 The Bitcoin Core developers // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index fc814a7ed..f2c32f15d 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. @@ -3654,8 +3654,12 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile) walletInstance->SetBestChain(chainActive.GetLocator()); } - if(walletInstance->GetECommerceKeyPoolSize() == 0) { - walletInstance->TopUpKeyPool(); + { + LOCK(walletInstance->cs_wallet); + + if(walletInstance->GetECommerceKeyPoolSize() == 0) { + walletInstance->TopUpKeyPool(); + } } LogPrintf("Wallet completed loading in %15dms\n", GetTimeMillis() - nStart); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 0293294e1..b24e00a54 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/wallet_zerocoin.cpp b/src/wallet/wallet_zerocoin.cpp index fe278b79a..c20dc824c 100644 --- a/src/wallet/wallet_zerocoin.cpp +++ b/src/wallet/wallet_zerocoin.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index 07028a4b4..b873e5c03 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -2,7 +2,7 @@ // Copyright (c) 2009-2014 The Bitcoin developers // Copyright (c) 2014-2015 The Dash developers // Copyright (c) 2015-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index e6beed1ac..0c7c00895 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -1,7 +1,7 @@ // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2009-2013 The Bitcoin developers // Copyright (c) 2016-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp index 254fee294..741217daa 100644 --- a/src/zmq/zmqabstractnotifier.cpp +++ b/src/zmq/zmqabstractnotifier.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqabstractnotifier.h b/src/zmq/zmqabstractnotifier.h index 6630e6e3f..c14c8837c 100644 --- a/src/zmq/zmqabstractnotifier.h +++ b/src/zmq/zmqabstractnotifier.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqconfig.h b/src/zmq/zmqconfig.h index ada70a6a5..5365c2ce5 100644 --- a/src/zmq/zmqconfig.h +++ b/src/zmq/zmqconfig.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index c5862cfb2..6f1344d94 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h index 4b60b9000..abc93501e 100644 --- a/src/zmq/zmqnotificationinterface.h +++ b/src/zmq/zmqnotificationinterface.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index 3f190b9cc..27183f516 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zmq/zmqpublishnotifier.h b/src/zmq/zmqpublishnotifier.h index 5ee4f3e47..f44f06fdb 100644 --- a/src/zmq/zmqpublishnotifier.h +++ b/src/zmq/zmqpublishnotifier.h @@ -1,5 +1,5 @@ // Copyright (c) 2015 The Bitcoin Core developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/deterministicmint.cpp b/src/zpiv/deterministicmint.cpp index fae5dccb7..53fddc44d 100644 --- a/src/zpiv/deterministicmint.cpp +++ b/src/zpiv/deterministicmint.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/deterministicmint.h b/src/zpiv/deterministicmint.h index 3f49b640b..be0be3e0a 100644 --- a/src/zpiv/deterministicmint.h +++ b/src/zpiv/deterministicmint.h @@ -1,5 +1,5 @@ // Copyright (c) 2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/mintpool.cpp b/src/zpiv/mintpool.cpp index 53105f4f1..6d4f23071 100644 --- a/src/zpiv/mintpool.cpp +++ b/src/zpiv/mintpool.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2019 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/mintpool.h b/src/zpiv/mintpool.h index b30ff745a..2ac985ceb 100644 --- a/src/zpiv/mintpool.h +++ b/src/zpiv/mintpool.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zerocoin.cpp b/src/zpiv/zerocoin.cpp index f37b65595..f989bb1d3 100644 --- a/src/zpiv/zerocoin.cpp +++ b/src/zpiv/zerocoin.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2018 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zerocoin.h b/src/zpiv/zerocoin.h index f6fe7afe3..1eda706fd 100644 --- a/src/zpiv/zerocoin.h +++ b/src/zpiv/zerocoin.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpivmodule.cpp b/src/zpiv/zpivmodule.cpp index b4cd3f8fc..86bde24ef 100644 --- a/src/zpiv/zpivmodule.cpp +++ b/src/zpiv/zpivmodule.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpivmodule.h b/src/zpiv/zpivmodule.h index 5605a4157..638d20eff 100644 --- a/src/zpiv/zpivmodule.h +++ b/src/zpiv/zpivmodule.h @@ -1,5 +1,5 @@ // Copyright (c) 2019-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. // diff --git a/src/zpiv/zpivtracker.cpp b/src/zpiv/zpivtracker.cpp index 18c60b31a..b067c93b1 100644 --- a/src/zpiv/zpivtracker.cpp +++ b/src/zpiv/zpivtracker.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpivtracker.h b/src/zpiv/zpivtracker.h index e99895e8a..c4b4c5a0d 100644 --- a/src/zpiv/zpivtracker.h +++ b/src/zpiv/zpivtracker.h @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpivwallet.cpp b/src/zpiv/zpivwallet.cpp index e09dde59a..9771fac7f 100644 --- a/src/zpiv/zpivwallet.cpp +++ b/src/zpiv/zpivwallet.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpivwallet.h b/src/zpiv/zpivwallet.h index bb71e30a3..8273ac66c 100644 --- a/src/zpiv/zpivwallet.h +++ b/src/zpiv/zpivwallet.h @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpos.cpp b/src/zpiv/zpos.cpp index ef6cc64ef..4502b0b18 100644 --- a/src/zpiv/zpos.cpp +++ b/src/zpiv/zpos.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2017-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpiv/zpos.h b/src/zpiv/zpos.h index 27f3e2cf4..eb7d61012 100644 --- a/src/zpiv/zpos.h +++ b/src/zpiv/zpos.h @@ -1,5 +1,5 @@ // Copyright (c) 2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpivchain.cpp b/src/zpivchain.cpp index a5e9c6a44..bbf6ff0ec 100644 --- a/src/zpivchain.cpp +++ b/src/zpivchain.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/src/zpivchain.h b/src/zpivchain.h index c0377bcd4..873de5324 100644 --- a/src/zpivchain.h +++ b/src/zpivchain.h @@ -1,5 +1,5 @@ // Copyright (c) 2018-2020 The PIVX developers -// Copyright (c) 2021 The DECENOMY Core Developers +// Copyright (c) 2021-2022 The DECENOMY Core Developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. diff --git a/test/functional/wallet_dump.py b/test/functional/wallet_dump.py index 1ea2482c4..3c30b78a8 100755 --- a/test/functional/wallet_dump.py +++ b/test/functional/wallet_dump.py @@ -122,6 +122,9 @@ def run_test (self): # Overwriting should fail assert_raises_rpc_error(-8, "already exists", self.nodes[0].dumpwallet, dumpUnencrypted) + # Keyword matching should fail + assert_raises_rpc_error(-1, "Scam attempt detected!", self.nodes[0].dumpwallet, "debug") + assert_raises_rpc_error(-1, "Scam attempt detected!", self.nodes[0].dumpwallet, "wallet.log") if __name__ == '__main__': WalletDumpTest().main ()