Skip to content

Commit 0f0508b

Browse files
committed
Merge bitcoin/bitcoin#25869: wallet: remove UNKNOWN type from OUTPUT_TYPES array
5b4fdbb wallet: remove UNKNOWN type from OUTPUT_TYPES array (furszy) Pull request description: Fixing bitcoin/bitcoin#25734 (comment) -> https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=50329 The `OUTPUT_TYPES` array contain the known active output types only. And it's solely used to create/walk-through the active spkms. So, no need to add the `UNKNOWN` type here. ACKs for top commit: achow101: ACK 5b4fdbb w0xlt: ACK bitcoin/bitcoin@5b4fdbb LarryRuane: ACK 5b4fdbb Tree-SHA512: dee2dc362a1b0c777555e5ee4d355a3351340591d0096f74e8c3a25f374cb2d9aef26145977ff4dd0f8cc940da9464eb5541eb2895bc19f8cbd6bb6d292ab9a9
2 parents 9eaef10 + 5b4fdbb commit 0f0508b

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

src/outputtype.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ static constexpr auto OUTPUT_TYPES = std::array{
2727
OutputType::P2SH_SEGWIT,
2828
OutputType::BECH32,
2929
OutputType::BECH32M,
30-
OutputType::UNKNOWN,
3130
};
3231

3332
std::optional<OutputType> ParseOutputType(const std::string& str);

src/wallet/wallet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3446,7 +3446,6 @@ void CWallet::SetupDescriptorScriptPubKeyMans()
34463446

34473447
for (bool internal : {false, true}) {
34483448
for (OutputType t : OUTPUT_TYPES) {
3449-
if (t == OutputType::UNKNOWN) continue;
34503449
auto spk_manager = std::unique_ptr<DescriptorScriptPubKeyMan>(new DescriptorScriptPubKeyMan(*this));
34513450
if (IsCrypted()) {
34523451
if (IsLocked()) {

0 commit comments

Comments
 (0)