external_signer: improve fingerprint matching logic (stop on first match) #22789
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
Contributor
|
Concept ACK
You could do this though: -for (unsigned int i = 0; i < psbtx.inputs.size(); ++i) {
+for (unsigned int i = 0; !match && i < psbtx.inputs.size(); ++i) {
const PSBTInput& input = psbtx.inputs[i];
for (const auto& entry : input.hd_keypaths) {
- if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) match = true;
+ if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) {
+ match = true;
+ break;
+ }
}
} |
Zero-1729
approved these changes
Aug 27, 2021
mjdietzx
reviewed
Aug 30, 2021
Comment on lines
80
to
+84
| for (const auto& entry : input.hd_keypaths) { | ||
| if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) match = true; | ||
| if (m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint))) return true; | ||
| } | ||
| } | ||
| return false; | ||
| }; |
Contributor
There was a problem hiding this comment.
I'm curious, could you get rid of the other for loop as well with the same approach? Would that be cleaner? Something like:
return std::any_of(input.hd_keypaths.begin(), input.hd_keypaths.end(), [](auto& entry){ return m_fingerprint == strprintf("%08x", ReadBE32(entry.second.fingerprint)); });
Member
|
Concept ACK. |
hebasto
approved these changes
Oct 8, 2021
| }; | ||
|
|
||
| if (!match) { | ||
| if (!std::any_of(psbtx.inputs.begin(), psbtx.inputs.end(), matches_signer_fingerprint)) { |
Member
There was a problem hiding this comment.
nit:
Suggested change
| if (!std::any_of(psbtx.inputs.begin(), psbtx.inputs.end(), matches_signer_fingerprint)) { | |
| if (!std::any_of(psbtx.inputs.cbegin(), psbtx.inputs.cend(), matches_signer_fingerprint)) { |
luke-jr
added a commit
to bitcoinknots/bitcoin
that referenced
this pull request
Oct 10, 2021
…tch) Simplified rewritten version Equivalent to d047ed7 by Sebastian Falbesoner <sebastian.falbesoner@gmail.com> Github-Pull: bitcoin#22789
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Oct 22, 2021
…gic (stop on first match) d047ed7 external_signer: improve fingerprint matching logic (stop on first match) (Sebastian Falbesoner) Pull request description: The fingerprint matching logic in `ExternalSigner::SignTransaction` currently always iterates all inputs of a PSBT, even after a match has already been found. I guess the reason for that is not that it was not thought of, but rather the fact that breaking out of a nested loop is simply not possible (at least not without adding ugly constructs like gotos or extra state variables). This PR fixes this by using `std::any_of` from C++'s standard library, see http://www.cplusplus.com/reference/algorithm/any_of/ ACKs for top commit: lsilva01: Code Review ACK bitcoin@d047ed7 Sjors: utACK d047ed7 Zero-1729: crACK d047ed7 mjdietzx: Code review ACK d047ed7 hebasto: ACK d047ed7, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 447e7c0c6a5b5549a2c09d52e55ba4146302c1a06e4d96de11f6945d09f98c89129cba221202dff7e0718e01a83dd173b9f19b1f02b6be228978f3f6e35d8096
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 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.
The fingerprint matching logic in
ExternalSigner::SignTransactioncurrently always iterates all inputs of a PSBT, even after a match has already been found. I guess the reason for that is not that it was not thought of, but rather the fact that breaking out of a nested loop is simply not possible (at least not without adding ugly constructs like gotos or extra state variables).This PR fixes this by using
std::any_offrom C++'s standard library, see http://www.cplusplus.com/reference/algorithm/any_of/