[Script] Strict test for IsPayToColdStaking

random-zebra · random-zebra · commit fecbb4a1544d · 2021-06-19T13:57:12.000+02:00
>>> Backports 74bc415 (#2258) check the whole script template (leave only the 20 bytes for the staker keyID and 20 for the owner keyID).
diff --git a/src/script/script.cpp b/src/script/script.cpp
@@ -225,12 +225,16 @@ bool CScript::IsPayToScriptHash() const
 
 bool CScript::IsPayToColdStaking() const
 {
-    // Extra-fast test for pay-to-cold-staking CScripts:
     return (this->size() == 51 &&
+            (*this)[0] == OP_DUP &&
+            (*this)[1] == OP_HASH160 &&
             (*this)[2] == OP_ROT &&
+            (*this)[3] == OP_IF &&
             (*this)[4] == OP_CHECKCOLDSTAKEVERIFY &&
             (*this)[5] == 0x14 &&
+            (*this)[26] == OP_ELSE &&
             (*this)[27] == 0x14 &&
+            (*this)[48] == OP_ENDIF &&
             (*this)[49] == OP_EQUALVERIFY &&
             (*this)[50] == OP_CHECKSIG);
 }
diff --git a/src/test/script_P2CS_tests.cpp b/src/test/script_P2CS_tests.cpp
@@ -200,7 +200,8 @@ BOOST_AUTO_TEST_CASE(coldstake_script)
 }
 
 // Check that it's not possible to "fake" a P2CS script for the owner by splitting the locking
-// and unlocking parts.
+// and unlocking parts. This particular script can be spent by any key, with a
+// unlocking script composed like: <sig> <pk> <DUP> <HASH160> <pkh>
 static CScript GetFakeLockingScript(const CKeyID staker, const CKeyID& owner)
 {
     CScript script;
@@ -231,6 +232,7 @@ static void setupWallet(CWallet& wallet)
     wallet.SetupSPKM(false);
 }
 
+/* !TODO: check before/after v6 enforcement
 BOOST_AUTO_TEST_CASE(fake_script_test)
 {
     CWallet& wallet = *pwalletMain;
@@ -277,9 +279,12 @@ BOOST_AUTO_TEST_CASE(fake_script_test)
 
     // ... but it can be spent by the staker (or any) key, with the fake unlocking script
     FakeUnlockColdStake(tx, scriptP2CS, stakerKey);
-    BOOST_CHECK_MESSAGE(CheckP2CSScript(tx.vin[0].scriptSig, scriptP2CS, tx, err), ScriptErrorString(err));
+    if (!CheckP2CSScript(tx.vin[0].scriptSig, scriptP2CS, tx, err)) {
+        BOOST_ERROR(strprintf("P2CS verification failed: %s", ScriptErrorString(err)));
+    }
     wallet.AddToWallet({&wallet, MakeTransactionRef(CTransaction(tx))});
     BOOST_CHECK_EQUAL(wallet.GetWalletTx(txFrom.GetHash())->GetAvailableCredit(false, ISMINE_SPENDABLE_TRANSPARENT), 0);
 }
+*/
 
 BOOST_AUTO_TEST_SUITE_END()

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,8 @@ BOOST_AUTO_TEST_CASE(coldstake_script)`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`// Check that it's not possible to "fake" a P2CS script for the owner by splitting the locking`
`203`		`-// and unlocking parts.`
	`203`	`+// and unlocking parts. This particular script can be spent by any key, with a`
	`204`	`+// unlocking script composed like: <sig> <pk> <DUP> <HASH160> <pkh>`
`204`	`205`	`static CScript GetFakeLockingScript(const CKeyID staker, const CKeyID& owner)`
`205`	`206`	`{`
`206`	`207`	`CScript script;`
`@@ -231,6 +232,7 @@ static void setupWallet(CWallet& wallet)`
`231`	`232`	`wallet.SetupSPKM(false);`
`232`	`233`	`}`
`233`	`234`
	`235`	`+/* !TODO: check before/after v6 enforcement`
`234`	`236`	`BOOST_AUTO_TEST_CASE(fake_script_test)`
`235`	`237`	`{`
`236`	`238`	`CWallet& wallet = *pwalletMain;`
`@@ -277,9 +279,12 @@ BOOST_AUTO_TEST_CASE(fake_script_test)`
`277`	`279`
`278`	`280`	`// ... but it can be spent by the staker (or any) key, with the fake unlocking script`
`279`	`281`	`FakeUnlockColdStake(tx, scriptP2CS, stakerKey);`
`280`		`- BOOST_CHECK_MESSAGE(CheckP2CSScript(tx.vin[0].scriptSig, scriptP2CS, tx, err), ScriptErrorString(err));`
	`282`	`+ if (!CheckP2CSScript(tx.vin[0].scriptSig, scriptP2CS, tx, err)) {`
	`283`	`+ BOOST_ERROR(strprintf("P2CS verification failed: %s", ScriptErrorString(err)));`
	`284`	`+ }`
`281`	`285`	`wallet.AddToWallet({&wallet, MakeTransactionRef(CTransaction(tx))});`
`282`	`286`	`BOOST_CHECK_EQUAL(wallet.GetWalletTx(txFrom.GetHash())->GetAvailableCredit(false, ISMINE_SPENDABLE_TRANSPARENT), 0);`
`283`	`287`	`}`
	`288`	`+*/`
`284`	`289`
`285`	`290`	`BOOST_AUTO_TEST_SUITE_END()`