Merge pull request #783 from openmina/p2p/dns

Resolve hostname

Author: vlad9486

core/src/network.rs

@@ -172,12 +172,12 @@ pub mod devnet {
 
     pub fn default_peers() -> Vec<&'static str> {
         vec![
-            // "/dns4/seed-1.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWAdgYL6hv18M3iDBdaK1dRygPivSfAfBNDzie6YqydVbs",
-            // "/dns4/seed-2.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag",
-            // "/dns4/seed-3.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWEiGVAFC7curXWXiGZyMWnZK9h8BKr88U8D5PKV3dXciv",
-            "/ip4/34.45.167.81/tcp/10003/p2p/12D3KooWAdgYL6hv18M3iDBdaK1dRygPivSfAfBNDzie6YqydVbs",
-            "/ip4/34.28.194.121/tcp/10003/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag",
-            "/ip4/34.44.189.148/tcp/10003/p2p/12D3KooWEiGVAFC7curXWXiGZyMWnZK9h8BKr88U8D5PKV3dXciv",
+            "/dns4/seed-1.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWAdgYL6hv18M3iDBdaK1dRygPivSfAfBNDzie6YqydVbs",
+            "/dns4/seed-2.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag",
+            "/dns4/seed-3.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWEiGVAFC7curXWXiGZyMWnZK9h8BKr88U8D5PKV3dXciv",
+            // "/ip4/34.45.167.81/tcp/10003/p2p/12D3KooWAdgYL6hv18M3iDBdaK1dRygPivSfAfBNDzie6YqydVbs",
+            // "/ip4/34.28.194.121/tcp/10003/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag",
+            // "/ip4/34.44.189.148/tcp/10003/p2p/12D3KooWEiGVAFC7curXWXiGZyMWnZK9h8BKr88U8D5PKV3dXciv",
         ]
     }
 }

node/native/src/node/builder.rs

@@ -271,6 +271,17 @@ impl NodeBuilder {
             self.initial_peers
         };
 
+        let initial_peers = initial_peers
+            .into_iter()
+            .filter_map(|opts| match opts {
+                P2pConnectionOutgoingInitOpts::LibP2P(mut opts) => {
+                    opts.host = opts.host.resolve()?;
+                    Some(P2pConnectionOutgoingInitOpts::LibP2P(opts))
+                }
+                x => Some(x),
+            })
+            .collect();
+
         let srs = self.verifier_srs.unwrap_or_else(get_srs);
         let block_verifier_index = self
             .block_verifier_index

node/src/action_kind.rs

@@ -51,6 +51,7 @@ use crate::p2p::network::identify::stream::P2pNetworkIdentifyStreamAction;
 use crate::p2p::network::identify::stream_effectful::P2pNetworkIdentifyStreamEffectfulAction;
 use crate::p2p::network::identify::P2pNetworkIdentifyAction;
 use crate::p2p::network::kad::bootstrap::P2pNetworkKadBootstrapAction;
+use crate::p2p::network::kad::kad_effectful::P2pNetworkKadEffectfulAction;
 use crate::p2p::network::kad::request::P2pNetworkKadRequestAction;
 use crate::p2p::network::kad::stream::P2pNetworkKademliaStreamAction;
 use crate::p2p::network::kad::{P2pNetworkKadAction, P2pNetworkKademliaAction};
