Merge pull request bitcoin#3 from dooglus/defaultcoin

Defaultcoin
dooglus · Oct 19, 2018 · d309f80 · d309f80
2 parents 758b5f5 + 717cef3
commit d309f80
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -191,6 +191,8 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
     // transaction (which in most cases can be a no-op).
     fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus());
 
+    addPackageTxs();
+
     nLastBlockTx = nBlockTx;
     nLastBlockSize = nBlockSize;
     nLastBlockWeight = nBlockWeight;
@@ -812,9 +814,9 @@ bool CheckStake(const std::shared_ptr<const CBlock> pblock, CWallet& wallet)
     }
 
     //// debug print
-    LogPrint("miner", "CheckStake() : new proof-of-stake block found  \n  hash: %s \nproofhash: %s  \ntarget: %s\n", hashBlock.GetHex(), proofHash.GetHex(), hashTarget.GetHex());
-    LogPrint("miner", "%s\n", pblock->ToString());
-    LogPrint("miner", "out %s\n", FormatMoney(pblock->vtx[1]->GetValueOut()));
+    LogPrintf("CheckStake() : new proof-of-stake block found  \n  hash: %s \nproofhash: %s  \ntarget: %s\n", hashBlock.GetHex(), proofHash.GetHex(), hashTarget.GetHex());
+    LogPrintf("%s\n", pblock->ToString());
+    LogPrintf("out %s\n", FormatMoney(pblock->vtx[1]->GetValueOut()));
 
     // Found a solution
     {

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -3180,13 +3180,15 @@ bool SignBlock(std::shared_ptr<CBlock> pblock, CWallet& wallet, const CAmount& n
     //unsigned int nStartTime = txCoinStake.nTime;
 
     uint32_t nTimeBlock = nTime;
+    unsigned int nStartTime = GetAdjustedTime();
 
     if(chainActive.Tip()->nHeight + 1 > Params().GetConsensus().nProtocolV2Height)
         txCoinStake.nTime &= ~STAKE_TIMESTAMP_MASK;
 
     int64_t nSearchTime = txCoinStake.nTime;
     if (nSearchTime > nLastCoinStakeSearchTime)
     {        
+        LogPrintf("starting stake\n");
         int64_t nSearchInterval = chainActive.Tip()->nHeight + 1 > Params().GetConsensus().nProtocolV2Height ? 1 : nSearchTime - nLastCoinStakeSearchTime;
         if (wallet.CreateCoinStake(wallet, pblock->nBits, nSearchInterval, nTotalFees, nTimeBlock, txCoinStake, key))
         {
@@ -3228,9 +3230,12 @@ bool SignBlock(std::shared_ptr<CBlock> pblock, CWallet& wallet, const CAmount& n
                 //LogPrint("xp", "SignBlock blockAfter %s\n", pblock->ToString());
                 //LogPrint("xp", "SignBlock xploited 1 %s %s %s\n", key.Sign(pblock->GetHash(), pblock->vchBlockSig), EnsureLowS(pblock->vchBlockSig), CheckHeaderPoS(*pblock, Params().GetConsensus()));
                 // append a signature to our block and ensure that is LowS
+                LogPrintf("successful stake took %lds\n", GetAdjustedTime() - nStartTime);
                 return key.Sign(pblock->GetHash(), pblock->vchBlockSig) &&
                            EnsureLowS(pblock->vchBlockSig) &&
                            CheckHeaderPoS(*pblock, Params().GetConsensus());
+            } else {
+                LogPrintf("found stake, but cannot use it\n");
             }
         }
         nLastCoinStakeSearchInterval = nSearchTime - nLastCoinStakeSearchTime;

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4559,7 +4559,7 @@ int CMerkleTx::GetDepthInMainChain(const CBlockIndex* &pindexRet) const
 
 int CMerkleTx::GetBlocksToMaturity() const
 {
-    if (!IsCoinBase())
+    if (!(IsCoinBase() || IsCoinStake()))
         return 0;
     return max(0, (Params().GetConsensus().nCoinbaseMaturity+1) - GetDepthInMainChain());
 }