watto-engineer · wagerr-builder · Jan 6, 2023 · Dec 30, 2022
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,6 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Wagerr Core developers
+# Copyright (c) 2018-2022 The Dash Core developers
+# Copyright (c) 2014-2018 The Wagerr developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/Makefile.bench.include b/src/Makefile.bench.include
@@ -1,5 +1,6 @@
 # Copyright (c) 2015-2016 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Wagerr Core developers
+# Copyright (c) 2018-2022 The Dash Core developers
+# Copyright (c) 2014-2018 The Wagerr developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -1,5 +1,6 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Wagerr Core developers
+# Copyright (c) 2018-2022 The Dash Core developers
+# Copyright (c) 2014-2018 The Wagerr developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
@@ -1,5 +1,6 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Wagerr Core developers
+# Copyright (c) 2018-2022 The Dash Core developers
+# Copyright (c) 2014-2018 The Wagerr developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -1,5 +1,6 @@
 # Copyright (c) 2013-2016 The Bitcoin Core developers
-# Copyright (c) 2014-2018 The Wagerr Core developers
+# Copyright (c) 2018-2022 The Dash Core developers
+# Copyright (c) 2014-2018 The Wagerr developers
 # 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
@@ -1,5 +1,6 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2015 The Bitcoin Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
 // Copyright (c) 2019 The ION Core developers
 // Copyright (c) 2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying

diff --git a/src/bench/block_assemble.cpp b/src/bench/block_assemble.cpp
@@ -27,13 +27,13 @@ static void AssembleBlock(benchmark::Bench& bench)
 
     // Collect some loose transactions that spend the coinbases of our mined blocks
     constexpr size_t NUM_BLOCKS{200};
