Skip to content

backport: Merge bitcoin#24097, 29035, 28784 #7050

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.

Sign up for GitHub

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

Jump to bottom
Draft
vijaydasmp wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

backport: Merge bitcoin#24097, 29035, 28784 #7050

vijaydasmp wants to merge 3 commits into from
+51 −51

Conversation

@vijaydasmp
Copy link

@vijaydasmp vijaydasmp commented Dec 6, 2025

backports

@github-actions
Copy link

github-actions bot commented Dec 6, 2025 •
edited
Loading

✅ No Merge Conflicts Detected

This PR currently has no conflicts with other open PRs.

@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin/bitcoin#28649: Do the SOCKS5 handshake reliably backport: Merge bitcoin#28649 Dec 6, 2025
@vijaydasmp vijaydasmp force-pushed the Dec_2025_5 branch 2 times, most recently from da13936 to c1765d3 Compare December 6, 2025 18:35
achow101 and others added 2 commits December 7, 2025 07:27
@achow101 @vijaydasmp
Merge bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, a…
3f1b5e1 
…nd rename it

37d150d refactor: Add more negative `!m_banned_mutex` thread safety annotations (Hennadii Stepanov)
0fb2908 refactor: replace RecursiveMutex m_banned_mutex with Mutex (w0xlt)
784c316 scripted-diff: rename m_cs_banned -> m_banned_mutex (w0xlt)
46709c5 refactor: Get rid of `BanMan::SetBannedSetDirty()` (Hennadii Stepanov)
d88c0d8 refactor: Get rid of `BanMan::BannedSetIsDirty()` (Hennadii Stepanov)

Pull request description:

  This PR is an alternative to bitcoin#24092. Last two commit have been cherry-picked from the latter.

ACKs for top commit:
  maflcko:
    ACK 37d150d 🎾
  achow101:
    ACK 37d150d
  theStack:
    Code-review ACK 37d150d
  vasild:
    ACK 37d150d

Tree-SHA512: 5e9d40101a09af6e0645a6ede67432ea68631a1b960f9e6af0ad07415ca7718a30fcc1aad5182d1d5265dc54c26aba2008fc9973840255c09adbab8fedf10075
@fanquake @vijaydasmp
Merge bitcoin#29035: test: fix addnode functional test failure on O…
d1970e2 
…penBSD

fd0bde2 test: fix `addnode` functional test failure on OpenBSD (Sebastian Falbesoner)

Pull request description:

  This is the functional test counterpart of PR bitcoin#28891 / commit 007d6f0 (unfortunately, I missed it back then and only ran the unit tests -- sorry for the noise).

  master branch on OpenBSD 7.4:
  ```
  $ ./test/functional/rpc_net.py
  2023-12-08T17:29:05.057000Z TestFramework (INFO): PRNG seed is: 6024296850131317403
  2023-12-08T17:29:05.058000Z TestFramework (INFO): Initializing test directory /tmp/bitcoin_func_test_au3zchif
  2023-12-08T17:29:05.618000Z TestFramework (INFO): Test getconnectioncount
  2023-12-08T17:29:05.618000Z TestFramework (INFO): Test getpeerinfo
  2023-12-08T17:29:06.643000Z TestFramework (INFO): Check getpeerinfo output before a version message was sent
  2023-12-08T17:29:06.709000Z TestFramework (INFO): Test getnettotals
  2023-12-08T17:29:06.773000Z TestFramework (INFO): Test getnetworkinfo
  2023-12-08T17:29:06.978000Z TestFramework (INFO): Test addnode and getaddednodeinfo
  2023-12-08T17:29:06.980000Z TestFramework (ERROR): Assertion failed
  Traceback (most recent call last):
    File "/home/thestack/bitcoin/test/functional/test_framework/test_framework.py", line 131, in main
      self.run_test()
    File "/home/thestack/bitcoin/./test/functional/rpc_net.py", line 65, in run_test
      self.test_addnode_getaddednodeinfo()
    File "/home/thestack/bitcoin/./test/functional/rpc_net.py", line 224, in test_addnode_getaddednodeinfo
      assert_raises_rpc_error(-23, "Node already added", self.nodes[0].addnode, node=ip_port2, command='add')
    File "/home/thestack/bitcoin/test/functional/test_framework/util.py", line 131, in assert_raises_rpc_error
      assert try_rpc(code, message, fun, *args, **kwds), "No exception raised"
  AssertionError: No exception raised
  ```

  On the PR branch, the same call succeeds.

ACKs for top commit:
  kevkevinpal:
    ACK [fd0bde2](bitcoin@fd0bde2)

Tree-SHA512: ae20816fa4025c212e115ebd267b5e5784bfcdf0051219eb686faaade47ec4f91a3947af6d24258b159290000d2dcc3f6e65e788b83b8a9297282945dbdafbfb
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28649 backport: Merge bitcoin#24097, 29035, 28784 Dec 7, 2025
@achow101 @vijaydasmp
Merge bitcoin#28784: rpc: keep .cookie file if it was not generated
d4f265a 
7cb9367 rpc: keep .cookie if it was not generated (Roman Zeyde)

Pull request description:

  Otherwise, starting bitcoind twice may cause the `.cookie` file generated by the first instance to be deleted by the second instance shutdown (after failing to obtain a lock).

ACKs for top commit:
  willcl-ark:
    re-ACK 7cb9367
  achow101:
    ACK 7cb9367
  kristapsk:
    re-ACK 7cb9367
  stickies-v:
    ACK 7cb9367

Tree-SHA512: 0960dbc457975b0e0535f3d814824a879d7f85c9f1191537415b3fc253429a316a8e4badde56c8bc139778f132392983cec5fbe03891fb15ff61d3bc3f6e681b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vijaydasmp @achow101 @fanquake