[0.17] Backport #14424 (Stop requiring imported pubkey to sign non-PKH schemes) #14889
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
looks like your rebased-from header is not correct (should be Apart from that, utACK Difference from cherry-picked commit is: diff --git a/src/script/sign.cpp b/src/script/sign.cpp
index a95a8609b3cf8f51e48c81199a764a480dc34c73..86b42d874f4f68f837c277df3358a00cdd60e1c2 100644
--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@@ -77,7 +77,10 @@ static bool CreateSig(const BaseSignatureCreator& creator, SignatureData& sigdat
sig_out = it->second.second;
return true;
}
- sigdata.misc_pubkeys.emplace(keyid, pubkey);
+ KeyOriginInfo info;
+ if (provider.GetKeyOrigin(keyid, info)) {
+ sigdata.misc_pubkeys.emplace(keyid, std::make_pair(pubkey, std::move(info)));
+ }
if (creator.CreateSig(provider, sig_out, keyid, scriptcode, sigversion)) {
auto i = sigdata.signatures.emplace(keyid, SigPair(pubkey, sig_out));
assert(i.second);This makes sense, as the key origin code is different from master to 0.17. |
Contributor
Author
|
Fixed the commit message, thanks @laanwj |
laanwj
added a commit
that referenced
this pull request
Dec 6, 2018
…to sign non-PKH schemes) 89a9a9d Stop requiring imported pubkey to sign non-PKH schemes (Pieter Wuille) Pull request description: Github-Pull: #14424 Rebased-From: 2f6b466 Tree-SHA512: 1ea10dee66626f04918f197cd7c4949a836fa49c8f676f276b2328f8d79389059db7b30fc04d4c4bf8209f6a8d21f3ea49a017ddc7623eca6b7e6efc2fe0d749
Contributor
|
ACK (looks like it works to me) |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Github-Pull: #14424
Rebased-From: 2f6b466