diff --git a/Cargo.lock b/Cargo.lock
index b29b05b..922e10c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -359,9 +359,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arti-client"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9600759b9461ddc620a657ddb0c60ad30ba2774c35063d65c8463c292c20bca4"
+checksum = "4403d53a0283643918804e5660f3e0c61c1ebe4316f7ff689d63ee67099ceff0"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -2882,9 +2882,9 @@ dependencies = [
 
 [[package]]
 name = "fs-mistrust"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28515c41c52a8a46080eaea6270371028a588ccf910c60f0f34edecfd4a891bc"
+checksum = "8bac926cebf23b68e62f518086eb5671f3d24daa00c395e2142840adef3dc476"
 dependencies = [
  "derive_builder_fork_arti",
  "dirs 6.0.0",
@@ -2928,9 +2928,9 @@ dependencies = [
 
 [[package]]
 name = "fslock-guard"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd65ae40b736ed57be8f11668c12ef6689e2f8609b36da22ff8f4a863a954d3"
+checksum = "96e83653bb011605793e687636bd1d24f1918f3c410f20e1d9173a37451cd351"
 dependencies = [
  "fslock-arti-fork",
  "thiserror 2.0.12",
@@ -3646,7 +3646,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_api"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -3671,7 +3671,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_config"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
@@ -3686,7 +3686,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_controller"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "chrono",
  "easy-jsonrpc-mw",
@@ -3720,7 +3720,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_impls"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -3759,7 +3759,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_libwallet"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "age",
  "base64 0.9.3",
@@ -3798,7 +3798,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_util"
 version = "5.4.0-alpha.1"
-source = "git+https://github.com/ardocrat/grin-wallet?branch=wallet_node_client_proxy#bb85ffff7f4f2b129ede72e0423449e924a528c0"
+source = "git+https://github.com/mimblewimble/grin-wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
 dependencies = [
  "data-encoding",
  "ed25519-dalek 1.0.1",
@@ -9138,9 +9138,9 @@ checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 
 [[package]]
 name = "tor-async-utils"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae472e9363f0a6996f7fd52f795b942c895d807e63799b5c5712524d832b4ac4"
+checksum = "ab39ac8f645cf00569cb2e4ec2b0723485496d0a92c7ee3c3dcb0f3a24890eef"
 dependencies = [
  "derive-deftly 1.0.1",
  "educe",
@@ -9154,9 +9154,9 @@ dependencies = [
 
 [[package]]
 name = "tor-basic-utils"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34a3106b61f70d1e92072859ea63bbcd1abea928bb2518314b1ead229c876b3"
+checksum = "33dafd99d3b6312c08c3f065dc4cffb664b6a507bb8360eb875621b130990489"
 dependencies = [
  "derive_more",
  "hex",
@@ -9173,9 +9173,9 @@ dependencies = [
 
 [[package]]
 name = "tor-bytes"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "679fd4574ccd514cecec56593c262703c9ff550addf0b68a857629d8878e721c"
+checksum = "9cad60b88e4e4f0ca456f7dc09f6803f61e7441e246fbe023a995542867bdec3"
 dependencies = [
  "bytes 1.10.1",
  "derive-deftly 1.0.1",
@@ -9191,9 +9191,9 @@ dependencies = [
 
 [[package]]
 name = "tor-cell"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e70fd32db0340b839bd7eefd7692e7ebf5213951e6fb5d55584226d6a1d1230"
+checksum = "c3f8549feabbff3239a7b95ea13c14f8e62b4e818da965d48c6828b8e3ec41f6"
 dependencies = [
  "amplify",
  "bitflags 2.9.1",
@@ -9214,15 +9214,16 @@ dependencies = [
  "tor-linkspec",
  "tor-llcrypto",
  "tor-memquota",
+ "tor-protover",
  "tor-units",
  "void",
 ]
 
 [[package]]
 name = "tor-cert"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919f2405bc098fb37f2fee6dfaf90e9a39e7fbe353ff5b209464bb7cb7be107e"
+checksum = "d74bedc43ceb07c10ad01df76c5a935272877be7044ba5529b05420fa05b223d"
 dependencies = [
  "caret",
  "derive_builder_fork_arti",
@@ -9236,9 +9237,9 @@ dependencies = [
 
 [[package]]
 name = "tor-chanmgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d72cf71c97fbb8ab50ee3453f4c6cfac9e6cec66d3e0f4b392b1065ad47142ea"
+checksum = "a890f9c0848e3e2586fd4edccfbccdd47543e87a1929cf2b4573d9a702440ac0"
 dependencies = [
  "async-trait",
  "caret",
@@ -9271,9 +9272,9 @@ dependencies = [
 
 [[package]]
 name = "tor-checkable"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00a4328f9a14ab9b3b21ae84d96c6fa0b45731f071bebe0a5bba7d66753b8654"
+checksum = "55af8d517e87c07f385bbdf8ea1fdd6e71830ecba5285b9a7bb249f7e4e47a85"
 dependencies = [
  "humantime",
  "signature 2.2.0",
@@ -9283,9 +9284,9 @@ dependencies = [
 
 [[package]]
 name = "tor-circmgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1086a2d9bf0182b61a26eaef5a44d5e201df0716faac6450cd0aafe97876ef63"
+checksum = "99c687d9033e41aaf4c39b6f6739cafdef3f6bc120cda5a6b8f7f5cf700caaa2"
 dependencies = [
  "amplify",
  "async-trait",
@@ -9331,9 +9332,9 @@ dependencies = [
 
 [[package]]
 name = "tor-config"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a0099cd04bbe4f15c7a7ff2cbe296e8483080fdc9f29445d046e43ad43238d"
+checksum = "e04449603ba1e7f00f8bf6cf6b5a5a81ec542f5b7dbd79aac33643449f490df0"
 dependencies = [
  "amplify",
  "cfg-if 1.0.0",
@@ -9365,9 +9366,9 @@ dependencies = [
 
 [[package]]
 name = "tor-config-path"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96df671c199202597bf631156f922ed4c7fc5e9d964fb4df4fcf9d7dc2b9e6b1"
+checksum = "69032b69a29c856dc80e6d6b3f0578581aa412769ad1425c8f0274f7fe877495"
 dependencies = [
  "directories",
  "once_cell",
@@ -9380,9 +9381,9 @@ dependencies = [
 
 [[package]]
 name = "tor-consdiff"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dcb72a74052dccc2e7d4db82ffb079c5b2de66619767475d99939c440ea0771"
+checksum = "2da1b81654807c5652286cb9bfad117c0cc0f7a58f945f34fb6be30d10eb071c"
 dependencies = [
  "digest 0.10.7",
  "hex",
@@ -9392,9 +9393,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirclient"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4cc3ccae0106893784a50291c9f2bc9a60478dc77dec97606962066de51add"
+checksum = "1ef2209ceb4db6f7586a418570be4927b8f3d1a3ece31b0e128bc198a51ab117"
 dependencies = [
  "async-compression",
  "base64ct",
@@ -9420,9 +9421,9 @@ dependencies = [
 
 [[package]]
 name = "tor-dirmgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4047aa930f52dc037d12cf12a757817ee7fed2d55ac39733bd84039f7018c7"
+checksum = "158b46df5c0bb1d69edfe51048f3f26a581d90d4132a9facd4f8533be81da437"
 dependencies = [
  "async-trait",
  "base64ct",
@@ -9475,9 +9476,9 @@ dependencies = [
 
 [[package]]
 name = "tor-error"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb86e4066361d17a99c3ff499473814fed182fca25cb8c53e350f23f6f6fe86"
+checksum = "b8fcc0b0b90078f705362335aee2ddf10a68108694ee4f063778c14eaf6fcca3"
 dependencies = [
  "derive_more",
  "futures 0.3.31",
@@ -9493,9 +9494,9 @@ dependencies = [
 
 [[package]]
 name = "tor-general-addr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc30ae918d31b5463a21ee5a2970e3670795276fbd1c565aa0c6170c0b3dcb3f"
+checksum = "be71b2de02947b2f8711881fe7262002b8ac2c7283937c8d7144d0a902ce7fe2"
 dependencies = [
  "derive_more",
  "thiserror 2.0.12",
@@ -9504,9 +9505,9 @@ dependencies = [
 
 [[package]]
 name = "tor-guardmgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11db35299ec505a09a6e52c1f6da10450e25f9966043980a04b6cdbbc9aec5f"
+checksum = "788b4fa9bdd757fa7ee3e3946dc3fc44e81d23e1865ce499f8204f318e57fd0b"
 dependencies = [
  "amplify",
  "base64ct",
@@ -9547,9 +9548,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsclient"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5c5969746e551b55a770bee1614c5a5f6f5e31b24222530a32eef8705d65ec6"
+checksum = "7c01d21f9a290b97fd6fb4b68e5f0eafc92ef61a47dd4fae6f3fbcbe0a2e449f"
 dependencies = [
  "async-trait",
  "derive-deftly 1.0.1",
@@ -9591,20 +9592,22 @@ dependencies = [
 
 [[package]]
 name = "tor-hscrypto"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9a27cb49e849891e582aaa50e8a0ea69313c07459602b9b329b261e63dc59a"
+checksum = "6bdf871ea7ef6df765f24d79d74b06f7387803f50e36c96015862b2efe5a5f1b"
 dependencies = [
  "cipher 0.4.4",
  "data-encoding",
  "derive-deftly 1.0.1",
  "derive_more",
  "digest 0.10.7",
+ "hex",
  "humantime",
  "itertools 0.14.0",
  "paste",
  "rand 0.9.1",
  "safelog",
+ "serde",
  "signature 2.2.0",
  "subtle",
  "thiserror 2.0.12",
@@ -9621,9 +9624,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsrproxy"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21aaedc9431d390714b2691f11c16c71f506ddbbeddeb5c658befc5e3f018eaf"
+checksum = "9fea6823821170a8abceb72d3a444ab2d15db2eab878e18b7e67ff700b3038c4"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_builder_fork_arti",
@@ -9650,9 +9653,9 @@ dependencies = [
 
 [[package]]
 name = "tor-hsservice"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c82ef7ea3069c675e6ef0edce1e4f333a575d753e763d04f1d481c944d7a679"
+checksum = "e73e37242b9ee1a78c44fc753ab7562696b099b53b2caabd986133cde462107b"
 dependencies = [
  "amplify",
  "async-trait",
@@ -9708,9 +9711,9 @@ dependencies = [
 
 [[package]]
 name = "tor-key-forge"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48b1c658d4f88ca59bc3b384ca3de908eebe5000c243283b2e458adf932a1d2d"
+checksum = "59e00ceba887c2441c642354f58cd7bac9efac87107e715d465afa262a9ccdea"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
@@ -9729,9 +9732,9 @@ dependencies = [
 
 [[package]]
 name = "tor-keymgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bcb6b882b635aba303dc718330bcfc6287d3756b5e7c1870259f92ac795432c"
+checksum = "ebded0b99e8d1df3ef8691839ee7ec66794f3e5bda151083ef4543ae3a528f81"
 dependencies = [
  "amplify",
  "arrayvec 0.7.6",
@@ -9767,9 +9770,9 @@ dependencies = [
 
 [[package]]
 name = "tor-linkspec"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c24b7652c8130efc619e4ffe24886b169e5b3664a3756a869d1e69206ce67a39"
+checksum = "d3705cc3bf4eefac8fa18f01e33384097cf10d952a25c43ab357c8cb8e8c2732"
 dependencies = [
  "base64ct",
  "by_address",
@@ -9794,9 +9797,9 @@ dependencies = [
 
 [[package]]
 name = "tor-llcrypto"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85f10a68746bbf0fad32abcd38f1a9fa905c9e60c92a99cae35e96ee617075a3"
+checksum = "4def0c5674fa67c5b8a8fb8814c0381570e4866842c233ac98982e78779339bf"
 dependencies = [
  "aes",
  "base64ct",
@@ -9834,9 +9837,9 @@ dependencies = [
 
 [[package]]
 name = "tor-log-ratelim"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe3c68920a78eeb81eef3fe50fcffa3f65e4f2394c2132e8849b6ac6d244413"
+checksum = "003db25e21771974c4b488f039c11509329d55da4a4bebee6276383b27412fff"
 dependencies = [
  "futures 0.3.31",
  "humantime",
@@ -9850,9 +9853,9 @@ dependencies = [
 
 [[package]]
 name = "tor-memquota"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e0391e1c8377c1511a11707aef7e850427fe3448de8e8794b016e9216d5b4c"
+checksum = "59ee8a33267e80ba58c727fe00e2315a4b98699ea69bd4b1b41121b1346a06f4"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
@@ -9878,9 +9881,9 @@ dependencies = [
 
 [[package]]
 name = "tor-netdir"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e0e2fd36ffa1f815ee68ada149e89dde17472e10c8ad2ea27798f32916e020"
+checksum = "d02a187a1d620a53f2b05ea5e7f5a02991fa5fd560b1b25a536c931f74e47aa8"
 dependencies = [
  "async-trait",
  "bitflags 2.9.1",
@@ -9911,9 +9914,9 @@ dependencies = [
 
 [[package]]
 name = "tor-netdoc"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f85d89993af320afe9139850939a7450884610e66908dfe17bc2b427902296b"
+checksum = "2d3fcd7edf0fb44fb25dc463581e74cd6cd2c53d04551299670f165cc980e523"
 dependencies = [
  "amplify",
  "base64ct",
@@ -9956,9 +9959,9 @@ dependencies = [
 
 [[package]]
 name = "tor-persist"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4880170f467e6b44547e258880cd3dcdbeff643881e7aefc7155a59ef30615"
+checksum = "633386d7a4ff47da9d2e7cac67ac3aa4d0054366d848b2c09d553237bd02b0cb"
 dependencies = [
  "amplify",
  "derive-deftly 1.0.1",
@@ -9985,9 +9988,9 @@ dependencies = [
 
 [[package]]
 name = "tor-proto"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4548ddde59a82813db633b9599fc251516ac61c951f3e27e4ec86b0dacb9b56b"
+checksum = "9dff944d90c538970b3ad07a52df4afe85accb10bafeea78c55c3a8b6ae33cd9"
 dependencies = [
  "amplify",
  "asynchronous-codec",
@@ -10006,6 +10009,7 @@ dependencies = [
  "futures-util",
  "hkdf 0.12.4",
  "hmac 0.12.1",
+ "itertools 0.14.0",
  "oneshot-fused-workaround",
  "pin-project",
  "rand 0.9.1",
@@ -10043,21 +10047,22 @@ dependencies = [
 
 [[package]]
 name = "tor-protover"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6ca1c73814a234e2d39f3aa168d867999c82ced075bef5a96c31648fa0aab36"
+checksum = "57a0f42fab1f6b653031defad07ce891dc21af3fe25eb631ab0c034882a700bd"
 dependencies = [
  "caret",
  "paste",
  "serde_with",
  "thiserror 2.0.12",
+ "tor-bytes",
 ]
 
 [[package]]
 name = "tor-ptmgr"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e07dd68f072c9f9cf61d1f8c88ab21243115fcf983d50fd04448c126a55b71be"
+checksum = "f4b0266b45d8f8ff6ea7f79405eb46b693ba585fe9126602c9f87a67283c4348"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -10082,9 +10087,9 @@ dependencies = [
 
 [[package]]
 name = "tor-relay-selection"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db156435a2859b71ec17ef4ca04b0cfc6ecd6a68e401375d79f155baed99ad2"
+checksum = "49c52c8c32ee42b02da8e5e94258b7bc136a41ea944ed20f74764c2deafbc3c3"
 dependencies = [
  "rand 0.9.1",
  "serde",
@@ -10096,9 +10101,9 @@ dependencies = [
 
 [[package]]
 name = "tor-rtcompat"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edda713133a1abf729ecc24af2616aa0ee4631098fc0e3617eeb704a647c8ed1"
+checksum = "c2c62e2b05b0ab52036b1dda8371a7d64cef02148c965d85140e1f8abc8e3ae9"
 dependencies = [
  "async-native-tls",
  "async-trait",
@@ -10125,9 +10130,9 @@ dependencies = [
 
 [[package]]
 name = "tor-rtmock"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99076aa2a63a6f3aa2de8d2f2b96d306d5efc5f9b48aa187205081dab34b2778"
+checksum = "ff562d8f58de3b59a35e047a5e0c34ca0a3d4bed72d9f0b493e6cba946aef248"
 dependencies = [
  "amplify",
  "assert_matches",
@@ -10154,9 +10159,9 @@ dependencies = [
 
 [[package]]
 name = "tor-socksproto"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc359b08eb4c85ff4a33e32e0c0794beedd81b7f2f0b10c0c17300e3af57085"
+checksum = "e572aa58e0a4799b1d49e29f7f552bf8b46b9d2b6536a3748cad30cfd94c01d9"
 dependencies = [
  "amplify",
  "caret",
@@ -10171,12 +10176,13 @@ dependencies = [
 
 [[package]]
 name = "tor-units"
-version = "0.30.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0282fefcdc3dd57699fa6a6a6db6fbc3d70824146472cffdf97503032aa51e3d"
+checksum = "d7acec20a7aafddf9f399bd32e4ff70e25144fcb5da298e0331504522bcb77f0"
 dependencies = [
  "derive-deftly 1.0.1",
  "derive_more",
+ "serde",
  "thiserror 2.0.12",
  "tor-memquota",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 942ebdd..7a56f3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,11 +60,11 @@ grin_util = "5.3.3"
 #grin_wallet_controller = { path = "../grin-wallet/controller" }
 
 # test
-grin_wallet_impls = { git = "https://github.com/ardocrat/grin-wallet", branch = "wallet_node_client_proxy" }
-grin_wallet_api = { git = "https://github.com/ardocrat/grin-wallet", branch = "wallet_node_client_proxy" }
-grin_wallet_libwallet = { git = "https://github.com/ardocrat/grin-wallet", branch = "wallet_node_client_proxy" }
-grin_wallet_util = { git = "https://github.com/ardocrat/grin-wallet", branch = "wallet_node_client_proxy" }
-grin_wallet_controller = { git = "https://github.com/ardocrat/grin-wallet", branch = "wallet_node_client_proxy" }
+grin_wallet_impls = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
+grin_wallet_api = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
+grin_wallet_libwallet = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
+grin_wallet_util = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
+grin_wallet_controller = { git = "https://github.com/mimblewimble/grin-wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
 
 ## ui
 egui = { version = "0.31.1", default-features = false }
@@ -108,16 +108,16 @@ hyper-proxy2 = "0.1.0"
 hyper-tls = "0.6.0"
 
 ## tor
-arti-client = { version = "0.30.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
-tor-rtcompat = { version = "0.30.0", features = ["static"] }
-tor-config = "0.30.0"
+arti-client = { version = "0.31.0", features = ["pt-client", "static", "onion-service-service", "onion-service-client"] }
+tor-rtcompat = { version = "0.31.0", features = ["static"] }
+tor-config = "0.31.0"
 fs-mistrust = "0.9.1"
-tor-hsservice = "0.30.0"
-tor-hsrproxy = "0.30.0"
-tor-keymgr = "0.30.0"
-tor-llcrypto = "0.30.0"
-tor-hscrypto = "0.30.0"
-tor-error = "0.30.0"
+tor-hsservice = "0.31.0"
+tor-hsrproxy = "0.31.0"
+tor-keymgr = "0.31.0"
+tor-llcrypto = "0.31.0"
+tor-hscrypto = "0.31.0"
+tor-error = "0.31.0"
 sha2 = "0.10.8"
 ed25519-dalek = "2.1.1"
 curve25519-dalek = "4.1.3"