Merge pull request #93 from BlockMechanic/segwit

m
Crowndev · Aug 11, 2022 · 4457efa · 4457efa
2 parents 6254b42 + e72adeb
commit 4457efa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -279,15 +279,15 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     pblock->vtx[0] = MakeTransactionRef(std::move(coinbaseTx));
 
     if (fProofOfStake){
-        //pblock->vtx.emplace_back();
+        pblock->vtx.emplace_back();
         pblock->vtx[1] = MakeTransactionRef(std::move(txCoinStake));
     }
 
     LogPrintf("%s: vtx size %d\n",__func__, pblock->vtx.size());
-/*
+
     if(fProofOfStake && pblock->vtx.size() > 2)
         pblock->vtx.pop_back();
-    */
+
     for (auto a: pblock->vtx)
         LogPrintf("%s\n", a->ToString());
 

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1021,7 +1021,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransactionRef& ptx, CWalletTx::Co
                 std::pair<TxSpends::const_iterator, TxSpends::const_iterator> range = mapTxSpends.equal_range(txin.prevout);
                 while (range.first != range.second) {
                     if (range.first->second != tx.GetHash()) {
-                        WalletLogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), confirm.hashBlock.ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n);
+                        //WalletLogPrintf("Transaction %s (in block %s) conflicts with wallet transaction %s (both spend %s:%i)\n", tx.GetHash().ToString(), confirm.hashBlock.ToString(), range.first->second.ToString(), range.first->first.hash.ToString(), range.first->first.n);
                         MarkConflicted(confirm.hashBlock, confirm.block_height, range.first->second);
                     }
                     range.first++;