Merge pull request bitcoin#15 from bitgreen/corruptionissue

Recent wallet issues

Author: barrystyle

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 4)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 3)
+define(_CLIENT_VERSION_BUILD, 4)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)

src/validation.cpp

@@ -627,6 +627,10 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
 
         // No transactions are allowed below minRelayTxFee except from disconnected blocks
         if (!bypass_limits && nModifiedFees < ::minRelayTxFee.GetFee(nSize)) {
+            if (tx.nType == TRANSACTION_PROVIDER_REGISTER) {
+                std::string strReason = "Did you remember to specify a funding address with adequate balance?";
+                return state.Invalid(ValidationInvalidReason::TX_MEMPOOL_POLICY, false, REJECT_INSUFFICIENTFEE, "min relay fee not met (%s)", strReason);
+            }
             return state.Invalid(ValidationInvalidReason::TX_MEMPOOL_POLICY, false, REJECT_INSUFFICIENTFEE, "min relay fee not met", strprintf("%d < %d", nModifiedFees, ::minRelayTxFee.GetFee(nSize)));
         }
 
@@ -3167,6 +3171,10 @@ CBlockIndex* BlockManager::AddToBlockIndex(const CBlockHeader& block, bool fProo
         pindexNew->nStatus |= nStatus;
     }
 
+    // set pos flag if it wasnt set
+    if (!block.nNonce)
+        pindexNew->SetProofOfStake();
+
     setDirtyBlockIndex.insert(pindexNew);
 
     // track prevBlockHash -> pindex (multimap)

src/wallet/wallet.cpp

@@ -2186,9 +2186,6 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
 
 void CWallet::ReacceptWalletTransactions(interfaces::Chain::Lock& locked_chain)
 {
-    // If transactions aren't being broadcasted, don't let them into local mempool either
-    if (!fBroadcastTransactions)
-        return;
     std::map<int64_t, CWalletTx*> mapSorted;
 
     // Sort pending wallet transactions based on their initial wallet insertion order
@@ -2200,11 +2197,16 @@ void CWallet::ReacceptWalletTransactions(interfaces::Chain::Lock& locked_chain)
 
         int nDepth = wtx.GetDepthInMainChain(locked_chain);
 
-        if (nDepth == 0 && !wtx.isAbandoned() && !wtx.IsLockedByInstantSend()) {
-            if (wtx.IsCoinBase() || wtx.IsCoinStake())
-                AbandonTransaction(locked_chain, wtxid);
-            else
-                mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
+        if (nDepth == 0 && !wtx.isAbandoned()) {
+            if (!wtx.IsLockedByInstantSend()) {
+                if (wtx.IsCoinBase() || wtx.IsCoinStake()) {
+                    // dont try to put orphaned stakes/coinbase back into mempool
+                    AbandonTransaction(locked_chain, wtxid);
+                    return;
+                } else {
+                    mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
+                }
+            }
         }
     }