@@ -313,9 +314,13 @@ pub enum ActionKind {
     P2pNetworkIdentifyStreamPrune,
     P2pNetworkIdentifyStreamRemoteClose,
     P2pNetworkIdentifyStreamEffectfulSendIdentify,
+    P2pNetworkKadBootstrapAppendRequest,
     P2pNetworkKadBootstrapCreateRequests,
+    P2pNetworkKadBootstrapFinalizeRequests,
     P2pNetworkKadBootstrapRequestDone,
     P2pNetworkKadBootstrapRequestError,
+    P2pNetworkKadEffectfulDiscovered,
+    P2pNetworkKadEffectfulMakeRequest,
     P2pNetworkKadRequestError,
     P2pNetworkKadRequestMuxReady,
     P2pNetworkKadRequestNew,
@@ -611,7 +616,7 @@ pub enum ActionKind {
 }
 
 impl ActionKind {
-    pub const COUNT: u16 = 504;
+    pub const COUNT: u16 = 508;
 }
 
 impl std::fmt::Display for ActionKind {
@@ -1075,6 +1080,7 @@ impl ActionKindGet for P2pNetworkAction {
             Self::Yamux(a) => a.kind(),
             Self::Identify(a) => a.kind(),
             Self::Kad(a) => a.kind(),
+            Self::KadEffectful(a) => a.kind(),
             Self::Pubsub(a) => a.kind(),
             Self::PubsubEffectful(a) => a.kind(),
             Self::Rpc(a) => a.kind(),
@@ -1718,6 +1724,15 @@ impl ActionKindGet for P2pNetworkKadAction {
     }
 }
 
+impl ActionKindGet for P2pNetworkKadEffectfulAction {
+    fn kind(&self) -> ActionKind {
+        match self {
+            Self::Discovered { .. } => ActionKind::P2pNetworkKadEffectfulDiscovered,
+            Self::MakeRequest { .. } => ActionKind::P2pNetworkKadEffectfulMakeRequest,
+        }
+    }
+}
+
 impl ActionKindGet for P2pNetworkPubsubAction {
     fn kind(&self) -> ActionKind {
         match self {
@@ -1812,6 +1827,8 @@ impl ActionKindGet for P2pNetworkKadBootstrapAction {
     fn kind(&self) -> ActionKind {
         match self {
             Self::CreateRequests => ActionKind::P2pNetworkKadBootstrapCreateRequests,
+            Self::AppendRequest { .. } => ActionKind::P2pNetworkKadBootstrapAppendRequest,
+            Self::FinalizeRequests => ActionKind::P2pNetworkKadBootstrapFinalizeRequests,
             Self::RequestDone { .. } => ActionKind::P2pNetworkKadBootstrapRequestDone,
             Self::RequestError { .. } => ActionKind::P2pNetworkKadBootstrapRequestError,
         }

node/src/logger/logger_effects.rs

@@ -116,6 +116,7 @@ pub fn logger_effects<S: Service>(store: &Store<S>, action: ActionWithMetaRef<'_
                 P2pNetworkAction::Yamux(action) => action.action_event(&context),
                 P2pNetworkAction::Rpc(action) => action.action_event(&context),
                 P2pNetworkAction::Kad(action) => action.action_event(&context),
+                P2pNetworkAction::KadEffectful(action) => action.action_event(&context),
                 P2pNetworkAction::Pubsub(action) => action.action_event(&context),
                 P2pNetworkAction::PubsubEffectful(action) => action.action_event(&context),
                 P2pNetworkAction::Identify(action) => action.action_event(&context),

node/src/p2p/mod.rs

@@ -95,6 +95,7 @@ impl_into_global_action!(network::P2pNetworkSchedulerAction);
 impl_into_global_action!(network::kad::P2pNetworkKademliaAction);
 impl_into_global_action!(network::pubsub::P2pNetworkPubsubAction);
 impl_into_global_action!(network::pubsub::P2pNetworkPubsubEffectfulAction);
+impl_into_global_action!(network::kad_effectful::P2pNetworkKadEffectfulAction);
 
 impl_into_global_action!(channels::P2pChannelsMessageReceivedAction);
 impl_into_global_action!(channels::best_tip::P2pChannelsBestTipAction);

node/testing/src/scenarios/p2p/pubsub.rs

@@ -16,7 +16,7 @@ impl P2pReceiveBlock {
             // make sure it will not ask initial peers
             .ask_initial_peers_interval(Duration::from_secs(3600))
             .max_peers(1)
-            .initial_peers(vec![ListenerNode::Custom("/ip4/34.135.63.47/tcp/10001/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag".parse().unwrap())]);
+            .initial_peers(vec![ListenerNode::Custom("/dns4/seed-2.devnet.gcp.o1test.net/tcp/10003/p2p/12D3KooWLjs54xHzVmMmGYb7W5RVibqbwD1co7M2ZMfPgPm7iAag".parse().unwrap())]);
         let retransmitter_openmina_node = runner.add_rust_node(config);
         let retransmitter_peer_id = runner
             .node(retransmitter_openmina_node)

node/testing/src/scenarios/solo_node/bootstrap.rs

@@ -28,7 +28,7 @@ impl SoloNodeBootstrap {
         const TIMEOUT: Duration = Duration::from_secs(60 * 40);
 
         const REPLAYER_1: & str =
-            "/ip4/135.181.217.23/tcp/31968/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv";
+            "/dns4/1.k8.openmina.com/tcp/31968/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv";
         let replayer = (&REPLAYER_1.parse::<libp2p::Multiaddr>().unwrap())
             .try_into()
             .unwrap();

node/testing/src/scenarios/solo_node/sync_root_snarked_ledger.rs

@@ -37,9 +37,9 @@ impl SoloNodeSyncRootSnarkedLedger {
         eprintln!("launch Openmina node with default configuration, id: {node_id}");
 
         const REPLAYER_1: &str =
-            "/ip4/65.109.110.75/tcp/18302/p2p/12D3KooWD8jSyPFXNdAcMBHyHjRBcK1AW9t3xvnpfCFSRKMweVKi";
+            "/dns4/web-node-1/tcp/18302/p2p/12D3KooWD8jSyPFXNdAcMBHyHjRBcK1AW9t3xvnpfCFSRKMweVKi";
         const REPLAYER_2: &str =
-            "/ip4/65.109.110.75/tcp/18303/p2p/12D3KooWBxbfeaxGHxdxP3U5jRKpNK5wQmbjKywGJEqTCNpVPxqk";
+            "/dns4/web-node-1/tcp/18303/p2p/12D3KooWBxbfeaxGHxdxP3U5jRKpNK5wQmbjKywGJEqTCNpVPxqk";
 
         // Initiate connection to 2 replayers.
         runner

p2p/src/connection/outgoing/mod.rs

@@ -382,7 +382,11 @@ impl TryFrom<&multiaddr::Multiaddr> for P2pConnectionOutgoingInitLibp2pOpts {
             host: match iter.next() {
                 Some(Protocol::Ip4(v)) => Host::Ipv4(v),
                 Some(Protocol::Dns(v) | Protocol::Dns4(v) | Protocol::Dns6(v)) => {
-                    Host::Domain(v.into_owned())
+                    Host::Domain(v.to_string()).resolve().ok_or(
+                        P2pConnectionOutgoingInitOptsParseError::Other(format!(
+                            "cannot resolve host {v}"
+                        )),
+                    )?
                 }
                 Some(_) => {
                     return Err(P2pConnectionOutgoingInitOptsParseError::Other(

p2p/src/lib.rs

@@ -144,5 +144,6 @@ pub trait P2pActionTrait<State>:
     + From<P2pChannelsSnarkJobCommitmentEffectfulAction>
     + From<P2pChannelsRpcEffectfulAction>
     + From<P2pChannelsSnarkEffectfulAction>
+    + From<P2pNetworkKadEffectfulAction>
 {
 }