phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

script: make IsPushdataOp non-static

Browse source 
We'll need it for Miniscript
This commit is contained in:
Antoine Poinsot 2021-09-25 15:21:57 +02:00
parent 8435d7f11a
commit 31ec6ae92a
No known key found for this signature in database
GPG key ID: E13FC145CD3F4304
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/script/standard.cpp
View file

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

5
src/script/standard.h
View file

@ -162,6 +162,11 @@ bool IsValidDestination(const CTxDestination& dest);
/** Get the name of a TxoutType as a string */ /** Get the name of a TxoutType as a string */
std::string GetTxnOutputType(TxoutType t); std::string GetTxnOutputType(TxoutType t);
constexpr bool IsPushdataOp(opcodetype opcode)
{
return opcode > OP_FALSE && opcode <= OP_PUSHDATA4;
}
/** /**
* Parse a scriptPubKey and identify script type for standard scripts. If * Parse a scriptPubKey and identify script type for standard scripts. If
* successful, returns script type and parsed pubkeys or hashes, depending on * successful, returns script type and parsed pubkeys or hashes, depending on