[Refactor] Rename CCSV opcode to OP_CHECKCOLDSTAKEVERIFY_LOF

random-zebra · random-zebra · commit b194386d8bce · 2021-05-11T10:39:27.000+02:00
Last Output Free
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -960,7 +960,7 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                 }
                 break;
 
-                case OP_CHECKCOLDSTAKEVERIFY:
+                case OP_CHECKCOLDSTAKEVERIFY_LOF:
                 {
                     if (g_IsV6Active) {
                         // the stack can contain only <sig> <pk> <pkh> at this point
diff --git a/src/script/script.cpp b/src/script/script.cpp
@@ -148,7 +148,7 @@ const char* GetOpName(opcodetype opcode)
     case OP_ZEROCOINPUBLICSPEND    : return "OP_ZEROCOINPUBLICSPEND";
 
     // cold staking
-    case OP_CHECKCOLDSTAKEVERIFY   : return "OP_CHECKCOLDSTAKEVERIFY";
+    case OP_CHECKCOLDSTAKEVERIFY_LOF   : return "OP_CHECKCOLDSTAKEVERIFY_LOF";
 
     case OP_INVALIDOPCODE          : return "OP_INVALIDOPCODE";
 
@@ -236,7 +236,7 @@ bool CScript::IsPayToColdStaking() const
             (!g_IsV6Active || (*this)[1] == OP_HASH160) &&
             (*this)[2] == OP_ROT &&
             (!g_IsV6Active || (*this)[3] == OP_IF) &&
-            (*this)[4] == OP_CHECKCOLDSTAKEVERIFY &&
+            (*this)[4] == OP_CHECKCOLDSTAKEVERIFY_LOF &&
             (*this)[5] == 0x14 &&
             (!g_IsV6Active || (*this)[26] == OP_ELSE) &&
             (*this)[27] == 0x14 &&
diff --git a/src/script/script.h b/src/script/script.h
@@ -184,7 +184,7 @@ enum opcodetype
     OP_ZEROCOINPUBLICSPEND = 0xc3,
 
     // cold staking
-    OP_CHECKCOLDSTAKEVERIFY = 0xd1,
+    OP_CHECKCOLDSTAKEVERIFY_LOF = 0xd1,     // last output free for masternode/budget payments
 
     OP_INVALIDOPCODE = 0xff,
 };
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
@@ -299,7 +299,7 @@ CScript GetScriptForStakeDelegation(const CKeyID& stakingKey, const CKeyID& spen
 {
     CScript script;
     script << OP_DUP << OP_HASH160 << OP_ROT <<
-            OP_IF << OP_CHECKCOLDSTAKEVERIFY << ToByteVector(stakingKey) <<
+            OP_IF << OP_CHECKCOLDSTAKEVERIFY_LOF << ToByteVector(stakingKey) <<
             OP_ELSE << ToByteVector(spendingKey) << OP_ENDIF <<
             OP_EQUALVERIFY << OP_CHECKSIG;
     return script;
diff --git a/src/test/script_P2CS_tests.cpp b/src/test/script_P2CS_tests.cpp
@@ -206,7 +206,7 @@ static CScript GetFakeLockingScript(const CKeyID staker, const CKeyID& owner)
 {
     CScript script;
     script << opcodetype(0x2F) << opcodetype(0x01) << OP_ROT <<
-            OP_IF << OP_CHECKCOLDSTAKEVERIFY << ToByteVector(staker) <<
+            OP_IF << OP_CHECKCOLDSTAKEVERIFY_LOF << ToByteVector(staker) <<
             OP_ELSE << ToByteVector(owner) << OP_DROP <<
             OP_EQUALVERIFY << OP_CHECKSIG;
 

Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,7 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&`
`960`	`960`	`}`
`961`	`961`	`break;`
`962`	`962`
`963`		`- case OP_CHECKCOLDSTAKEVERIFY:`
	`963`	`+ case OP_CHECKCOLDSTAKEVERIFY_LOF:`
`964`	`964`	`{`
`965`	`965`	`if (g_IsV6Active) {`
`966`	`966`	`// the stack can contain only <sig> <pk> <pkh> at this point`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ CScript GetScriptForStakeDelegation(const CKeyID& stakingKey, const CKeyID& spen`
`299`	`299`	`{`
`300`	`300`	`CScript script;`
`301`	`301`	`script << OP_DUP << OP_HASH160 << OP_ROT <<`
`302`		`- OP_IF << OP_CHECKCOLDSTAKEVERIFY << ToByteVector(stakingKey) <<`
	`302`	`+ OP_IF << OP_CHECKCOLDSTAKEVERIFY_LOF << ToByteVector(stakingKey) <<`
`303`	`303`	`OP_ELSE << ToByteVector(spendingKey) << OP_ENDIF <<`
`304`	`304`	`OP_EQUALVERIFY << OP_CHECKSIG;`
`305`	`305`	`return script;`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ static CScript GetFakeLockingScript(const CKeyID staker, const CKeyID& owner)`
`206`	`206`	`{`
`207`	`207`	`CScript script;`
`208`	`208`	`script << opcodetype(0x2F) << opcodetype(0x01) << OP_ROT <<`
`209`		`- OP_IF << OP_CHECKCOLDSTAKEVERIFY << ToByteVector(staker) <<`
	`209`	`+ OP_IF << OP_CHECKCOLDSTAKEVERIFY_LOF << ToByteVector(staker) <<`
`210`	`210`	`OP_ELSE << ToByteVector(owner) << OP_DROP <<`
`211`	`211`	`OP_EQUALVERIFY << OP_CHECKSIG;`
`212`	`212`