@@ -1807,16 +1807,16 @@ bool GenericTransactionSignatureChecker<T>::CheckSequence(const CScriptNum& nSeq
1807
1807
template class GenericTransactionSignatureChecker <CTransaction>;
1808
1808
template class GenericTransactionSignatureChecker <CMutableTransaction>;
1809
1809
1810
- static bool ExecuteWitnessScript (const Span<const valtype>& stack_span, const CScript& scriptPubKey , unsigned int flags, SigVersion sigversion, const BaseSignatureChecker& checker, ScriptExecutionData& execdata, ScriptError* serror)
1810
+ static bool ExecuteWitnessScript (const Span<const valtype>& stack_span, const CScript& exec_script , unsigned int flags, SigVersion sigversion, const BaseSignatureChecker& checker, ScriptExecutionData& execdata, ScriptError* serror)
1811
1811
{
1812
1812
std::vector<valtype> stack{stack_span.begin (), stack_span.end ()};
1813
1813
1814
1814
if (sigversion == SigVersion::TAPSCRIPT) {
1815
1815
// OP_SUCCESSx processing overrides everything, including stack element size limits
1816
- CScript::const_iterator pc = scriptPubKey .begin ();
1817
- while (pc < scriptPubKey .end ()) {
1816
+ CScript::const_iterator pc = exec_script .begin ();
1817
+ while (pc < exec_script .end ()) {
1818
1818
opcodetype opcode;
1819
- if (!scriptPubKey .GetOp (pc, opcode)) {
1819
+ if (!exec_script .GetOp (pc, opcode)) {
1820
1820
// Note how this condition would not be reached if an unknown OP_SUCCESSx was found
1821
1821
return set_error (serror, SCRIPT_ERR_BAD_OPCODE);
1822
1822
}
@@ -1839,7 +1839,7 @@ static bool ExecuteWitnessScript(const Span<const valtype>& stack_span, const CS
1839
1839
}
1840
1840
1841
1841
// Run the script interpreter.
1842
- if (!EvalScript (stack, scriptPubKey , flags, checker, sigversion, execdata, serror)) return false ;
1842
+ if (!EvalScript (stack, exec_script , flags, checker, sigversion, execdata, serror)) return false ;
1843
1843
1844
1844
// Scripts inside witness implicitly require cleanstack behaviour
1845
1845
if (stack.size () != 1 ) return set_error (serror, SCRIPT_ERR_CLEANSTACK);
0 commit comments