From 1732dcedca7c7ab0c105a15fe4ae418523666134 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 12 Dec 2023 13:28:41 +0200 Subject: [PATCH 1/2] wallet use dns seeds --- .../minotari_console_wallet/src/init/mod.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/applications/minotari_console_wallet/src/init/mod.rs b/applications/minotari_console_wallet/src/init/mod.rs index cbabc75a9e..d5faff3b2a 100644 --- a/applications/minotari_console_wallet/src/init/mod.rs +++ b/applications/minotari_console_wallet/src/init/mod.rs @@ -50,7 +50,7 @@ use tari_common::{ }; use tari_comms::{ multiaddr::Multiaddr, - peer_manager::{Peer, PeerFeatures}, + peer_manager::{Peer, PeerFeatures, PeerQuery}, types::CommsPublicKey, NodeIdentity, }; @@ -321,6 +321,13 @@ pub async fn get_base_node_peer_config( } } } + let query = PeerQuery::new().select_where(|p| p.is_seed()); + let peer_seeds = wallet.comms.peer_manager().perform_query(query).await.map_err(|err| { + ExitError::new( + ExitCode::InterfaceError, + format!("Could net get seed peers from peer manager: {}", err), + ) + })?; // config let base_node_peers = config @@ -332,16 +339,6 @@ pub async fn get_base_node_peer_config( .collect::, _>>() .map_err(|err| ExitError::new(ExitCode::ConfigError, format!("Malformed base node peer: {}", err)))?; - // peer seeds - let peer_seeds = config - .peer_seeds - .peer_seeds - .iter() - .map(|s| SeedPeer::from_str(s)) - .map(|r| r.map(Peer::from)) - .collect::, _>>() - .map_err(|err| ExitError::new(ExitCode::ConfigError, format!("Malformed seed peer: {}", err)))?; - let peer_config = PeerConfig::new(selected_base_node, base_node_peers, peer_seeds); debug!(target: LOG_TARGET, "base node peer config: {:?}", peer_config); From 8152ff123fc8002184daa9243573f2bd07253116 Mon Sep 17 00:00:00 2001 From: SW van Heerden Date: Tue, 12 Dec 2023 16:10:47 +0200 Subject: [PATCH 2/2] add wallet _log --- base_layer/wallet_ffi/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base_layer/wallet_ffi/src/lib.rs b/base_layer/wallet_ffi/src/lib.rs index ae525c3ef8..f382acbcc1 100644 --- a/base_layer/wallet_ffi/src/lib.rs +++ b/base_layer/wallet_ffi/src/lib.rs @@ -8247,7 +8247,9 @@ pub unsafe extern "C" fn emoji_set_destroy(emoji_set: *mut EmojiSet) { /// None #[no_mangle] pub unsafe extern "C" fn wallet_destroy(wallet: *mut TariWallet) { + debug!(target: LOG_TARGET, "Wallet destroy called"); if !wallet.is_null() { + debug!(target: LOG_TARGET, "Wallet pointer not yet destroyed, shutting down now"); let mut w = Box::from_raw(wallet); let wallet_comms = w.wallet.comms.clone(); w.shutdown.trigger();