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

Avoid dependence on CTxDestination index order

Browse Source
This commit is contained in:
Pieter Wuille
2021-05-23 18:23:58 -07:00
parent 31df02a070
commit 41839bdb89
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/script/descriptor.cpp
View File

@@ -638,6 +638,19 @@ public:
std::optional<OutputType> GetOutputType() const override { return std::nullopt; } std::optional<OutputType> GetOutputType() const override { return std::nullopt; }
}; };
static std::optional<OutputType> OutputTypeFromDestination(const CTxDestination& dest) {
if (std::holds_alternative<PKHash>(dest) ||
std::holds_alternative<ScriptHash>(dest)) {
return OutputType::LEGACY;
}
if (std::holds_alternative<WitnessV0KeyHash>(dest) ||
std::holds_alternative<WitnessV0ScriptHash>(dest) ||
std::holds_alternative<WitnessUnknown>(dest)) {
return OutputType::BECH32;
}
return std::nullopt;
}
/** A parsed addr(A) descriptor. */ /** A parsed addr(A) descriptor. */
class AddressDescriptor final : public DescriptorImpl class AddressDescriptor final : public DescriptorImpl
{ {
@@ -651,15 +664,7 @@ public:
std::optional<OutputType> GetOutputType() const override std::optional<OutputType> GetOutputType() const override
{ {
switch (m_destination.index()) { return OutputTypeFromDestination(m_destination);
case 1 /* PKHash */:
case 2 /* ScriptHash */: return OutputType::LEGACY;
case 3 /* WitnessV0ScriptHash */:
case 4 /* WitnessV0KeyHash */:
case 5 /* WitnessUnknown */: return OutputType::BECH32;
case 0 /* CNoDestination */:
default: return std::nullopt;
}
} }
bool IsSingleType() const final { return true; } bool IsSingleType() const final { return true; }
}; };
@@ -679,15 +684,7 @@ public:
{ {
CTxDestination dest; CTxDestination dest;
ExtractDestination(m_script, dest); ExtractDestination(m_script, dest);
switch (dest.index()) { return OutputTypeFromDestination(dest);
case 1 /* PKHash */:
case 2 /* ScriptHash */: return OutputType::LEGACY;
case 3 /* WitnessV0ScriptHash */:
case 4 /* WitnessV0KeyHash */:
case 5 /* WitnessUnknown */: return OutputType::BECH32;
case 0 /* CNoDestination */:
default: return std::nullopt;
}
} }
bool IsSingleType() const final { return true; } bool IsSingleType() const final { return true; }
}; };