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/bitcoin#22626, 23050 #6221

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

Conversation

vijaydasmp
Copy link

btc backports

@vijaydasmp vijaydasmp force-pushed the bp23_89 branch 2 times, most recently from 9f2112f to 397c0da Compare August 18, 2024 12:13
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#22955 backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 22831, 22798 Aug 18, 2024
@vijaydasmp vijaydasmp force-pushed the bp23_89 branch 3 times, most recently from 91b9bd8 to e4f4403 Compare August 19, 2024 07:52
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 22831, 22798 backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 22831, 21679 Aug 20, 2024
Copy link

This pull request has conflicts, please rebase.

Copy link

github-actions bot commented Sep 4, 2024

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 22831, 21679 backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 21679 Sep 6, 2024
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#22955, 22626, 23050, 21679 backport: Merge bitcoin/bitcoin#22626, 23050, 21679 Sep 6, 2024
Copy link

This pull request has conflicts, please rebase.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#22626, 23050, 21679 backport: Merge bitcoin/bitcoin#22626, 23050 Sep 15, 2024
laanwj and others added 2 commits September 15, 2024 19:32
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
…ce-versa

c17f554 Fix BlockAssembler::AddToBlock, CTxMemPool::PrioritiseTransaction logging (Jon Atack)

Pull request description:

  This is a tale of two fees, er, fee rates... indeed, one is misdescribed as a fee, and the other is incorrectly called a fee rate.

  From this review discussion: bitcoin#22689 (comment) (thanks to John Newbery).

ACKs for top commit:
  laanwj:
    Code review ACK c17f554

Tree-SHA512: 3d9df3209a72562c5f9bbf815923d5b089d04491b8d19caa2c04158c501b47ef01e47f1c32d89adcbaf3c6357329507f65b4bb2963214c3451bbfa61ac812530
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