try something else

Author: cong-or

Cargo.lock

@@ -29,8 +29,6 @@ hex = "0.4"
 bech32 = "0.8"
 base64 = "0.13.0"
 http = "0.2.2"
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-local-ip-address = "0.4.9"
 
 [dev-dependencies]
 bincode = "1.3.3"

src/jormungandr/jormungandr-lib/Cargo.toml

@@ -1,9 +1,8 @@
-use std::net::{IpAddr, Ipv4Addr};
+use std::net::IpAddr;
 
 use crate::{crypto::hash::Hash, interfaces::BlockDate, time::SystemTime};
 use chain_impl_mockchain::key;
-#[cfg(not(target_family = "wasm"))]
-use local_ip_address::local_ip;
+
 use serde::{Deserialize, Serialize};
 
 /// identify the source of a fragment
@@ -23,18 +22,6 @@ pub enum FragmentOrigin {
     JRpc,
 }
 
-impl FragmentOrigin {
-    pub fn default_origin_addr() -> Self {
-        #[cfg(not(target_family = "wasm"))]
-        match local_ip() {
-            Ok(ip) => FragmentOrigin::Network { addr: ip },
-            Err(_err) => FragmentOrigin::Network {
-                addr: std::net::IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)),
-            },
-        }
-    }
-}
-
 /// status of the fragment within the blockchain or the pool
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub enum FragmentStatus {

src/jormungandr/jormungandr-lib/src/interfaces/fragment_log.rs

@@ -69,6 +69,7 @@ prometheus = { version = "0.13", optional = true }
 jsonrpsee-http-server = { version = "0.11.0" }
 jsonrpsee-core = { version = "0.11.0" }
 reqwest = { version = "0.11",  default-features = false, features = ["rustls-tls"] }
+local-ip-address = "0.4.9"
 
 [dev-dependencies]
 tokio = { version = "^1.15", features = ["full"] }

src/jormungandr/jormungandr/Cargo.toml

@@ -1,4 +1,4 @@
-use crate::fragment::FragmentId;
+use crate::{fragment::FragmentId, network::bootstrap::local_addr_lookup};
 use jormungandr_lib::{
     crypto::hash::Hash,
     interfaces::{BlockDate, FragmentLog, FragmentOrigin, FragmentStatus},
@@ -78,7 +78,9 @@ impl Logs {
                 // state transition.
                 let mut entry = FragmentLog::new(
                     fragment_id.into_hash(),
-                    FragmentOrigin::default_origin_addr(),
+                    FragmentOrigin::Network {
+                        addr: local_addr_lookup(),
+                    },
                 );
                 entry.modify(status);
                 self.entries.put(fragment_id, (entry, Some(ledger_date)));

src/jormungandr/jormungandr/src/fragment/logs.rs

@@ -8,7 +8,11 @@ use crate::{
 use chain_core::property::ReadError;
 use chain_network::{data as net_data, error::Error as NetworkError};
 use futures::prelude::*;
-use std::fmt::Debug;
+use local_ip_address::local_ip;
+use std::{
+    fmt::Debug,
+    net::{IpAddr, Ipv4Addr},
+};
 use tokio_util::sync::CancellationToken;
 
 #[derive(thiserror::Error, Debug)]
@@ -126,3 +130,16 @@ pub async fn bootstrap_from_peer(
         .map_err(Box::new)?;
     }
 }
+
+pub fn local_addr_lookup() -> IpAddr {
+    match local_ip() {
+        Ok(ip) => ip,
+        Err(err) => {
+            tracing::error!(
+                reason = %err,
+                "unable to lookup local addr"
+            );
+            std::net::IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1))
+        }
+    }
+}

src/jormungandr/jormungandr/src/network/bootstrap.rs

@@ -2,6 +2,7 @@ use super::{buffer_sizes, convert::Decode, GlobalStateR};
 use crate::{
     blockcfg::Fragment,
     intercom::{self, BlockMsg, TopologyMsg, TransactionMsg},
+    network::bootstrap::local_addr_lookup,
     settings::start::network::Configuration,
     topology::{Gossip, NodeId},
     utils::async_msg::{self, MessageBox},
@@ -378,7 +379,9 @@ impl FragmentProcessor {
             Some(addr) => FragmentOrigin::Network { addr: addr.ip() },
             None => {
                 tracing::error!("node addr not present in config, reverting to local lookup");
-                FragmentOrigin::default_origin_addr()
+                FragmentOrigin::Network {
+                    addr: local_addr_lookup(),
+                }
             }
         };