fix: revert anemo address tcp change and add checks for primary address format

Author: muXxer

crates/iota-genesis-builder/src/validator_info.rs

@@ -133,10 +133,10 @@ impl GenesisValidatorInfo {
         }
 
         if let Err(e) = self.info.p2p_address.to_anemo_address() {
-            bail!("p2p address must be valid anemo address: {e}");
+            bail!("p2p address must be a valid anemo address: {e}");
         }
-        if let Err(e) = self.info.primary_address.to_anemo_address() {
-            bail!("primary address must be valid anemo address: {e}");
+        if !self.info.primary_address.is_loosely_valid_tcp_addr() {
+            bail!("primary address must be a valid TCP multiaddress");
         }
 
         if self.info.commission_rate > 10000 {

crates/iota-network-stack/src/multiaddr.rs

@@ -52,22 +52,19 @@ impl Multiaddr {
     }
 
     /// Attempts to convert a multiaddr of the form
-    /// `/[ip4,ip6,dns]/{}/[udp, tcp]/{port}` into an anemo address
+    /// `/[ip4,ip6,dns]/{}/udp/{port}` into an anemo address
     pub fn to_anemo_address(&self) -> Result<anemo::types::Address, &'static str> {
         let mut iter = self.iter();
 
         match (iter.next(), iter.next()) {
-            (Some(Protocol::Ip4(ipaddr)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => {
-                Ok((ipaddr, port).into())
-            }
-            (Some(Protocol::Ip6(ipaddr)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => {
-                Ok((ipaddr, port).into())
-            }
-            (Some(Protocol::Dns(hostname)), Some(Protocol::Udp(port) | Protocol::Tcp(port))) => {
+            (Some(Protocol::Ip4(ipaddr)), Some(Protocol::Udp(port))) => Ok((ipaddr, port).into()),
+            (Some(Protocol::Ip6(ipaddr)), Some(Protocol::Udp(port))) => Ok((ipaddr, port).into()),
+            (Some(Protocol::Dns(hostname)), Some(Protocol::Udp(port))) => {
                 Ok((hostname.as_ref(), port).into())
             }
+
             _ => {
-                tracing::warn!("unsupported p2p multiaddr: '{self}'");
+                tracing::warn!("unsupported udp multiaddr: '{self}'");
                 Err("invalid address")
             }
         }
@@ -420,15 +417,10 @@ mod test {
 
     #[test]
     fn test_to_anemo_address() {
-        let addr_ip4_udp = Multiaddr(multiaddr!(Ip4([15, 15, 15, 1]), Udp(10500u16)))
-            .to_anemo_address()
-            .unwrap();
-        assert_eq!("15.15.15.1:10500".to_string(), addr_ip4_udp.to_string());
-
-        let addr_ip4_tcp = Multiaddr(multiaddr!(Ip4([15, 15, 15, 1]), Tcp(10500u16)))
+        let addr_ip4 = Multiaddr(multiaddr!(Ip4([15, 15, 15, 1]), Udp(10500u16)))
             .to_anemo_address()
             .unwrap();
-        assert_eq!("15.15.15.1:10500".to_string(), addr_ip4_tcp.to_string());
+        assert_eq!("15.15.15.1:10500".to_string(), addr_ip4.to_string());
 
         let addr_ip6 = Multiaddr(multiaddr!(
             Ip6([15, 15, 15, 15, 15, 15, 15, 1]),
@@ -438,14 +430,13 @@ mod test {
         .unwrap();
         assert_eq!("[f:f:f:f:f:f:f:1]:10500".to_string(), addr_ip6.to_string());
 
-        let addr_dns = Multiaddr(multiaddr!(Dns("iota.iota"), Tcp(10501u16)))
+        let addr_dns = Multiaddr(multiaddr!(Dns("iota.iota"), Udp(10501u16)))
             .to_anemo_address()
             .unwrap();
         assert_eq!("iota.iota:10501".to_string(), addr_dns.to_string());
 
-        // Error case
         let addr_invalid =
-            Multiaddr(multiaddr!(Dns("iota.iota"), Sctp(10501u16))).to_anemo_address();
+            Multiaddr(multiaddr!(Dns("iota.iota"), Tcp(10501u16))).to_anemo_address();
         assert!(addr_invalid.is_err());
     }
 

crates/iota-network/src/discovery/tests.rs

@@ -193,7 +193,7 @@ async fn three_nodes_can_connect_via_discovery() -> Result<()> {
 }
 
 #[tokio::test(flavor = "current_thread", start_paused = true)]
-async fn peers_are_added_from_reocnfig_channel() -> Result<()> {
+async fn peers_are_added_from_reconfig_channel() -> Result<()> {
     let (tx_1, rx_1) = create_test_channel();
     let config = P2pConfig::default();
     let (builder, server) = Builder::new(rx_1).config(config.clone()).build();

crates/iota-types/src/iota_system_state/iota_system_state_inner_v1.rs

@@ -160,9 +160,9 @@ impl ValidatorMetadataV1 {
 
         let primary_address = Multiaddr::try_from(self.primary_address.clone())
             .map_err(|_| E_METADATA_INVALID_PRIMARY_ADDR)?;
-        primary_address
-            .to_anemo_address()
-            .map_err(|_| E_METADATA_INVALID_PRIMARY_ADDR)?;
+        if !primary_address.is_loosely_valid_tcp_addr() {
+            return Err(E_METADATA_INVALID_PRIMARY_ADDR);
+        }
 
         let next_epoch_authority_pubkey = match self.next_epoch_authority_pubkey_bytes.clone() {
             None => Ok::<Option<AuthorityPublicKey>, u64>(None),
@@ -243,9 +243,9 @@ impl ValidatorMetadataV1 {
             Some(address) => {
                 let address =
                     Multiaddr::try_from(address).map_err(|_| E_METADATA_INVALID_PRIMARY_ADDR)?;
-                address
-                    .to_anemo_address()
-                    .map_err(|_| E_METADATA_INVALID_PRIMARY_ADDR)?;
+                if !address.is_loosely_valid_tcp_addr() {
+                    return Err(E_METADATA_INVALID_PRIMARY_ADDR);
+                };
 
                 Ok(Some(address))
             }