Merge pull request #8 from ElectraProtocol/dev

Release v1.0.2.0

Author: Jenova7

.cirrus.yml

@@ -19,7 +19,7 @@ env:
 
 # https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
 global_task_template: &GLOBAL_TASK_TEMPLATE
-  skip: $CIRRUS_REPO_FULL_NAME == "bitcoin-core/gui" && $CIRRUS_PR == ""  # No need to run on the read-only mirror, unless it is a PR. https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution
+  skip: $CIRRUS_REPO_FULL_NAME == "xep-core/gui" && $CIRRUS_PR == ""  # No need to run on the read-only mirror, unless it is a PR. https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution
   ccache_cache:
     folder: "/tmp/ccache_dir"
   depends_built_cache:

.travis.yml

@@ -1,13 +1,13 @@
 # Travis caches can be manually removed if necessary. This is one of the very
 # few manual operations that is possible with Travis, and it can be done by a
-# Bitcoin Core GitHub member via the Travis web interface [0].
+# XEP Core GitHub member via the Travis web interface [0].
 #
 # Travis CI uploads the cache after the script phase of the build [1].
 # However, the build is terminated without saving the cache if it takes over
 # 50 minutes [2]. Thus, if we spent too much time in early build stages, fail
 # with an error and save the cache.
 #
-# [0] https://travis-ci.org/bitcoin/bitcoin/caches
+# [0] https://travis-ci.org/xep/xep/caches
 # [1] https://docs.travis-ci.com/user/caching/#build-phases
 # [2] https://docs.travis-ci.com/user/customizing-the-build#build-timeouts
 
@@ -42,10 +42,10 @@ before_script:
 script:
   - export CONTINUE=1
   - if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi  # Likely the depends build took very long
-  - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi  # continue on repos with extended build time (90 minutes)
+  - if [ $TRAVIS_REPO_SLUG = "xep/xep" ]; then export CONTINUE=1; fi  # continue on repos with extended build time (90 minutes)
   - if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
   - if [[ $SECONDS -gt 50*60-$EXPECTED_TESTS_DURATION_IN_SECONDS ]]; then export CONTINUE=0; fi
-  - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi  # continue on repos with extended build time (90 minutes)
+  - if [ $TRAVIS_REPO_SLUG = "xep/xep" ]; then export CONTINUE=1; fi  # continue on repos with extended build time (90 minutes)
   - if [ $CONTINUE = "1" ]; then set -o errexit; source ./ci/test/06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
 after_script:
   - echo $TRAVIS_COMMIT_RANGE

build_msvc/.gitignore

@@ -10,18 +10,18 @@ packages/*
 *.vcxproj.user
 
 # .vcxproj files that are auto-generated by the msvc-autogen.py script.
-libbitcoin_cli/libbitcoin_cli.vcxproj
-libbitcoin_common/libbitcoin_common.vcxproj
-libbitcoin_crypto/libbitcoin_crypto.vcxproj
-libbitcoin_server/libbitcoin_server.vcxproj
-libbitcoin_util/libbitcoin_util.vcxproj
-libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj
-libbitcoin_wallet/libbitcoin_wallet.vcxproj
-libbitcoin_zmq/libbitcoin_zmq.vcxproj
-bench_bitcoin/bench_bitcoin.vcxproj
+libxep_cli/libxep_cli.vcxproj
+libxep_common/libxep_common.vcxproj
+libxep_crypto/libxep_crypto.vcxproj
+libxep_server/libxep_server.vcxproj
+libxep_util/libxep_util.vcxproj
+libxep_wallet_tool/libxep_wallet_tool.vcxproj
+libxep_wallet/libxep_wallet.vcxproj
+libxep_zmq/libxep_zmq.vcxproj
+bench_xep/bench_xep.vcxproj
 libtest_util/libtest_util.vcxproj
 
 */Win32
-libbitcoin_qt/QtGeneratedFiles/*
-test_bitcoin-qt/QtGeneratedFiles/*
+libxep_qt/QtGeneratedFiles/*
+test_xep-qt/QtGeneratedFiles/*
 vcpkg_installed

configure.ac

@@ -1,8 +1,8 @@
 AC_PREREQ([2.69])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2021)

src/chainparams.cpp

@@ -91,7 +91,8 @@ class CMainParams : public CChainParams {
         consensus.nSubsidyHalvingInterval = 210000;
         consensus.nBudgetPaymentsStartBlock = std::numeric_limits<int>::max();
         consensus.nPoSStartBlock = 0;
-        consensus.nLastPoWBlock = std::numeric_limits<int>::max();
+        consensus.nLastPoWBlock = 150000;
+        consensus.nMandatoryUpgradeBlock = 150000;
         consensus.nTreasuryPaymentsStartBlock = std::numeric_limits<int>::max();
         consensus.BIP16Exception = uint256{};
         consensus.BIP34Height = 0;
@@ -125,9 +126,10 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
         consensus.mTreasuryPayees.emplace(CScript() << OP_0 << ParseHex("978a5064cd1fdf8c2510fe3fcbd65eaa5e98b32d"), 100); // 10% (full reward) for ep1qj799qexdrl0ccfgslcluh4j74f0f3vedatcv0k
+        consensus.nTreasuryRewardPercentage = 10; // 10% of block reward goes to treasury
 
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000");
-        consensus.defaultAssumeValid = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000"); // 654683
+        consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000035a7e986160b3cac");
+        consensus.defaultAssumeValid = uint256S("0x505286a87781aabbb6cfc7a9b735ffacd8ce73bc06ed17dae546cafe4ca3e7a3"); // 50000
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -187,7 +189,8 @@ class CMainParams : public CChainParams {
 
         checkpointData = {
             {
-                {0, uint256S("000000954c02f260a6db02c712557adcb5a7a8a0a9acfd3d3c2b3a427376c56f")},
+                { 0, uint256S("000000954c02f260a6db02c712557adcb5a7a8a0a9acfd3d3c2b3a427376c56f")},
+                { 50000, uint256S("505286a87781aabbb6cfc7a9b735ffacd8ce73bc06ed17dae546cafe4ca3e7a3")},
             }
         };
 
@@ -213,6 +216,7 @@ class CTestNetParams : public CChainParams {
         consensus.nBudgetPaymentsStartBlock = std::numeric_limits<int>::max();
         consensus.nPoSStartBlock = 0;
         consensus.nLastPoWBlock = std::numeric_limits<int>::max();
+        consensus.nMandatoryUpgradeBlock = 0;
         consensus.nTreasuryPaymentsStartBlock = 200;
         consensus.BIP16Exception = uint256{};
         consensus.BIP34Height = 0;
@@ -246,6 +250,7 @@ class CTestNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
         consensus.mTreasuryPayees.emplace(CScript() << OP_0 << ParseHex("978a5064cd1fdf8c2510fe3fcbd65eaa5e98b32d"), 100); // 10% (full reward) for ep1qj799qexdrl0ccfgslcluh4j74f0f3vedatcv0k
+        consensus.nTreasuryRewardPercentage = 10; // 10% of block reward goes to treasury
 
         consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000");
         consensus.defaultAssumeValid = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000"); // 1864000
@@ -375,6 +380,7 @@ class SigNetParams : public CChainParams {
         consensus.nBudgetPaymentsStartBlock = std::numeric_limits<int>::max();
         consensus.nPoSStartBlock = 0;
         consensus.nLastPoWBlock = std::numeric_limits<int>::max();
+        consensus.nMandatoryUpgradeBlock = 0;
         consensus.nTreasuryPaymentsStartBlock = 200;
         consensus.BIP16Exception = uint256{};
         consensus.BIP34Height = 1;
@@ -408,6 +414,7 @@ class SigNetParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
         consensus.mTreasuryPayees.emplace(CScript() << OP_0 << ParseHex("978a5064cd1fdf8c2510fe3fcbd65eaa5e98b32d"), 100); // 10% (full reward) for ep1qj799qexdrl0ccfgslcluh4j74f0f3vedatcv0k
+        consensus.nTreasuryRewardPercentage = 10; // 10% of block reward goes to treasury
 
         // message start is defined as the first 4 bytes of the sha256d of the block script
         CHashWriter h(SER_DISK, 0);
@@ -461,6 +468,7 @@ class CRegTestParams : public CChainParams {
         consensus.nBudgetPaymentsStartBlock = std::numeric_limits<int>::max();
         consensus.nPoSStartBlock = 0;
         consensus.nLastPoWBlock = std::numeric_limits<int>::max();
+        consensus.nMandatoryUpgradeBlock = 0;
         consensus.nTreasuryPaymentsStartBlock = 30;
         consensus.BIP16Exception = uint256{};
         consensus.BIP34Height = 500; // BIP34 activated on regtest (Used in functional tests)
@@ -492,6 +500,7 @@ class CRegTestParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
         consensus.mTreasuryPayees.emplace(CScript() << OP_0 << ParseHex("978a5064cd1fdf8c2510fe3fcbd65eaa5e98b32d"), 100); // 10% (full reward) for ep1qj799qexdrl0ccfgslcluh4j74f0f3vedatcv0k
+        consensus.nTreasuryRewardPercentage = 10; // 10% of block reward goes to treasury
 
         consensus.nMinimumChainWork = uint256{};
         consensus.defaultAssumeValid = uint256{};

src/coins.cpp

@@ -67,7 +67,7 @@ bool CCoinsViewCache::GetCoin(const COutPoint &outpoint, Coin &coin) const {
 
 void CCoinsViewCache::AddCoin(const COutPoint &outpoint, Coin&& coin, bool possible_overwrite) {
     assert(!coin.IsSpent());
-    if (coin.out.scriptPubKey.IsUnspendable()) return;
+    if (coin.out.scriptPubKey.IsUnspendable() || coin.out.nValue == 0 || coin.out.scriptPubKey.empty()) return;
     CCoinsMap::iterator it;
     bool inserted;
     std::tie(it, inserted) = cacheCoins.emplace(std::piecewise_construct, std::forward_as_tuple(outpoint), std::tuple<>());

src/consensus/params.h

@@ -52,9 +52,11 @@ struct Params {
     int nBudgetPaymentsStartBlock;
     int nPoSStartBlock;
     int nLastPoWBlock;
+    int nMandatoryUpgradeBlock;
     int nTreasuryPaymentsStartBlock;
     int nTreasuryPaymentsCycleBlocks;
-    std::map<CScript, int> mTreasuryPayees;
+    std::map<CScript, unsigned int> mTreasuryPayees;
+    unsigned int nTreasuryRewardPercentage;
     /* Block hash that is excepted from BIP16 enforcement */
     uint256 BIP16Exception;
     /** Block height and hash at which BIP34 becomes active */

