use 8546 for nitro ws port

Author: alxiong

justfile

@@ -131,7 +131,7 @@ mkconfig_nitro DATETIME *ARGS:
     --nitro-addr "localhost:55000" \
     --chain-namespace 412346 \
     --parent-rpc-url "http://127.0.0.1:8545" \
-    --parent-ws-url "ws://127.0.0.1:8545" \
+    --parent-ws-url "ws://127.0.0.1:8546" \
     --parent-chain-id 1337 \
     --parent-ibox-contract "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1" \
     --key-manager-contract "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35" \

test-configs/nitro-ci-committee/node_0.toml

@@ -26,7 +26,7 @@ namespace = 412346
 [chain.parent]
 id = 1337
 rpc_url = "http://127.0.0.1:8545/"
-ws_url = "ws://127.0.0.1:8545/"
+ws_url = "ws://127.0.0.1:8546/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"

test-configs/nitro-ci-committee/node_1.toml

@@ -26,7 +26,7 @@ namespace = 412346
 [chain.parent]
 id = 1337
 rpc_url = "http://127.0.0.1:8545/"
-ws_url = "ws://127.0.0.1:8545/"
+ws_url = "ws://127.0.0.1:8546/"
 ibox_contract = "0xa0f3a1a4e2b2bcb7b48c8527c28098f207572ec1"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"

timeboost-config/src/node.rs

@@ -116,6 +116,7 @@ namespace = 10101
 [chain.parent]
 id = 31337
 rpc_url = "http://127.0.0.1:8545/"
+ws_url = "ws://127.0.0.1:8545/"
 ibox_contract = "0x4dbd4fc535ac27206064b68ffcf827b0a60bab3f"
 block_tag = "finalized"
 key_manager_contract = "0x2bbf15bc655c4cc157b769cfcb1ea9924b9e1a35"

timeboost/src/lib.rs

@@ -23,7 +23,7 @@ use timeboost_sequencer::{Output, Sequencer};
 use timeboost_types::{BundleVariant, ConsensusTime, KeyStore};
 use tokio::select;
 use tokio::sync::mpsc::{self, Receiver, Sender};
-use tracing::{info, warn};
+use tracing::{error, info, warn};
 
 pub use conf::{TimeboostConfig, TimeboostConfigBuilder};
 pub use timeboost_builder as builder;
@@ -101,13 +101,26 @@ impl Timeboost {
         // setup the websocket for contract event stream
         let ws = WsConnect::new(self.config.chain_config.parent.ws_url.clone());
         // spawn the pubsub service (and backend) and the frontend is registered at the provider
-        let provider = ProviderBuilder::new().connect_pubsub_with(ws).await?;
+        let provider = ProviderBuilder::new()
+            .connect_pubsub_with(ws)
+            .await
+            .map_err(|err| {
+                error!(?err, "event pubsub failed to start");
+                err
+            })?;
 
         let filter = Filter::new()
             .address(self.config.chain_config.parent.key_manager_contract)
             .event(KeyManager::CommitteeCreated::SIGNATURE)
             .from_block(BlockNumberOrTag::Finalized);
-        let mut events = provider.subscribe_logs(&filter).await?.into_stream();
+        let mut events = provider
+            .subscribe_logs(&filter)
+            .await
+            .map_err(|err| {
+                error!(?err, "pubsub subscription failed");
+                err
+            })?
+            .into_stream();
 
         loop {
             select! {