backport: Merge bitcoin/bitcoin#22337 #6130
Merged
Conversation
This file contains 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
vijaydasmp
force-pushed
the
bp23_98_2
branch
9 times, most recently
from
6b7c87b
to
9c9676b
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp23_98_2
branch
2 times, most recently
from
8413f62
to
36c5569
Compare
|
Hello @UdjinM6, @knst , @PastaPastaPasta requesting review |
|
Hello @UdjinM6 , @PastaPastaPasta requesting review |
|
Needs rebase to fix |
UdjinM6
previously approved these changes
Aug 15, 2024
|
For some reason you rebased this on a commit from like a month ago? can you rebase on latest develop? I like the added signature though! Note: the rebase to 62b11c4 looks clean, commit is same, but I'd prefer not merging in from a really old based branch |
PastaPastaPasta
approved these changes
Aug 25, 2024
|
rebased from latest , @UdjinM6 had approved the changes earlier , rebasing removed the approval, I will request again |
UdjinM6
approved these changes
Aug 26, 2024
92993aa Change SignTransaction's input_errors to use bilingual_str (Andrew Chow) 171366e Use bilingual_str for address fetching functions (Andrew Chow) 9571c69 Add bilingual_str::clear() (Andrew Chow) Pull request description: In a couple of places in the wallet, errors are `std::string`. In order for these errors to be translated, change them to use `bilingual_str`. ACKs for top commit: hebasto: re-ACK 92993aa, only rebased since my [previous](bitcoin#22337 (review)) review, verified with klementtan: Code review ACK 92993aa meshcollider: Code review ACK 92993aa Tree-SHA512: 5400e419dd87db8c49b67ed0964de2d44b58010a566ca246f2f0760ed9ef6a9b6f6df7a6adcb211b315b74c727bfe8c7d07eb5690b5922fa5828ceef4c83461f Signed-off-by: Vijay <vijaydas.mp@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
bitcoin backport