From f7beb95a1f921ed292680fbd2f042b4bac73bf59 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Wed, 7 Nov 2018 10:50:32 -0500 Subject: [PATCH 1/2] remove redundant KeyOriginInfo access, already done in CreateSig --- src/script/sign.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 89cc7c808c7..47114d2e2a9 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -63,14 +63,7 @@ static bool GetPubKey(const SigningProvider& provider, SignatureData& sigdata, c return true; } // Query the underlying provider - if (provider.GetPubKey(address, pubkey)) { - KeyOriginInfo info; - if (provider.GetKeyOrigin(address, info)) { - sigdata.misc_pubkeys.emplace(address, std::make_pair(pubkey, std::move(info))); - } - return true; - } - return false; + return provider.GetPubKey(address, pubkey); } static bool CreateSig(const BaseSignatureCreator& creator, SignatureData& sigdata, const SigningProvider& provider, std::vector& sig_out, const CPubKey& pubkey, const CScript& scriptcode, SigVersion sigversion) From b81a1860561ccbda3cd6913f54e49fdc91c7718c Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Tue, 13 Nov 2018 10:42:10 -0500 Subject: [PATCH 2/2] GetPubKey: make sigdata const --- src/script/sign.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 47114d2e2a9..67d102cc0e0 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -48,7 +48,7 @@ static bool GetCScript(const SigningProvider& provider, const SignatureData& sig return false; } -static bool GetPubKey(const SigningProvider& provider, SignatureData& sigdata, const CKeyID& address, CPubKey& pubkey) +static bool GetPubKey(const SigningProvider& provider, const SignatureData& sigdata, const CKeyID& address, CPubKey& pubkey) { // Look for pubkey in all partial sigs const auto it = sigdata.signatures.find(address);