highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-04 00:41:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Make CScriptVisitor stateless

Browse Source
This commit is contained in:
João Barbosa 2020-05-04 10:50:43 +01:00
parent 24f7029064
commit 3351c91ed4
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/script/standard.cpp
View File

@ -239,59 +239,47 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::
namespace namespace
{ {
class CScriptVisitor : public boost::static_visitor<bool> class CScriptVisitor : public boost::static_visitor<CScript>
{ {
private:
CScript *script;
public: public:
explicit CScriptVisitor(CScript *scriptin) { script = scriptin; } CScript operator()(const CNoDestination& dest) const
bool operator()(const CNoDestination &dest) const {
script->clear();
return false;
}
bool operator()(const PKHash &keyID) const {
script->clear();
*script << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
return true;
}
bool operator()(const ScriptHash &scriptID) const {
script->clear();
*script << OP_HASH160 << ToByteVector(scriptID) << OP_EQUAL;
return true;
}
bool operator()(const WitnessV0KeyHash& id) const
{ {
script->clear(); return CScript();
*script << OP_0 << ToByteVector(id);
return true;
} }
bool operator()(const WitnessV0ScriptHash& id) const CScript operator()(const PKHash& keyID) const
{ {
script->clear(); return CScript() << OP_DUP << OP_HASH160 << ToByteVector(keyID) << OP_EQUALVERIFY << OP_CHECKSIG;
*script << OP_0 << ToByteVector(id);
return true;
} }
bool operator()(const WitnessUnknown& id) const CScript operator()(const ScriptHash& scriptID) const
{ {
script->clear(); return CScript() << OP_HASH160 << ToByteVector(scriptID) << OP_EQUAL;
*script << CScript::EncodeOP_N(id.version) << std::vector<unsigned char>(id.program, id.program + id.length); }
return true;
CScript operator()(const WitnessV0KeyHash& id) const
{
return CScript() << OP_0 << ToByteVector(id);
}
CScript operator()(const WitnessV0ScriptHash& id) const
{
return CScript() << OP_0 << ToByteVector(id);
}
CScript operator()(const WitnessUnknown& id) const
{
return CScript() << CScript::EncodeOP_N(id.version) << std::vector<unsigned char>(id.program, id.program + id.length);
} }
}; };
const CScriptVisitor g_script_visitor;
} // namespace } // namespace
CScript GetScriptForDestination(const CTxDestination& dest) CScript GetScriptForDestination(const CTxDestination& dest)
{ {
CScript script; return boost::apply_visitor(::g_script_visitor, dest);
boost::apply_visitor(CScriptVisitor(&script), dest);
return script;
} }
CScript GetScriptForRawPubKey(const CPubKey& pubKey) CScript GetScriptForRawPubKey(const CPubKey& pubKey)