merge hell

Author: lukeiannucci

Cargo.lock

@@ -97,7 +97,7 @@ thiserror = "2.0"
 tokio = { version = "1", default-features = false, features = ["full"] }
 tokio-stream = "0.1.17"
 tokio-tungstenite = { version = "0.28.0", features = ["rustls-tls-webpki-roots", "url"] }
-tokio-util = { version = "0.7.15", features = ["compat", "rt"] }
+tokio-util = { version = "0.7.17", features = ["compat", "rt"] }
 toml = "0.9"
 tonic = "0.14.1"
 tonic-prost = "0.14.1"

Cargo.toml

@@ -1,7 +1,7 @@
 use std::io;
 use thiserror::Error;
 
-use crate::frame::InvalidHeader;
+use crate::{Address, frame::InvalidHeader};
 
 /// The empty type has no values.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -14,6 +14,10 @@ pub enum NetworkError {
     #[error("i/o error: {0}")]
     Io(#[from] io::Error),
 
+    /// Bind error.
+    #[error("error binding to address {0}: {1}")]
+    Bind(Address, #[source] io::Error),
+
     /// The received frame header is not valid.
     #[error("invalid frame header: {0}")]
     InvalidFrameHeader(#[from] InvalidHeader),

cliquenet/src/error.rs

@@ -269,7 +269,10 @@ impl Network {
         T: tcp::Listener + Send + 'static,
         T::Stream: Unpin + Send,
     {
-        let listener = T::bind(&bind_to.into()).await?;
+        let bind_addr = bind_to.into();
+        let listener = T::bind(&bind_addr)
+            .await
+            .map_err(|e| NetworkError::Bind(bind_addr, e))?;
 
         debug!(%name, node = %label, addr = %listener.local_addr()?, "listening");
 

cliquenet/src/net.rs

@@ -84,9 +84,7 @@ services:
       - -c
       - > 
         /app/mkconfig -n 4 --committee-id 0 \
-          --public-addr "node:8000" \
-          --internal-addr "node:8003" \
-          --http-api "node:8004" \
+          --bind "node:8000" \
           --nitro-addr "block-maker:55000" \
           --public-mode "docker-dns" \
           --nitro-mode "unchanged" \

contracts

@@ -99,15 +99,13 @@ services:
     entrypoint: 
       - sh
       - -c
-      - > 
-        /app/mkconfig -n 4 --committee-id 0 --seed 42 \
-          --public-addr "node:8000" \
+      - >
+        /app/mkconfig -n 4 --committee-id 0 \
+          --bind "node:8000" \
           --public-mode "docker-dns" \
-          --internal-addr "node:8003" \
-          --http-api "node:8004" \
-          --batch-poster-api "http://host.docker.internal:8547" \
           --nitro-addr "nitro:55000" \
           --nitro-mode "docker-dns" \
+          --batch-poster-api "http://host.docker.internal:8547" \
           --chain-namespace 412346 \
           --parent-rpc-url "http://demo-l1-network:8545" \
           --parent-ws-url "ws://demo-l1-network:8546" \

docker-compose.block-maker.yml

@@ -101,15 +101,14 @@ bench *ARGS:
   cargo bench --benches {{ARGS}} -- --nocapture
 
 mkconfig NUM_NODES DATETIME *ARGS:
-  cargo run --release --bin mkconfig -- -n {{NUM_NODES}} \
+  cargo run --release --bin mkconfig -- \
+    -n {{NUM_NODES}} \
     --committee-id 0 \
-    --public-addr "127.0.0.1:8000" \
-    --internal-addr "127.0.0.1:8003" \
-    --http-api "127.0.0.1:8004" \
+    --bind "127.0.0.1:8000" \
     --chain-namespace 10101 \
     --parent-rpc-url "http://127.0.0.1:8545" \
     --parent-ws-url "ws://127.0.0.1:8545" \
-    --batch-poster-api "http://127.0.0.1:8547" \
+    --batch-poster-api "127.0.0.1:8547" \
     --parent-chain-id 31337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \
@@ -118,13 +117,13 @@ mkconfig NUM_NODES DATETIME *ARGS:
     --output "test-configs/c0" {{ARGS}}
 
 mkconfig-docker DATETIME *ARGS:
-  cargo run --release --bin mkconfig -- -n 5 \
+  cargo run --release --bin mkconfig -- \
+    -n 5 \
     --committee-id 0 \
-    --public-addr "node:8000" \
-    --public-mode "docker-dns" \
-    --internal-addr "node:8003" \
-    --http-api "node:8004" \
-    --nitro-addr "nitro:55000" \
+    --bind "0.0.0.0:8000" \
+    --external-base "node:8000" \
+    --external-mode "docker-dns" \
+    --nitro "nitro:55000" \
     --nitro-mode "docker-dns" \
     --parent-rpc-url "http://demo-l1-network:8545" \
     --parent-ws-url "ws://demo-l1-network:8546" \
@@ -139,13 +138,13 @@ mkconfig-docker DATETIME *ARGS:
     --output "test-configs/docker" {{ARGS}}
 
 mkconfig-nitro-ci DATETIME *ARGS:
-  cargo run --release --bin mkconfig -- -n 2 \
+  cargo run --release --bin mkconfig -- \
+    -n 2 \
     --committee-id 0 \
-    --public-addr "127.0.0.1:8000" \
-    --internal-addr "0.0.0.0:8003" \
-    --http-api "127.0.0.1:8004" \
-    --nitro-addr "localhost:55000" \
-    --batch-poster-api "http://host.docker.internal:8547" \
+    --bind "0.0.0.0:8000" \
+    --batch-poster-api "127.0.0.1:8547" \
+    --external-base "127.0.0.1:8000" \
+    --nitro "localhost:55000" \
     --chain-namespace 412346 \
     --parent-rpc-url "http://127.0.0.1:8545" \
     --parent-ws-url "ws://127.0.0.1:8546" \
@@ -159,13 +158,12 @@ mkconfig-nitro-ci DATETIME *ARGS:
     --output "test-configs/nitro-ci" {{ARGS}}
 
 mkconfig-local DATETIME *ARGS:
-  cargo run --release --bin mkconfig -- -n 5 \
+  cargo run --release --bin mkconfig -- \
+    -n 5 \
     --committee-id 0 \
-    --public-addr "127.0.0.1:8000" \
-    --internal-addr "127.0.0.1:8003" \
-    --http-api "127.0.0.1:8004" \
-    --nitro-addr "127.0.0.1:55000" \
-    --batch-poster-api "http://127.0.0.1:8547" \
+    --bind "127.0.0.1:8000" \
+    --nitro "127.0.0.1:55000" \
+    --batch-poster-api "127.0.0.1:8547" \
     --nitro-mode "unchanged" \
     --chain-namespace 10101 \
     --parent-rpc-url "http://127.0.0.1:8545" \
@@ -178,14 +176,13 @@ mkconfig-local DATETIME *ARGS:
     --output "test-configs/local" {{ARGS}}
 
 mkconfig-linux NUM_NODES DATETIME *ARGS:
-  cargo run --release --bin mkconfig -- -n {{NUM_NODES}} \
+  cargo run --release --bin mkconfig -- \
+    -n {{NUM_NODES}} \
     --committee-id 0 \
-    --public-addr "11.0.0.1:8000" \
-    --public-mode "increment-address" \
-    --internal-addr "11.0.0.1:8003" \
-    --http-api "11.0.0.1:8004" \
-    --nitro-addr "11.0.1.0:55000" \
-    --batch-poster-api "11.0.0.1:8547" \
+    --bind "11.0.0.1:8000" \
+    --batch-poster-api "127.0.0.1:8547" \
+    --bind-mode "increment-address" \
+    --nitro "11.0.1.0:55000" \
     --nitro-mode "unchanged" \
     --chain-namespace 10101 \
     --parent-rpc-url "http://11.0.1.0:8545" \
@@ -255,10 +252,8 @@ test-dyn-comm: build-release-until build-test-utils
         --until 2000" \
     --run   "5:target/release/mkconfig -n 4 \
                  --committee-id 1 \
-                 --public-addr 127.0.0.1:9000 \
-                 --internal-addr 127.0.0.1:9003 \
-                 --http-api 127.0.0.1:9004 \
-                 --batch-poster-api 127.0.0.1:9004 \
+                 --bind 127.0.0.1:9000 \
+                 --batch-poster-api "127.0.0.1:8547" \
                  --chain-namespace 10101 \
                  --parent-rpc-url http://127.0.0.1:8545 \
                  --parent-ws-url ws://127.0.0.1:8545 \

docker-compose.nitro.yml

@@ -107,7 +107,7 @@ if [ ! $config_dir ]; then
     exit 1
 fi
 
-just build-release --features="until"
+just build-release --features="until" || exit 1
 
 if [ $nitro_url ]; then
     timeout 90 bash -c "until curl -sSf $nitro_url -o /dev/null; do sleep 1; done" || exit 1

justfile

@@ -6,47 +6,47 @@ node = "node_0"
 signing_key = "eiwaGN1NNaQdbnR9FsjKzUeLghQZsTLPjiL4RcQgfLoX"
 dh_key = "AZrLbV37HAGhBWh49JHzup6Wfpu2AAGWGJJnxCDJibiY"
 dkg_enc_key = "7PdmfTS45d2hTXB8NcrTmvDwUVBimpYBbrBaGnu3i5Ne65krVfUpbe7bYRHS3AEg7H"
-public_address = "127.0.0.1:8000"
+address = "127.0.0.1:8000"
 http_api = "127.0.0.1:8004"
-internal_api = "127.0.0.1:8003"
-batch_poster_api = "http://127.0.0.1:8547"
+grpc_api = "127.0.0.1:8003"
+batch_poster_api = "127.0.0.1:8547"
 
 [[members]]
 node = "node_1"
 signing_key = "vGKKAxVNfkSCdn8qh36nXdSZqyhPq644sQBoeZtcEUCR"
 dh_key = "FHTJAk6oyt3jefEp1ZrPEn2MkqRt2LibEFd57AnEUZdb"
 dkg_enc_key = "7p1BtEz7WnFMt6Hr28X3Rngqza6i8hRoswhzZRFd6GzgkspLKHBfDocHP8DwzXiNiZ"
-public_address = "127.0.0.1:8010"
+address = "127.0.0.1:8010"
 http_api = "127.0.0.1:8014"
-internal_api = "127.0.0.1:8013"
-batch_poster_api = "http://127.0.0.1:8557"
+grpc_api = "127.0.0.1:8013"
+batch_poster_api = "127.0.0.1:8557"
 
 [[members]]
 node = "node_2"
 signing_key = "264jMLf85hfufg4ck97Hw2jiL6i1PHNoGUqxUqfhtssaE"
 dh_key = "63eYNKoW2PsWZFhHHj3eZwHTdPE7gEjEDM7gGeDf9Uaj"
 dkg_enc_key = "62bnAAbU58zZUcGqy9JKGZRZHkm3g7JZB2DtJGQyChXQBPGvXSS6fF21yoxiVuD1eb"
-public_address = "127.0.0.1:8020"
+address = "127.0.0.1:8020"
 http_api = "127.0.0.1:8024"
-internal_api = "127.0.0.1:8023"
-batch_poster_api = "http://127.0.0.1:8567"
+grpc_api = "127.0.0.1:8023"
+batch_poster_api = "127.0.0.1:8567"
 
 [[members]]
 node = "node_3"
 signing_key = "v6UBdLT5BvMhLW7iKv7M2xYeaW2SCAsnZ5PiSg6AaKfA"
 dh_key = "Do2GmAexW5MUdD8nToDiBWGbDgk1AwXoxtLTyirDtKQh"
 dkg_enc_key = "7aZBFZUEbXxFH9SiGJeUyjzas4mYJ1R13mTPsPeawVU7JFuocfvX9XsRT8qgr17RCe"
-public_address = "127.0.0.1:8030"
+address = "127.0.0.1:8030"
 http_api = "127.0.0.1:8034"
-internal_api = "127.0.0.1:8033"
-batch_poster_api = "http://127.0.0.1:8577"
+grpc_api = "127.0.0.1:8033"
+batch_poster_api = "127.0.0.1:8577"
 
 [[members]]
 node = "node_4"
 signing_key = "tV66KknkDH47hRSNzwJtt7Q7EZtxVxQsNnUGoAJdDn6J"
 dh_key = "HXaesvEGFiDgrVTix1fKzSLTarFexTZSJD6ymSrF7vPL"
 dkg_enc_key = "6R69TzDg3jo1MTex9Uter9XQud458YPpSvXirkYdS295PV81CRvgz5jVWQbkCpZnYV"
-public_address = "127.0.0.1:8040"
+address = "127.0.0.1:8040"
 http_api = "127.0.0.1:8044"
-internal_api = "127.0.0.1:8043"
-batch_poster_api = "http://127.0.0.1:8587"
+grpc_api = "127.0.0.1:8043"
+batch_poster_api = "127.0.0.1:8587"