GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 5ccab7187b into merged_master (Bitcoin PR bitcoin/bitcoin#23394)

Browse source 
- commented out some script tests that need to be fixed
 - commented out feature_taproot.py since it needs significant updates
This commit is contained in:
Byron Hambly 2023-05-25 10:03:24 +00:00
commit 1beaa601b4
14 changed files with 947 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/script/interpreter.cpp
View file

@ -569,7 +569,7 @@ static bool EvalChecksig(const valtype& sig, const valtype& pubkey, CScript::con
const CHashWriter HASHER_TAPLEAF_ELEMENTS = TaggedHash("TapLeaf/elements");
const CHashWriter HASHER_TAPBRANCH_ELEMENTS = TaggedHash("TapBranch/elements");
static const CHashWriter HASHER_TAPSIGHASH_ELEMENTS = TaggedHash("TapSighash/elements");
const CHashWriter HASHER_TAPSIGHASH_ELEMENTS = TaggedHash("TapSighash/elements");
bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, unsigned int flags, const BaseSignatureChecker& checker, SigVersion sigversion, ScriptExecutionData& execdata, ScriptError* serror)
{