[zPIV] testnet publicSpend enforcement height set.

furszy · furszy · commit 216a3174affd · 2019-06-04T12:30:25.000+02:00
[zPIV] v1 serials validation was not checked against the publicSpend height.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -298,7 +298,7 @@ class CTestNetParams : public CMainParams
         nRejectOldSporkKey = 1522454400; //!> Reject old spork key after Saturday, March 31, 2018 12:00:00 AM GMT
 
         // Public coin spend enforcement
-        nPublicZCSpends = 1086574;
+        nPublicZCSpends = 1818300;
 
         // Fake Serial Attack
         nFakeSerialBlockheightEnd = -1;
diff --git a/src/main.cpp b/src/main.cpp
@@ -988,10 +988,10 @@ bool isBlockBetweenFakeSerialAttackRange(int nHeight)
     return nHeight <= Params().Zerocoin_Block_EndFakeSerial();
 }
 
-bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPrivZerocoinSpend, bool isPublicSpend) {
+bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPublicSpend) {
     if (blockHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {
         // reject old coin spend
-        if (isPrivZerocoinSpend) {
+        if (!isPublicSpend) {
             return error("%s: failed to add block with older zc spend version", __func__);
         }
 
@@ -1042,11 +1042,14 @@ bool ContextualCheckZerocoinSpendNoSerialCheck(const CTransaction& tx, const Coi
         }
     }
 
-    //Reject V1 old serials.
-    if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {
-        return error("%s : zPIV v1 serial spend not spendable\n", __func__,
-                     spend->getCoinSerialNumber().GetHex(), tx.GetHash().GetHex());
+    if (pindex->nHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {
+        //Reject V1 old serials.
+        if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {
+            return error("%s : zPIV v1 serial spend not spendable, serial %s, tx %s\n", __func__,
+                         spend->getCoinSerialNumber().GetHex(), tx.GetHash().GetHex());
+        }
     }
+
     //Reject serial's that are not in the acceptable value range
     if (!spend->HasValidSerial(Params().Zerocoin_Params(false))) {
         // Up until this block our chain was not checking serials correctly..
@@ -1416,7 +1419,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa
                 }
 
                 // Check enforcement
-                if (!CheckPublicCoinSpendEnforced(chainActive.Height(), isPrivZerocoinSpend, isPublicSpend)){
+                if (!CheckPublicCoinSpendEnforced(chainActive.Height(), isPublicSpend)){
                     return state.Invalid(error("%s: AcceptToMemoryPool failed for tx %s", __func__,
                                                tx.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");
                 }
@@ -3250,7 +3253,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                     continue;
 
                 // Check enforcement
-                if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPrivZerocoinSpend, isPublicSpend)){
+                if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPublicSpend)){
                     return false;
                 }
 
@@ -4811,7 +4814,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,
                     if (isPrivZerocoinSpend || isPublicSpend) {
 
                         // Check enforcement
-                        if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPrivZerocoinSpend, isPublicSpend)){
+                        if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPublicSpend)){
                             return false;
                         }
 
diff --git a/src/main.h b/src/main.h
@@ -374,7 +374,7 @@ bool ReindexAccumulators(list<uint256>& listMissingCheckpoints, string& strError
 bool isBlockBetweenFakeSerialAttackRange(int nHeight);
 
 // Public coin spend
-bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPrivZerocoinSpend, bool isPublicSpend);
+bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPublicSpend);
 
 /**
  * Check if transaction will be final in the next block to be created.

Original file line number	Diff line number	Diff line change
`@@ -988,10 +988,10 @@ bool isBlockBetweenFakeSerialAttackRange(int nHeight)`
`988`	`988`	`return nHeight <= Params().Zerocoin_Block_EndFakeSerial();`
`989`	`989`	`}`
`990`	`990`
`991`		`-bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPrivZerocoinSpend, bool isPublicSpend) {`
	`991`	`+bool CheckPublicCoinSpendEnforced(int blockHeight, bool isPublicSpend) {`
`992`	`992`	`if (blockHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {`
`993`	`993`	`// reject old coin spend`
`994`		`- if (isPrivZerocoinSpend) {`
	`994`	`+ if (!isPublicSpend) {`
`995`	`995`	`return error("%s: failed to add block with older zc spend version", __func__);`
`996`	`996`	`}`
`997`	`997`
`@@ -1042,11 +1042,14 @@ bool ContextualCheckZerocoinSpendNoSerialCheck(const CTransaction& tx, const Coi`
`1042`	`1042`	`}`
`1043`	`1043`	`}`
`1044`	`1044`
`1045`		`- //Reject V1 old serials.`
`1046`		`- if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {`
`1047`		`- return error("%s : zPIV v1 serial spend not spendable\n", __func__,`
`1048`		`- spend->getCoinSerialNumber().GetHex(), tx.GetHash().GetHex());`
	`1045`	`+ if (pindex->nHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {`
	`1046`	`+ //Reject V1 old serials.`
	`1047`	`+ if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {`
	`1048`	`+ return error("%s : zPIV v1 serial spend not spendable, serial %s, tx %s\n", __func__,`
	`1049`	`+ spend->getCoinSerialNumber().GetHex(), tx.GetHash().GetHex());`
	`1050`	`+ }`
`1049`	`1051`	`}`
	`1052`	`+`
`1050`	`1053`	`//Reject serial's that are not in the acceptable value range`
`1051`	`1054`	`if (!spend->HasValidSerial(Params().Zerocoin_Params(false))) {`
`1052`	`1055`	`// Up until this block our chain was not checking serials correctly..`
`@@ -1416,7 +1419,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState& state, const CTransa`
`1416`	`1419`	`}`
`1417`	`1420`
`1418`	`1421`	`// Check enforcement`
`1419`		`- if (!CheckPublicCoinSpendEnforced(chainActive.Height(), isPrivZerocoinSpend, isPublicSpend)){`
	`1422`	`+ if (!CheckPublicCoinSpendEnforced(chainActive.Height(), isPublicSpend)){`
`1420`	`1423`	`return state.Invalid(error("%s: AcceptToMemoryPool failed for tx %s", __func__,`
`1421`	`1424`	`tx.GetHash().GetHex()), REJECT_INVALID, "bad-txns-invalid-zpiv");`
`1422`	`1425`	`}`
`@@ -3250,7 +3253,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin`
`3250`	`3253`	`continue;`
`3251`	`3254`
`3252`	`3255`	`// Check enforcement`
`3253`		`- if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPrivZerocoinSpend, isPublicSpend)){`
	`3256`	`+ if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPublicSpend)){`
`3254`	`3257`	`return false;`
`3255`	`3258`	`}`
`3256`	`3259`
`@@ -4811,7 +4814,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CBlockIndex** ppindex,`
`4811`	`4814`	`if (isPrivZerocoinSpend \|\| isPublicSpend) {`
`4812`	`4815`
`4813`	`4816`	`// Check enforcement`
`4814`		`- if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPrivZerocoinSpend, isPublicSpend)){`
	`4817`	`+ if (!CheckPublicCoinSpendEnforced(pindex->nHeight, isPublicSpend)){`
`4815`	`4818`	`return false;`
`4816`	`4819`	`}`
`4817`	`4820`