diff --git a/Cargo.lock b/Cargo.lock
index 8a8faba..0b234be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1066,33 +1066,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest 0.10.7",
- "fiat-crypto",
- "rustc_version",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
 [[package]]
 name = "darling"
 version = "0.14.4"
@@ -1464,12 +1437,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "fiat-crypto"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -1818,15 +1785,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "getrandom_or_panic"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
-dependencies = [
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -2853,18 +2811,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "merlin"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.6.4",
- "zeroize",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -3961,15 +3907,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
-[[package]]
-name = "rustc_version"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
-dependencies = [
- "semver",
-]
-
 [[package]]
 name = "rustix"
 version = "0.35.16"
@@ -4214,7 +4151,7 @@ dependencies = [
  "arrayvec 0.5.2",
  "curve25519-dalek 2.1.3",
  "getrandom 0.1.16",
- "merlin 2.0.1",
+ "merlin",
  "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
@@ -4222,23 +4159,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "schnorrkel"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
-dependencies = [
- "arrayref",
- "arrayvec 0.7.6",
- "curve25519-dalek 4.1.3",
- "getrandom_or_panic",
- "merlin 3.0.0",
- "rand_core 0.6.4",
- "sha2 0.10.8",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -4337,12 +4257,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "1.0.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-
 [[package]]
 name = "serde"
 version = "1.0.214"
@@ -4698,14 +4612,14 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
  "parking_lot",
  "primitive-types",
  "rand 0.8.5",
  "regex",
  "scale-info",
- "schnorrkel 0.9.1",
+ "schnorrkel",
  "secp256k1 0.24.3",
  "secrecy",
  "serde",
@@ -4742,14 +4656,14 @@ dependencies = [
  "lazy_static",
  "libsecp256k1",
  "log",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
  "parking_lot",
  "primitive-types",
  "rand 0.8.5",
  "regex",
  "scale-info",
- "schnorrkel 0.9.1",
+ "schnorrkel",
  "secp256k1 0.24.3",
  "secrecy",
  "serde",
@@ -4930,10 +4844,10 @@ checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c"
 dependencies = [
  "async-trait",
  "futures",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
  "parking_lot",
- "schnorrkel 0.9.1",
+ "schnorrkel",
  "sp-core 11.0.0",
  "sp-externalities 0.15.0",
  "thiserror",
@@ -4946,10 +4860,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "452d079f592c97369c9ca8a5083b25f146751c6b5af10cbcacc2b24dc53fd72a"
 dependencies = [
  "futures",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
  "parking_lot",
- "schnorrkel 0.9.1",
+ "schnorrkel",
  "sp-core 20.0.0",
  "sp-externalities 0.18.0",
  "thiserror",
@@ -5430,13 +5344,13 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "substrate-bip39"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f"
+checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328"
 dependencies = [
  "hmac 0.11.0",
  "pbkdf2 0.8.0",
- "schnorrkel 0.11.4",
+ "schnorrkel",
  "sha2 0.9.9",
  "zeroize",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 0aa61f7..ab06921 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,20 +17,20 @@ anyhow = "1.0.56"
 async-trait = "0.1"
 base64 = "0.13.0"
 bb8-redis = "0.13"
-clap = {version = "4", features = ["derive"]}
+clap = { version = "4", features = ["derive"] }
 futures = "0.3"
-hex = {version = "0.4", features = ["alloc"]}
+hex = { version = "0.4", features = ["alloc"] }
 http = "0.2.7"
 log = "0.4"
 md5 = "0.7.0"
 nix = "0.24.1"
-serde = {version = "1.0.136", features = ["derive"]}
-serde_json = {version = "1.0.81"}
+serde = { version = "1.0.136", features = ["derive"] }
+serde_json = { version = "1.0.81" }
 simple_logger = "2.1"
 thiserror = "1.0.31"
-tokio = {version = "1", features = ["full"]}
+tokio = { version = "1", features = ["full"] }
 tokio-retry = "0.3"
-uuid = {version = "1.1.0", features = ["v4"]}
+uuid = { version = "1.1.0", features = ["v4"] }
 jsonrpsee-core = "0.14.0"
 mime = "0.3"
 mpart-async = "0.6.0"
@@ -38,29 +38,33 @@ url = "2.3.1"
 tokio-tungstenite = { version = "0.20", features = ["native-tls"] }
 futures-util = "0.3.25"
 jwt = "0.16"
-subxt = { version = "0.28.0", features = ["substrate-compat"]}
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] }
+subxt = { version = "0.28.0", features = ["substrate-compat"] }
+codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
+  "derive",
+  "full",
+  "bit-vec",
+] }
 itertools = "0.11"
 ttl_cache = "0.5"
 
 # for static build
 openssl = { version = "0.10", features = ["vendored"] }
-workers = { git = "https://github.com/threefoldtech/tokio-worker-pool", branch = "main"}
-protobuf = { version = "3.2.0", features = ["with-bytes"]}
+workers = { git = "https://github.com/threefoldtech/tokio-worker-pool", branch = "main" }
+protobuf = { version = "3.2.0", features = ["with-bytes"] }
 
-hyper = {version = "0.14", features = ["full"]}
+hyper = { version = "0.14", features = ["full"] }
 hyper-tungstenite = "0.11"
 lazy_static = "1.4.0"
-prometheus = {version = "0.13.3", features=["process"]}
+prometheus = { version = "0.13.3", features = ["process"] }
 
-tfchain-client = { git="https://github.com/threefoldtech/tfchain.git", version="0.2.0", branch="development" }
+tfchain-client = { git = "https://github.com/threefoldtech/tfchain.git", version = "0.2.0", branch = "development" }
 reqwest = "0.11"
 
 # for e2e
 bip39 = { version = "2.0.0", default-features = false }
-substrate-bip39 = { version = "0.4.4"}
+substrate-bip39 = { version = "=0.4.5" }
 secp256k1 = "0.26"
-aes-gcm = { version = "0.10", features=["aes", "alloc"] }
+aes-gcm = { version = "0.10", features = ["aes", "alloc"] }
 sha2 = "0.10"
 rand_core = "0.6"