From 1caa52f40670f88a947f41c3e43f5e4e53a0cff3 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Thu, 23 Jan 2025 11:31:32 +1100
Subject: [PATCH] Enable running multiple Core v28 nodes

Currently the `node` crate cannot run multiple instances of Bitcoin Core
v28 because of changes to bind logic in that release.

The solution is to use `-bind` instead of `-port`.

For more information on the relevant changes in Core v28 see:

https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-28.0.md#p2p-and-network-changes

This patch was created with help of @MaxFangX - mad props.

Fix: #41
---
 node/src/lib.rs | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/node/src/lib.rs b/node/src/lib.rs
index d520b33..4f9dd96 100644
--- a/node/src/lib.rs
+++ b/node/src/lib.rs
@@ -307,16 +307,16 @@ impl Node {
             P2P::Yes => {
                 let p2p_port = get_available_port()?;
                 let p2p_socket = SocketAddrV4::new(LOCAL_IP, p2p_port);
-                let p2p_arg = format!("-port={}", p2p_port);
-                let args = vec![p2p_arg];
+                let bind_arg = format!("-bind={}", p2p_socket);
+                let args = vec![bind_arg];
                 (args, Some(p2p_socket))
             }
             P2P::Connect(other_node_url, listen) => {
                 let p2p_port = get_available_port()?;
                 let p2p_socket = SocketAddrV4::new(LOCAL_IP, p2p_port);
-                let p2p_arg = format!("-port={}", p2p_port);
+                let bind_arg = format!("-bind={}", p2p_socket);
                 let connect = format!("-connect={}", other_node_url);
-                let mut args = vec![p2p_arg, connect];
+                let mut args = vec![bind_arg, connect];
                 if listen {
                     args.push("-listen=1".to_string())
                 }
@@ -674,22 +674,6 @@ mod test {
     }
 
     #[test]
-    // In v28:
-    //
-    // > Bitcoin Core will now fail to start up if any of its P2P binds fail, rather than the
-    // > previous behaviour where it would only abort startup if all P2P binds had failed.
-    //
-    // ref: https://bitcoincore.org/en/releases/28.0/
-    // ref: https://github.com/bitcoin/bitcoin/pull/22729
-    //
-    // I tried various things to stop bitcoind attempting to bind on 18445 but could get nothing to work.
-    //
-    // - Tried using arg `-torcontrol=0`.
-    // - Tried using arg `-listenonion=0`.
-    // - Tried using arg `-bind={available_port}`.
-    // - Tried using arg `-bind={available_port}=onion`.
-    // - Tried using both the two bind args above together.
-    #[cfg(not(feature = "28_0"))]
     fn test_multi_p2p() {
         let exe = init();