merge bitcoin #15323 #15637 #16433 #16024 : Backport#4609
Merged
PastaPastaPasta merged 4 commits intodashpay:developfrom Dec 28, 2021
Merged
merge bitcoin #15323 #15637 #16433 #16024 : Backport#4609PastaPastaPasta merged 4 commits intodashpay:developfrom
PastaPastaPasta merged 4 commits intodashpay:developfrom
Conversation
60500d0 to
4d048f3
Compare
1ed2707 to
aad0ab9
Compare
|
This pull request has conflicts, please rebase. |
d6fb51e to
80fa0fa
Compare
Author
|
dependent on bitcoin@c536dfb |
|
This pull request has conflicts, please rebase. |
36b13b4 to
4e4caff
Compare
64fb6b3 to
f79ef7e
Compare
Author
|
Hello @UdjinM6 @PastaPastaPasta |
UdjinM6
requested changes
Dec 23, 2021
…checksum in RPC example e23809a [rpc] deriveaddresses: Correct descriptor checksum in RPCExamples (Chris Capobianco) Pull request description: Trvial: This fixes the descriptor checksum found the in the deriveaddresses RPC example. The current checksum value does work, but only if the "h" used for the hardened derivation key origin are replaced with "'". Given the discussion to switch from "'" to "h" [here](bitcoin#15740), I thought it made more sense to update the checksum rather then changing all the "h" to "'" in this example. ACKs for commit e23809: instagibbs: tACK bitcoin@e23809a Tree-SHA512: 06a2b9f3e714ecde9b9a80b3b7a4082eb072e71d8abcc455ff5387e470d48839f22a70b78bbae1cf9122cb133fee46830819b6f39d67aec8c3c8d5889ae94e04
…movalReason::UNKNOWN 0000ff0 txmempool: Remove unused default value MemPoolRemovalReason::UNKNOWN (MarcoFalke) Pull request description: The `remove*` methods set the removal reason to `UNKNOWN` by default. This is nowhere used; Except in tests, where the value doesn't matter. Fix that by removing the confusing default. ACKs for top commit: practicalswift: utACK 0000ff0 promag: ACK 0000ff0. jonasschnelli: utACK 0000ff0 Tree-SHA512: ffc8b35dd3291a81225171577c743c8bb2645638cab02960b6361174cb68afd739aaab7ab8661d65de5750d37daf16bb7eee9338958d8609093a8d46c2ada1ab
e16b6a7 rpc: Rename size to vsize in mempool related calls (Miguel Herranz) Pull request description: bitcoin#13008 rebased on `master`, with release notes split out. > In getmempoolancestors, getmempooldescendants, getmempoolentry and getrawmempool RPCs size returns the virtual transaction size as defined in BIP 141. Renaming it to vsize makes it consistent with returned value and other calls such as getrawtransaction. > > Related to bitcoin#11218. ACKs for commit e16b6a: MarcoFalke: re-utACK e16b6a7 jnewbery: utACK e16b6a7 Tree-SHA512: ce95260fe7f280eacf4ff70bfffe02315c3a521b3b462a34e72a05b90733f40cc473319ac2df05d3e3c12cb7b1fbf2a1bbea632a8f979fff94207854cdbd494d
effe81f Move g_is_mempool_loaded into CTxMemPool::m_is_loaded (Ben Woosley) bb8ae2c rpc: Expose g_is_mempool_loaded via getmempoolinfo and /rest/mempool/info.json (Ben Woosley) Pull request description: And use it to fix a race condition in mempool_persist.py: https://travis-ci.org/Empact/bitcoin/jobs/487577243 Since e.g. getrawmempool returns errors based on this status, this enables users to test it for readiness. Fixes bitcoin#12863 ACKs for commit effe81: MarcoFalke: utACK effe81f jnewbery: utACK effe81f Tree-SHA512: 74328b0c17a97efb8a000d4ee49b9a673c2b6dde7ea30c43a6a2eff961a233351c9471f9a42344412135786c02bdf2ee1b2526651bb8fed68bd94d2120c4ef86
Merged
PastaPastaPasta
approved these changes
Dec 28, 2021
Member
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit
| return " \"size\" : n, (numeric) transaction size in bytes\n" | ||
| return " \"vsize\" : n, (numeric) virtual transaction size. This can be different from actual serialized size for high-sigop transactions.\n" | ||
| " \"size\" : n, (numeric) (DEPRECATED) same as vsize. Only returned if dashd is started with -deprecatedrpc=size\n" | ||
| " size will be completely removed in v0.20.\n" |
Member
There was a problem hiding this comment.
nit: not sure this should be stated for us
PastaPastaPasta
added a commit
that referenced
this pull request
Jun 29, 2025
, bitcoin#23075, bitcoin#24817, bitcoin#25087, bitcoin#24839, bitcoin#20456, bitcoin#26640, bitcoin#26892, bitcoin#26280, bitcoin#26657, bitcoin#26923, partial bitcoin#19937 (test backports: part 3) 54740ae merge bitcoin#26923: simplify p2p_{tx_download,eviction}.py by using MiniWallet (Kittywhiskers Van Gogh) ace58fd merge bitcoin#26657: Run feature_bip68_sequence.py with MiniWallet (Kittywhiskers Van Gogh) 2f7b3b5 merge bitcoin#26280: Return coinbase flag in scantxoutset (Kittywhiskers Van Gogh) 314c28a merge bitcoin#26892: simplify p2p_permissions.py by using MiniWallet (Kittywhiskers Van Gogh) 2c1e298 merge bitcoin#26640: Run mempool_compatibility.py with MiniWallet (Kittywhiskers Van Gogh) 9937fb8 merge bitcoin#20456: Fix intermittent issue in mempool_compatibility (Kittywhiskers Van Gogh) 6add1c4 merge bitcoin#24839: use MiniWallet for mining_prioritisetransaction.py (Kittywhiskers Van Gogh) 69abcec merge bitcoin#25087: use MiniWallet for feature_dbcrash.py (Kittywhiskers Van Gogh) 917f6b6 merge bitcoin#24817: use MiniWallet for feature_fee_estimation.py (Kittywhiskers Van Gogh) 30b1637 merge bitcoin#23075: Fee estimation functional test cleanups (Kittywhiskers Van Gogh) 8d5883c merge bitcoin#24623: Add diamond-shape prioritisetransaction test (Kittywhiskers Van Gogh) ae7e4cb partial bitcoin#19937: signet mining utility (Kittywhiskers Van Gogh) 1770877 merge bitcoin#24637: use MiniWallet for mempool_package_onemore.py (Kittywhiskers Van Gogh) 4865a3c merge bitcoin#24587: use MiniWallet for rpc_createmultisig.py (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Depends on #6725 * In [bitcoin#24587](bitcoin#24587), `checkbalances()` in `rpc_createmultisig.py` had to be reworked as we have to _exclude_ the 9 blocks generated by the test itself (excluding the original mining of 149 blocks), i.e. 2 blocks generated by `do_multisig()` ([source](https://github.com/dashpay/dash/blob/4865a3c6228ccb5d08865ad78f16854c25143f35/test/functional/rpc_createmultisig.py#L171), [source](https://github.com/dashpay/dash/blob/4865a3c6228ccb5d08865ad78f16854c25143f35/test/functional/rpc_createmultisig.py#L194)) (itself called 4 times, [source](https://github.com/dashpay/dash/blob/4865a3c6228ccb5d08865ad78f16854c25143f35/test/functional/rpc_createmultisig.py#L58-L61)) and 1 block generated by `checkbalances()` ([source](https://github.com/dashpay/dash/blob/4865a3c6228ccb5d08865ad78f16854c25143f35/test/functional/rpc_createmultisig.py#L111)) * [bitcoin#19937](bitcoin#19937) is partially backported to avoid the need for reconnections (or nodes altogether) just to be able to call `getblocktemplate`, as is done in `mining_prioritisetransaction.py`. * Portions of [bitcoin#25445](bitcoin#25445) (fa04ff6) have been included when backporting [bitcoin#24817](bitcoin#24817) and [bitcoin#25087](bitcoin#25087) for correctness. * Portions of [bitcoin#25435](bitcoin#25435) (fa8421b) and [bitcoin#25356](bitcoin#25356) (fa779de) have been included when backporting [bitcoin#24839](bitcoin#24839) for correctness. * In [bitcoin#26923](bitcoin#26923), `rescan_utxos()` has to be manually called (instead of it being called implicitly) as [bitcoin#26886](bitcoin#26886) has not been backported yet and is not included here due to its longer list of dependent PRs. * In [bitcoin#20456](bitcoin#20456), v18 has been used to replace v0.15 as `getmempoolinfo["loaded"]` was implemented in [bitcoin#15323](bitcoin#15323) (71e38b9 in [dash#4609](#4609)), which is included in v18. * Additionally, [bitcoin#26640](bitcoin#26640) needs a more recent version of Dash Core to be tested against as v0.15 does not recognize `maxfeerate` as an argument ([build](https://github.com/dashpay/dash/actions/runs/15785409773/job/44513474715?pr=6726#step:6:861)), which the `MiniWallet` changes introduced by [bitcoin#26640](bitcoin#26640) rely on. * The deletion of the default data directory to avoid problematic migration logic has been documented in the description on [dash#6327](#6327) ## Breaking Changes None expected. New field added in `scantxoutset` and changes in `getblocktemplate` behavior on test chains are not breaking. ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK 54740ae UdjinM6: utACK 54740ae Tree-SHA512: a8c15e1a18f31fc8df7e5445e9f075003e961380114c72226c70dbab0d866d43beb372421ee2e6ce823953af793de3a1112a15d962be27fe7500c5c392171512
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
4 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.