Move final fluid tx check to CheckTransactionToBlock

AmirAbrams · AmirAbrams · commit 388b5dfc288e · 2018-04-02T00:36:47.000-05:00
diff --git a/src/fluid.cpp b/src/fluid.cpp
@@ -610,8 +610,12 @@ bool CFluid::ProvisionalCheckTransaction(const CTransaction &transaction) {
     return true;
 }
 
-bool CFluid::CheckTransactionToBlock(const CTransaction &transaction, const CBlockHeader& blockHeader) {
+bool CFluid::CheckTransactionToBlock(const CTransaction& transaction, const CBlockHeader& blockHeader) {
     uint256 hash = blockHeader.GetHash();
+    return CheckTransactionToBlock(transaction, hash);
+}
+
+bool CFluid::CheckTransactionToBlock(const CTransaction& transaction, const uint256 hash) {
     if (mapBlockIndex.count(hash) == 0)
         return true;
 
@@ -627,4 +631,4 @@ bool CFluid::CheckTransactionToBlock(const CTransaction &transaction, const CBlo
     }
 
     return true;
-}
+}
diff --git a/src/fluid.h b/src/fluid.h
@@ -76,7 +76,9 @@ class CFluid : public CFluidParameters, public COperations {
 
     bool ValidationProcesses(CValidationState& state, CScript txOut, CAmount txValue);
 
-    bool CheckTransactionToBlock(const CTransaction &transaction, const CBlockHeader& blockHeader);
+    bool CheckTransactionToBlock(const CTransaction& transaction, const CBlockHeader& blockHeader);
+    bool CheckTransactionToBlock(const CTransaction& transaction, const uint256 hash);
+
     bool ProvisionalCheckTransaction(const CTransaction &transaction);
     bool InsertTransactionToRecord(CScript fluidInstruction, std::vector<std::string>& transactionRecord);
     CDynamicAddress GetAddressFromDigestSignature(const std::string digestSignature, const std::string messageTokenKey);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -205,20 +205,16 @@ CBlockTreeDB *pblocktree = NULL;
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {
-	CBlockIndex* pblockindex = chainActive[nBlockHeight-1];
-	
     if (tx.nLockTime == 0)
         return true;
+
     if ((int64_t)tx.nLockTime < ((int64_t)tx.nLockTime < LOCKTIME_THRESHOLD ? (int64_t)nBlockHeight : nBlockTime))
         return true;
     
     if (nBlockHeight >= fluid.FLUID_ACTIVATE_HEIGHT) {
 		if (!fluid.ProvisionalCheckTransaction(tx))
 			return false;
 		
-		if (!fluid.CheckTransactionToBlock(tx, pblockindex->GetBlockHeader()))
-			return false;
-		
 		BOOST_FOREACH(const CTxOut& txout, tx.vout)	{	
 			if (IsTransactionFluid(txout.scriptPubKey)) {
                 std::string strErrorMessage;
@@ -3374,6 +3370,9 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CB
 
     // Check that all transactions are finalized
     for (const CTransaction& tx : block.vtx) {
+        if (!fluid.CheckTransactionToBlock(tx, pindexPrev->GetBlockHeader()))
+            return state.DoS(10, error("%s: contains an invalid fluid transaction", __func__), REJECT_INVALID, "invalid-fluid-txns");
+
         if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) {
             return state.DoS(10, error("%s: contains a non-final transaction", __func__), REJECT_INVALID, "bad-txns-nonfinal");
         }
@@ -3390,13 +3389,6 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, const CB
         }
     }
 
-    // Check that all transactions are finalized
-    for (const CTransaction& tx : block.vtx) {
-        if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) {
-            return state.DoS(10, error("%s: contains a non-final transaction", __func__), REJECT_INVALID, "bad-txns-nonfinal");
-        }
-    }
-
     // If Fluid transaction present, has it been adhered to?
     CDynamicAddress mintAddress; CAmount fluidIssuance;
     
