diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-23 10:12:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-11-23 10:13:03 +0100 |
| commit | 0595164dbaa355dc7c4e485a8d7eaebac36069e5 (patch) | |
| tree | 0cf8294e2aaf3cf92fe6e8ade66afd5789ab5024 /src/script | |
| parent | 1d3af69fd07439b15fdbfb157091b509722d6476 (diff) | |
| parent | b81a1860561ccbda3cd6913f54e49fdc91c7718c (diff) | |
| download | bitcoin-0595164dbaa355dc7c4e485a8d7eaebac36069e5.tar.xz | |
Merge #14678: [wallet] remove redundant KeyOriginInfo access, already done in CreateSig
b81a1860561ccbda3cd6913f54e49fdc91c7718c GetPubKey: make sigdata const (Gregory Sanders)
f7beb95a1f921ed292680fbd2f042b4bac73bf59 remove redundant KeyOriginInfo access, already done in CreateSig (Gregory Sanders)
Pull request description:
This redundancy is confusing as it looks like pubkeyhashes are special in some way based on where it's called.
Tree-SHA512: a980b7c774c6d69322945227a2b156489fb1991ebf57fe6f26096d5f8047f246a133debc241b05af67810f604b040079add3ab3d30d9e2928095905a2afe17eb
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/sign.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 2795dc96d3..e5651710f1 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); @@ -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<unsigned char>& sig_out, const CPubKey& pubkey, const CScript& scriptcode, SigVersion sigversion) |