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: bitcoin#23590, 23258, 23061, 23694 #6256

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from

Conversation

vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Sep 7, 2024

more bitcoin backports

…hecks fails

faad05c Crash debug builds when mempool ConsensusScriptChecks fails (MarcoFalke)

Pull request description:

  Currently a bug in the function might sneak around our testing infrastructure.

  Fix that by turning bugs into crashes during tests.

ACKs for top commit:
  glozow:
    utACK faad05c, there's something seriously wrong with the code if this returns false, good to throw in debug mode

Tree-SHA512: dfea1cd9ce3f1c303f49cca1417cd5c77c6ed12849aaff7b6ab1b6060f2f0c9cf5d4689017355d11f66639bab35823f65f848e6979042fa875181509dfd5d3d7
@vijaydasmp vijaydasmp changed the title backport: bitcoin# backport: bitcoin#23590, 23528, 2306 Sep 7, 2024
@vijaydasmp vijaydasmp changed the title backport: bitcoin#23590, 23528, 2306 backport: bitcoin#23590, 23528, 23061 Sep 7, 2024
@vijaydasmp vijaydasmp changed the title backport: bitcoin#23590, 23528, 23061 backport: bitcoin#23590, 23528, 23061, 23694 Sep 8, 2024
@vijaydasmp vijaydasmp changed the title backport: bitcoin#23590, 23528, 23061, 23694 backport: bitcoin#23590, 23258, 23061, 23694 Sep 8, 2024
@vijaydasmp vijaydasmp marked this pull request as ready for review September 8, 2024 06:25
@vijaydasmp
Copy link
Author

Hello @UdjinM6 requesting review

UdjinM6
UdjinM6 previously approved these changes Sep 11, 2024
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 376cb95

@vijaydasmp
Copy link
Author

vijaydasmp commented Sep 12, 2024

Hello @PastaPastaPasta, @knst , requesting review

@UdjinM6 UdjinM6 added this to the 21.2 milestone Sep 22, 2024
@@ -1366,7 +1366,7 @@ void CWallet::updatedBlockTip()
void CWallet::BlockUntilSyncedToCurrentChain() const {
AssertLockNotHeld(cs_wallet);
// Skip the queue-draining stuff if we know we're caught up with
// chainActive.Tip(), otherwise put a callback in the validation interface queue and wait
// chain.Tip(), otherwise put a callback in the validation interface queue and wait
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

23258: nit: missing parenthesis

chain -> chain()

Comment on lines 1 to 5
- In previous releases, the meaning of the command line option
`-persistmempool` (without a value provided) incorrectly disabled mempool
persistence. `-persistmempool` is now treated like other boolean options to
mean `-persistmempool=1`. Passing `-persistmempool=0`, `-persistmempool=1`
and `-nopersistmempool` is unaffected. (#)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

23061: we don't need a release note for it, because this issue has been fixed very long time ago by kwvg here 18514d3 (#5546)

Please, keep only changes in test/functional/mempool_persist.py for this backport

fanquake and others added 3 commits September 24, 2024 20:18
…ctive()

a0efe52 Fix outdated comments referring to ::ChainActive() (Samuel Dobson)

Pull request description:

  After bitcoin#21866 there are a few outdated comments referring to `::ChainActive()`, which should instead refer to `ChainstateManager::ActiveChain()`.

ACKs for top commit:
  jamesob:
    ACK bitcoin@a0efe52

Tree-SHA512: 80da19c105ed29ac247e6df4c8e916c3bf3f37230b63f07302114eef9c115add673e9649f0bbe237295be0c6da7b1030b5b93e14daf6768f17ce5de7cf2c9ff2
faa9c19 doc: Add 23061 release notes (MarcoFalke)
faff17b Fix (inverse) meaning of -persistmempool (MarcoFalke)

Pull request description:

  Passing `-persistmempool` is currently treated as `-nopersistmempool`

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

Tree-SHA512: f34a89a07745dabe340eb845b2a348b79c093e9056f7a21c17e1ba2e278177c9b4cf30e8095791fd645a7f90eb34850b2eee0c869b4f6ec02bf749c73b0e52ee
…tion

fa1571b doc: Add missing optional to MempoolEntryDescription (MarcoFalke)

Pull request description:

  Needed for bitcoin#23083.

  Can be reviewed with `--word-diff-regex=.`.

ACKs for top commit:
  josibake:
    ACK bitcoin@fa1571b
  shaavan:
    ACK fa1571b

Tree-SHA512: b4370003d2aeadce438778e15bd9a0d6a7fef4711acbe8471a50a9d72bbf74e1705fecbaae6f7eb367ece7c795a816c4b8b6583ed6c8f91b35621ca30fd95c18
@vijaydasmp
Copy link
Author

Hello @knst , requesting review

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 65821b9

Copy link
Collaborator

@knst knst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 65821b9

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.

4 participants