Repository navigation
backport: v0.26 bitcoin#27884, bitcoin#28070, bitcoin#28157 - #95
Conversation
377a227 to
3cf2eac
Compare
All functional tests passed. The jobs failed later, when Dash CI's log collection ran combine_logs.py and hit its 'only one node0/*/debug.log' assertion. bitcoin#28157's new test_acceptstalefeeestimates_arg_support starts node0 on testnet3 and devnet; those starts fail in AppInitMain after logging has begun, so they leave extra node0//debug.log folders (upstream CI only combines logs on failure, so it never hits this). The test now deletes the folders those failed starts create, and upstream's assertions are unchanged. (folded into the 🤖 backportsys, on behalf of the Dash backport pipeline. |
3cf2eac to
7767731
Compare
7767731 to
2387055
Compare
ba5b287 to
4c719b3
Compare
…ere possible aaaa3ae test: Use TestNode *_path properties where possible (MarcoFalke) dddd899 test: Allow pathlib.Path as RPC argument via authproxy (MarcoFalke) fa41614 scripted-diff: Use wallets_path and chain_path where possible (MarcoFalke) fa493fa test: Use wallet_dir lambda in wallet_multiwallet test where possible (MarcoFalke) Pull request description: It seems inconsistent, fragile and verbose to: * Call `get_datadir_path` to recreate the path that already exists as field in TestNode * Call `os.path.join` with the hardcoded chain name or `self.chain` to recreate the TestNode `chain_path` property * Sometimes even use the hardcoded node dir name (`"node0"`) Fix all issues by using the TestNode properties. ACKs for top commit: willcl-ark: re-ACK aaaa3ae theStack: Code-review ACK aaaa3ae 🌊 Tree-SHA512: e4720278085beb8164e1fe6c1aa18f601558a9263494ce69a83764c1487007de63ebb51d1b1151862dc4d5b49ded6162a5c1553cd30ea1c28627d447db4d8e72 Dash adaptations: - test/functional/test_framework/test_node.py: chain_path keeps Dash's get_chain_folder() (devnet folder naming), now built on the new datadir_path; imports serialization_fallback, Dash's name for EncodeDecimal - test/functional/test_framework/util.py: no change, Dash already moved EncodeDecimal into authproxy as serialization_fallback; the authproxy pathlib.Path hunk applied to serialization_fallback - test/functional/wallet_backup.py: the Dash-only rmtree of evodb, llmq and indexes also uses chain_path, alongside upstream's blocks and chainstate - test/functional/wallet_hd.py: the Dash-only rmtree of evodb, llmq and indexes (both places) also uses chain_path, alongside upstream's blocks and chainstate - test/functional/wallet_backwards_compatibility.py: keeps Dash's version < 160000 cutoff and has no v16 wallets dir line, because Dash's set of old nodes is master/v19/v17 - test/functional/wallet_upgradewallet.py: converts Dash's v18_2 and v16_1 wallet paths to wallets_path in place of upstream's v16_3/v15_2/splithd lines, which Dash's test does not have - test/functional/wallet_descriptor.py: keeps Dash's explicit sqlite3 connect/close structure; only the wallet_db path moves to wallets_path - test/functional/rpc_whitelist.py: keeps Dash's extra 'quorum sign' in never_allowed while moving the conf write into run_test with restart_node - test/functional/rpc_blockchain.py: keeps Dash's log wording 'Test that getblock with invalid verbosity type...' while taking upstream's reordering and chain_path use - test/functional/wallet_migration.py: keeps 'import os', which upstream drops, because Dash's own test_wallet_name_with_slashes still uses os.path Not applicable to Dash (intentionally omitted): - test/functional/feature_txindex_compatibility.py: Dash already removed this test (merge of bitcoin#28753) along with the legacy -txindex check; none of the listed Dash-only tests has the same os.path.join(datadir, chain) pattern - test/functional/wallet_inactive_hdchains.py: test comes from bitcoin#23304 (inactive HD chains via sethdseed); Dash's HD wallet has no sethdseed or inactive-chain code - test/functional/feature_fee_estimation.py: edits the 'fresh estimation / RBF estimates' block from bitcoin#22539; Dash has no RBF and lacks that block; Dash already uses chain_path elsewhere
fafe43c scripted-diff: Use blocks_path where possible (MarcoFalke) fa060c1 test: Add blocks_path property to TestNode (MarcoFalke) faba4fc test: Drop 22.x node from TxindexCompatibilityTest (MarcoFalke) fa7f65b test: Use clean chain in MempoolCompatibilityTest (MarcoFalke) Pull request description: The node in this test was never really needed, because the compatibility tests shouldn't be used to test previous releases. (The test suite of the previous release itself should be used for that). So remove it. Also, other test changes. (See individual commits) ACKs for top commit: theStack: Code-review ACK fafe43c Tree-SHA512: 289f54695bf5310663ab38ebf1aa457f53d0aafae56e6657be0e75bf96b303165bad417dc7eaf4c40f0639aa92ce139e5bacb318a2eabab1f8e23a811cabe0cc Dash adaptations: - test/functional/mempool_compatibility.py: drops Dash's shutil.rmtree of node0's cached regtest dir (and the os/shutil imports); setup_clean_chain=True means no cached chain dir exists, so rmtree would raise - test/functional/mempool_compatibility.py: does not add upstream's COINBASE_MATURITY import context; Dash's version generates 100 blocks literally and never imported it - test/functional/feature_txindex_compatibility.py: upstream hunk not applied; Dash already deleted this test via bitcoin#28753, so the file stays deleted Not applicable to Dash (intentionally omitted): - test/functional/feature_txindex_compatibility.py: Dash already removed this test in merge bitcoin#28753 (upstream's later removal of it), so there is no file to edit
… is only supported on regtest chain ee5a036 test: ensure acceptstalefeeestimates is supported only on regtest chain (ismaelsadeeq) 22d5d4b tx fees, policy: doc: update and delete unnecessary comment (ismaelsadeeq) Pull request description: This PR Follow up comments from [bitcoin#27622](bitcoin#27622) It test that the new `regtest-only` option `acceptstalefeeestimates` is not supported on [main, signet and test chains](https://github.com/bitcoin/bitcoin/pull/27622/files#r1235218268), removes an unnecessary [comment](https://github.com/bitcoin/bitcoin/pull/27622/files#r1235204323), and update fee estimator `MAXFILEAGE` [description comment](https://github.com/bitcoin/bitcoin/pull/27622/files#r1233887314). ACKs for top commit: jonatack: ACK ee5a036 glozow: utACK ee5a036 Tree-SHA512: 4755f25b08db62f37614ea768272b12580ee0d481fb7fa339379901a6132c66828777c6747d3fe67490ceace3a6ff248bf13bdf65720f6e5ba8642eb762acd3c
4c719b3 to
d2600bc
Compare
|
merged as dashpay#7907 |
Automated Bitcoin Core v0.26 backports, batch
backport-0.26-b180-src-wallet.61144e66a8c7fcabbc034c719b396cProvenance
Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.