diff --git a/.gitmodules b/.gitmodules
index 0b6eef1..4d3b136 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "dart-warp"]
 	path = dart-warp
 	url = https://github.com/hhanh00/dart-warp.git
+[submodule "ywallet"]
+	path = ywallet
+	url = git@github.com:hhanh00/ywallet.git
diff --git a/Cargo.lock b/Cargo.lock
index c6a3969..62f7087 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3997,6 +3997,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -4418,6 +4419,15 @@ version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "which"
 version = "4.4.2"
diff --git a/Cargo.toml b/Cargo.toml
index 3e253a6..3cc1ba2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ figment = { version = "0.10.19", features = [ "env", "toml" ] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = [ "env-filter" ] }
 tokio = { version = "1.40", features = ["rt-multi-thread"] }
-tonic = { version = "0.12", features = ["tls", "tls-roots"] }
+tonic = { version = "0.12", features = ["tls", "tls-native-roots", "tls-webpki-roots"] }
 prost = "0.13"
 hex = { version = "0.4", features = ["serde"] }
 r2d2 = "0.8.10"
diff --git a/dart-warp b/dart-warp
index b522a05..18f4684 160000
--- a/dart-warp
+++ b/dart-warp
@@ -1 +1 @@
-Subproject commit b522a059bc306db36732a5d14ffac289ef6d2167
+Subproject commit 18f468429fdb6fe0f2e505b573aaeb157a05042e
diff --git a/ywallet b/ywallet
new file mode 160000
index 0000000..a8722db
--- /dev/null
+++ b/ywallet
@@ -0,0 +1 @@
+Subproject commit a8722db85455ead04231a3f14de72cde24404c80
diff --git a/zcash-warp b/zcash-warp
index 8a39272..b20be83 160000
--- a/zcash-warp
+++ b/zcash-warp
@@ -1 +1 @@
-Subproject commit 8a39272cbd8c90987637041e87cdf6051bcf0887
+Subproject commit b20be83e2f0b51af68a326ad6264a341fc217bbe