Merge bitcoin#13793, #14208 #4328
Merged
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
UdjinM6
requested changes
Aug 10, 2021
|
This pull request has conflicts, please rebase. |
Member
|
14168 was merged in #4312. Please drop |
5tefan
force-pushed
the
backports_018_e0a4f9de7
branch
from
33944e1 to
877f254
Compare
5tefan
changed the title
|
pls squash the fix (877f254) into the corresponding backport commit (6854734) |
5tefan
force-pushed
the
backports_018_e0a4f9de7
branch
from
877f254 to
07dd0f6
Compare
|
This pull request has conflicts, please rebase. |
5tefan
force-pushed
the
backports_018_e0a4f9de7
branch
from
07dd0f6 to
495cfa6
Compare
Author
|
Done. Sorry, I messed up the rebase initially -- lots of extraneous commits are showing up here in the conversation. |
UdjinM6
requested changes
Aug 12, 2021
e4ef4b4 [build] remove #ifdef ENABLE_WALLET from interfaces/node (John Newbery) Pull request description: Adds a couple of redefinitions to dummywallet.cpp. Tree-SHA512: d226bcccc46d089eac88beb54c31f6f18817682994b371f9793a5d28bec5d60dbdffacc8fc281807e25cc7f89da23e1f8f36fd99d12f8a40f77a972840e8c1b4 Co-authored-by: UdjinM6 <[email protected]>
…tor impl details faa1a74 tx pool: Use class methods to hide raw map iterator impl details (MarcoFalke) Pull request description: ATMP et al would often use map iterator implementation details such as `end()` or `find()`, which is acceptable in current code. However, this not only makes it impossible to turn the maps into private members in the future but also makes it harder to replace the maps with different data structures. This is required for and split off of bitcoin#13804 Tree-SHA512: 4f9017fd1d98d9df49d25bba92655a4a97755eea161fd1cbb565ceb81bbc2b4924129d214f8a29563a77e3d8eef85a67c81245ecdc9a9e5292d419922a93cb88
5tefan
force-pushed
the
backports_018_e0a4f9de7
branch
from
22ea112 to
db302f9
Compare
PastaPastaPasta
approved these changes
Aug 12, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
No description provided.