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

Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147)

Browse source
This commit is contained in:
James Dorfman 2024-07-08 17:49:09 +00:00
commit 94e058d3b7
12 changed files with 2419 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/script/standard.cpp
View file

@ -105,11 +105,6 @@ static constexpr bool IsSmallInteger(opcodetype opcode)
return opcode >= OP_1 && opcode <= OP_16;
}
static constexpr bool IsPushdataOp(opcodetype opcode)
{
return opcode > OP_FALSE && opcode <= OP_PUSHDATA4;
}
/** Retrieve a minimally-encoded number in range [min,max] from an (opcode, data) pair,
* whether it's OP_n or through a push. */
static std::optional<int> GetScriptNumber(opcodetype opcode, valtype data, int min, int max)