-    std::array<CTransactionRef, NUM_BLOCKS - COINBASE_MATURITY + 1> txs;
+    std::array<CTransactionRef, NUM_BLOCKS + 101> txs;
     for (size_t b{0}; b < NUM_BLOCKS; ++b) {
         CMutableTransaction tx;
         tx.vin.push_back(MineBlock(test_setup.m_node, SCRIPT_PUB));
         tx.vin.back().scriptSig = scriptSig;
         tx.vout.emplace_back(1337, SCRIPT_PUB);
-        if (NUM_BLOCKS - b >= COINBASE_MATURITY)
+        if (NUM_BLOCKS - b >= 100)
             txs.at(b) = MakeTransactionRef(tx);
     }
     {

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
@@ -80,7 +80,7 @@ static void HASH_1MB_QUARK(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(BUFFER_SIZE,0);
     bench.batch(in.size()).unit("byte").minEpochIterations(10).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -147,7 +147,7 @@ static void HASH_QUARK_0032b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(32,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -156,7 +156,7 @@ static void HASH_QUARK_0080b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(80,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -165,7 +165,7 @@ static void HASH_QUARK_0128b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(128,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -174,7 +174,7 @@ static void HASH_QUARK_0512b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(512,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -183,7 +183,7 @@ static void HASH_QUARK_1024b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(1024,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 
@@ -192,7 +192,7 @@ static void HASH_QUARK_2048b_single(benchmark::Bench& bench)
     uint256 hash;
     std::vector<uint8_t> in(2048,0);
     bench.minEpochIterations(10000).run([&] {
-        hash = HashQUARK(in.begin(), in.end());
+        hash = HashQuark(in.begin(), in.end());
     });
 }
 

diff --git a/src/bench/duplicate_inputs.cpp b/src/bench/duplicate_inputs.cpp
@@ -37,7 +37,7 @@ static void DuplicateInputs(benchmark::Bench& bench)
     coinbaseTx.vin[0].prevout.SetNull();
     coinbaseTx.vout.resize(1);
     coinbaseTx.vout[0].scriptPubKey = SCRIPT_PUB;
-    coinbaseTx.vout[0].nValue = GetBlockSubsidy(block.nBits, nHeight, chainparams.GetConsensus());
+    coinbaseTx.vout[0].nValue = GetBlockSubsidy(block.nBits, nHeight, chainparams.GetConsensus(), false, false);
     coinbaseTx.vin[0].scriptSig = CScript() << nHeight << OP_0;
 
     naughtyTx.vout.resize(1);

diff --git a/src/wagerr-cli.cpp → src/bitcoin-cli.cpp b/src/wagerr-cli.cpp → src/bitcoin-cli.cpp
diff --git a/src/wagerr-tx.cpp → src/bitcoin-tx.cpp b/src/wagerr-tx.cpp → src/bitcoin-tx.cpp
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -50,7 +50,7 @@ static bool AppInit(int argc, char* argv[])
 
     util::ThreadSetInternalName("init");
 
-    // If Qt is used, parameters/wagerr.conf are parsed in qt/wagerr.cpp's main()
+    // If Qt is used, parameters/wagerr.conf are parsed in qt/bitcoin.cpp's main()
     SetupServerArgs(node);
     ArgsManager& args = *Assert(node.args);
     std::string error;

diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2018-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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/coinjoin/client.cpp b/src/coinjoin/client.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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/coinjoin/options.cpp b/src/coinjoin/options.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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/coinjoin/server.cpp b/src/coinjoin/server.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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/governance/classes.cpp b/src/governance/classes.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2021 The Wagerr 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.h b/src/hash.h
@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2015 The Bitcoin Core developers
 // Copyright (c) 2014-2022 The Dash Core developers
-// Copyright (c) 2017-2022 The Wagerr Core developers
+// Copyright (c) 2017-2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/llmq/quorums.cpp b/src/llmq/quorums.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2018-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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
@@ -1,4 +1,5 @@
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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
@@ -158,7 +158,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     std::vector<std::shared_ptr<CWallet>> wallets = GetWallets();
 //    const SigningProvider& signingProvider = wallets.size() < 1 ? SigningProvider() : wallets[0].get()->GetSigningProvider();
     const SigningProvider& signingProvider = wallets.size() < 1 ? SigningProvider() : *wallets[0]->GetSigningProvider();
-    if (HasWallets()) {
+    if (wallets.size() > 0) {
         nSplitValue = (CAmount)(wallets[0]->GetStakeSplitThreshold() * COIN);
     }
 #else

diff --git a/src/net.cpp b/src/net.cpp
@@ -1,7 +1,8 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2019 The Bitcoin Core developers
 // Copyright (c) 2019 The PIVX Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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
@@ -1,6 +1,7 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/pos/rewards.cpp b/src/pos/rewards.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2020 The ION Core developers
-// Copyright (c) 2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/pos/rewards.h b/src/pos/rewards.h
@@ -1,5 +1,6 @@
 // Copyright (c) 2020 The ION Core developers
-// Copyright (c) 2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 

diff --git a/src/pos/staking-manager.cpp b/src/pos/staking-manager.cpp
@@ -1,3 +1,4 @@
+// Copyright (c) 2018-2022 The Dash Core developers
 // Copyright (c) 2019-2020 The ION Core developers
 // Copyright (c) 2022 The Wagerr developers
 // Distributed under the MIT/X11 software license, see the accompanying

diff --git a/src/pos/staking-manager.h b/src/pos/staking-manager.h
@@ -1,3 +1,4 @@
+// Copyright (c) 2018-2022 The Dash Core developers
 // Copyright (c) 2019-2020 The ION Core developers
 // Copyright (c) 2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying

diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/appearancewidget.cpp b/src/qt/appearancewidget.cpp
@@ -1,4 +1,5 @@
-// Copyright (c) 2020-2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr 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
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2021 The Wagerr developers
 // 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/wagerr.cpp → src/qt/bitcoin.cpp b/src/qt/wagerr.cpp → src/qt/bitcoin.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
@@ -2,9 +2,9 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <qt/wagerramountfield.h>
+#include <qt/bitcoinamountfield.h>
 
-#include <qt/wagerrunits.h>
+#include <qt/bitcoinunits.h>
 #include <qt/guiutil.h>
 
 #include <QApplication>
@@ -181,7 +181,7 @@ class AmountLineEdit: public QLineEdit
     void valueChanged();
 };
 
-#include <qt/wagerramountfield.moc>
+#include <qt/bitcoinamountfield.moc>
 
 BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
     QWidget(parent),

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/clientmodel.h b/src/qt/clientmodel.h
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/guiconstants.h b/src/qt/guiconstants.h
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2021 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/guiutil.cpp b/src/qt/guiutil.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/intro.cpp b/src/qt/intro.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/openuridialog.cpp b/src/qt/openuridialog.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2014 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/optionsmodel.cpp b/src/qt/optionsmodel.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2011-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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/mining.cpp b/src/rpc/mining.cpp
@@ -1,7 +1,8 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2018 The Bitcoin Core developers
 // Copyright (c) 2020 The ION Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // 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
@@ -1,6 +1,7 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2022 The Wagerr Core developers
+// Copyright (c) 2018-2022 The Dash Core developers
+// Copyright (c) 2014-2022 The Wagerr developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.