fix: fix panic when no public addresses

applications/tari_app_grpc/Cargo.toml

@@ -11,7 +11,7 @@ edition = "2018"
 tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_core = { path = "../../base_layer/core" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_script = { path = "../../infrastructure/tari_script" }
 tari_utilities = { version = "0.4.10"}
 

applications/tari_app_utilities/Cargo.toml

@@ -14,7 +14,7 @@ tari_utilities = { version = "0.4.10"}
 
 clap = { version = "3.2.0", features = ["derive", "env"] }
 futures = { version = "^0.3.16", default-features = false, features = ["alloc"] }
-json5 = "0.2.2"
+json5 = "0.4"
 log = { version = "0.4.8", features = ["std"] }
 rand = "0.7.3"
 tokio = { version = "1.23", features = ["signal"] }

applications/tari_base_node/Cargo.toml

@@ -15,7 +15,7 @@ tari_comms = { path = "../../comms/core", features = ["rpc"] }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_core = { path = "../../base_layer/core", default-features = false, features = ["transactions"] }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }
 tari_storage = {path="../../infrastructure/storage"}

applications/tari_console_wallet/Cargo.toml

@@ -13,7 +13,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
 tari_contacts = { path = "../../base_layer/contacts" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_key_manager = { path = "../../base_layer/key_manager" }
 tari_libtor = { path = "../../infrastructure/libtor", optional = true }
 tari_p2p = { path = "../../base_layer/p2p", features = ["auto-update"] }

applications/tari_miner/Cargo.toml

@@ -14,7 +14,7 @@ tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
 tari_app_utilities = { path = "../tari_app_utilities" }
 tari_app_grpc = { path = "../tari_app_grpc" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_utilities = "0.4.10"
 
 borsh = "0.9.3"

base_layer/common_types/Cargo.toml

@@ -7,7 +7,7 @@ version = "0.50.0-pre.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_utilities = "0.4.10"
 # TODO: remove this dependency and move Network into tari_common_types
 tari_common = {  path = "../../common" }

base_layer/contacts/Cargo.toml

@@ -12,7 +12,7 @@ tari_common_sqlite = { path = "../../common_sqlite" }
 tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = {  path = "../../comms/core" }
 tari_comms_dht = { path = "../../comms/dht" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_p2p = {  path = "../p2p", features = ["auto-update"] }
 tari_service_framework = {  path = "../service_framework" }
 tari_shutdown = {  path = "../../infrastructure/shutdown" }
@@ -30,7 +30,7 @@ rand = "0.7.3"
 thiserror = "1.0.26"
 tokio = { version = "1.23", features = ["sync", "macros"] }
 tower = "0.4"
-uuid = { version = "1.3.1", features = ["v4"] }
+uuid = { version = "1.3", features = ["v4"] }
 
 [dev-dependencies]
 tari_comms_dht = {  path = "../../comms/dht", features = ["test-mocks"] }

base_layer/contacts/tests/contacts_service.rs

@@ -72,7 +72,7 @@ pub fn setup_contacts_service<T: ContactsBackend + 'static>(
         transport: TransportConfig {
             transport_type: TransportType::Memory,
             memory: MemoryTransportConfig {
-                listener_address: node_identity.first_public_address(),
+                listener_address: node_identity.first_public_address().unwrap(),
             },
             ..Default::default()
         },

base_layer/core/Cargo.toml

@@ -24,7 +24,7 @@ tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = {  path = "../../comms/core" }
 tari_comms_dht = {  path = "../../comms/dht" }
 tari_comms_rpc_macros = {  path = "../../comms/rpc_macros" }
-tari_crypto = { version = "0.16.12", features = ["borsh"] }
+tari_crypto = { version = "0.16", features = ["borsh"] }
 tari_metrics = { path = "../../infrastructure/metrics" }
 tari_mmr = {  path = "../../base_layer/mmr", optional = true, features = ["native_bitmap"] }
 tari_p2p = {  path = "../../base_layer/p2p" }

base_layer/key_manager/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = ["lib", "cdylib"]
 
 # NB: All dependencies must support or be gated for the WASM target.
 [dependencies]
-tari_crypto = {version = "0.16.12"}
+tari_crypto = {version = "0.16"}
 tari_utilities = "0.4.10"
 tari_common_sqlite = { path = "../../common_sqlite" }
 tari_common_types = {  path = "../../base_layer/common_types"}

base_layer/mmr/Cargo.toml

@@ -14,7 +14,7 @@ benches = ["criterion"]
 
 [dependencies]
 tari_utilities = "0.4.10"
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_common = {path = "../../common"}
 thiserror = "1.0.26"
 borsh = "0.9.3"

base_layer/p2p/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 tari_comms = {  path = "../../comms/core" }
 tari_comms_dht = {  path = "../../comms/dht" }
 tari_common = {  path = "../../common" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_service_framework = {  path = "../service_framework" }
 tari_shutdown = {  path = "../../infrastructure/shutdown" }
 tari_storage = {  path = "../../infrastructure/storage" }

base_layer/p2p/src/initialization.rs

@@ -155,7 +155,7 @@ pub async fn initialize_local_test_comms<P: AsRef<Path>>(
 
     let comms = CommsBuilder::new()
         .allow_test_addresses()
-        .with_listener_address(node_identity.first_public_address())
+        .with_listener_address(node_identity.first_public_address().unwrap())
         .with_listener_liveness_max_sessions(1)
         .with_node_identity(node_identity)
         .with_user_agent(&"/test/1.0")

base_layer/tari_mining_helper_ffi/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 tari_comms = {  path = "../../comms/core" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_common = {  path = "../../common" }
 tari_core = {  path = "../core", default-features = false, features = ["transactions"]}
 tari_utilities = "0.4.10"

base_layer/wallet/Cargo.toml

@@ -12,7 +12,7 @@ tari_common = { path = "../../common" }
 tari_common_types = {  path = "../../base_layer/common_types" }
 tari_comms = {  path = "../../comms/core" }
 tari_comms_dht = {  path = "../../comms/dht" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_key_manager = {  path = "../key_manager", features = ["key_manager_service"] }
 tari_p2p = {  path = "../p2p", features = ["auto-update"] }
 tari_script = { path = "../../infrastructure/tari_script" }

base_layer/wallet/src/error.rs

@@ -101,6 +101,8 @@ pub enum WalletError {
     TransportChannelError(#[from] TransportChannelError),
     #[error("Unexpected API Response while calling method `{method}` on `{api}`")]
     UnexpectedApiResponse { method: String, api: String },
+    #[error("Public address not set for this wallet")]
+    PublicAddressNotSet,
 }
 
 pub const LOG_TARGET: &str = "tari::application";

base_layer/wallet/src/wallet.rs

@@ -273,7 +273,12 @@ where
 
         // Persist the comms node address and features after it has been spawned to capture any modifications made
         // during comms startup. In the case of a Tor Transport the public address could have been generated
-        wallet_database.set_node_address(comms.node_identity().first_public_address())?;
+        wallet_database.set_node_address(
+            comms
+                .node_identity()
+                .first_public_address()
+                .ok_or(WalletError::PublicAddressNotSet)?,
+        )?;
         wallet_database.set_node_features(comms.node_identity().features())?;
         let identity_sig = comms.node_identity().identity_signature_read().as_ref().cloned();
         if let Some(identity_sig) = identity_sig {

base_layer/wallet/tests/wallet.rs

@@ -130,7 +130,7 @@ async fn create_wallet(
         override_from: None,
         public_addresses: MultiaddrList::default(),
         transport: TransportConfig::new_memory(MemoryTransportConfig {
-            listener_address: node_identity.first_public_address(),
+            listener_address: node_identity.first_public_address().unwrap(),
         }),
         datastore_path: data_path.to_path_buf(),
         peer_database_name: random::string(8),
@@ -255,7 +255,7 @@ async fn test_wallet() {
         .peer_manager()
         .add_peer(create_peer(
             bob_identity.public_key().clone(),
-            bob_identity.first_public_address(),
+            bob_identity.first_public_address().unwrap(),
         ))
         .await
         .unwrap();
@@ -265,15 +265,15 @@ async fn test_wallet() {
         .peer_manager()
         .add_peer(create_peer(
             alice_identity.public_key().clone(),
-            alice_identity.first_public_address(),
+            alice_identity.first_public_address().unwrap(),
         ))
         .await
         .unwrap();
 
     alice_wallet
         .set_base_node_peer(
             (*base_node_identity.public_key()).clone(),
-            base_node_identity.first_public_address().clone(),
+            base_node_identity.first_public_address().unwrap(),
         )
         .await
         .unwrap();
@@ -735,7 +735,10 @@ async fn test_import_utxo() {
     let expected_output_hash = output.hash();
     let node_address = TariAddress::new(node_identity.public_key().clone(), network);
     alice_wallet
-        .set_base_node_peer(node_identity.public_key().clone(), node_identity.first_public_address())
+        .set_base_node_peer(
+            node_identity.public_key().clone(),
+            node_identity.first_public_address().unwrap(),
+        )
         .await
         .unwrap();
     let tx_id = alice_wallet

base_layer/wallet_ffi/Cargo.toml

@@ -12,7 +12,7 @@ tari_common = { path="../../common" }
 tari_common_types = { path="../common_types" }
 tari_comms = {  path = "../../comms/core", features = ["c_integration"]}
 tari_comms_dht = {  path = "../../comms/dht", default-features = false }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_key_manager = {  path = "../key_manager" }
 tari_p2p = {  path = "../p2p" }
 tari_script = { path = "../../infrastructure/tari_script" }

base_layer/wallet_ffi/src/lib.rs

@@ -10754,7 +10754,7 @@ mod test {
                 NodeIdentity::random(&mut OsRng, get_next_memory_address(), PeerFeatures::COMMUNICATION_NODE);
             let base_node_peer_public_key_ptr = Box::into_raw(Box::new(node_identity.public_key().clone()));
             let base_node_peer_address_ptr =
-                CString::into_raw(CString::new(node_identity.first_public_address().to_string()).unwrap())
+                CString::into_raw(CString::new(node_identity.first_public_address().unwrap().to_string()).unwrap())
                     as *const c_char;
             wallet_add_base_node_peer(
                 wallet_ptr,

common/Cargo.toml

@@ -14,7 +14,7 @@ build = ["toml", "prost-build"]
 static-application-info = ["git2"]
 
 [dependencies]
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 
 anyhow = "1.0.53"
 config = { version = "0.13.0", default_features = false, features = ["toml"] }

comms/core/Cargo.toml

@@ -10,7 +10,7 @@ version = "0.50.0-pre.0"
 edition = "2018"
 
 [dependencies]
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_metrics = { path = "../../infrastructure/metrics" }
 tari_storage = {  path = "../../infrastructure/storage" }
 tari_shutdown = {  path = "../../infrastructure/shutdown" }

comms/core/src/builder/comms_node.rs

@@ -244,17 +244,14 @@ impl UnspawnedCommsNode {
         );
 
         // Spawn liveness check now that we have the final address
-        let liveness_watch = connection_manager_config
-            .liveness_self_check_interval
-            .map(|interval| {
-                LivenessCheck::spawn(
-                    transport,
-                    node_identity.first_public_address(),
-                    interval,
-                    shutdown_signal.clone(),
-                )
-            })
-            .unwrap_or_else(|| watch::channel(LivenessStatus::Disabled).1);
+        let liveness_watch = if let Some(public_address) = node_identity.first_public_address() {
+            connection_manager_config
+                .liveness_self_check_interval
+                .map(|interval| LivenessCheck::spawn(transport, public_address, interval, shutdown_signal.clone()))
+                .unwrap_or_else(|| watch::channel(LivenessStatus::Disabled).1)
+        } else {
+            watch::channel(LivenessStatus::Disabled).1
+        };
 
         Ok(CommsNode {
             shutdown_signal,

comms/core/src/peer_manager/node_identity.rs

@@ -126,8 +126,8 @@ impl NodeIdentity {
         acquire_read_lock!(self.public_addresses).clone()
     }
 
-    pub fn first_public_address(&self) -> Multiaddr {
-        acquire_read_lock!(self.public_addresses)[0].clone()
+    pub fn first_public_address(&self) -> Option<Multiaddr> {
+        acquire_read_lock!(self.public_addresses).get(0).cloned()
     }
 
     /// Modify the public address.

comms/core/src/protocol/rpc/test/comms_integration.rs

@@ -44,7 +44,7 @@ async fn run_service() {
     let mock_state = rpc_service.shared_state();
     let shutdown = Shutdown::new();
     let comms1 = CommsBuilder::new()
-        .with_listener_address(node_identity1.first_public_address())
+        .with_listener_address(node_identity1.first_public_address().unwrap())
         .with_node_identity(node_identity1)
         .with_shutdown_signal(shutdown.to_signal())
         .with_peer_storage(CommsDatabase::new(), None)
@@ -57,7 +57,7 @@ async fn run_service() {
 
     let node_identity2 = build_node_identity(Default::default());
     let comms2 = CommsBuilder::new()
-        .with_listener_address(node_identity2.first_public_address())
+        .with_listener_address(node_identity2.first_public_address().unwrap())
         .with_shutdown_signal(shutdown.to_signal())
         .with_node_identity(node_identity2.clone())
         .with_peer_storage(CommsDatabase::new(), None)

comms/dht/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 tari_comms = {  path = "../core", features = ["rpc"] }
 tari_common = { path = "../../common" }
 tari_comms_rpc_macros = {  path = "../rpc_macros" }
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16.2"}
 tari_utilities = "0.4.10"
 tari_shutdown = {  path = "../../infrastructure/shutdown" }
 tari_storage = {  path = "../../infrastructure/storage" }

comms/dht/examples/memory_net/utilities.rs

@@ -903,7 +903,7 @@ async fn setup_comms_dht(
     let comms = CommsBuilder::new()
         .allow_test_addresses()
         // In this case the listener address and the public address are the same (/memory/...)
-        .with_listener_address(node_identity.first_public_address())
+        .with_listener_address(node_identity.first_public_address().unwrap())
         .with_shutdown_signal(shutdown_signal)
         .with_node_identity(node_identity)
         .with_min_connectivity(1)

comms/dht/tests/dht.rs

@@ -172,7 +172,7 @@ async fn setup_comms_dht(
     let comms = CommsBuilder::new()
         .allow_test_addresses()
         // In this case the listener address and the public address are the same (/memory/...)
-        .with_listener_address(node_identity.first_public_address())
+        .with_listener_address(node_identity.first_public_address().unwrap())
         .with_shutdown_signal(shutdown_signal)
         .with_node_identity(node_identity)
         .with_peer_storage(storage,None)

infrastructure/tari_script/Cargo.toml

@@ -11,7 +11,7 @@ readme = "README.md"
 license = "BSD-3-Clause"
 
 [dependencies]
-tari_crypto = { version = "0.16.12"}
+tari_crypto = { version = "0.16"}
 tari_utilities = "0.4.10"
 
 blake2 = "0.9"

integration_tests/Cargo.toml

@@ -13,7 +13,7 @@ tari_base_node = { path = "../applications/tari_base_node" }
 tari_base_node_grpc_client = { path = "../clients/rust/base_node_grpc_client" }
 tari_chat_client = { path = "../base_layer/contacts/examples/chat_client" }
 tari_chat_ffi = { path = "../base_layer/chat_ffi" }
-tari_crypto = "0.16.12"
+tari_crypto = "0.16"
 tari_common = { path = "../common" }
 tari_common_types = { path = "../base_layer/common_types" }
 tari_comms = { path = "../comms/core" }