Backport 14711, 15342, partial 15855#4537
Merged
UdjinM6 merged 3 commits intodashpay:developfrom Nov 3, 2021
Merged
Conversation
Member
Author
|
I don't f***ing believe it... I swear I did that exact diff... |
Member
Author
|
Also, please review #4538 first (unless you're okay w/ the disordered commits here) |
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
c75b018 to
80d1ba5
Compare
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
80d1ba5 to
0967bcd
Compare
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
0967bcd to
2dd827b
Compare
UdjinM6
requested changes
Oct 25, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
macos build failed (few werror issues)
UdjinM6
requested changes
Oct 26, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
pls see fbce40f581c4c288901f8a90ae0aff1d9d4533d6
This was referenced Oct 31, 2021
|
ping |
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
9e5325f to
e7d6a8f
Compare
Member
Author
|
thanks, picked and squashed :) and then rebased |
|
This pull request has conflicts, please rebase. |
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
e7d6a8f to
38b2bfa
Compare
…wallet code 44de156 Remove remaining chainActive references from CWallet (Russell Yanofsky) db21f02 Convert CWallet::ScanForWalletTransactions and SyncTransaction to the new Chain apis (Russell Yanofsky) 2ffb079 Add findFork and findBlock to the Chain interface (Russell Yanofsky) d93c4c1 Add time methods to the Chain interface (Russell Yanofsky) 700c42b Add height, depth, and hash methods to the Chain interface (Russell Yanofsky) Pull request description: This change removes uses of `chainActive` and `mapBlockIndex` globals in wallet code. It is a refactoring change which does not affect external behavior. This is the next step in the larger bitcoin#10973 refactoring change, which removes all other accesses to node global variables from wallet code. Doing this is useful to provide a better defined interface between the wallet and node, and necessary to allow wallet and node code to run in separate processes in bitcoin#10102. Tree-SHA512: 4dcec8a31c458f54e2ea6ecf01e430469b0994c5b41a21a2d150efa67cd209f4c93ae210a101e064b3a87c52c6edfc70b070e979992be0e3a00fd425de6230a8
aebafd0 Rename Chain getLocator -> getTipLocator (Russell Yanofsky) 2c1fbaa Drop redundant get_value_or (Russell Yanofsky) 84adb20 Fix ScanForWalletTransactions start_block comment (Russell Yanofsky) 2efa66b Document rescanblockchain returned stop_height being null (Russell Yanofsky) db2d093 Add suggested rescanblockchain comments (Russell Yanofsky) a8d645c Update ScanForWalletTransactions result comment (Russell Yanofsky) 95a812b Rename ScanResult stop_block field (Russell Yanofsky) Pull request description: This implements suggested changes from bitcoin#14711 review comments that didn't make make it in before merging. There are no changes in behavior in this PR, just documentation updates, simplifications, and variable renames. Tree-SHA512: 39f1a5718195732b70b5e427c3b3e4295ea5af6328a5991763a422051212dfb95383186db0c0504ce2c2782fb61998dfd2fe9851645b7cb4e75d849049483cc8 # Conflicts: # src/interfaces/chain.cpp # src/qt/test/wallettests.cpp # src/wallet/test/wallet_tests.cpp # src/wallet/wallet.cpp
…nnotation for cs_main fa3c651 [refactor] interfaces: Add missing LockAnnotation for cs_main (MarcoFalke) Pull request description: This adds missing `LockAnnotation lock(::cs_main);` to `src/interfaces/chain.cpp` (as well as tests and benchmarks) ACKs for commit fa3c65: practicalswift: utACK fa3c651 ryanofsky: utACK fa3c651 Tree-SHA512: b67082fe3718c94b4addf7f2530593915225c25080f20c3ffa4ff7e08f1f49548f255fb285f89a8feff84be3f6c91e1792495ced9f6bf396732396d1356d597a
PastaPastaPasta
force-pushed
the
backport-14711
branch
from
38b2bfa to
0bc782d
Compare
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
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.
@UdjinM6 I need your help here, unit tests fail on the test you introduced here: #4002 and I can't seem to figure it out