feat: use tor connector when bulding client

HarborWallet · Jun 15, 2024 · 83c4154 · 83c4154
1 parent fcad4c9
commit 83c4154
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,14 +30,14 @@ hex = "0.4.3"
 
 bitcoin = { version = "0.30.2", features = ["base64"] }
 bip39 = "2.0.0"
-fedimint-api-client = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-client = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-core = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-wallet-client = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-mint-client = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-ln-client = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-bip39 = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
-fedimint-ln-common = { git = "https://github.com/oleonardolima/fedimint/", branch = "feat/add-mvp-tor-support-connection-to-hostnames" }
+fedimint-api-client = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-client = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-core = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-wallet-client = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-mint-client = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-ln-client = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-bip39 = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
+fedimint-ln-common = { git = "https://github.com/oleonardolima/fedimint/", rev = "2b54c1cbbec42499c805862724496f45006393db" }
 
 [dev-dependencies]
 tempdir = "0.3.7"
diff --git a/justfile b/justfile
@@ -5,7 +5,7 @@ set dotenv-load := true
 FEATURE_FLAG := if env('USE_VENDOR_FEATURE', '0') == "1" { "--features vendored" } else { "" }
 
 run:
-    RUST_LOG=harbor=debug,iced_wgpu=error,wgpu_core=error,info cargo run {{FEATURE_FLAG}}
+    RUST_LOG=harbor=debug,fedimint=trace,jsonrpsee=trace,arti=trace,iced_wgpu=error,wgpu_core=error,info cargo run {{FEATURE_FLAG}}
 
 watch:
     RUST_LOG=harbor=debug,iced_wgpu=error,wgpu_core=error,info cargo watch -x "run {{FEATURE_FLAG}}"

diff --git a/src/core.rs b/src/core.rs
@@ -2,6 +2,7 @@ use anyhow::anyhow;
 use bip39::Mnemonic;
 use bitcoin::address::NetworkUnchecked;
 use bitcoin::{Address, Network};
+use fedimint_api_client::api::Connector;
 use fedimint_core::config::{ClientConfig, FederationId};
 use fedimint_core::invite_code::InviteCode;
 use fedimint_core::Amount;
@@ -302,7 +303,7 @@ impl HarborCore {
 
     async fn get_federation_info(&self, invite_code: InviteCode) -> anyhow::Result<ClientConfig> {
         let download = Instant::now();
-        let config = fedimint_api_client::download_from_invite_code(&invite_code)
+        let config = fedimint_api_client::download_from_invite_code(Connector::Tor, &invite_code)
             .await
             .map_err(|e| {
                 error!("Could not download federation info: {e}");

diff --git a/src/fedimint_client.rs b/src/fedimint_client.rs
@@ -6,6 +6,7 @@ use async_trait::async_trait;
 use bip39::Mnemonic;
 use bitcoin::hashes::hex::FromHex;
 use bitcoin::Network;
+use fedimint_api_client::api::Connector;
 use fedimint_bip39::Bip39RootSecretStrategy;
 use fedimint_client::oplog::UpdateStreamOrOutcome;
 use fedimint_client::secret::{get_default_client_secret, RootSecretStrategy};
@@ -85,6 +86,8 @@ impl FedimintClient {
 
         client_builder.with_primary_module(1);
 
+        client_builder.with_tor_connector();
+
         trace!("Building fedimint client db");
         let secret = Bip39RootSecretStrategy::<12>::to_root_secret(mnemonic);
 
@@ -100,7 +103,7 @@ impl FedimintClient {
             )
         } else if let FederationInviteOrId::Invite(i) = invite_or_id {
             let download = Instant::now();
-            let config = fedimint_api_client::download_from_invite_code(&i)
+            let config = fedimint_api_client::download_from_invite_code(Connector::Tor, &i)
                 .await
                 .map_err(|e| {
                     error!("Could not download federation info: {e}");