AcceptBlock() check for double spent serials only on main chain flag.

furszy · furszy · commit e1974d23f315 · 2019-02-08T15:49:49.000+01:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -4643,7 +4643,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
                     }
 
                     if (!ContextualCheckZerocoinSpendNoSerialCheck(stakeTxIn, spend, pindex, 0))
-                        return state.DoS(100,error("%s: ContextualCheckZerocoinSpend failed for tx %s", __func__,
+                        return state.DoS(100,error("%s: forked chain ContextualCheckZerocoinSpend failed for tx %s", __func__,
                                                    stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");
 
                     // Now only the ZKP left..
@@ -4686,12 +4686,14 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
                 }
             }
         } else {
-            for (CTxIn zPivInput : zPIVInputs) {
-                    CoinSpend spend = TxInToZerocoinSpend(zPivInput);
-                    if (!ContextualCheckZerocoinSpend(stakeTxIn, spend, pindex, 0))
-                        return state.DoS(100,error("%s: ContextualCheckZerocoinSpend failed for tx %s", __func__,
-                                stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");
-            }
+            if(!isBlockFromFork)
+                for (CTxIn zPivInput : zPIVInputs) {
+                        CoinSpend spend = TxInToZerocoinSpend(zPivInput);
+                        if (!ContextualCheckZerocoinSpend(stakeTxIn, spend, pindex, 0))
+                            return state.DoS(100,error("%s: main chain ContextualCheckZerocoinSpend failed for tx %s", __func__,
+                                    stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");
+                }
+
         }
 
     }

Original file line number	Diff line number	Diff line change
`@@ -4643,7 +4643,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,`
`4643`	`4643`	`}`
`4644`	`4644`
`4645`	`4645`	`if (!ContextualCheckZerocoinSpendNoSerialCheck(stakeTxIn, spend, pindex, 0))`
`4646`		`- return state.DoS(100,error("%s: ContextualCheckZerocoinSpend failed for tx %s", __func__,`
	`4646`	`+ return state.DoS(100,error("%s: forked chain ContextualCheckZerocoinSpend failed for tx %s", __func__,`
`4647`	`4647`	`stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");`
`4648`	`4648`
`4649`	`4649`	`// Now only the ZKP left..`
`@@ -4686,12 +4686,14 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,`
`4686`	`4686`	`}`
`4687`	`4687`	`}`
`4688`	`4688`	`} else {`
`4689`		`- for (CTxIn zPivInput : zPIVInputs) {`
`4690`		`- CoinSpend spend = TxInToZerocoinSpend(zPivInput);`
`4691`		`- if (!ContextualCheckZerocoinSpend(stakeTxIn, spend, pindex, 0))`
`4692`		`- return state.DoS(100,error("%s: ContextualCheckZerocoinSpend failed for tx %s", __func__,`
`4693`		`- stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");`
`4694`		`- }`
	`4689`	`+ if(!isBlockFromFork)`
	`4690`	`+ for (CTxIn zPivInput : zPIVInputs) {`
	`4691`	`+ CoinSpend spend = TxInToZerocoinSpend(zPivInput);`
	`4692`	`+ if (!ContextualCheckZerocoinSpend(stakeTxIn, spend, pindex, 0))`
	`4693`	`+ return state.DoS(100,error("%s: main chain ContextualCheckZerocoinSpend failed for tx %s", __func__,`
	`4694`	`+ stakeTxIn.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");`
	`4695`	`+ }`
	`4696`	`+`
`4695`	`4697`	`}`
`4696`	`4698`
`4697`	`4699`	`}`