Merge pull request #5 from who-biz/blocktemplate-quickfix

Quick fix for `getblocktemplate`, gets mining and mempool working
chips-blockchain · Jul 20, 2021 · ce47b5b · ce47b5b
2 parents db34e4d + 36ce9a0
commit ce47b5b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -163,7 +163,9 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // not activated.
     // TODO: replace this with a call to main to assess validity of a mempool
     // transaction (which in most cases can be a no-op).
-    fIncludeWitness = DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_SEGWIT);
+
+    fIncludeWitness = /*DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_SEGWIT)*/ true;
+    // TODO: ensure static value is okay here
 
     int nPackagesSelected = 0;
     int nDescendantsUpdated = 0;

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -775,7 +775,8 @@ static RPCHelpMan getblocktemplate()
     pblock->nNonce = 0;
 
     // NOTE: If at some point we support pre-segwit miners post-segwit-activation, this needs to take segwit support into consideration
-    const bool fPreSegWit = !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT);
+    const bool fPreSegWit = false;
+    //const bool fPreSegwit = !DeploymentActiveAfter(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT);
 
     UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal");