highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 23:29:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Construct g_verify_flag_names on first use

Browse Source
This commit is contained in:
MarcoFalke
2025-10-10 16:58:04 +02:00
parent cd1b7fa1ff
commit faa9d10c84
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/script/interpreter.cpp
View File

@@ -2163,31 +2163,35 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
return 0; return 0;
} }
const std::map<std::string, script_verify_flag_name>& ScriptFlagNamesToEnum()
{
#define FLAG_NAME(flag) {std::string(#flag), SCRIPT_VERIFY_##flag} #define FLAG_NAME(flag) {std::string(#flag), SCRIPT_VERIFY_##flag}
const std::map<std::string, script_verify_flag_name> g_verify_flag_names{ static const std::map<std::string, script_verify_flag_name> g_names_to_enum{
FLAG_NAME(P2SH), FLAG_NAME(P2SH),
FLAG_NAME(STRICTENC), FLAG_NAME(STRICTENC),
FLAG_NAME(DERSIG), FLAG_NAME(DERSIG),
FLAG_NAME(LOW_S), FLAG_NAME(LOW_S),
FLAG_NAME(SIGPUSHONLY), FLAG_NAME(SIGPUSHONLY),
FLAG_NAME(MINIMALDATA), FLAG_NAME(MINIMALDATA),
FLAG_NAME(NULLDUMMY), FLAG_NAME(NULLDUMMY),
FLAG_NAME(DISCOURAGE_UPGRADABLE_NOPS), FLAG_NAME(DISCOURAGE_UPGRADABLE_NOPS),
FLAG_NAME(CLEANSTACK), FLAG_NAME(CLEANSTACK),
FLAG_NAME(MINIMALIF), FLAG_NAME(MINIMALIF),
FLAG_NAME(NULLFAIL), FLAG_NAME(NULLFAIL),
FLAG_NAME(CHECKLOCKTIMEVERIFY), FLAG_NAME(CHECKLOCKTIMEVERIFY),
FLAG_NAME(CHECKSEQUENCEVERIFY), FLAG_NAME(CHECKSEQUENCEVERIFY),
FLAG_NAME(WITNESS), FLAG_NAME(WITNESS),
FLAG_NAME(DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM), FLAG_NAME(DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM),
FLAG_NAME(WITNESS_PUBKEYTYPE), FLAG_NAME(WITNESS_PUBKEYTYPE),
FLAG_NAME(CONST_SCRIPTCODE), FLAG_NAME(CONST_SCRIPTCODE),
FLAG_NAME(TAPROOT), FLAG_NAME(TAPROOT),
FLAG_NAME(DISCOURAGE_UPGRADABLE_PUBKEYTYPE), FLAG_NAME(DISCOURAGE_UPGRADABLE_PUBKEYTYPE),
FLAG_NAME(DISCOURAGE_OP_SUCCESS), FLAG_NAME(DISCOURAGE_OP_SUCCESS),
FLAG_NAME(DISCOURAGE_UPGRADABLE_TAPROOT_VERSION), FLAG_NAME(DISCOURAGE_UPGRADABLE_TAPROOT_VERSION),
}; };
#undef FLAG_NAME #undef FLAG_NAME
return g_names_to_enum;
}
std::vector<std::string> GetScriptFlagNames(script_verify_flags flags) std::vector<std::string> GetScriptFlagNames(script_verify_flags flags)
{ {
@@ -2196,7 +2200,7 @@ std::vector<std::string> GetScriptFlagNames(script_verify_flags flags)
return res; return res;
} }
script_verify_flags leftover = flags; script_verify_flags leftover = flags;
for (const auto& [name, flag] : g_verify_flag_names) { for (const auto& [name, flag] : ScriptFlagNamesToEnum()) {
if ((flags & flag) != 0) { if ((flags & flag) != 0) {
res.push_back(name); res.push_back(name);
leftover &= ~flag; leftover &= ~flag;

2
src/script/interpreter.h
View File

@@ -381,7 +381,7 @@ size_t CountWitnessSigOps(const CScript& scriptSig, const CScript& scriptPubKey,
int FindAndDelete(CScript& script, const CScript& b); int FindAndDelete(CScript& script, const CScript& b);
extern const std::map<std::string, script_verify_flag_name> g_verify_flag_names; const std::map<std::string, script_verify_flag_name>& ScriptFlagNamesToEnum();
std::vector<std::string> GetScriptFlagNames(script_verify_flags flags); std::vector<std::string> GetScriptFlagNames(script_verify_flags flags);

2
src/test/transaction_tests.cpp
View File

@@ -50,7 +50,7 @@ typedef std::vector<unsigned char> valtype;
static CFeeRate g_dust{DUST_RELAY_TX_FEE}; static CFeeRate g_dust{DUST_RELAY_TX_FEE};
static bool g_bare_multi{DEFAULT_PERMIT_BAREMULTISIG}; static bool g_bare_multi{DEFAULT_PERMIT_BAREMULTISIG};
static const std::map<std::string, script_verify_flag_name>& mapFlagNames = g_verify_flag_names; static const std::map<std::string, script_verify_flag_name>& mapFlagNames = ScriptFlagNamesToEnum();
script_verify_flags ParseScriptFlags(std::string strFlags) script_verify_flags ParseScriptFlags(std::string strFlags)
{ {