Skip to content

backport: Merge bitcoin#30066, 30234, 27892, 27895 - #7655

Draft
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:Branch_9_3
Draft

backport: Merge bitcoin#30066, 30234, 27892, 27895#7655
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:Branch_9_3

Conversation

@vijaydasmp

Copy link
Copy Markdown

Bitcoin Bakcporting

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#30066, 30234, 27892, 27895, 27632 backport: Merge bitcoin#30066, 30234, 27892, 27895, 27632 Sep 3, 2026
fanquake and others added 4 commits September 4, 2026 15:20
6779e6e test: clean up is node stopped (dimitaracev)

Pull request description:

  Fixes bitcoin#27893

  Use f'strings for the message when asserting `expected_ret_code` and `return_code`. Change the `expected_ret_code` from an optional to have a default value of `0`.

  cc MarcoFalke

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 6779e6e
  stickies-v:
    ACK 6779e6e
  brunoerg:
    ACK 6779e6e

Tree-SHA512: af84e7ffe467ced29236dee9206687786a2efb89ab8b039c3ebfb93ea23fc273206cd51f20c9fb6bee4135770e9a649538942571d9c0be83ba9535fa8e59cb28
…tting, Fix ADL violation

fa8ef7d refactor: Avoid copy of bilingual_str when formatting, Fix ADL violation (MarcoFalke)

Pull request description:

  This refactor shouldn't change behavior, but may fix compile errors such as bitcoin#27862 (comment)

ACKs for top commit:
  achow101:
    ACK fa8ef7d
  ryanofsky:
    Code review ACK fa8ef7d. Looks great! Thanks for updating
  hebasto:
    ACK fa8ef7d, I have reviewed the code and it looks OK.

Tree-SHA512: 903019962f27b5432b8e3af052b472238ef68d3ee165148c9d2232bf290309075f9f17d8d06c9b5c7fddb89c1a9c3a4c09c6310af01e8561adc0244a30db0857
26a7f70 ci: enable self-assignment clang-tidy check (Cory Fields)
32b1d13 refactor: add self-assign checks to classes which violate the clang-tidy check (Cory Fields)

Pull request description:

  See comment here: bitcoin#30161 (comment)

  Our code failed these checks in three places, which have been fixed up here. Though these appear to have been harmless, adding the check avoids the copy in the self-assignment case so there should be no downside.

  ~Additionally, minisketch failed the check as well. See bitcoin-core/minisketch#87
  Edit: Done

  After fixing up the violations, turn on the aggressive clang-tidy check.

  Note for reviewers: `git diff -w` makes this trivial to review.

ACKs for top commit:
  hebasto:
    ACK 26a7f70, I have reviewed the code and it looks OK.
  TheCharlatan:
    ACK 26a7f70

Tree-SHA512: 74d8236a1b5a698f2f61c4740c4fc77788b7f882c4b395acc4e6bfef1ec8a4554ea8821a26b14d70cfa6c8e2e9ea305deeea3fbf323967fa19343c007a53c5ba
9365baa test: add conflicting topology test case (Greg Sanders)

Pull request description:

  We want to ensure that even if topologies
  that are acceptable are relaxed, like
  removing package-not-child-with-unconfirmed-parents, that we don't end up accepting packages we shouldn't.

ACKs for top commit:
  glozow:
    reACK 9365baa
  rkrux:
    reACK [9365baa](bitcoin@9365baa)

Tree-SHA512: d58661064ca099ac0447c331a5020c74c0cdfe24259aa875592805bbd63de1bf23aa7ced9ff485fef90dc0602fcb997e631aaf1aa2e9805d2cf5f0e5c9b2f0e2
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#30066, 30234, 27892, 27895, 27632 backport: Merge bitcoin#30066, 30234, 27892, 27895 Sep 4, 2026
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