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#19833, 22626 #6136

Closed
wants to merge 2 commits into from

Conversation

vijaydasmp
Copy link

btc backport

@vijaydasmp vijaydasmp changed the title backport: bitcoin#19833 backport: Merge bitcoin#22788, bitcoin#19833 Jul 21, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#22788, bitcoin#19833 backport: Merge bitcoin#19833, 22788 Jul 21, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#19833, 22788 backport: Merge bitcoin#19833, (scripted-diff) 22788 Jul 21, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_95_1 branch 4 times, most recently from 62fa849 to fdfafac Compare July 22, 2024 02:38
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#19833, (scripted-diff) 22788 backport: Merge bitcoin#19833, 22626 Jul 22, 2024
Copy link

This pull request has conflicts, please rebase.

MarcoFalke and others added 2 commits August 3, 2024 16:10
5fabde6 wallet: AddWalletDescriptor requires cs_wallet lock (João Barbosa)
32d036e wallet: GetLabelAddresses requires cs_wallet lock (João Barbosa)

Pull request description:

  This is another small change towards non recursive wallet lock.

ACKs for top commit:
  hebasto:
    ACK 5fabde6, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 00506f0159c56854a171e58a451db8dd9b9f735039697b1cf2ca7f54de61fb51cc1e5eff42265233e041b4b1bfd29c2247496dc4456578e1a23c323bdec2901b
fa20f81 Remove txindex migration code (MarcoFalke)
fae8786 doc: Fix validation typo (MarcoFalke)
fab8900 Add missing includes and forward declarations, remove unused ones (MarcoFalke)

Pull request description:

  No supported version of Bitcoin Core used the legacy txindex, so all relevant nodes can be assumed to have upgraded. Thus, there is no need to keep this code any longer.

  As a temporary courtesy, provide a one-time warning on how to free the disk space used by the legacy txindex.

  Fixes bitcoin#22615

ACKs for top commit:
  laanwj:
    Code review ACK fa20f81
  hebasto:
    ACK fa20f81, tested on Linux Mint 20.2 (x86_64).
  Zero-1729:
    crACK fa20f81
  theStack:
    Approach ACK fa20f81

Tree-SHA512: 68aa32d064d1e3932e6e382816a4b5de417bd7e82861fea1ee50660e8c397f4efeb88ae4ed54a8ad1952c3563eb0b8449d7ccf883c353cc4d4dc7e15c53d78e8
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.

2 participants