diff --git a/src/script/sign.cpp b/src/script/sign.cpp --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -50,32 +50,6 @@ return false; } -static bool GetPubKey(const SigningProvider &provider, SignatureData &sigdata, - const CKeyID &address, CPubKey &pubkey) { - // Look for pubkey in all partial sigs - const auto it = sigdata.signatures.find(address); - if (it != sigdata.signatures.end()) { - pubkey = it->second.first; - return true; - } - // Look for pubkey in pubkey list - const auto &pk_it = sigdata.misc_pubkeys.find(address); - if (pk_it != sigdata.misc_pubkeys.end()) { - pubkey = pk_it->second.first; - 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; -} - static bool CreateSig(const BaseSignatureCreator &creator, SignatureData &sigdata, const SigningProvider &provider, std::vector &sig_out, const CPubKey &pubkey, diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -390,7 +390,7 @@ return false; } - // Rather not work on nonstandard transactions (unless -testnet/-regtest) + // Rather not work on nonstandard transactions (unless -testnet) std::string reason; if (fRequireStandard && !IsStandardTx(tx, reason)) { return state.DoS(0, false, REJECT_NONSTANDARD, reason);