From 3e159538409f294a879a0e92c86678e2bb1ef130 Mon Sep 17 00:00:00 2001 From: lateminer <9951982+lateminer@users.noreply.github.com> Date: Sat, 4 Nov 2023 22:31:19 +0100 Subject: [PATCH] Revert "wallet: Get only P2PKH addresses for now" This reverts commit f126b58ec5225f13c170d65a496fdde899e2968a. --- src/outputtype.cpp | 5 ----- src/test/fuzz/key.cpp | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 85119ef6c2..9a3870d8dc 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -73,7 +73,6 @@ std::vector GetAllDestinationsForKey(const CPubKey& key) { PKHash keyid(key); CTxDestination p2pkh{keyid}; - /* if (key.IsCompressed()) { CTxDestination segwit = WitnessV0KeyHash(keyid); CTxDestination p2sh = ScriptHash(GetScriptForDestination(segwit)); @@ -81,10 +80,6 @@ std::vector GetAllDestinationsForKey(const CPubKey& key) } else { return Vector(std::move(p2pkh)); } - */ - - // Blackcoin: only P2PKH is supported for now - return Vector(std::move(p2pkh)); } CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, const CScript& script, OutputType type) diff --git a/src/test/fuzz/key.cpp b/src/test/fuzz/key.cpp index 7489297130..ea6883c08d 100644 --- a/src/test/fuzz/key.cpp +++ b/src/test/fuzz/key.cpp @@ -107,12 +107,7 @@ FUZZ_TARGET_INIT(key, initialize_key) assert(pubkey.IsValid()); assert(pubkey.IsFullyValid()); assert(HexToPubKey(HexStr(pubkey)) == pubkey); - /* assert(GetAllDestinationsForKey(pubkey).size() == 3); - */ - - // Blackcoin: only P2PKH is supported for now - assert(GetAllDestinationsForKey(pubkey).size() == 1); } {