backport: Merge bitcoin#22507, 21464, 22677, 23065, 23642, 21679 #6099
+268
−116
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
changed the title
vijaydasmp
force-pushed
the
bp23_100_1
branch
3 times, most recently
from
9881474
to
c50dd0a
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_100_1
branch
2 times, most recently
from
7b66f1f
to
0c23f20
Compare
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp23_100_1
branch
from
8f2eba9
to
c0f8c45
Compare
vijaydasmp
changed the title
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_100_1
branch
7 times, most recently
from
04076d6
to
a587c2b
Compare
vijaydasmp
force-pushed
the
bp23_100_1
branch
5 times, most recently
from
f5feb15
to
e58b893
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp23_100_1
branch
from
e58b893
to
926ca85
Compare
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
….sigs repo fafade9 doc: Adjust commit message template for the guix.sigs repo (MarcoFalke) Pull request description: Seems to be the most common template used, so adjust this here, too. ACKs for top commit: laanwj: ACK fafade9 hebasto: re-ACK fafade9 Tree-SHA512: 20477d14ecfad94f3b28b94786a4c0d98df539360d0c1deefa94766064a7d0700c849e54d6b251f922e135fcfa964ada0c724090f7f92b459ea39f7c3ca8c65d
c5b36b1 Mempool Update Cut-Through Optimization (Jeremy Rubin) c49daf9 [TESTS] Increase limitancestorcount in tournament RPC test to showcase improved algorithm (Jeremy Rubin) Pull request description: Often when we're updating mempool entries we update entries that we ultimately end up removing the updated entries shortly thereafter. This patch makes it so that we filter for such entries a bit earlier in processing, which yields a mild improvement for these cases, and is negligible overhead otherwise. There's potential for a better -- but more sophisticated -- algorithm that can be used taking advantage of epochs, but I figured it is better to do something that is simple and works first and upgrade it later as the other epoch mempool work proceeds as it makes the patches for the epoch algorithm simpler to understand, so you can consider this as preparatory work. It could either go in now if it is not controversial, or we could wait until the other patch is ready to go. ACKs for top commit: instagibbs: reACK c5b36b1 sipa: utACK c5b36b1 mzumsande: Code Review ACK c5b36b1 Tree-SHA512: 78b16864f77a637d8a68a65e23c019a9757d8b2243486728ef601d212ae482f6084cf8e69d810958c356f1803178046e4697207ba40d6d10529ca57de647fae6
d96b000 Make GUI UTXO lock/unlock persistent (Samuel Dobson) 077154f Add release note for lockunspent change (Samuel Dobson) 719ae92 Update lockunspent tests for lock persistence (Samuel Dobson) f13fc16 Allow lockunspent to store the lock in the wallet DB (Samuel Dobson) c527893 Allow locked UTXOs to be store in the wallet database (Samuel Dobson) Pull request description: Addresses and closes bitcoin#22368 As per that issue (and its predecessor bitcoin#14907), there seems to be some interest in allowing unspent outputs to be locked persistently. This PR does so by adding a flag to lockunspent to store the change in the wallet database. Defaults to false, so there is no change in default behaviour. Edit: GUI commit changes default behaviour. UTXOs locked/unlocked via the GUI are now persistent. ACKs for top commit: achow101: ACK d96b000 kristapsk: ACK d96b000 lsilva01: Tested ACK bitcoin@d96b000 on Ubuntu 20.04 prayank23: ACK bitcoin@d96b000 Tree-SHA512: 957a5bbfe7f763036796906ccb1598feb6c14c5975838be1ba24a198840bf59e83233165cb112cebae909b6b25bf27275a4d7fa425923ef6c788ff671d7a89a8
3333070 refactor: Call type-solver earlier in decodescript (MarcoFalke) fab0d99 style: Remove whitespace (MarcoFalke) Pull request description: The current logic is a bit confusing. First creating the `UniValue` return dict, then parsing it again to get the type as `std::string`. Clean this up by using a strong type `TxoutType`. Also, remove whitespace. ACKs for top commit: shaavan: ACK 3333070 theStack: Code-review ACK 3333070 Tree-SHA512: 49db7bc614d2491cd3ec0177d21ad1e9924dbece1eb5635290cd7fd18cb30adf4711b891daf522e7c4f6baab3033b66393bbfcd1d4726f24f90a433124f925d6
vijaydasmp
force-pushed
the
bp23_100_1
branch
from
b4d9cc1
to
713a76d
Compare
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 backports