diff --git a/Cargo.lock b/Cargo.lock
index 704b3e0..77fba22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -41,40 +41,25 @@ version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
 
-[[package]]
-name = "arrayref"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "asmr"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bigint",
  "bincode",
  "bitcoin",
  "blake2 0.9.2",
- "curve25519-dalek 2.1.3",
+ "curve25519-dalek 3.2.1",
  "derive_more",
  "digest 0.9.0",
  "digest_auth",
  "enum-utils",
  "enum_dispatch",
  "env_logger",
- "ff",
  "futures",
- "group",
  "hex 0.4.3",
- "hex-literal",
+ "hex-literal 0.4.1",
  "lazy_static",
  "log",
  "monero",
@@ -83,7 +68,6 @@ dependencies = [
  "rand 0.7.3",
  "rand 0.8.5",
  "reqwest",
- "rust-argon2",
  "secp256kfun",
  "serde",
  "serde_json",
@@ -146,11 +130,11 @@ dependencies = [
 
 [[package]]
 name = "base58-monero"
-version = "0.1.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87c25c7705c81e36f14c293e67846819b1fa3ca7c5e9888ebf149c2bd59d06aa"
+checksum = "935c90240f9b7749c80746bf88ad9cb346f34b01ee30ad4d566dfdecd6e3cc6a"
 dependencies = [
- "keccak-hash 0.1.2",
+ "thiserror",
 ]
 
 [[package]]
@@ -165,16 +149,6 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
 
-[[package]]
-name = "bigint"
-version = "4.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0e8c8a600052b52482eff2cf4d810e462fdff1f656ac1ecb6232132a1ed7def"
-dependencies = [
- "byteorder",
- "crunchy 0.1.6",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -212,27 +186,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
-[[package]]
-name = "bitvec"
-version = "0.17.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium",
-]
-
-[[package]]
-name = "bitvec"
-version = "0.18.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98fcd36dda4e17b7d7abc64cb549bf0201f4ab71e00700c798ca7e62ed3761fa"
-dependencies = [
- "funty",
- "radium",
- "wyz",
-]
-
 [[package]]
 name = "blake2"
 version = "0.8.1"
@@ -256,17 +209,6 @@ dependencies = [
  "opaque-debug 0.3.1",
 ]
 
-[[package]]
-name = "blake2b_simd"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
-dependencies = [
- "arrayref",
- "arrayvec",
- "constant_time_eq",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -282,12 +224,6 @@ version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
-[[package]]
-name = "byte-slice-cast"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
-
 [[package]]
 name = "byte-tools"
 version = "0.3.1"
@@ -363,12 +299,6 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -400,18 +330,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crunchy"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda"
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -453,12 +371,12 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "2.1.3"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
+checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
 dependencies = [
  "byteorder",
- "digest 0.8.1",
+ "digest 0.9.0",
  "rand_core 0.5.1",
  "serde",
  "subtle 2.5.0",
@@ -521,12 +439,6 @@ dependencies = [
  "rand 0.6.5",
 ]
 
-[[package]]
-name = "either"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
-
 [[package]]
 name = "encoding_rs"
 version = "0.8.34"
@@ -595,42 +507,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6294da962646baa738414e8e718d1a1f0360a51d92de89ccbf91870418f5360"
-dependencies = [
- "crunchy 0.1.6",
- "ethereum-types-serialize",
- "fixed-hash 0.2.5",
- "serde",
- "tiny-keccak",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e742184dc63a01c8ea0637369f8faa27c40f537949908a237f95c05e68d2c96"
-dependencies = [
- "crunchy 0.1.6",
- "ethbloom",
- "ethereum-types-serialize",
- "fixed-hash 0.2.5",
- "serde",
- "uint 0.4.1",
-]
-
-[[package]]
-name = "ethereum-types-serialize"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1873d77b32bc1891a79dad925f2acbc318ee942b38b9110f9dbc5fbeffcea350"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "failure"
 version = "0.1.8"
@@ -638,19 +514,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86"
 dependencies = [
  "backtrace",
- "failure_derive",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "synstructure",
 ]
 
 [[package]]
@@ -659,51 +522,16 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
-[[package]]
-name = "ff"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01646e077d4ebda82b73f1bca002ea1e91561a77df2431a9e79729bcc31950ef"
-dependencies = [
- "bitvec 0.18.5",
- "rand_core 0.5.1",
- "subtle 2.5.0",
-]
-
 [[package]]
 name = "fixed-hash"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7afe6ce860afb14422711595a7b26ada9ed7de2f43c0b2ab79d09ee196287273"
-dependencies = [
- "heapsize",
- "rand 0.4.6",
- "rustc-hex",
-]
-
-[[package]]
-name = "fixed-hash"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1a683d1234507e4f3bf2736eeddf0de1dc65996dc0164d57eba0a74bcf29489"
-dependencies = [
- "byteorder",
- "libc",
- "rand 0.5.6",
- "rustc-hex",
- "static_assertions 0.2.5",
-]
-
-[[package]]
-name = "fixed-hash"
-version = "0.4.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516877b7b9a1cc2d0293cbce23cd6203f0edbfd4090e6ca4489fecb5aa73050e"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
 dependencies = [
  "byteorder",
- "rand 0.5.6",
+ "rand 0.8.5",
  "rustc-hex",
- "static_assertions 0.2.5",
+ "static_assertions",
 ]
 
 [[package]]
@@ -758,12 +586,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
-[[package]]
-name = "funty"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
-
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -900,18 +722,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "group"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc11f9f5fbf1943b48ae7c2bf6846e7d827a512d1be4f23af708f5ca5d01dde1"
-dependencies = [
- "byteorder",
- "ff",
- "rand_core 0.5.1",
- "subtle 2.5.0",
-]
-
 [[package]]
 name = "h2"
 version = "0.2.7"
@@ -938,15 +748,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "heapsize"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -989,6 +790,12 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -1078,15 +885,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "impl-codec"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53"
-dependencies = [
- "parity-scale-codec",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -1135,19 +933,9 @@ dependencies = [
 
 [[package]]
 name = "keccak-hash"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "253bbe643c32c816bf58fa5a88248fafedeebb139705ad17a62add3517854a86"
-dependencies = [
- "ethereum-types",
- "tiny-keccak",
-]
-
-[[package]]
-name = "keccak-hash"
-version = "0.3.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364fca1db2974c2730ddfe2627b03a8def6128c9899303ca05e40ca6f20903"
+checksum = "ae0386ec98c26dd721aaa3412bf3a817156ff3ee7cb6959503f8d1095f4ccc51"
 dependencies = [
  "primitive-types",
  "tiny-keccak",
@@ -1293,18 +1081,17 @@ dependencies = [
 
 [[package]]
 name = "monero"
-version = "0.8.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c2ebb6aa0eee891e1828f157eb879d13b7e836b35d839cea7bfd73b3daccfe5"
+checksum = "2c73108ba5cf025e437600990935234241f95ada3c4621960d50912cde739af6"
 dependencies = [
  "base58-monero",
- "byteorder",
- "curve25519-dalek 2.1.3",
- "failure",
- "failure_derive",
- "fixed-hash 0.3.2",
+ "curve25519-dalek 3.2.1",
+ "fixed-hash",
  "hex 0.4.3",
- "keccak-hash 0.3.0",
+ "hex-literal 0.3.4",
+ "keccak-hash",
+ "thiserror",
 ]
 
 [[package]]
@@ -1475,18 +1262,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "parity-scale-codec"
-version = "1.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
-dependencies = [
- "arrayvec",
- "bitvec 0.17.4",
- "byte-slice-cast",
- "serde",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1545,13 +1320,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "primitive-types"
-version = "0.5.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83ef7b3b965c0eadcb6838f34f827e1dfb2939bdd5ebd43f9647e009b12b0371"
+checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e"
 dependencies = [
- "fixed-hash 0.4.0",
- "impl-codec",
- "uint 0.8.5",
+ "fixed-hash",
+ "uint",
 ]
 
 [[package]]
@@ -1602,12 +1376,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
-
 [[package]]
 name = "rand"
 version = "0.4.6"
@@ -1621,19 +1389,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.5"
@@ -1885,18 +1640,6 @@ dependencies = [
  "winreg",
 ]
 
-[[package]]
-name = "rust-argon2"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
-dependencies = [
- "base64",
- "blake2b_simd",
- "constant_time_eq",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -1989,7 +1732,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6012a8b1fdbf0716bfd4cf14486ddcad7e1e8b60bc492c5d8940573ab23e5809"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
  "subtle-ng",
 ]
 
@@ -2118,12 +1861,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "static_assertions"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -2201,18 +1938,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.12.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "unicode-xid",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.10.1"
@@ -2243,13 +1968,33 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.63",
+]
+
 [[package]]
 name = "tiny-keccak"
-version = "1.5.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8a021c69bb74a44ccedb824a046447e2c84a01df9e5c20779750acb38e11b2"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
- "crunchy 0.2.2",
+ "crunchy",
 ]
 
 [[package]]
@@ -2376,26 +2121,14 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "uint"
-version = "0.4.1"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "754ba11732b9161b94c41798e5197e5e75388d012f760c42adb5000353e98646"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
 dependencies = [
  "byteorder",
- "crunchy 0.1.6",
- "heapsize",
- "rustc-hex",
-]
-
-[[package]]
-name = "uint"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177"
-dependencies = [
- "byteorder",
- "crunchy 0.2.2",
- "rustc-hex",
- "static_assertions 1.1.0",
+ "crunchy",
+ "hex 0.4.3",
+ "static_assertions",
 ]
 
 [[package]]
@@ -2440,12 +2173,6 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
-[[package]]
-name = "unicode-xid"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
-
 [[package]]
 name = "url"
 version = "2.5.0"
@@ -2709,14 +2436,8 @@ dependencies = [
  "winapi-build",
 ]
 
-[[package]]
-name = "wyz"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
-
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
diff --git a/Cargo.toml b/Cargo.toml
index c5b81f7..cfca840 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,39 +5,35 @@ authors = ["Luke Parker <lukeparker5132@gmail.com>", "Lee Bousfield <ljbousfield
 edition = "2018"
 
 [dependencies]
-async-trait = "0.1.36"
-lazy_static = "1.4.0"
-hex-literal = "0.3.1"
-hex = "0.4.2"
-enum-utils = "0.1.1"
-enum_dispatch = "0.3.2"
-anyhow = "1.0.32"
-futures = "0.3.5"
-tokio = { version = "0.2.6", features = ["full"] }
-log = "0.4.8"
-env_logger = "0.7.1"
-structopt = "0.3.16"
-rand = { version = "0.7.3", features = ["std"] }
+async-trait = "0.1"
+lazy_static = "1"
+hex-literal = "0.4"
+hex = "0.4"
+enum-utils = "0.1"
+enum_dispatch = "0.3"
+anyhow = "1"
+futures = "0.3"
+tokio = { version = "0.2", features = ["full"] }
+log = "0.4"
+env_logger = "0.7"
+structopt = "0.3"
+rand = { version = "0.7", features = ["std"] }
 rand_8 = { package = "rand", version = "0.8", features = ["std"] }
-bigint = "4.4.3"
-digest = "0.9.0"
-sha2 = "0.9.1"
-blake2 = "0.9.0"
-rust-argon2 = "0.8.2"
+digest = "0.9"
+sha2 = "0.9"
+blake2 = "0.9"
 secp256kfun = { version = "0.6", default-features = false, features = ["serde"] }
-curve25519-dalek = { version = "2.1.0", features = ["serde"] }
-serde = { version = "1.0.114", features = ["derive"] }
-derive_more = "0.99.9"
-bincode = "1.3.1"
-serde_json = "1.0.56"
-reqwest = { version = "0.10.6", features = ["json"] }
+curve25519-dalek = { version = "3", features = ["serde"] }
+serde = { version = "1", features = ["derive"] }
+derive_more = "0.99"
+bincode = "1"
+serde_json = "1"
+reqwest = { version = "0.10", features = ["json"] }
 bitcoin = { git = "https://github.com/rust-litecoin/rust-litecoin", branch = "ltc" }
-nanocurrency-types = "0.3.19"
-num_cpus = "1.13.0"
-monero = "0.8.1"
-digest_auth = "0.2.3"
-ff = "0.8"
-group = "0.8"
+nanocurrency-types = "0.3"
+num_cpus = "1"
+monero = "0.12"
+digest_auth = "0.2"
 
 [features]
 no_confs = []
diff --git a/ci/setup-coins/litecoin.sh b/ci/setup-coins/litecoin.sh
index 1ff2add..da89034 100755
--- a/ci/setup-coins/litecoin.sh
+++ b/ci/setup-coins/litecoin.sh
@@ -7,8 +7,7 @@ mkdir -p "$config_dir"
 mkdir -p ~/coins/litecoin
 cd ~/coins/litecoin
 
-ltc_version="0.20.1"
-curl https://download.litecoin.org/litecoin-0.21.3/linux/litecoin-"$ltc_version"/linux/litecoin-"$ltc_version"-x86_64-linux-gnu.tar.gz | tar -xzf -
+ltc_version="0.21.3" && curl https://download.litecoin.org/litecoin-"$ltc_version"/linux/litecoin-"$ltc_version"-x86_64-linux-gnu.tar.gz | tar -xzf -
 mv litecoin-"$ltc_version" litecoin-node
 
 git clone --depth 1 --branch v0.8.10 'https://github.com/spesmilo/electrumx'
@@ -42,7 +41,7 @@ refund="$(./electrum-ltc/run_electrum --regtest getunusedaddress)"
 cat > "$config_dir/litecoin.json" << EOF
 {
   "url": "http://ci:password@127.0.0.1:3000",
-  "btc_url": "http://ci:password@127.0.0.1:18443",
+  "ltc_url": "http://ci:password@127.0.0.1:18443",
   "destination": "$destination",
   "refund": "$refund"
 }
diff --git a/config_example/litecoin.json b/config_example/litecoin.json
index a46f13a..205b6a0 100644
--- a/config_example/litecoin.json
+++ b/config_example/litecoin.json
@@ -3,5 +3,5 @@
   "destination": "tb1q7lqp5ut9q2x0gtstqju0had4l6qs44xj594dge",
   "refund": "tb1q7lqp5ut9q2x0gtstqju0had4l6qs44xj594dge",
 
-  "btc_url": "http://user:pass@127.0.0.1:18443"
+  "ltc_url": "http://user:pass@127.0.0.1:18443"
 }
diff --git a/src/coins/btc/engine.rs b/src/coins/btc/engine.rs
index 8c62384..d8633c7 100644
--- a/src/coins/btc/engine.rs
+++ b/src/coins/btc/engine.rs
@@ -37,7 +37,7 @@ lazy_static! {
 #[derive(Deserialize)]
 pub struct BtcConfig {
   pub url: String,
-  pub btc_url: Option<String>,
+  pub ltc_url: Option<String>,
   pub destination: String,
   pub refund: String
 }
diff --git a/src/coins/btc/rpc.rs b/src/coins/btc/rpc.rs
index cf8c331..82da8c2 100644
--- a/src/coins/btc/rpc.rs
+++ b/src/coins/btc/rpc.rs
@@ -40,14 +40,14 @@ pub struct AddressHistoryItem {
 pub struct BtcRpc {
   url: String,
   #[allow(dead_code)]
-  btc_url: Option<String>
+  ltc_url: Option<String>
 }
 
 impl BtcRpc {
   pub fn new(config: &BtcConfig) -> anyhow::Result<BtcRpc> {
     Ok(BtcRpc {
       url: config.url.clone(),
-      btc_url: config.btc_url.clone()
+      ltc_url: config.ltc_url.clone()
     })
   }
 
@@ -155,7 +155,7 @@ impl BtcRpc {
     let address: String = self.rpc_call("getunusedaddress", &json!([])).await?;
     let client = reqwest::Client::new();
     let res: serde_json::Value =
-      client.post(&self.btc_url.clone().expect("Calling directly to BTCd except no URL was specified"))
+      client.post(&self.ltc_url.clone().expect("Calling directly to BTCd except no URL was specified"))
       .json(
         & FullParams {
           jsonrpc: "2.0",
diff --git a/src/coins/xmr/verifier.rs b/src/coins/xmr/verifier.rs
index a4121d6..8179c98 100644
--- a/src/coins/xmr/verifier.rs
+++ b/src/coins/xmr/verifier.rs
@@ -82,7 +82,7 @@ impl UnscriptedVerifier for XmrVerifier {
 
     // Decrypt the amount, verify the accuracy of the commitment, and confirm with the user
     let enc_amount;
-    if let EcdhInfo::Bulletproof2 { amount } = send.rct_signatures.sig.as_ref().expect("Transaction from RPC didn't have signature data").ecdh_info[outputs[0].index] {
+    if let EcdhInfo::Bulletproof { amount } = send.rct_signatures.sig.as_ref().expect("Transaction from RPC didn't have signature data").ecdh_info[outputs[0].index] {
       enc_amount = u64::from_le_bytes(amount.to_fixed_bytes());
     } else {
       anyhow::bail!("Unrecognized transaction type");