Merge pull request #89 from BlockMechanic/segwit

Segwit
Crowndev · Aug 2, 2022 · b1e3fd6 · b1e3fd6
2 parents f9b366d + 9468ff3
commit b1e3fd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -283,7 +283,7 @@ class CTestNetParams : public CChainParams {
         pchMessageStart[2] = 0x09;
         pchMessageStart[3] = 0x07;
         nDefaultPort = 18333;
-        nBlockPoSStart = 8000;
+        nBlockPoSStart = 5000;
         nPruneAfterHeight = 100000;
         nAuxpowChainId = 20;
         nChainStallDuration = 60*60;
@@ -301,10 +301,10 @@ class CTestNetParams : public CChainParams {
         CScript genscript(addrdata.begin(), addrdata.end());
         consensus.mandatory_coinbase_destination = genscript; 
 
-        genesis = CreateGenesisBlock(1658666109, 919334, 0x1e0ffff0, 1, 10 * COIN, consensus);
+        genesis = CreateGenesisBlock(1659429370, 551064, 0x1e0ffff0, 1, 10 * COIN, consensus);
         consensus.hashGenesisBlock = genesis.GetHash();
         //MineNewGenesisBlock(consensus,genesis);
-        assert(consensus.hashGenesisBlock == uint256S("0x00000ff89c2e1ed18e7b6ce593ecd3cefd1fc8f252369e192bae05301b3e992d"));
+        assert(consensus.hashGenesisBlock == uint256S("0x000003e4d706ae2480a9b269042d8c9c493a216a328103a4bdb9656b93818307"));
         assert(genesis.hashMerkleRoot == uint256S("0x80ad356118a9ab8db192db66ef77146cc36d958f959251feace550e4ca3d1446"));
 
         vFixedSeeds.clear();

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1365,7 +1365,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
     }
 
     int halvings = nHeight / Params().GetConsensus().nSubsidyHalvingInterval;
-    if (Params().NetworkIDString() == CBaseChainParams::TESTNET && nHeight < 8000)
+    if (Params().NetworkIDString() == CBaseChainParams::TESTNET && nHeight < 5000)
         nSubsidy = 100 * COIN;
 
     // Subsidy is cut in half every 2,100,000 blocks which will occur approximately every 4 years.
@@ -1379,7 +1379,7 @@ CAmount GetBlockValue(int nHeight, const CAmount &nFees)
 
     int64_t budgetValue = nSubsidy * 0.25;
     if (Params().NetworkIDString() == CBaseChainParams::TESTNET) {
-        if (nHeight >= 8000)
+        if (nHeight >= 5000)
             nSubsidy -= budgetValue;
     } else {
         if (nHeight > 1265000)