src/kernel.cpp

@@ -262,8 +262,10 @@ uint256 ComputeStakeModifierV2(const CBlockIndex* pindexPrev, const uint256& ker
 {
     if (!pindexPrev)
         return uint256(); // genesis block's modifier is 0
-    if (pindexPrev->nHeight == 1029999)
+    if (pindexPrev->nHeight == 0 || /*pindexPrev->nHeight == 1029999 ||*/ Params().NetworkIDString() == CBaseChainParams::REGTEST) {
+        // Give a stake modifier to the first block - fixed stake modifier only for regtest
         return uint256S("0x61106044818e45706b1694a6a28dfe23d58a2c7d4adcff81fb1aeb6d74ea6f9e");
+    }
 
     CHashWriter ss(SER_GETHASH, 0);
     ss << kernel;

src/miner.cpp

@@ -114,9 +114,9 @@ static inline void FillTreasuryPayee(CMutableTransaction& txNew, const int nHeig
     const CAmount nTreasuryPayment = GetTreasuryPayment(nHeight, consensusParams);
 
     if (nTreasuryPayment > 0) {
-        const std::map<CScript, int>& treasuryPayees = consensusParams.mTreasuryPayees;
+        const std::map<CScript, unsigned int>& treasuryPayees = consensusParams.mTreasuryPayees;
 
-        for (const std::pair<CScript, int>& payee : treasuryPayees)
+        for (const std::pair<CScript, unsigned int>& payee : treasuryPayees)
             txNew.vout.emplace_back(nTreasuryPayment * payee.second / 100, payee.first);
     }
 }
@@ -597,7 +597,7 @@ bool CreateCoinStake(CMutableTransaction& coinstakeTx, CBlock* pblock, std::shar
                     LogPrintf("%s : parsed kernel type=%s\n", __func__, GetTxnOutputType(whichType));
 
                 if (whichType == TxoutType::PUBKEY || whichType == TxoutType::PUBKEYHASH || whichType == TxoutType::WITNESS_V0_KEYHASH || whichType == TxoutType::SCRIPTHASH || whichType == TxoutType::WITNESS_V0_SCRIPTHASH) { // we support p2pkh, p2wpkh, p2sh-p2wpkh, and p2sh/p2wsh-multisig inputs
-                    const bool fNewStakingCodeActive = Params().NetworkIDString() != CBaseChainParams::MAIN;
+                    const bool fNewStakingCodeActive = nHeight >= consensusParams.nMandatoryUpgradeBlock;
                     if (whichType == TxoutType::SCRIPTHASH || whichType == TxoutType::WITNESS_V0_SCRIPTHASH) { // a p2sh/p2wsh input could be many things, but we only support p2sh-p2wpkh and multisig for now
                         CScript subscript;
                         std::unique_ptr<SigningProvider> provider = pwallet->GetSolvingProvider(scriptPubKeyKernel);

src/net_processing.h

@@ -27,7 +27,7 @@ extern RecursiveMutex g_cs_orphans;
 static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100;
 /** Default number of orphan+recently-replaced txn to keep around for block reconstruction */
 static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100;
-static const bool DEFAULT_PEERBLOOMFILTERS = false;
+static const bool DEFAULT_PEERBLOOMFILTERS = true; // See https://github.com/bitcoin/bitcoin/pull/16152 for reasons why we may want to disable this in the future
 static const bool DEFAULT_PEERBLOCKFILTERS = false;
 /** Threshold for marking a node to be discouraged, e.g. disconnected and added to the discouragement filter. */
 static const int DISCOURAGEMENT_THRESHOLD{100};