Merge fa809af into merged_master (Elements PR ElementsProject#1141)

gwillen · gwillen · commit 0876dba1a3a4 · 2023-03-01T10:01:55.000-08:00
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -3173,7 +3173,7 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion,
             }
             execdata.m_tapleaf_hash_init = true;
             if ((control[0] & TAPROOT_LEAF_MASK) == TAPROOT_LEAF_TAPSCRIPT) {
-                // Tapscript (leaf version 0xc0)
+                // Tapscript (leaf version 0xc4)
                 execdata.m_validation_weight_left = ::GetSerializeSize(witness.stack, PROTOCOL_VERSION) + VALIDATION_WEIGHT_OFFSET;
                 execdata.m_validation_weight_left_init = true;
                 return ExecuteWitnessScript(stack, exec_script, flags, SigVersion::TAPSCRIPT, checker, execdata, serror);

Original file line number	Diff line number	Diff line change
`@@ -3173,7 +3173,7 @@ static bool VerifyWitnessProgram(const CScriptWitness& witness, int witversion,`
`3173`	`3173`	`}`
`3174`	`3174`	`execdata.m_tapleaf_hash_init = true;`
`3175`	`3175`	`if ((control[0] & TAPROOT_LEAF_MASK) == TAPROOT_LEAF_TAPSCRIPT) {`
`3176`		`- // Tapscript (leaf version 0xc0)`
	`3176`	`+ // Tapscript (leaf version 0xc4)`
`3177`	`3177`	`execdata.m_validation_weight_left = ::GetSerializeSize(witness.stack, PROTOCOL_VERSION) + VALIDATION_WEIGHT_OFFSET;`
`3178`	`3178`	`execdata.m_validation_weight_left_init = true;`
`3179`	`3179`	`return ExecuteWitnessScript(stack, exec_script, flags, SigVersion::TAPSCRIPT, checker, execdata, serror);`