Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: console wallet use dns seeds #6034

Merged
merged 3 commits into from
Dec 12, 2023
Merged

feat: console wallet use dns seeds #6034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1732dce
wallet use dns seeds
SWvheerden Dec 12, 2023
8152ff1
add wallet _log
SWvheerden Dec 12, 2023
0f035ab
Merge branch 'development' into sw_fix_wallet_dns
SWvheerden Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions applications/minotari_console_wallet/src/init/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use tari_common::{
};
use tari_comms::{
multiaddr::Multiaddr,
peer_manager::{Peer, PeerFeatures},
peer_manager::{Peer, PeerFeatures, PeerQuery},
types::CommsPublicKey,
NodeIdentity,
};
Expand Down Expand Up @@ -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
Expand All @@ -332,16 +339,6 @@ pub async fn get_base_node_peer_config(
.collect::<Result<Vec<_>, _>>()
.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::<Result<Vec<_>, _>>()
.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);

Expand Down
2 changes: 2 additions & 0 deletions base_layer/wallet_ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading