fix: allow public addresses from command line

tari-project · Apr 13, 2023 · 27ecd8d · 27ecd8d
1 parent 254ea14
commit 27ecd8d
Show file tree

Hide file tree

Showing 10 changed files with 273 additions and 23 deletions.
diff --git a/applications/tari_base_node/src/main.rs b/applications/tari_base_node/src/main.rs
@@ -136,7 +136,7 @@ fn main_inner() -> Result<(), ExitError> {
     // Load or create the Node identity
     let node_identity = setup_node_identity(
         &config.base_node.identity_file,
-        config.base_node.p2p.public_addresses.clone(),
+        config.base_node.p2p.public_addresses.clone().into_vec(),
         cli.non_interactive_mode || cli.init,
         PeerFeatures::COMMUNICATION_NODE,
     )?;

diff --git a/applications/tari_console_wallet/src/init/mod.rs b/applications/tari_console_wallet/src/init/mod.rs
@@ -31,6 +31,7 @@ use tari_app_utilities::identity_management::setup_node_identity;
 use tari_common::{
     configuration::{
         bootstrap::{grpc_default_port, prompt, ApplicationType},
+        MultiaddrList,
         Network,
     },
     exit_codes::{ExitCode, ExitError},
@@ -378,8 +379,8 @@ pub async fn init_wallet(
 
     let node_addresses = if config.wallet.p2p.public_addresses.is_empty() {
         match wallet_db.get_node_address()? {
-            Some(addr) => vec![addr],
-            None => vec![],
+            Some(addr) => MultiaddrList::from(vec![addr]),
+            None => MultiaddrList::default(),
         }
     } else {
         config.wallet.p2p.public_addresses.clone()
@@ -394,9 +395,14 @@ pub async fn init_wallet(
                 "Node identity overridden by file {}",
                 identity_file.to_string_lossy()
             );
-            setup_node_identity(identity_file, node_addresses, true, PeerFeatures::COMMUNICATION_CLIENT)?
+            setup_node_identity(
+                identity_file,
+                node_addresses.to_vec(),
+                true,
+                PeerFeatures::COMMUNICATION_CLIENT,
+            )?
         },
-        None => setup_identity_from_db(&wallet_db, &master_seed, node_addresses)?,
+        None => setup_identity_from_db(&wallet_db, &master_seed, node_addresses.to_vec())?,
     };
 
     let mut wallet_config = config.wallet.clone();

diff --git a/base_layer/contacts/tests/contacts_service.rs b/base_layer/contacts/tests/contacts_service.rs
@@ -23,7 +23,7 @@
 use std::{convert::TryInto, sync::Arc, time::Duration};
 
 use rand::rngs::OsRng;
-use tari_common::configuration::{Network, StringList};
+use tari_common::configuration::{MultiaddrList, Network, StringList};
 use tari_common_sqlite::connection::{DbConnection, DbConnectionUrl};
 use tari_common_types::{tari_address::TariAddress, types::PublicKey};
 use tari_comms::{peer_manager::PeerFeatures, NodeIdentity};
@@ -67,7 +67,7 @@ pub fn setup_contacts_service<T: ContactsBackend + 'static>(
     ));
     let comms_config = P2pConfig {
         override_from: None,
-        public_addresses: vec![],
+        public_addresses: MultiaddrList::default(),
         transport: TransportConfig {
             transport_type: TransportType::Memory,
             memory: MemoryTransportConfig {

diff --git a/base_layer/p2p/src/config.rs b/base_layer/p2p/src/config.rs
@@ -30,6 +30,7 @@ use tari_common::{
     configuration::{
         serializers,
         utils::{deserialize_string_or_struct, serialize_string},
+        MultiaddrList,
         StringList,
     },
     DnsNameServer,
@@ -87,7 +88,7 @@ pub struct P2pConfig {
     /// The public address advertised to other peers by this node. If not set it will be set automatically depending on
     /// the transport type. The TCP transport is not able to determine the users public IP, so this will need to be
     /// manually set.
-    pub public_addresses: Vec<Multiaddr>,
+    pub public_addresses: MultiaddrList,
     /// Transport configuration
     pub transport: TransportConfig,
     /// Path to the LMDB data files.
@@ -132,7 +133,7 @@ impl Default for P2pConfig {
     fn default() -> Self {
         Self {
             override_from: None,
-            public_addresses: vec![],
+            public_addresses: MultiaddrList::default(),
             transport: Default::default(),
             datastore_path: PathBuf::from("peer_db"),
             peer_database_name: "peers".to_string(),

diff --git a/base_layer/wallet/tests/wallet.rs b/base_layer/wallet/tests/wallet.rs
@@ -25,7 +25,7 @@ use std::{mem::size_of, panic, path::Path, sync::Arc, time::Duration};
 use chacha20poly1305::{Key, KeyInit, XChaCha20Poly1305};
 use rand::{rngs::OsRng, RngCore};
 use support::utils::make_input;
-use tari_common::configuration::StringList;
+use tari_common::configuration::{MultiaddrList, StringList};
 use tari_common_types::{
     chain_metadata::ChainMetadata,
     tari_address::TariAddress,
@@ -127,7 +127,7 @@ async fn create_wallet(
     let node_identity = NodeIdentity::random(&mut OsRng, get_next_memory_address(), PeerFeatures::COMMUNICATION_NODE);
     let comms_config = P2pConfig {
         override_from: None,
-        public_addresses: vec![],
+        public_addresses: MultiaddrList::default(),
         transport: TransportConfig::new_memory(MemoryTransportConfig {
             listener_address: node_identity.first_public_address(),
         }),
@@ -669,7 +669,7 @@ async fn test_import_utxo() {
     let (connection, _temp_dir) = make_wallet_database_connection(None);
     let comms_config = P2pConfig {
         override_from: None,
-        public_addresses: vec![],
+        public_addresses: MultiaddrList::default(),
         transport: TransportConfig::new_tcp(TcpTransportConfig {
             listener_address: "/ip4/127.0.0.1/tcp/0".parse().unwrap(),
             tor_socks_address: None,

diff --git a/base_layer/wallet_ffi/src/lib.rs b/base_layer/wallet_ffi/src/lib.rs
@@ -86,7 +86,7 @@ use log4rs::{
 };
 use num_traits::FromPrimitive;
 use rand::rngs::OsRng;
-use tari_common::configuration::StringList;
+use tari_common::configuration::{MultiaddrList, StringList};
 use tari_common_types::{
     emoji::emoji_set,
     tari_address::{TariAddress, TariAddressError},
@@ -4772,9 +4772,9 @@ pub unsafe extern "C" fn comms_config_create(
     match public_address {
         Ok(public_address) => {
             let addresses = if (*transport).transport_type == TransportType::Tor {
-                vec![]
+                MultiaddrList::default()
             } else {
-                vec![public_address]
+                MultiaddrList::from(vec![public_address])
             };
 
             let config = TariCommsConfig {
@@ -5294,8 +5294,8 @@ pub unsafe extern "C" fn wallet_create(
         let node_features = wallet_database.get_node_features()?.unwrap_or_default();
         let node_addresses = if comms_config.public_addresses.is_empty() {
             match wallet_database.get_node_address()? {
-                Some(addr) => vec![addr],
-                None => vec![],
+                Some(addr) => MultiaddrList::from(vec![addr]),
+                None => MultiaddrList::default(),
             }
         } else {
             comms_config.public_addresses.clone()
@@ -5316,7 +5316,7 @@ pub unsafe extern "C" fn wallet_create(
         // SAFETY: we are manually checking the validity of this signature before adding Some(..)
         let node_identity = Arc::new(NodeIdentity::with_signature_unchecked(
             comms_secret_key,
-            node_addresses,
+            node_addresses.to_vec(),
             node_features,
             identity_sig,
         ));

diff --git a/common/src/configuration/mod.rs b/common/src/configuration/mod.rs
@@ -43,6 +43,7 @@ pub mod loader;
 mod network;
 pub use network::Network;
 mod common_config;
+mod multiaddr_list;
 pub mod name_server;
 pub mod serializers;
 mod string_list;
@@ -52,6 +53,7 @@ use std::{iter::FromIterator, net::SocketAddr};
 
 pub use common_config::CommonConfig;
 use multiaddr::{Error, Multiaddr, Protocol};
+pub use multiaddr_list::MultiaddrList;
 pub use string_list::StringList;
 
 /// Interpret a string as either a socket address (first) or a multiaddr format string.