Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: Merge bitcoin#23523, 23725, 23002 #6258

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

vijaydasmp
Copy link

bitcoin backports

@vijaydasmp vijaydasmp force-pushed the bp23_2024_09_03 branch 3 times, most recently from 184a622 to 9dcb748 Compare September 9, 2024 14:56
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23517 backport: Merge bitcoin#23636, Sep 9, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23636, backport: Merge bitcoin#23636, 23523 Sep 9, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23636, 23523 backport: Merge bitcoin#23636, 23523, 23686, 23725, 23002 Sep 10, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_09_03 branch 2 times, most recently from 62f55d5 to 98e885f Compare September 10, 2024 13:50
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23636, 23523, 23686, 23725, 23002 backport: Merge bitcoin#23523, 23686, 23725, 23002 Sep 10, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_09_03 branch 2 times, most recently from 3a40427 to 9a71755 Compare October 5, 2024 04:02
Copy link

github-actions bot commented Oct 5, 2024

This pull request has conflicts, please rebase.

MarcoFalke added 3 commits October 17, 2024 20:52
…s` and add to test runner

035767f test: add interface_bitcoin_cli.py --descriptors to test_runner.py (Sebastian Falbesoner)
e4fa28a test: fix test interface_bitcoin_cli.py for descriptor wallets (Sebastian Falbesoner)

Pull request description:

  The functional test interface_bitcoin_cli.py currently fails on master branch, if descriptor wallets are used (argument `--descriptors`), see bitcoin#23684. This is due to the fact that different change output types are used for created transactions (P2WPKH for legacy wallets, P2TR for descriptor wallets; the former doesn't have a ScriptPubKeyMan for bech32m), resulting in different tx sizes and hence also fees. Fix this by explicitely setting the output type via passing both `-addresstype=bech32` and `-changetype=bech32` as argument. The former would not be needed by now, but makes the test more deterministic and avoids a failure if bech32m becomes the default address type.

  Fixes bitcoin#23684, should also pave the way for bitcoin#23682.

Top commit has no ACKs.

Tree-SHA512: 39b780e25e4c7094cb3378e0f10d4a8aebac1500b7b2d68de47e54e23b9b5efe5afcf8765bb8398eeaf56968e2586a1b294a0f8773c7d90f4188a0f00b8501ff
…rs` and add to test runner

61fb410 test: add feature_coinstatsindex.py --descriptors to test_runner.py (Sebastian Falbesoner)
50b044a test: fix test feature_coinstatsindex.py for descriptor wallets (Sebastian Falbesoner)

Pull request description:

  The functional test feature_coinstatsindex.py currently fails on master branch, if descriptor wallets are used (argument `--descriptors`; or if BDB is not compiled, see bitcoin#23682 (comment)). This is due to the fact that different change output types are used for created transactions (P2WPKH for legacy wallets, P2TR for descriptor wallets; the former doesn't have a ScriptPubKeyMan for bech32m), resulting in different tx sizes and hence also fees. Fix this by explicitely setting the output type via passing both `-addresstype=bech32` and `-changetype=bech32` as argument. The former would not be needed by now, but makes the test more deterministic and avoids a failure if bech32m becomes the default address type.

  Should further pave the way for bitcoin#23682.

ACKs for top commit:
  MarcoFalke:
    cr ACK 61fb410

Tree-SHA512: 300a53f539c0b874da5fc1dd1e4e41b9408dc5526c5858c79f0aabf2ab07e57df4c9cc627fafe25246206752754a91a2977a3df8f8b2d98fb98e51c7e4d81633
9c1052a wallet: Default new wallets to descriptor wallets (Andrew Chow)
f19ad40 rpc, wallet: Descriptor wallets are no longer experimental (Andrew Chow)

Pull request description:

  Changes the default wallet type from legacy to descriptors. Descriptor wallets will now by the default type. Additionally, descriptor wallets will no longer be marked as experimental.

  This follows the timeline proposed in bitcoin#20160

ACKs for top commit:
  lsilva01:
    Tested ACK bitcoin@9c1052a on Ubuntu 20.04
  prayank23:
    tACK bitcoin@9c1052a
  meshcollider:
    Code review ACK 9c1052a

Tree-SHA512: 834e6fec88e0c18673af7ebe135bd5333694d1be502164eb93a90e3e76c27974165aa4e59426945100c88e4eca07356e16886ef5b05cf789683ecb23fc71a12a
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23523, 23686, 23725, 23002 backport: Merge bitcoin#23523, 23725, 23002 Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant