[zPIV] v1 serials modulus fix + isStandardTx fix for publicSpends.

furszy · furszy · commit 28afbd29814c · 2019-06-04T12:30:25.000+02:00
cleanup, publicCoinSpend object leftover removed + minor log added to CheckProofOfStake.
diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -372,7 +372,8 @@ bool CheckProofOfStake(const CBlock block, uint256& hashProofOfStake, std::uniqu
         uint256 hashBlock;
         CTransaction txPrev;
         if (!GetTransaction(txin.prevout.hash, txPrev, hashBlock, true))
-            return error("CheckProofOfStake() : INFO: read txPrev failed");
+            return error("CheckProofOfStake() : INFO: read txPrev failed, tx id prev: %s, block id %s",
+                         txin.prevout.hash.GetHex(), block.GetHash().GetHex());
 
         //verify signature and script
         if (!VerifyScript(txin.scriptSig, txPrev.vout[txin.prevout.n].scriptPubKey, STANDARD_SCRIPT_VERIFY_FLAGS, TransactionSignatureChecker(&tx, 0)))
diff --git a/src/main.cpp b/src/main.cpp
@@ -739,7 +739,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
     }
 
     for (const CTxIn& txin : tx.vin) {
-        if (txin.IsZerocoinSpend())
+        if (txin.IsZerocoinSpend() || txin.IsZerocoinPublicSpend())
             continue;
         // Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed
         // keys. (remember the 520 byte limit on redeemScript size) That works
@@ -1042,16 +1042,17 @@ bool ContextualCheckZerocoinSpendNoSerialCheck(const CTransaction& tx, const Coi
         }
     }
 
+    bool v1Serial = spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION;
     if (pindex->nHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {
         //Reject V1 old serials.
-        if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {
+        if (v1Serial) {
             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))) {
+    if (!spend->HasValidSerial(Params().Zerocoin_Params(v1Serial)))  {
         // Up until this block our chain was not checking serials correctly..
         if (!isBlockBetweenFakeSerialAttackRange(pindex->nHeight))
             return error("%s : zPIV spend with serial %s from tx %s is not in valid range\n", __func__,
@@ -1817,15 +1818,13 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState& state, const CTransact
 
 bool GetOutput(const uint256& hash, unsigned int index, CValidationState& state, CTxOut& out)
 {
-    libzerocoin::ZerocoinParams* params = Params().Zerocoin_Params(false);
-    PublicCoinSpend ret(params);
     CTransaction txPrev;
     uint256 hashBlock;
     if (!GetTransaction(hash, txPrev, hashBlock, true)) {
         return state.DoS(100, error("Output not found"));
     }
     if (index > txPrev.vout.size()) {
-        return state.DoS(100, error("Output not found, invalid index %d", index));
+        return state.DoS(100, error("Output not found, invalid index %d for %s",index, hash.GetHex()));
     }
     out = txPrev.vout[index];
     return true;

Original file line number	Diff line number	Diff line change
`@@ -739,7 +739,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)`
`739`	`739`	`}`
`740`	`740`
`741`	`741`	`for (const CTxIn& txin : tx.vin) {`
`742`		`- if (txin.IsZerocoinSpend())`
	`742`	`+ if (txin.IsZerocoinSpend() \|\| txin.IsZerocoinPublicSpend())`
`743`	`743`	`continue;`
`744`	`744`	`// Biggest 'standard' txin is a 15-of-15 P2SH multisig with compressed`
`745`	`745`	`// keys. (remember the 520 byte limit on redeemScript size) That works`
`@@ -1042,16 +1042,17 @@ bool ContextualCheckZerocoinSpendNoSerialCheck(const CTransaction& tx, const Coi`
`1042`	`1042`	`}`
`1043`	`1043`	`}`
`1044`	`1044`
	`1045`	`+ bool v1Serial = spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION;`
`1045`	`1046`	`if (pindex->nHeight >= Params().Zerocoin_Block_Public_Spend_Enabled()) {`
`1046`	`1047`	`//Reject V1 old serials.`
`1047`		`- if (spend->getVersion() < libzerocoin::PrivateCoin::PUBKEY_VERSION) {`
	`1048`	`+ if (v1Serial) {`
`1048`	`1049`	`return error("%s : zPIV v1 serial spend not spendable, serial %s, tx %s\n", __func__,`
`1049`	`1050`	`spend->getCoinSerialNumber().GetHex(), tx.GetHash().GetHex());`
`1050`	`1051`	`}`
`1051`	`1052`	`}`
`1052`	`1053`
`1053`	`1054`	`//Reject serial's that are not in the acceptable value range`
`1054`		`- if (!spend->HasValidSerial(Params().Zerocoin_Params(false))) {`
	`1055`	`+ if (!spend->HasValidSerial(Params().Zerocoin_Params(v1Serial))) {`
`1055`	`1056`	`// Up until this block our chain was not checking serials correctly..`
`1056`	`1057`	`if (!isBlockBetweenFakeSerialAttackRange(pindex->nHeight))`
`1057`	`1058`	`return error("%s : zPIV spend with serial %s from tx %s is not in valid range\n", __func__,`
`@@ -1817,15 +1818,13 @@ bool AcceptableInputs(CTxMemPool& pool, CValidationState& state, const CTransact`
`1817`	`1818`
`1818`	`1819`	`bool GetOutput(const uint256& hash, unsigned int index, CValidationState& state, CTxOut& out)`
`1819`	`1820`	`{`
`1820`		`- libzerocoin::ZerocoinParams* params = Params().Zerocoin_Params(false);`
`1821`		`- PublicCoinSpend ret(params);`
`1822`	`1821`	`CTransaction txPrev;`
`1823`	`1822`	`uint256 hashBlock;`
`1824`	`1823`	`if (!GetTransaction(hash, txPrev, hashBlock, true)) {`
`1825`	`1824`	`return state.DoS(100, error("Output not found"));`
`1826`	`1825`	`}`
`1827`	`1826`	`if (index > txPrev.vout.size()) {`
`1828`		`- return state.DoS(100, error("Output not found, invalid index %d", index));`
	`1827`	`+ return state.DoS(100, error("Output not found, invalid index %d for %s",index, hash.GetHex()));`
`1829`	`1828`	`}`
`1830`	`1829`	`out = txPrev.vout[index];`
`1831`	`1830`	`return true;`