Make libtor on by default for *nix builds

tari-project · Dec 20, 2023 · 1c2f0e4 · 1c2f0e4
1 parent 3396168
commit 1c2f0e4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/base_node_binaries.json b/.github/workflows/base_node_binaries.json
@@ -28,7 +28,7 @@
     "cross": false,
     "target_cpu": "x86-64",
     "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
-    "features": "libtor, safe"
+    "features": "default, safe"
   },
   {
     "name": "macos-arm64",
@@ -38,7 +38,7 @@
     "cross": false,
     "target_cpu": "generic",
     "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
-    "features": "libtor, safe",
+    "features": "default, safe",
     "build_enabled": true
   },
   {

diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -70,6 +70,7 @@ features = ["crossterm"]
 tari_features = { path = "../../common/tari_features"}
 
 [features]
+default = ["libtor"]
 libtor = ["tari_libtor"]
 grpc = []
 

diff --git a/applications/minotari_node/Cargo.toml b/applications/minotari_node/Cargo.toml
@@ -52,7 +52,7 @@ tonic = { version = "0.6.2", features = ["tls", "tls-roots" ] }
 tari_metrics = { path = "../../infrastructure/metrics", optional = true, features = ["server"] }
 
 [features]
-default = ["metrics"]
+default = ["metrics", "libtor"]
 metrics = ["tari_metrics", "tari_comms/metrics"]
 safe = []
 libtor = ["tari_libtor"]

diff --git a/applications/minotari_node/src/config.rs b/applications/minotari_node/src/config.rs
@@ -168,7 +168,7 @@ impl Default for BaseNodeConfig {
             grpc_tls_enabled: false,
             mining_enabled: false,
             identity_file: PathBuf::from("config/base_node_id.json"),
-            use_libtor: false,
+            use_libtor: true,
             tor_identity_file: PathBuf::from("config/base_node_tor_id.json"),
             p2p,
             db_type: DatabaseType::Lmdb,

diff --git a/base_layer/wallet/src/config.rs b/base_layer/wallet/src/config.rs
@@ -154,7 +154,7 @@ impl Default for WalletConfig {
             recovery_retry_limit: 3,
             fee_per_gram: 5,
             num_required_confirmations: 3,
-            use_libtor: false,
+            use_libtor: true,
             identity_file: None,
         }
     }

diff --git a/common/config/presets/c_base_node_c.toml b/common/config/presets/c_base_node_c.toml
@@ -2,7 +2,7 @@
 #identity_file = "config/base_node_id.json"
 
 # Spin up and use a built-in Tor instance, only works on macos/linux and must comment out 'tor.control_address' below.
-# This requires that the base node was built with the optional "libtor" feature flag. (default = false)
+# This requires that the base node was built with the optional "libtor" feature flag. (default = true)
 #use_libtor = false
 
 # A path to the file that stores the tor hidden service private key, if using the tor transport.

diff --git a/common/config/presets/d_console_wallet.toml b/common/config/presets/d_console_wallet.toml
@@ -79,7 +79,7 @@
 #num_required_confirmations = 3
 
 # Spin up and use a built-in Tor instance, only works on macos/linux and must comment out 'tor.control_address' below.
-# This requires that the base node was built with the optional "libtor" feature flag. (default = false)
+# This requires that the base node was built with the optional "libtor" feature flag. (default = true)
 #use_libtor = false
 
 # A path to the file that stores your node identity and secret key (default = "none")