Cargo.toml: temp remove p2p-tor from net defaults due to android build errors, and add it back in on darkirc Cargo.toml

see main project Cargo.toml for more info.

Cargo.lock

@@ -7949,7 +7949,6 @@ checksum = "fb5df07e4a32aab17c8813aa43719a07fae6167212e4506b48f79a035bd2f4e9"
 dependencies = [
  "aes 0.8.4",
  "base64ct",
- "cipher 0.4.4",
  "ctr 0.9.2",
  "curve25519-dalek",
  "derive_more",
@@ -7958,7 +7957,6 @@ dependencies = [
  "educe",
  "getrandom 0.2.15",
  "hex",
- "openssl",
  "rand_core 0.6.4",
  "rsa",
  "safelog",
@@ -7970,7 +7968,6 @@ dependencies = [
  "simple_asn1",
  "subtle",
  "thiserror",
- "typenum",
  "x25519-dalek",
  "zeroize",
 ]

Cargo.toml

@@ -68,7 +68,7 @@ futures-rustls = {version = "0.26.0", default-features = false, features = ["log
 
 # Pluggable Transports
 socket2 = {version = "0.5.7", features = ["all"], optional = true}
-arti-client = {version = "0.20.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "accel-sha1-asm", "accel-openssl", "onion-service-client", "onion-service-service"], optional = true}
+arti-client = {version = "0.20.0", default-features = false, features = ["async-std", "compression", "error_detail", "rustls", "accel-sha1-asm", "onion-service-client", "onion-service-service"], optional = true}
 tor-error = {version = "0.20.0", optional = true}
 tor-rtcompat = {version = "0.20.0", features = ["async-std", "rustls"], optional = true}
 tor-hscrypto = {version = "0.20.0", optional = true}
@@ -260,7 +260,11 @@ net = [
     "util",
 
     "p2p-tcp",
-    "p2p-tor",
+    # This is temporarily disabled and for now is opt in.
+    # The issue is with OpenSSL on Android. While it can be disabled in arti,
+    # tor-dirmgr depends on sqlite/sqlcipher vis rusqlite. While this can be
+    # bundled, then for the crypto it requires OpenSSL again.
+    #"p2p-tor",
     #"p2p-nym",
     "p2p-unix",
 ]

bin/darkirc/Cargo.toml

@@ -18,7 +18,7 @@ name = "darkirc"
 path = "src/main.rs"
 
 [dependencies]
-darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "net", "util", "system", "rpc", "zk"]}
+darkfi = {path = "../../", features = ["async-daemonize", "event-graph", "net", "p2p-tor", "util", "system", "rpc", "zk"]}
 darkfi-sdk = {path = "../../src/sdk", features = ["async"]}
 darkfi-serial = {path = "../../src/serial", features = ["async"]}
 libc = "0.2.155"

bin/darkwallet/Cargo.toml

@@ -51,6 +51,7 @@ halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v4"}
 
 [target.'cfg(target_os = "android")'.dependencies]
 android_logger = "0.13.3"
+#openssl = { version = "*", features = ["vendored"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 simplelog = "0.12.1"

bin/darkwallet/Makefile

@@ -2,7 +2,7 @@ default:
 	cargo lrun
 
 android:
-	podman run -v $(shell pwd):/root/dw -w /root/dw -t apk cargo quad-apk build
+	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/darkwallet/ -t apk cargo quad-apk build
 	adb uninstall darkfi.darkwallet
 	adb install target/android-artifacts/debug/apk/darkwallet.apk
 	reset