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#23712 , 23346 #6308

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

Conversation

vijaydasmp
Copy link

bitcoin backports

@vijaydasmp vijaydasmp changed the title backport Merge bitcoin#23712 , 23515 backport: Merge bitcoin#23712 , 23515 Nov 25, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 , 23515 backport: Merge bitcoin#23712 Nov 25, 2024
Copy link

This pull request has conflicts, please rebase.

Copy link

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008, 22100 Nov 27, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_10_05 branch 3 times, most recently from 34e0c08 to a1d6b20 Compare December 30, 2024 13:30
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008, 22100 backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008 Dec 30, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008 backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008, 22100 Dec 30, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_2024_10_05 branch 7 times, most recently from d54db04 to 0644cde Compare January 3, 2025 06:29
Copy link

This pull request has conflicts, please rebase.

MarcoFalke added 2 commits January 15, 2025 17:22
…wallet type availability

b57bf25 test: interface_bitcoin_cli.py: check specified wallet type availability (Sebastian Falbesoner)

Pull request description:

  Currently the test `interface_bitcoin_cli.py` performs the wallet-relevant parts if _any_ wallet type support is compiled in, independently of
  whether the test is run with legacy or descriptor wallet specified. This leads to a failure if the test is started with the `--legacy-wallet` parameter, but bitcoind is compiled without BDB support, see e.g
   bitcoin#23686 (comment)

  Fix this by checking if the specified wallet type (BDB for legacy wallet, SQLite for descriptor wallet) is available.

  Should further pave the way for bitcoin#23682.

ACKs for top commit:
  achow101:
    ACK b57bf25

Tree-SHA512: ddb5a94ba61133eff8de79d4946b3b9d476232b26e83bf768894cac4691e72602f88b6c02c72b992e12c2feb9bff1f0a2e0a265948a00954311104add1347184
…et tool

3431839 util, refactor: Improve headers for bitcoin-wallet tool (Hennadii Stepanov)

Pull request description:

  This PR:
  - removes unneeded `#include <wallet/wallet.h>` from `<wallet/wallettool.h>`
  - introduces class forward declaration in `<wallet/wallettool.h>`
  - added `#include <config/bitcoin-config.h>` to `wallet/wallettool.cpp` where the `USE_BDB` macro is used

Top commit has no ACKs.

Tree-SHA512: a0de560d821f8b570ae806a1165b9b382c9e0b339687d932052fa4c38ab2ba493e7e050f19adc02ad7db40c42cf88ac1d37209f9071494a0ab268ed33ff22b9f
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 , 23346, 23120, 23640, 22008, 22100 backport: Merge bitcoin#23712 , 23346, 23640 Jan 15, 2025
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#23712 , 23346, 23640 backport: Merge bitcoin#23712 , 23346 Jan 15, 2025
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