feat: allow passing in narwhal ip/port

cli/src/commands/start.rs

@@ -86,6 +86,10 @@ pub struct Start {
     #[clap(default_value = "", long = "validators")]
     pub validators: String,
 
+    // Specify the IP address and port for narwhal.
+    #[clap(long = "narwhal")]
+    pub narwhal: Option<SocketAddr>,
+
     /// Specify the IP address and port for the REST server
     #[clap(default_value = "0.0.0.0:3033", long = "rest")]
     pub rest: SocketAddr,
@@ -243,15 +247,19 @@ impl Start {
         // and the REST IP to `3030 + dev`.
         if let Some(dev) = self.dev {
             // Add the dev nodes to the trusted peers.
-            for i in 0..dev {
-                if i != dev {
-                    trusted_peers.push(SocketAddr::from_str(&format!("127.0.0.1:{}", 4130 + i))?);
+            if trusted_peers.is_empty() {
+                for i in 0..dev {
+                    if i != dev {
+                        trusted_peers.push(SocketAddr::from_str(&format!("127.0.0.1:{}", 4130 + i))?);
+                    }
                 }
             }
-            // To avoid ambiguity, we define the first few nodes to be the trusted validators to connect to.
-            for i in 0..2 {
-                if i != dev {
-                    trusted_validators.push(SocketAddr::from_str(&format!("127.0.0.1:{}", MEMORY_POOL_PORT + i))?);
+            if trusted_validators.is_empty() {
+                // To avoid ambiguity, we define the first few nodes to be the trusted validators to connect to.
+                for i in 0..2 {
+                    if i != dev {
+                        trusted_validators.push(SocketAddr::from_str(&format!("127.0.0.1:{}", MEMORY_POOL_PORT + i))?);
+                    }
                 }
             }
             // Set the node IP to `4130 + dev`.
@@ -382,8 +390,9 @@ impl Start {
         crate::helpers::check_validator_machine(node_type, self.dev.is_some());
 
         // Initialize the node.
+        let narwhal_ip = if self.dev.is_some() { self.narwhal } else { None };
         match node_type {
-            NodeType::Validator => Node::new_validator(self.node, rest_ip, account, &trusted_peers, &trusted_validators, genesis, cdn, self.dev).await,
+            NodeType::Validator => Node::new_validator(self.node, rest_ip, narwhal_ip, account, &trusted_peers, &trusted_validators, genesis, cdn, self.dev).await,
             NodeType::Prover => Node::new_prover(self.node, account, &trusted_peers, genesis, self.dev).await,
             NodeType::Client => Node::new_client(self.node, rest_ip, account, &trusted_peers, genesis, cdn, self.dev).await,
         }

node/narwhal/src/gateway.rs

@@ -143,9 +143,9 @@ impl<N: Network> Gateway<N> {
     ) -> Result<Self> {
         // Initialize the gateway IP.
         let ip = match (ip, dev) {
-            (_, Some(dev)) => SocketAddr::from_str(&format!("127.0.0.1:{}", MEMORY_POOL_PORT + dev))?,
+            (None, Some(dev)) => SocketAddr::from_str(&format!("127.0.0.1:{}", MEMORY_POOL_PORT + dev))?,
             (None, None) => SocketAddr::from_str(&format!("0.0.0.0:{}", MEMORY_POOL_PORT))?,
-            (Some(ip), None) => ip,
+            (Some(ip), _) => ip,
         };
         // Initialize the TCP stack.
         let tcp = Tcp::new(Config::new(ip, MAX_COMMITTEE_SIZE));

node/src/node.rs

@@ -41,6 +41,7 @@ impl<N: Network> Node<N> {
     pub async fn new_validator(
         node_ip: SocketAddr,
         rest_ip: Option<SocketAddr>,
+        narwhal_ip: Option<SocketAddr>,
         account: Account<N>,
         trusted_peers: &[SocketAddr],
         trusted_validators: &[SocketAddr],
@@ -49,7 +50,8 @@ impl<N: Network> Node<N> {
         dev: Option<u16>,
     ) -> Result<Self> {
         Ok(Self::Validator(Arc::new(
-            Validator::new(node_ip, rest_ip, account, trusted_peers, trusted_validators, genesis, cdn, dev).await?,
+            Validator::new(node_ip, rest_ip, narwhal_ip, account, trusted_peers, trusted_validators, genesis, cdn, dev)
+                .await?,
         )))
     }
 

node/src/validator/mod.rs

@@ -74,6 +74,7 @@ impl<N: Network, C: ConsensusStorage<N>> Validator<N, C> {
     pub async fn new(
         node_ip: SocketAddr,
         rest_ip: Option<SocketAddr>,
+        narwhal_ip: Option<SocketAddr>,
         account: Account<N>,
         trusted_peers: &[SocketAddr],
         trusted_validators: &[SocketAddr],
@@ -101,7 +102,7 @@ impl<N: Network, C: ConsensusStorage<N>> Validator<N, C> {
         let sync = BlockSync::new(BlockSyncMode::Gateway, ledger_service.clone());
 
         // Initialize the consensus.
-        let mut consensus = Consensus::new(account.clone(), ledger_service, None, trusted_validators, dev)?;
+        let mut consensus = Consensus::new(account.clone(), ledger_service, narwhal_ip, trusted_validators, dev)?;
         // Initialize the primary channels.
         let (primary_sender, primary_receiver) = init_primary_channels::<N>();
         // Start the consensus.
@@ -474,6 +475,7 @@ mod tests {
         let validator = Validator::<CurrentNetwork, ConsensusMemory<CurrentNetwork>>::new(
             node,
             Some(rest),
+            None,
             account,
             &[],
             &[],

node/tests/common/node.rs

@@ -49,6 +49,7 @@ pub async fn validator() -> Validator<CurrentNetwork, ConsensusMemory<CurrentNet
     Validator::new(
         "127.0.0.1:0".parse().unwrap(),
         None,
+        None,
         Account::<CurrentNetwork>::from_str("APrivateKey1zkp2oVPTci9kKcUprnbzMwq95Di1MQERpYBhEeqvkrDirK1").unwrap(),
         &[],
         &[],