diff --git a/Cargo.lock b/Cargo.lock
index d13abb7..4826f80 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -662,6 +662,28 @@ dependencies = [
  "tokio 1.48.0",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite 0.2.16",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2 1.0.103",
+ "quote 1.0.42",
+ "syn 2.0.110",
+]
+
 [[package]]
 name = "async-task"
 version = "4.7.1"
@@ -797,12 +819,6 @@ dependencies = [
  "safemem",
 ]
 
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -815,6 +831,12 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -1859,15 +1881,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ct-logs"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113"
-dependencies = [
- "sct",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -3568,7 +3581,7 @@ dependencies = [
  "grin_keychain",
  "grin_p2p",
  "grin_servers",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_api",
  "grin_wallet_controller",
  "grin_wallet_impls",
@@ -3595,7 +3608,7 @@ dependencies = [
  "qrcodegen",
  "rand 0.9.2",
  "rfd",
- "ring",
+ "ring 0.16.20",
  "rkv",
  "rqrr",
  "rust-i18n",
@@ -3628,11 +3641,11 @@ dependencies = [
 
 [[package]]
 name = "grin_api"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6443239e75a15c517ce24fe4dd3ef257898ae0224e6b7c993db28794e13ecf3e"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
- "bytes 0.5.6",
+ "async-stream",
+ "bytes 1.10.1",
  "easy-jsonrpc-mw",
  "futures 0.3.31",
  "grin_chain",
@@ -3640,30 +3653,30 @@ dependencies = [
  "grin_p2p",
  "grin_pool",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "http 0.2.12",
- "hyper 0.13.10",
- "hyper-rustls 0.20.0",
+ "hyper 0.14.32",
+ "hyper-rustls 0.23.2",
  "hyper-timeout",
  "lazy_static",
  "log",
  "regex",
- "ring",
- "rustls 0.17.0",
+ "ring 0.16.20",
+ "rustls 0.20.9",
+ "rustls-pemfile",
  "serde",
  "serde_derive",
  "serde_json",
  "thiserror 1.0.69",
- "tokio 0.2.25",
- "tokio-rustls 0.13.1",
+ "tokio 1.48.0",
+ "tokio-rustls 0.23.4",
  "url",
 ]
 
 [[package]]
 name = "grin_chain"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdedcee9e20e0cc8dc1460b37b3951306c774a6aa5788e3f45addc56e60f7fbe"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "bit-vec 0.6.3",
  "bitflags 1.3.2",
@@ -3674,7 +3687,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "lazy_static",
  "log",
  "lru-cache",
@@ -3685,15 +3698,14 @@ dependencies = [
 
 [[package]]
 name = "grin_config"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f592415c070206f7ea44faec8880cd1b8ff205f5f6053f756e3501b3d240cb75"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
  "grin_p2p",
  "grin_servers",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "rand 0.6.5",
  "serde",
  "serde_derive",
@@ -3702,9 +3714,8 @@ dependencies = [
 
 [[package]]
 name = "grin_core"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4fbf242a2a23a6554dd4c430574d2563993cf5f44921f953635e8a177cf2506"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -3713,7 +3724,7 @@ dependencies = [
  "croaring",
  "enum_primitive",
  "grin_keychain",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "lazy_static",
  "log",
  "lru-cache",
@@ -3729,14 +3740,13 @@ dependencies = [
 
 [[package]]
 name = "grin_keychain"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abeb1c22f48269a0bf463de589f8961d8bbb554def5e5e405710ead9a1b4c71a"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "byteorder",
  "digest 0.9.0",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "hmac 0.11.0",
  "lazy_static",
  "log",
@@ -3752,9 +3762,8 @@ dependencies = [
 
 [[package]]
 name = "grin_p2p"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b0ecc5597244d698ec4e1ea2e7d04c3b209f496db16731a04f06af41572c54"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "bitflags 1.3.2",
  "bytes 0.5.6",
@@ -3763,7 +3772,7 @@ dependencies = [
  "grin_chain",
  "grin_core",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "log",
  "lru-cache",
  "num",
@@ -3775,15 +3784,14 @@ dependencies = [
 
 [[package]]
 name = "grin_pool"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14b758b202f034a03b894e732c716ddece8994fae5d8da1e074b1a9e07219f2b"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "blake2-rfc",
  "chrono",
  "grin_core",
  "grin_keychain",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "log",
  "rand 0.6.5",
  "serde",
@@ -3808,10 +3816,10 @@ dependencies = [
 
 [[package]]
 name = "grin_servers"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8444cfbed8ff5371683eb622972136f22dfc6f76b5140b29279a4bbee6a0b58e"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
+ "async-stream",
  "chrono",
  "fs2",
  "futures 0.3.31",
@@ -3822,31 +3830,31 @@ dependencies = [
  "grin_p2p",
  "grin_pool",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "http 0.2.12",
- "hyper 0.13.10",
- "hyper-rustls 0.20.0",
+ "hyper 0.14.32",
+ "hyper-rustls 0.23.2",
  "lmdb-zero",
  "log",
  "rand 0.6.5",
+ "rustls 0.20.9",
  "serde",
  "serde_derive",
  "serde_json",
- "tokio 0.2.25",
- "tokio-util 0.2.0",
+ "tokio 1.48.0",
+ "tokio-util 0.7.17",
  "walkdir",
 ]
 
 [[package]]
 name = "grin_store"
-version = "5.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "708e53758263fa17dfd3fc46419ded59a84d07818e1ee7526b0d47ba268f1362"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
 dependencies = [
  "byteorder",
  "croaring",
  "grin_core",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "libc",
  "lmdb-zero",
  "log",
@@ -3880,10 +3888,32 @@ dependencies = [
  "zip",
 ]
 
+[[package]]
+name = "grin_util"
+version = "5.4.0-alpha.0"
+source = "git+https://code.gri.mw/ardocrat/node?rev=a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e#a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e"
+dependencies = [
+ "anyhow",
+ "backtrace",
+ "base64 0.12.3",
+ "byteorder",
+ "grin_secp256k1zkp",
+ "lazy_static",
+ "log",
+ "log4rs",
+ "parking_lot 0.10.2",
+ "rand 0.6.5",
+ "serde",
+ "serde_derive",
+ "walkdir",
+ "zeroize",
+ "zip",
+]
+
 [[package]]
 name = "grin_wallet_api"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -3891,14 +3921,14 @@ dependencies = [
  "ed25519-dalek 1.0.1",
  "grin_core",
  "grin_keychain",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_config",
  "grin_wallet_impls",
  "grin_wallet_libwallet",
  "grin_wallet_util",
  "log",
  "rand 0.6.5",
- "ring",
+ "ring 0.16.20",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3908,11 +3938,11 @@ dependencies = [
 [[package]]
 name = "grin_wallet_config"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "dirs 2.0.2",
  "grin_core",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_util",
  "rand 0.6.5",
  "serde",
@@ -3923,7 +3953,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_controller"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "chrono",
  "easy-jsonrpc-mw",
@@ -3931,19 +3961,19 @@ dependencies = [
  "grin_api",
  "grin_core",
  "grin_keychain",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_api",
  "grin_wallet_config",
  "grin_wallet_impls",
  "grin_wallet_libwallet",
  "grin_wallet_util",
- "hyper 0.13.10",
+ "hyper 0.14.32",
  "lazy_static",
  "log",
  "prettytable-rs",
  "qr_code",
  "rand 0.7.3",
- "ring",
+ "ring 0.16.20",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3957,7 +3987,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_impls"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -3971,7 +4001,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_config",
  "grin_wallet_libwallet",
  "grin_wallet_util",
@@ -3980,7 +4010,7 @@ dependencies = [
  "rand 0.6.5",
  "regex",
  "reqwest",
- "ring",
+ "ring 0.16.20",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3996,7 +4026,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_libwallet"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "age",
  "base64 0.9.3",
@@ -4011,7 +4041,7 @@ dependencies = [
  "grin_core",
  "grin_keychain",
  "grin_store",
- "grin_util",
+ "grin_util 5.4.0-alpha.0",
  "grin_wallet_config",
  "grin_wallet_util",
  "hmac 0.12.1",
@@ -4035,11 +4065,11 @@ dependencies = [
 [[package]]
 name = "grin_wallet_util"
 version = "5.4.0-alpha.1"
-source = "git+https://code.gri.mw/CORE/wallet?rev=930a44d456b43172fc096eda0bbf6a3841f48c6a#930a44d456b43172fc096eda0bbf6a3841f48c6a"
+source = "git+https://code.gri.mw/ardocrat/wallet?rev=8c9171e640f4a95bec7e22d9acb1725ebb2e30a1#8c9171e640f4a95bec7e22d9acb1725ebb2e30a1"
 dependencies = [
  "data-encoding",
  "ed25519-dalek 1.0.1",
- "grin_util",
+ "grin_util 5.3.3",
  "rand 0.6.5",
  "serde",
  "serde_derive",
@@ -4482,24 +4512,6 @@ dependencies = [
  "tower-service",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08"
-dependencies = [
- "bytes 0.5.6",
- "ct-logs",
- "futures-util",
- "hyper 0.13.10",
- "log",
- "rustls 0.17.0",
- "rustls-native-certs",
- "tokio 0.2.25",
- "tokio-rustls 0.13.1",
- "webpki",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.21.0"
@@ -4513,7 +4525,22 @@ dependencies = [
  "rustls 0.18.1",
  "tokio 0.2.25",
  "tokio-rustls 0.14.1",
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+dependencies = [
+ "http 0.2.12",
+ "hyper 0.14.32",
+ "log",
+ "rustls 0.20.9",
+ "rustls-native-certs",
+ "tokio 1.48.0",
+ "tokio-rustls 0.23.4",
 ]
 
 [[package]]
@@ -4534,13 +4561,13 @@ dependencies = [
 
 [[package]]
 name = "hyper-timeout"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d1f9b0b8258e3ef8f45928021d3ef14096c2b93b99e4b8cfcabf1f58ec84b0a"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "bytes 0.5.6",
- "hyper 0.13.10",
- "tokio 0.2.25",
+ "hyper 0.14.32",
+ "pin-project-lite 0.2.16",
+ "tokio 1.48.0",
  "tokio-io-timeout",
 ]
 
@@ -5782,8 +5809,8 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
- "security-framework-sys 2.15.0",
+ "security-framework",
+ "security-framework-sys",
  "tempfile",
 ]
 
@@ -7949,11 +7976,25 @@ dependencies = [
  "libc",
  "once_cell",
  "spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
  "web-sys",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if 1.0.4",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ripemd160"
 version = "0.9.1"
@@ -8185,19 +8226,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1"
-dependencies = [
- "base64 0.11.0",
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
 [[package]]
 name = "rustls"
 version = "0.18.1"
@@ -8206,21 +8234,42 @@ checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
 dependencies = [
  "base64 0.12.3",
  "log",
- "ring",
- "sct",
- "webpki",
+ "ring 0.16.20",
+ "sct 0.6.1",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+dependencies = [
+ "log",
+ "ring 0.16.20",
+ "sct 0.7.1",
+ "webpki 0.22.4",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.3.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls 0.17.0",
+ "rustls-pemfile",
  "schannel",
- "security-framework 0.4.4",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -8362,8 +8411,18 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -8411,19 +8470,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "security-framework"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation 0.7.0",
- "core-foundation-sys 0.7.0",
- "libc",
- "security-framework-sys 0.4.3",
-]
-
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -8434,17 +8480,7 @@ dependencies = [
  "core-foundation 0.9.4",
  "core-foundation-sys 0.8.7",
  "libc",
- "security-framework-sys 2.15.0",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"
-dependencies = [
- "core-foundation-sys 0.7.0",
- "libc",
+ "security-framework-sys",
 ]
 
 [[package]]
@@ -9483,12 +9519,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-io-timeout"
-version = "0.4.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9390a43272c8a6ac912ed1d1e2b6abeafd5047e05530a2fa304deee041a06215"
+checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
 dependencies = [
- "bytes 0.5.6",
- "tokio 0.2.25",
+ "pin-project-lite 0.2.16",
+ "tokio 1.48.0",
 ]
 
 [[package]]
@@ -9523,18 +9559,6 @@ dependencies = [
  "tokio 1.48.0",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4"
-dependencies = [
- "futures-core",
- "rustls 0.17.0",
- "tokio 0.2.25",
- "webpki",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.14.1"
@@ -9544,7 +9568,18 @@ dependencies = [
  "futures-core",
  "rustls 0.18.1",
  "tokio 0.2.25",
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.23.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+dependencies = [
+ "rustls 0.20.9",
+ "tokio 1.48.0",
+ "webpki 0.22.4",
 ]
 
 [[package]]
@@ -11138,6 +11173,12 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
 [[package]]
 name = "unty"
 version = "0.0.4"
@@ -11599,8 +11640,18 @@ version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -11609,7 +11660,7 @@ version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
 dependencies = [
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index dfb43e7..c30e7f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,14 +28,24 @@ panic = "abort"
 log = "0.4.27"
 
 ## grin
-grin_api = "5.3.3"
-grin_chain = "5.3.3"
-grin_config = "5.3.3"
-grin_core = "5.3.3"
-grin_p2p = "5.3.3"
-grin_servers = "5.3.3"
-grin_keychain = "5.3.3"
-grin_util = "5.3.3"
+#grin_api = "5.3.3"
+#grin_chain = "5.3.3"
+#grin_config = "5.3.3"
+#grin_core = "5.3.3"
+#grin_p2p = "5.3.3"
+#grin_servers = "5.3.3"
+#grin_keychain = "5.3.3"
+#grin_util = "5.3.3"
+
+
+grin_api = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_chain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_config = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_core = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_p2p = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_servers = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_keychain = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
+grin_util = { git = "https://code.gri.mw/ardocrat/node", rev = "a3ee15a8b27216cd2ff4b3b99894cd98dd33fa7e" }
 
 #grin_wallet_impls = "5.3.3"
 #grin_wallet_api = "5.3.3"
@@ -60,11 +70,11 @@ grin_util = "5.3.3"
 #grin_wallet_controller = { path = "../grin-wallet/controller" }
 
 # test
-grin_wallet_impls = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
-grin_wallet_api = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
-grin_wallet_libwallet = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
-grin_wallet_util = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
-grin_wallet_controller = { git = "https://code.gri.mw/CORE/wallet", rev = "930a44d456b43172fc096eda0bbf6a3841f48c6a" }
+grin_wallet_impls = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+grin_wallet_api = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+grin_wallet_libwallet = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+grin_wallet_util = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
+grin_wallet_controller = { git = "https://code.gri.mw/ardocrat/wallet", rev = "8c9171e640f4a95bec7e22d9acb1725ebb2e30a1" }
 
 ## ui
 egui = { version = "0.33.0", default-features = false }