diff --git a/Cargo.lock b/Cargo.lock
index 52d114c844..233561fd42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,9 +132,9 @@ checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
 
 [[package]]
 name = "anyhow"
-version = "1.0.43"
+version = "1.0.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf"
+checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1"
 
 [[package]]
 name = "arc-swap"
@@ -179,9 +179,9 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -190,9 +190,9 @@ version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -220,9 +220,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "base58-monero"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465ba1f408efdef4d9379bdfa7340899b63e472d50c7fb666480ccfd5a893e53"
+checksum = "1df741a56140a4d26932fde3bd69ce8abec7f50d238f8c16351caa789a6d8fe9"
 dependencies = [
  "thiserror",
 ]
@@ -293,8 +293,8 @@ dependencies = [
  "lazycell",
  "log 0.4.14",
  "peeking_take_while",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "regex",
  "rustc-hash",
  "shlex",
@@ -321,9 +321,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitstring"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d"
+checksum = "22a39c0db600cfe77ef1b6d9ea71173bdccf190722877969d526d380519b6ecc"
 
 [[package]]
 name = "blake2"
@@ -390,9 +390,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
+checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
  "lazy_static 1.4.0",
  "memchr",
@@ -418,9 +418,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
 
 [[package]]
 name = "bumpalo"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
+checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
 
 [[package]]
 name = "bytemuck"
@@ -497,20 +497,20 @@ dependencies = [
  "heck",
  "indexmap",
  "log 0.4.14",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "serde 1.0.130",
  "serde_json",
- "syn 1.0.75",
+ "syn 1.0.81",
  "tempfile",
  "toml 0.5.8",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
 
 [[package]]
 name = "cexpr"
@@ -634,9 +634,9 @@ checksum = "b0fc239e0f6cb375d2402d48afb92f76f5404fd1df208a41930ec81eda078bea"
 
 [[package]]
 name = "clang-sys"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cf2cc85830eae84823884db23c5306442a6c3d5bfd3beb2f2a2c829faa1816"
+checksum = "10612c0ec0e0a1ff0e97980647cb058a6e7aedb913d01d009c406b8b7d0b26ee"
 dependencies = [
  "glob",
  "libc",
@@ -669,9 +669,9 @@ dependencies = [
 
 [[package]]
 name = "clipboard-win"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4ea1881992efc993e4dc50a324cdbd03216e41bdc8385720ff47efc9bd2ca8"
+checksum = "3db8340083d28acb43451166543b98c838299b7e0863621be53a338adceea0ed"
 dependencies = [
  "error-code",
  "str-buf",
@@ -717,9 +717,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
+checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -727,9 +727,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "cpufeatures"
@@ -991,9 +991,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.45+curl-7.78.0"
+version = "0.4.49+curl-7.79.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de9e5a72b1c744eb5dd20b2be4d7eb84625070bb5c4ab9b347b70464ab1e62eb"
+checksum = "e0f44960aea24a786a46907b8824ebc0e66ca06bf4e4978408c7499620343483"
 dependencies = [
  "cc",
  "libc",
@@ -1020,9 +1020,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek-ng"
-version = "4.1.0"
+version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2d05dbe571a5f832174d536b65101025c33693189830372032c005af68cbaec"
+checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8"
 dependencies = [
  "byteorder",
  "digest",
@@ -1051,10 +1051,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "strsim 0.9.3",
- "syn 1.0.75",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1064,8 +1064,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
- "quote 1.0.9",
- "syn 1.0.75",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1076,9 +1076,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
 
 [[package]]
 name = "decimal-rs"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628081e4b054b20bc00989885feca733c66f19d0e983bb4a3b81b6edcd0b70bc"
+checksum = "783393e45feb78bb74819e3df984929325cba6c517d7de56f1f2303d8fcacd04"
 dependencies = [
  "ethnum",
  "fast-float",
@@ -1092,9 +1092,9 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1116,9 +1116,9 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
 dependencies = [
  "darling",
  "derive_builder_core",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1128,9 +1128,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
 dependencies = [
  "darling",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1140,10 +1140,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df"
 dependencies = [
  "convert_case",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "rustc_version 0.3.3",
- "syn 1.0.75",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1159,9 +1159,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "1.4.7"
+version = "1.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bba51ca66f57261fd17cadf8b73e4775cc307d0521d855de3f5de91a8f074e0e"
+checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d"
 dependencies = [
  "bigdecimal",
  "byteorder",
@@ -1180,9 +1180,9 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1272,9 +1272,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.28"
+version = "0.8.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
+checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1292,9 +1292,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1389,9 +1389,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
+checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
  "cfg-if 1.0.0",
  "crc32fast",
@@ -1455,9 +1455,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adc00f486adfc9ce99f77d717836f0c5aa84965eb0b4f051f4e83f7cab53f8b"
+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1470,9 +1470,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ed2411805f6e4e3d9bc904c95d5d423b89b3b25dc0250aa74729de20629ff9"
+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1490,9 +1490,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af51b1b4a7fdff033703db39de8802c673eb91855f2e0d47dcf3bf2c0ef01f99"
+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d"
 
 [[package]]
 name = "futures-core-preview"
@@ -1502,9 +1502,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0d535a57b87e1ae31437b892713aee90cd2d7b0ee48727cd11fc72ef54761c"
+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1524,9 +1524,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b0e06c393068f3a6ef246c75cdca793d6a46347e75286933e5e75fd2fd11582"
+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377"
 
 [[package]]
 name = "futures-io-preview"
@@ -1536,15 +1536,15 @@ checksum = "f4914ae450db1921a56c91bde97a27846287d062087d4a652efc09bb3a01ebda"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
  "autocfg 1.0.1",
  "proc-macro-hack",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -1563,9 +1563,9 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0f30aaa67363d119812743aa5f33c201a7a66329f97d1a887022971feea4b53"
+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11"
 
 [[package]]
 name = "futures-sink-preview"
@@ -1575,15 +1575,15 @@ checksum = "86f148ef6b69f75bb610d4f9a2336d4fc88c4b5b67129d1a340dd0fd362efeec"
 
 [[package]]
 name = "futures-task"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe54a98670017f3be909561f6ad13e810d9a51f3f061b902062ca3da80799f2"
+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99"
 
 [[package]]
 name = "futures-test"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a5ac667be097531d74ff9fff9c9da7820dd63afd2312bb9c6f589211ae32080"
+checksum = "46b9f6d284a9595a613f881a7b08d46abaab1005995e6fe3ccfe2398f6aea492"
 dependencies = [
  "futures-core",
  "futures-executor",
@@ -1608,9 +1608,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eb846bfd58e44a8481a00049e82c43e0ccb5d61f8dc071057cb19249dd4d78"
+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481"
 dependencies = [
  "autocfg 1.0.1",
  "futures 0.1.31",
@@ -1746,9 +1746,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
 [[package]]
 name = "h2"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7f3675cfef6a30c8031cf9e6493ebdc3bb3272a3fea3923c4210d1830e6a472"
+checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -1758,7 +1758,7 @@ dependencies = [
  "http",
  "indexmap",
  "slab",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-util",
  "tracing",
 ]
@@ -1815,9 +1815,9 @@ checksum = "21e4590e13640f19f249fe3e4eca5113bc4289f2497710378190e7f4bd96f45b"
 
 [[package]]
 name = "http"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
+checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
@@ -1826,9 +1826,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5"
+checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
  "bytes 1.1.0",
  "http",
@@ -1883,9 +1883,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.12"
+version = "0.14.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13f67199e765030fa08fe0bd581af683f0d5bc04ea09c2b1102012c5fb90e7fd"
+checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b"
 dependencies = [
  "bytes 1.1.0",
  "futures-channel",
@@ -1899,7 +1899,7 @@ dependencies = [
  "itoa",
  "pin-project-lite 0.2.7",
  "socket2",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tower-service",
  "tracing",
  "want",
@@ -1911,9 +1911,9 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-io-timeout",
 ]
 
@@ -1924,9 +1924,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes 1.1.0",
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "native-tls",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-native-tls",
 ]
 
@@ -1984,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -2035,9 +2035,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "js-sys"
-version = "0.3.53"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
+checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2099,9 +2099,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.101"
+version = "0.2.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
+checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673"
 
 [[package]]
 name = "libgit2-sys"
@@ -2130,9 +2130,9 @@ dependencies = [
 
 [[package]]
 name = "libloading"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
+checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0"
 dependencies = [
  "cfg-if 1.0.0",
  "winapi 0.3.9",
@@ -2163,9 +2163,9 @@ dependencies = [
 
 [[package]]
 name = "libssh2-sys"
-version = "0.2.21"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0186af0d8f171ae6b9c4c90ec51898bad5d08a2d5e470903a50d9ad8959cbee"
+checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
 dependencies = [
  "cc",
  "libc",
@@ -2377,9 +2377,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
 dependencies = [
  "migrations_internals",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -2409,9 +2409,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
 dependencies = [
  "libc",
  "log 0.4.14",
@@ -2483,9 +2483,9 @@ checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99"
 dependencies = [
  "proc-macro-crate",
  "proc-macro-error",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "synstructure",
 ]
 
@@ -2588,7 +2588,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f"
 dependencies = [
- "num-bigint 0.3.2",
+ "num-bigint 0.3.3",
  "num-complex",
  "num-integer",
  "num-iter",
@@ -2609,9 +2609,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba"
+checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3"
 dependencies = [
  "autocfg 1.0.1",
  "num-integer",
@@ -2652,9 +2652,9 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -2695,7 +2695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
 dependencies = [
  "autocfg 1.0.1",
- "num-bigint 0.3.2",
+ "num-bigint 0.3.3",
  "num-integer",
  "num-traits 0.2.14",
 ]
@@ -2742,9 +2742,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "openssl"
-version = "0.10.36"
+version = "0.10.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
+checksum = "2bc6b9e4403633698352880b22cbe2f0e45dd0177f6fabe4585536e56a3e4f75"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
@@ -2771,9 +2771,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.66"
+version = "0.9.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
+checksum = "1c571f25d3f66dd427e417cebf73dbe2361d6125cf6e3a70d143fdf97c9f5150"
 dependencies = [
  "autocfg 1.0.1",
  "cc",
@@ -2791,14 +2791,14 @@ checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22"
 dependencies = [
  "async-trait",
  "crossbeam-channel 0.5.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "js-sys",
  "lazy_static 1.4.0",
  "percent-encoding 2.1.0",
  "pin-project 1.0.8",
  "rand 0.8.4",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
 ]
 
@@ -2814,7 +2814,7 @@ dependencies = [
  "opentelemetry-semantic-conventions",
  "thiserror",
  "thrift",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -2837,18 +2837,18 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039f02eb0f69271f26abe3202189275d7aa2258b903cb0281b5de710a2570ff3"
+checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d"
 dependencies = [
  "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "packed_simd_2"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e64858a2d3733fdd61adfdd6da89aa202f7ff0e741d2fc7ed1e452ba9dc99d7"
+checksum = "71c0c06716cfc81616fa8e22b721ce92fecd594508bc0eb3d04ae3ef35ac10c5"
 dependencies = [
  "cfg-if 0.1.10",
  "libm 0.1.4",
@@ -3031,9 +3031,9 @@ version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -3042,9 +3042,9 @@ version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -3067,9 +3067,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.19"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
+checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
 
 [[package]]
 name = "poly1305"
@@ -3107,15 +3107,15 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
+checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92"
+checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83"
 dependencies = [
  "thiserror",
  "toml 0.5.8",
@@ -3128,9 +3128,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "version_check 0.9.3",
 ]
 
@@ -3140,8 +3140,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "version_check 0.9.3",
 ]
 
@@ -3168,9 +3168,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.28"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
+checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
 dependencies = [
  "unicode-xid 0.2.2",
 ]
@@ -3211,9 +3211,9 @@ checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
 dependencies = [
  "anyhow",
  "itertools 0.10.1",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -3259,11 +3259,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
+checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.32",
 ]
 
 [[package]]
@@ -3503,9 +3503,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22"
+checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.1.0",
@@ -3514,7 +3514,7 @@ dependencies = [
  "futures-util",
  "http",
  "http-body",
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "hyper-tls",
  "ipnet",
  "js-sys",
@@ -3527,7 +3527,7 @@ dependencies = [
  "serde 1.0.130",
  "serde_json",
  "serde_urlencoded",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-native-tls",
  "url 2.2.2",
  "wasm-bindgen",
@@ -3694,8 +3694,8 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "688599bdab9f42105d0ae1494335a9ffafdeb7d36325e6b10fd4abc5829d6284"
 dependencies = [
- "quote 1.0.9",
- "syn 1.0.75",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -3852,7 +3852,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
 dependencies = [
- "ordered-float 2.7.0",
+ "ordered-float 2.8.0",
  "serde 1.0.130",
 ]
 
@@ -3862,16 +3862,16 @@ version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.67"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950"
+checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
 dependencies = [
  "itoa",
  "ryu",
@@ -3884,9 +3884,9 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -3912,9 +3912,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad104641f3c958dab30eb3010e834c2622d1f3f4c530fef1dee20ad9485f3c09"
+checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af"
 dependencies = [
  "dtoa",
  "indexmap",
@@ -3962,9 +3962,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "740223c51853f3145fe7c90360d2d4232f2b62e3449489c207eccde818979982"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
 dependencies = [
  "lazy_static 1.4.0",
 ]
@@ -3997,9 +3997,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335"
+checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788"
 
 [[package]]
 name = "simple_asn1"
@@ -4014,15 +4014,15 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
 
 [[package]]
 name = "smallvec"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
+checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
 
 [[package]]
 name = "snow"
@@ -4043,9 +4043,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765f090f0e423d2b55843402a07915add955e7d60657db13707a159727326cad"
+checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
 dependencies = [
  "libc",
  "winapi 0.3.9",
@@ -4098,9 +4098,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
 
 [[package]]
 name = "structopt"
-version = "0.3.22"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71"
+checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c"
 dependencies = [
  "clap",
  "lazy_static 1.4.0",
@@ -4109,15 +4109,15 @@ dependencies = [
 
 [[package]]
 name = "structopt-derive"
-version = "0.4.15"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10"
+checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -4133,9 +4133,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6e163a520367c465f59e0a61a23cfae3b10b6546d78b6f672a382be79f7110"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -4145,9 +4145,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -4157,9 +4157,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e61bb0be289045cb80bfce000512e32d09f8337e54c186725da381377ad1f8d5"
 dependencies = [
  "heck",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -4204,12 +4204,12 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.75"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7"
+checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
  "unicode-xid 0.2.2",
 ]
 
@@ -4224,13 +4224,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.5"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa"
+checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "unicode-xid 0.2.2",
 ]
 
@@ -4255,7 +4255,7 @@ version = "0.12.0"
 dependencies = [
  "config",
  "dirs-next 1.0.2",
- "futures 0.3.16",
+ "futures 0.3.17",
  "log 0.4.14",
  "qrcode",
  "rand 0.8.4",
@@ -4270,7 +4270,7 @@ dependencies = [
  "tari_crypto",
  "tari_p2p",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
 ]
 
@@ -4283,7 +4283,7 @@ dependencies = [
  "chrono",
  "config",
  "either",
- "futures 0.3.16",
+ "futures 0.3.17",
  "log 0.4.14",
  "num_cpus",
  "opentelemetry",
@@ -4306,7 +4306,7 @@ dependencies = [
  "tari_service_framework",
  "tari_shutdown",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
  "tracing",
  "tracing-opentelemetry",
@@ -4367,13 +4367,13 @@ name = "tari_common_types"
 version = "0.12.0"
 dependencies = [
  "digest",
- "futures 0.3.16",
+ "futures 0.3.17",
  "lazy_static 1.4.0",
  "rand 0.8.4",
  "serde 1.0.130",
  "tari_crypto",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -4391,7 +4391,7 @@ dependencies = [
  "data-encoding",
  "digest",
  "env_logger 0.7.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "lazy_static 1.4.0",
  "lmdb-zero",
  "log 0.4.14",
@@ -4415,7 +4415,7 @@ dependencies = [
  "tari_test_utils",
  "tempfile",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
  "tokio-util",
  "tower 0.3.1",
@@ -4439,7 +4439,7 @@ dependencies = [
  "diesel_migrations",
  "digest",
  "env_logger 0.7.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-test",
  "futures-util",
  "lazy_static 1.4.0",
@@ -4464,10 +4464,10 @@ dependencies = [
  "tari_utilities",
  "tempfile",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
  "tokio-test 0.4.2",
- "tower 0.4.8",
+ "tower 0.4.10",
  "tower-test",
  "ttl_cache",
 ]
@@ -4476,14 +4476,14 @@ dependencies = [
 name = "tari_comms_rpc_macros"
 version = "0.12.0"
 dependencies = [
- "futures 0.3.16",
- "proc-macro2 1.0.28",
+ "futures 0.3.17",
+ "proc-macro2 1.0.32",
  "prost",
- "quote 1.0.9",
- "syn 1.0.75",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "tari_comms",
  "tari_test_utils",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tower-service",
 ]
 
@@ -4495,7 +4495,7 @@ dependencies = [
  "chrono",
  "chrono-english",
  "crossterm",
- "futures 0.3.16",
+ "futures 0.3.17",
  "log 0.4.14",
  "opentelemetry",
  "opentelemetry-jaeger",
@@ -4519,7 +4519,7 @@ dependencies = [
  "tari_shutdown",
  "tari_wallet",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
  "tracing",
  "tracing-opentelemetry",
@@ -4546,7 +4546,7 @@ dependencies = [
  "digest",
  "env_logger 0.7.1",
  "fs2",
- "futures 0.3.16",
+ "futures 0.3.17",
  "hex",
  "integer-encoding 3.0.2",
  "lazy_static 1.4.0",
@@ -4578,7 +4578,7 @@ dependencies = [
  "tari_test_utils",
  "tempfile",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tracing",
  "tracing-attributes",
  "tracing-futures",
@@ -4589,7 +4589,7 @@ dependencies = [
 [[package]]
 name = "tari_crypto"
 version = "0.11.2"
-source = "git+https://github.com/tari-project/tari-crypto.git?branch=main#75a6456a48d1f6dc36e58f49a215a3e9f0c465ab"
+source = "git+https://github.com/tari-project/tari-crypto.git?branch=main#a5defb77e4e212ca5f3fe5e8a1bfe57810efd83e"
 dependencies = [
  "base64 0.10.1",
  "blake2",
@@ -4645,10 +4645,10 @@ dependencies = [
  "config",
  "derive-error",
  "env_logger 0.7.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-test",
  "hex",
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "jsonrpc",
  "log 0.4.14",
  "rand 0.8.4",
@@ -4663,7 +4663,7 @@ dependencies = [
  "tari_crypto",
  "tari_utilities",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
  "tracing",
  "tracing-futures",
@@ -4678,7 +4678,7 @@ dependencies = [
  "bufstream",
  "chrono",
  "crossbeam",
- "futures 0.3.16",
+ "futures 0.3.17",
  "hex",
  "jsonrpc",
  "log 0.4.14",
@@ -4697,7 +4697,7 @@ dependencies = [
  "tari_crypto",
  "thiserror",
  "time",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
 ]
 
@@ -4730,7 +4730,7 @@ dependencies = [
  "clap",
  "env_logger 0.6.2",
  "fs2",
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-timer",
  "lazy_static 1.4.0",
  "lmdb-zero",
@@ -4755,7 +4755,7 @@ dependencies = [
  "tari_utilities",
  "tempfile",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
  "tower 0.3.1",
  "tower-service",
@@ -4768,13 +4768,13 @@ version = "0.12.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-test",
  "log 0.4.14",
  "tari_shutdown",
  "tari_test_utils",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tower 0.3.1",
  "tower-service",
 ]
@@ -4783,8 +4783,8 @@ dependencies = [
 name = "tari_shutdown"
 version = "0.12.0"
 dependencies = [
- "futures 0.3.16",
- "tokio 1.11.0",
+ "futures 0.3.17",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -4832,10 +4832,10 @@ dependencies = [
  "config",
  "derive-error",
  "env_logger 0.7.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-test",
  "hex",
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "jsonrpc",
  "log 0.4.14",
  "rand 0.7.3",
@@ -4849,7 +4849,7 @@ dependencies = [
  "tari_crypto",
  "tari_utilities",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tonic",
  "tonic-build",
  "tracing",
@@ -4862,13 +4862,13 @@ dependencies = [
 name = "tari_test_utils"
 version = "0.12.0"
 dependencies = [
- "futures 0.3.16",
+ "futures 0.3.17",
  "futures-test",
  "lazy_static 1.4.0",
  "rand 0.8.4",
  "tari_shutdown",
  "tempfile",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -4904,7 +4904,7 @@ dependencies = [
  "digest",
  "env_logger 0.7.1",
  "fs2",
- "futures 0.3.16",
+ "futures 0.3.17",
  "libsqlite3-sys",
  "lmdb-zero",
  "log 0.4.14",
@@ -4928,7 +4928,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "time",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tower 0.3.1",
 ]
 
@@ -4938,7 +4938,7 @@ version = "0.20.0"
 dependencies = [
  "chrono",
  "env_logger 0.7.1",
- "futures 0.3.16",
+ "futures 0.3.17",
  "lazy_static 1.4.0",
  "libc",
  "log 0.4.14",
@@ -4959,7 +4959,7 @@ dependencies = [
  "tari_wallet",
  "tempfile",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -4996,7 +4996,7 @@ dependencies = [
  "tari_core",
  "tari_crypto",
  "tari_utilities",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -5010,22 +5010,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
+checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.29"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
+checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -5102,9 +5102,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.3.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "848a1e1181b9f6753b5e96a092749e29b11d19ede67dfbbd6c7dc7e0f49b5338"
+checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -5130,9 +5130,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.11.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce"
+checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee"
 dependencies = [
  "autocfg 1.0.1",
  "bytes 1.1.0",
@@ -5154,18 +5154,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90c49f106be240de154571dd31fbe48acb10ba6c6dd6f6517ad603abffa42de9"
 dependencies = [
  "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.3.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110"
+checksum = "114383b041aa6212c579467afa0075fbbdd0718de036100bc0ba7961d8cb9095"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -5175,7 +5175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -5185,19 +5185,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
  "rustls",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "webpki",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
 dependencies = [
  "futures-core",
  "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-util",
 ]
 
@@ -5221,15 +5221,15 @@ dependencies = [
  "async-stream",
  "bytes 1.1.0",
  "futures-core",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
 dependencies = [
  "bytes 1.1.0",
  "futures-core",
@@ -5237,7 +5237,7 @@ dependencies = [
  "futures-sink",
  "log 0.4.14",
  "pin-project-lite 0.2.7",
- "tokio 1.11.0",
+ "tokio 1.13.0",
 ]
 
 [[package]]
@@ -5273,16 +5273,16 @@ dependencies = [
  "h2",
  "http",
  "http-body",
- "hyper 0.14.12",
+ "hyper 0.14.14",
  "hyper-timeout",
  "percent-encoding 2.1.0",
  "pin-project 1.0.8",
  "prost",
  "prost-derive",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
  "tokio-util",
- "tower 0.4.8",
+ "tower 0.4.10",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -5295,10 +5295,10 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08"
 dependencies = [
- "proc-macro2 1.0.28",
+ "proc-macro2 1.0.32",
  "prost-build",
- "quote 1.0.9",
- "syn 1.0.75",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
@@ -5321,18 +5321,19 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60422bc7fefa2f3ec70359b8ff1caff59d785877eb70595904605bcc412470f"
+checksum = "c00e500fff5fa1131c866b246041a6bf96da9c965f8fe4128cb1421f23e93c00"
 dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
  "indexmap",
  "pin-project 1.0.8",
+ "pin-project-lite 0.2.7",
  "rand 0.8.4",
  "slab",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-stream",
  "tokio-util",
  "tower-layer",
@@ -5479,9 +5480,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.26"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
+checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if 1.0.0",
  "log 0.4.14",
@@ -5492,20 +5493,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.15"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
+checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.19"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ca517f43f0fb96e0c3072ed5c275fe5eece87e8cb52f4a77b69226d3b1c9df8"
+checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4"
 dependencies = [
  "lazy_static 1.4.0",
 ]
@@ -5556,9 +5557,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.20"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe"
+checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
 dependencies = [
  "ansi_term 0.12.1",
  "chrono",
@@ -5584,9 +5585,9 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
 
 [[package]]
 name = "trust-dns-client"
-version = "0.21.0-alpha.2"
+version = "0.21.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edaa01dcab6aff8dbd2efa666c5b656729d2c04728c50e16e30117be07c764ac"
+checksum = "44bd50900d7796338807398681ed6d8de0c840d0d9aac65cff093b5635b22e57"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",
@@ -5600,16 +5601,16 @@ dependencies = [
  "ring",
  "rustls",
  "thiserror",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "trust-dns-proto",
  "webpki",
 ]
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.21.0-alpha.2"
+version = "0.21.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09637dee9c56a62b9acd8ca59ab2ed9459d8430b005100d9063ea326a0a3590a"
+checksum = "d2e43c627e8301d45629cdfaf63e2e0c57305a07e9f1ea48208fd262ba2d87eb"
 dependencies = [
  "async-trait",
  "cfg-if 1.0.0",
@@ -5628,7 +5629,7 @@ dependencies = [
  "smallvec",
  "thiserror",
  "tinyvec",
- "tokio 1.11.0",
+ "tokio 1.13.0",
  "tokio-rustls",
  "url 2.2.2",
  "webpki",
@@ -5699,9 +5700,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
+checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
 
 [[package]]
 name = "ucd-trie"
@@ -5732,9 +5733,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
+checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f"
 
 [[package]]
 name = "unicode-normalization"
@@ -5753,9 +5754,9 @@ checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
+checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "unicode-xid"
@@ -5894,36 +5895,34 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce9b1b516211d33767048e5d47fa2a381ed8b76fc48d2ce4aa39877f9f183e0"
+checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
 dependencies = [
  "cfg-if 1.0.0",
- "serde 1.0.130",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe8dc78e2326ba5f845f4b5bf548401604fa20b1dd1d365fb73b6c1d6364041"
+checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
 dependencies = [
  "bumpalo",
  "lazy_static 1.4.0",
  "log 0.4.14",
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.26"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fded345a6559c2cfee778d562300c581f7d4ff3edb9b0d230d69800d213972"
+checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -5933,38 +5932,38 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44468aa53335841d9d6b6c023eaab07c0cd4bddbcfdee3e2bb1e8d2cb8069fef"
+checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
- "quote 1.0.9",
+ "quote 1.0.10",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0195807922713af1e67dc66132c7328206ed9766af3858164fb583eedc25fbad"
+checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.76"
+version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
+checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
 
 [[package]]
 name = "web-sys"
-version = "0.3.53"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
+checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -6054,9 +6053,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f"
+checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
 dependencies = [
  "curve25519-dalek",
  "rand_core 0.5.1",
@@ -6078,7 +6077,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107"
 dependencies = [
- "futures 0.3.16",
+ "futures 0.3.17",
  "log 0.4.14",
  "nohash-hasher",
  "parking_lot 0.11.2",
@@ -6097,12 +6096,12 @@ dependencies = [
 
 [[package]]
 name = "zeroize_derive"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
+checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7"
 dependencies = [
- "proc-macro2 1.0.28",
- "quote 1.0.9",
- "syn 1.0.75",
+ "proc-macro2 1.0.32",
+ "quote 1.0.10",
+ "syn 1.0.81",
  "synstructure",
 ]
diff --git a/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs b/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs
index 7e10d59745..007fee029a 100644
--- a/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs
+++ b/base_layer/core/src/base_node/state_machine_service/states/horizon_state_sync/horizon_state_synchronization.rs
@@ -29,8 +29,8 @@ use crate::{
         },
         sync::rpc,
     },
-    blocks::BlockHeader,
-    chain_storage::{async_db::AsyncBlockchainDb, BlockchainBackend, ChainStorageError, MmrTree, PrunedOutput},
+    blocks::{BlockHeader, UpdateBlockAccumulatedData},
+    chain_storage::{async_db::AsyncBlockchainDb, BlockchainBackend, ChainStorageError, MmrTree},
     proto::base_node::{
         sync_utxo as proto_sync_utxo,
         sync_utxos_response::UtxoOrDeleted,
@@ -44,16 +44,10 @@ use crate::{
 use croaring::Bitmap;
 use futures::StreamExt;
 use log::*;
-use std::{
-    convert::{TryFrom, TryInto},
-    sync::Arc,
-};
-use tari_common_types::types::{HashDigest, RangeProofService};
+use std::convert::{TryFrom, TryInto};
+use tari_common_types::types::{Commitment, HashDigest, RangeProofService};
 use tari_comms::PeerConnection;
-use tari_crypto::{
-    commitment::HomomorphicCommitment,
-    tari_utilities::{hex::Hex, Hashable},
-};
+use tari_crypto::tari_utilities::{hex::Hex, Hashable};
 use tari_mmr::{MerkleMountainRange, MutableMmr};
 
 const LOG_TARGET: &str = "c::bn::state_machine_service::states::horizon_state_sync";
@@ -65,6 +59,8 @@ pub struct HorizonStateSynchronization<'a, B: BlockchainBackend> {
     prover: &'a RangeProofService,
     num_kernels: u64,
     num_outputs: u64,
+    kernel_sum: Commitment,
+    utxo_sum: Commitment,
 }
 
 impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
@@ -81,6 +77,8 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
             prover,
             num_kernels: 0,
             num_outputs: 0,
+            kernel_sum: Default::default(),
+            utxo_sum: Default::default(),
         }
     }
 
@@ -119,6 +117,7 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
         client: &mut rpc::BaseNodeSyncRpcClient,
         to_header: &BlockHeader,
     ) -> Result<(), HorizonSyncError> {
+        self.initialize().await?;
         debug!(target: LOG_TARGET, "Synchronizing kernels");
         self.synchronize_kernels(client, to_header).await?;
         debug!(target: LOG_TARGET, "Synchronizing outputs");
@@ -126,12 +125,30 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
         Ok(())
     }
 
+    async fn initialize(&mut self) -> Result<(), HorizonSyncError> {
+        let metadata = self.db().get_chain_metadata().await?;
+        let data = self
+            .db()
+            .fetch_block_accumulated_data(metadata.best_block().clone())
+            .await?;
+        self.utxo_sum = data.utxo_sum().clone();
+        self.kernel_sum = data.kernel_sum().clone();
+        debug!(
+            target: LOG_TARGET,
+            "Loaded utxo_sum = {}, kernel_sum = {}",
+            self.utxo_sum.to_hex(),
+            self.kernel_sum.to_hex()
+        );
+        Ok(())
+    }
+
     async fn synchronize_kernels(
         &mut self,
         client: &mut rpc::BaseNodeSyncRpcClient,
         to_header: &BlockHeader,
     ) -> Result<(), HorizonSyncError> {
         let local_num_kernels = self.db().fetch_mmr_size(MmrTree::Kernel).await?;
+        let metadata = self.db().get_chain_metadata().await?;
 
         let remote_num_kernels = to_header.kernel_mmr_size;
         self.num_kernels = remote_num_kernels;
@@ -192,6 +209,8 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                 .map_err(HorizonSyncError::InvalidKernelSignature)?;
 
             kernels.push(kernel.clone());
+            self.kernel_sum = &self.kernel_sum + &kernel.excess;
+            error!(target: LOG_TARGET, "DEBUG: kernel_sum = {}", self.kernel_sum.to_hex());
             txn.insert_kernel_via_horizon_sync(kernel, current_header.hash().clone(), mmr_position as u32);
             if mmr_position == current_header.header().kernel_mmr_size - 1 {
                 debug!(
@@ -221,11 +240,16 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                     });
                 }
 
-                txn.update_pruned_hash_set(
-                    MmrTree::Kernel,
+                let kernel_hash_set = kernel_mmr.get_pruned_hash_set()?;
+                txn.update_block_accumulated_data_via_horizon_sync(
                     current_header.hash().clone(),
-                    kernel_mmr.get_pruned_hash_set()?,
+                    UpdateBlockAccumulatedData {
+                        kernel_sum: Some(self.kernel_sum.clone()),
+                        kernel_hash_set: Some(kernel_hash_set),
+                        ..Default::default()
+                    },
                 );
+                txn.set_pruned_height(metadata.pruned_height(), self.kernel_sum.clone(), self.utxo_sum.clone());
 
                 txn.commit().await?;
                 if mmr_position < end - 1 {
@@ -258,6 +282,8 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
     ) -> Result<(), HorizonSyncError> {
         let local_num_outputs = self.db().fetch_mmr_size(MmrTree::Utxo).await?;
 
+        let metadata = self.db().get_chain_metadata().await?;
+
         let remote_num_outputs = to_header.output_mmr_size;
         self.num_outputs = remote_num_outputs;
 
@@ -322,10 +348,11 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
         let block_data = db
             .fetch_block_accumulated_data(current_header.header().prev_hash.clone())
             .await?;
-        let (_, output_pruned_set, rp_pruned_set, mut full_bitmap) = block_data.dissolve();
+        let (_, output_pruned_set, witness_pruned_set, _) = block_data.dissolve();
+        let mut full_bitmap = self.db().fetch_deleted_bitmap_at_tip().await?.into_bitmap();
 
         let mut output_mmr = MerkleMountainRange::<HashDigest, _>::new(output_pruned_set);
-        let mut witness_mmr = MerkleMountainRange::<HashDigest, _>::new(rp_pruned_set);
+        let mut witness_mmr = MerkleMountainRange::<HashDigest, _>::new(witness_pruned_set);
 
         while let Some(response) = output_stream.next().await {
             let res: SyncUtxosResponse = response?;
@@ -356,6 +383,7 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                     output_hashes.push(output.hash());
                     witness_hashes.push(output.witness_hash());
                     unpruned_outputs.push(output.clone());
+                    self.utxo_sum = &self.utxo_sum + &output.commitment;
                     txn.insert_output_via_horizon_sync(
                         output,
                         current_header.hash().clone(),
@@ -415,8 +443,8 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                         witness_mmr.push(hash)?;
                     }
 
-                    // Check that the difference bitmap is excessively large. Bitmap::deserialize panics if greater than
-                    // isize::MAX, however isize::MAX is still an inordinate amount of data. An
+                    // Check that the difference bitmap isn't excessively large. Bitmap::deserialize panics if greater
+                    // than isize::MAX, however isize::MAX is still an inordinate amount of data. An
                     // arbitrary 4 MiB limit is used.
                     const MAX_DIFF_BITMAP_BYTE_LEN: usize = 4 * 1024 * 1024;
                     if diff_bitmap.len() > MAX_DIFF_BITMAP_BYTE_LEN {
@@ -471,14 +499,19 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                     }
 
                     txn.update_deleted_bitmap(diff_bitmap.clone());
-                    txn.update_pruned_hash_set(MmrTree::Utxo, current_header.hash().clone(), pruned_output_set);
-                    txn.update_pruned_hash_set(
-                        MmrTree::Witness,
+
+                    let witness_hash_set = witness_mmr.get_pruned_hash_set()?;
+                    txn.update_block_accumulated_data_via_horizon_sync(
                         current_header.hash().clone(),
-                        witness_mmr.get_pruned_hash_set()?,
+                        UpdateBlockAccumulatedData {
+                            utxo_sum: Some(self.utxo_sum.clone()),
+                            utxo_hash_set: Some(pruned_output_set),
+                            witness_hash_set: Some(witness_hash_set),
+                            deleted_diff: Some(diff_bitmap.into()),
+                            ..Default::default()
+                        },
                     );
-                    txn.update_block_accumulated_data_with_deleted_diff(current_header.hash().clone(), diff_bitmap);
-
+                    txn.set_pruned_height(metadata.pruned_height(), self.kernel_sum.clone(), self.utxo_sum.clone());
                     txn.commit().await?;
 
                     current_header = db.fetch_chain_header(current_header.height() + 1).await?;
@@ -518,99 +551,25 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
     async fn finalize_horizon_sync(&mut self) -> Result<(), HorizonSyncError> {
         debug!(target: LOG_TARGET, "Validating horizon state");
 
-        let info = HorizonSyncInfo::new(
+        self.shared.set_state_info(StateInfo::HorizonSync(HorizonSyncInfo::new(
             vec![self.sync_peer.peer_node_id().clone()],
             HorizonSyncStatus::Finalizing,
-        );
-        self.shared.set_state_info(StateInfo::HorizonSync(info));
+        )));
 
         let header = self.db().fetch_chain_header(self.horizon_sync_height).await?;
-        let mut pruned_utxo_sum = HomomorphicCommitment::default();
-        let mut pruned_kernel_sum = HomomorphicCommitment::default();
-
-        let mut prev_mmr = 0;
-        let mut prev_kernel_mmr = 0;
-        let bitmap = Arc::new(
-            self.db()
-                .fetch_complete_deleted_bitmap_at(header.hash().clone())
-                .await?
-                .into_bitmap(),
-        );
-        let expected_prev_best_block = self.shared.db.get_chain_metadata().await?.best_block().clone();
-        for h in 0..=header.height() {
-            let curr_header = self.db().fetch_chain_header(h).await?;
-
-            trace!(
-                target: LOG_TARGET,
-                "Fetching utxos from db: height:{}, header.output_mmr:{}, prev_mmr:{}, end:{}",
-                curr_header.height(),
-                curr_header.header().output_mmr_size,
-                prev_mmr,
-                curr_header.header().output_mmr_size - 1
-            );
-            let (utxos, _) = self
-                .db()
-                .fetch_utxos_by_mmr_position(prev_mmr, curr_header.header().output_mmr_size - 1, bitmap.clone())
-                .await?;
-            trace!(
-                target: LOG_TARGET,
-                "Fetching kernels from db: height:{}, header.kernel_mmr:{}, prev_mmr:{}, end:{}",
-                curr_header.height(),
-                curr_header.header().kernel_mmr_size,
-                prev_kernel_mmr,
-                curr_header.header().kernel_mmr_size - 1
-            );
-            let kernels = self
-                .db()
-                .fetch_kernels_by_mmr_position(prev_kernel_mmr, curr_header.header().kernel_mmr_size - 1)
-                .await?;
-
-            let mut utxo_sum = HomomorphicCommitment::default();
-            debug!(target: LOG_TARGET, "Number of kernels returned: {}", kernels.len());
-            debug!(target: LOG_TARGET, "Number of utxos returned: {}", utxos.len());
-            let mut prune_counter = 0;
-            for u in utxos {
-                match u {
-                    PrunedOutput::NotPruned { output } => {
-                        utxo_sum = &output.commitment + &utxo_sum;
-                    },
-                    _ => {
-                        prune_counter += 1;
-                    },
-                }
-            }
-            if prune_counter > 0 {
-                debug!(target: LOG_TARGET, "Pruned {} outputs", prune_counter);
-            }
-            prev_mmr = curr_header.header().output_mmr_size;
-
-            pruned_utxo_sum = &utxo_sum + &pruned_utxo_sum;
-
-            for k in kernels {
-                pruned_kernel_sum = &k.excess + &pruned_kernel_sum;
-            }
-            prev_kernel_mmr = curr_header.header().kernel_mmr_size;
-
-            trace!(
-                target: LOG_TARGET,
-                "Height: {} Kernel sum:{:?} Pruned UTXO sum: {:?}",
-                h,
-                pruned_kernel_sum,
-                pruned_utxo_sum
-            );
-        }
 
         self.shared
             .sync_validators
             .final_horizon_state
             .validate(
-                &*self.db().clone().into_inner().db_read_access()?,
+                &*self.db().inner().db_read_access()?,
                 header.height(),
-                &pruned_utxo_sum,
-                &pruned_kernel_sum,
+                &self.utxo_sum,
+                &self.kernel_sum,
             )
             .map_err(HorizonSyncError::FinalStateValidationFailed)?;
 
+        let metadata = self.db().get_chain_metadata().await?;
         info!(
             target: LOG_TARGET,
             "Horizon state validation succeeded! Committing horizon state."
@@ -621,9 +580,9 @@ impl<'a, B: BlockchainBackend + 'static> HorizonStateSynchronization<'a, B> {
                 header.height(),
                 header.hash().clone(),
                 header.accumulated_data().total_accumulated_difficulty,
-                expected_prev_best_block,
+                metadata.best_block().clone(),
             )
-            .set_pruned_height(header.height(), pruned_kernel_sum, pruned_utxo_sum)
+            .set_pruned_height(header.height(), self.kernel_sum.clone(), self.utxo_sum.clone())
             .commit()
             .await?;
 
diff --git a/base_layer/core/src/blocks/accumulated_data.rs b/base_layer/core/src/blocks/accumulated_data.rs
index c14f494c2e..fb7aaeec3a 100644
--- a/base_layer/core/src/blocks/accumulated_data.rs
+++ b/base_layer/core/src/blocks/accumulated_data.rs
@@ -49,29 +49,32 @@ use tari_mmr::{pruned_hashset::PrunedHashSet, ArrayLike};
 
 const LOG_TARGET: &str = "c::bn::acc_data";
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct BlockAccumulatedData {
     pub(crate) kernels: PrunedHashSet,
     pub(crate) outputs: PrunedHashSet,
+    pub(crate) witness: PrunedHashSet,
     pub(crate) deleted: DeletedBitmap,
-    pub(crate) range_proofs: PrunedHashSet,
     pub(crate) kernel_sum: Commitment,
+    pub(crate) utxo_sum: Commitment,
 }
 
 impl BlockAccumulatedData {
     pub fn new(
         kernels: PrunedHashSet,
         outputs: PrunedHashSet,
-        range_proofs: PrunedHashSet,
+        witness: PrunedHashSet,
         deleted: Bitmap,
-        total_kernel_sum: Commitment,
+        kernel_sum: Commitment,
+        utxo_sum: Commitment,
     ) -> Self {
         Self {
             kernels,
             outputs,
-            range_proofs,
+            witness,
             deleted: DeletedBitmap { deleted },
-            kernel_sum: total_kernel_sum,
+            kernel_sum,
+            utxo_sum,
         }
     }
 
@@ -79,13 +82,22 @@ impl BlockAccumulatedData {
         &self.deleted.deleted
     }
 
+    pub fn set_deleted(&mut self, deleted: DeletedBitmap) -> &mut Self {
+        self.deleted = deleted;
+        self
+    }
+
     pub fn dissolve(self) -> (PrunedHashSet, PrunedHashSet, PrunedHashSet, Bitmap) {
-        (self.kernels, self.outputs, self.range_proofs, self.deleted.deleted)
+        (self.kernels, self.outputs, self.witness, self.deleted.deleted)
     }
 
     pub fn kernel_sum(&self) -> &Commitment {
         &self.kernel_sum
     }
+
+    pub fn utxo_sum(&self) -> &Commitment {
+        &self.utxo_sum
+    }
 }
 
 impl Default for BlockAccumulatedData {
@@ -96,8 +108,9 @@ impl Default for BlockAccumulatedData {
             deleted: DeletedBitmap {
                 deleted: Bitmap::create(),
             },
-            range_proofs: Default::default(),
+            witness: Default::default(),
             kernel_sum: Default::default(),
+            utxo_sum: Default::default(),
         }
     }
 }
@@ -110,11 +123,21 @@ impl Display for BlockAccumulatedData {
             self.outputs.len().unwrap_or(0),
             self.deleted.deleted.cardinality(),
             self.kernels.len().unwrap_or(0),
-            self.range_proofs.len().unwrap_or(0)
+            self.witness.len().unwrap_or(0)
         )
     }
 }
 
+#[derive(Debug, Clone, Default)]
+pub struct UpdateBlockAccumulatedData {
+    pub kernel_hash_set: Option<PrunedHashSet>,
+    pub utxo_hash_set: Option<PrunedHashSet>,
+    pub witness_hash_set: Option<PrunedHashSet>,
+    pub deleted_diff: Option<DeletedBitmap>,
+    pub utxo_sum: Option<Commitment>,
+    pub kernel_sum: Option<Commitment>,
+}
+
 /// Wrapper struct to serialize and deserialize Bitmap
 #[derive(Debug, Clone)]
 pub struct DeletedBitmap {
diff --git a/base_layer/core/src/blocks/mod.rs b/base_layer/core/src/blocks/mod.rs
index 19a49c3071..3b7eb851f1 100644
--- a/base_layer/core/src/blocks/mod.rs
+++ b/base_layer/core/src/blocks/mod.rs
@@ -30,6 +30,7 @@ pub use accumulated_data::{
     ChainHeader,
     CompleteDeletedBitmap,
     DeletedBitmap,
+    UpdateBlockAccumulatedData,
 };
 
 mod error;
diff --git a/base_layer/core/src/chain_storage/async_db.rs b/base_layer/core/src/chain_storage/async_db.rs
index bf7c9b4a06..5a31c60bb6 100644
--- a/base_layer/core/src/chain_storage/async_db.rs
+++ b/base_layer/core/src/chain_storage/async_db.rs
@@ -32,6 +32,7 @@ use crate::{
         DeletedBitmap,
         HistoricalBlock,
         NewBlockTemplate,
+        UpdateBlockAccumulatedData,
     },
     chain_storage::{
         blockchain_database::MmrRoots,
@@ -61,7 +62,6 @@ use tari_common_types::{
     chain_metadata::ChainMetadata,
     types::{BlockHash, Commitment, HashOutput, Signature},
 };
-use tari_mmr::pruned_hashset::PrunedHashSet;
 
 const LOG_TARGET: &str = "c::bn::async_db";
 
@@ -145,7 +145,7 @@ impl<B: BlockchainBackend + 'static> AsyncBlockchainDb<B> {
     //---------------------------------- Metadata --------------------------------------------//
     make_async_fn!(get_chain_metadata() -> ChainMetadata, "get_chain_metadata");
 
-    make_async_fn!(fetch_horizon_data() -> Option<HorizonData>, "fetch_horizon_data");
+    make_async_fn!(fetch_horizon_data() -> HorizonData, "fetch_horizon_data");
 
     //---------------------------------- TXO --------------------------------------------//
     make_async_fn!(fetch_utxo(hash: HashOutput) -> Option<PrunedOutput>, "fetch_utxo");
@@ -280,11 +280,11 @@ impl<'a, B: BlockchainBackend + 'static> AsyncDbTransaction<'a, B> {
         &mut self,
         height: u64,
         hash: HashOutput,
-        accumulated_data: u128,
+        accumulated_difficulty: u128,
         expected_prev_best_block: HashOutput,
     ) -> &mut Self {
         self.transaction
-            .set_best_block(height, hash, accumulated_data, expected_prev_best_block);
+            .set_best_block(height, hash, accumulated_difficulty, expected_prev_best_block);
         self
     }
 
@@ -328,23 +328,12 @@ impl<'a, B: BlockchainBackend + 'static> AsyncDbTransaction<'a, B> {
         self
     }
 
-    pub fn update_pruned_hash_set(
+    pub fn update_block_accumulated_data_via_horizon_sync(
         &mut self,
-        mmr_tree: MmrTree,
         header_hash: HashOutput,
-        pruned_hash_set: PrunedHashSet,
+        values: UpdateBlockAccumulatedData,
     ) -> &mut Self {
-        self.transaction
-            .update_pruned_hash_set(mmr_tree, header_hash, pruned_hash_set);
-        self
-    }
-
-    pub fn update_block_accumulated_data_with_deleted_diff(
-        &mut self,
-        header_hash: HashOutput,
-        deleted: Bitmap,
-    ) -> &mut Self {
-        self.transaction.update_deleted_with_diff(header_hash, deleted);
+        self.transaction.update_block_accumulated_data(header_hash, values);
         self
     }
 
diff --git a/base_layer/core/src/chain_storage/blockchain_database.rs b/base_layer/core/src/chain_storage/blockchain_database.rs
index 52c1ce2099..d45c8e5fca 100644
--- a/base_layer/core/src/chain_storage/blockchain_database.rs
+++ b/base_layer/core/src/chain_storage/blockchain_database.rs
@@ -31,6 +31,7 @@ use crate::{
         DeletedBitmap,
         HistoricalBlock,
         NewBlockTemplate,
+        UpdateBlockAccumulatedData,
     },
     chain_storage::{
         consts::{
@@ -208,8 +209,25 @@ where B: BlockchainBackend
         };
         if is_empty {
             info!(target: LOG_TARGET, "Blockchain db is empty. Adding genesis block.");
-            let genesis_block = blockchain_db.consensus_manager.get_genesis_block();
-            blockchain_db.insert_block(Arc::new(genesis_block))?;
+            let genesis_block = Arc::new(blockchain_db.consensus_manager.get_genesis_block());
+            blockchain_db.insert_block(genesis_block.clone())?;
+            let mut txn = DbTransaction::new();
+            let utxo_sum = genesis_block.block().body.outputs().iter().map(|k| &k.commitment).sum();
+            let kernel_sum = genesis_block.block().body.kernels().iter().map(|k| &k.excess).sum();
+            txn.update_block_accumulated_data(genesis_block.hash().clone(), UpdateBlockAccumulatedData {
+                kernel_hash_set: None,
+                utxo_hash_set: None,
+                witness_hash_set: None,
+                deleted_diff: None,
+                utxo_sum: Some(utxo_sum),
+                kernel_sum: Some(kernel_sum),
+            });
+            txn.set_pruned_height(
+                0,
+                genesis_block.block().body.kernels().iter().map(|k| &k.excess).sum(),
+                genesis_block.block().body.outputs().iter().map(|o| &o.commitment).sum(),
+            );
+            blockchain_db.write(txn)?;
             blockchain_db.store_pruning_horizon(config.pruning_horizon)?;
         }
         if cleanup_orphans_at_startup {
@@ -573,7 +591,7 @@ where B: BlockchainBackend
 
     /// Returns the sum of all kernels
     pub fn fetch_kernel_commitment_sum(&self, at_hash: &HashOutput) -> Result<Commitment, ChainStorageError> {
-        Ok(self.fetch_block_accumulated_data(at_hash.clone())?.kernel_sum)
+        Ok(self.fetch_block_accumulated_data(at_hash.clone())?.kernel_sum().clone())
     }
 
     /// Returns `n` hashes from height _h - offset_ where _h_ is the tip header height back to `h - n - offset`.
@@ -972,9 +990,9 @@ where B: BlockchainBackend
         rewind_to_hash(&mut *db, hash)
     }
 
-    pub fn fetch_horizon_data(&self) -> Result<Option<HorizonData>, ChainStorageError> {
+    pub fn fetch_horizon_data(&self) -> Result<HorizonData, ChainStorageError> {
         let db = self.db_read_access()?;
-        db.fetch_horizon_data()
+        Ok(db.fetch_horizon_data()?.unwrap_or_default())
     }
 
     pub fn fetch_complete_deleted_bitmap_at(
@@ -1071,7 +1089,7 @@ pub fn calculate_mmr_roots<T: BlockchainBackend>(db: &T, block: &Block) -> Resul
     let BlockAccumulatedData {
         kernels,
         outputs,
-        range_proofs,
+        witness: range_proofs,
         ..
     } = db
         .fetch_block_accumulated_data(&header.prev_hash)?
@@ -2034,6 +2052,7 @@ fn cleanup_orphans<T: BlockchainBackend>(db: &mut T, orphan_storage_capacity: us
 
     db.delete_oldest_orphans(horizon_height, orphan_storage_capacity)
 }
+
 fn prune_database_if_needed<T: BlockchainBackend>(
     db: &mut T,
     pruning_horizon: u64,
@@ -2067,6 +2086,7 @@ fn prune_database_if_needed<T: BlockchainBackend>(
         )?;
         let mut txn = DbTransaction::new();
         for block_to_prune in (last_pruned + 1)..abs_pruning_horizon {
+            let header = db.fetch_chain_header_by_height(block_to_prune)?;
             let curr_block = db.fetch_block_accumulated_data_by_height(block_to_prune).or_not_found(
                 "BlockAccumulatedData",
                 "height",
@@ -2074,12 +2094,20 @@ fn prune_database_if_needed<T: BlockchainBackend>(
             )?;
             // Note, this could actually be done in one step instead of each block, since deleted is
             // accumulated
-            let inputs_to_prune = curr_block.deleted.bitmap().clone() - last_block.deleted.bitmap();
+            let output_mmr_positions = curr_block.deleted() - last_block.deleted();
             last_block = curr_block;
 
-            txn.prune_outputs_and_update_horizon(inputs_to_prune.to_vec(), block_to_prune);
+            txn.prune_outputs_at_positions(output_mmr_positions.to_vec());
+            txn.delete_all_inputs_in_block(header.hash().clone());
         }
 
+        txn.set_pruned_height(
+            abs_pruning_horizon - 1,
+            last_block.kernel_sum().clone(),
+            last_block.utxo_sum().clone(),
+        );
+        // TODO: prune block accumulated data
+
         db.write(txn)?;
     }
 
diff --git a/base_layer/core/src/chain_storage/db_transaction.rs b/base_layer/core/src/chain_storage/db_transaction.rs
index 970988d655..01e7bcb78d 100644
--- a/base_layer/core/src/chain_storage/db_transaction.rs
+++ b/base_layer/core/src/chain_storage/db_transaction.rs
@@ -20,8 +20,8 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 use crate::{
-    blocks::{Block, BlockHeader, BlockHeaderAccumulatedData, ChainBlock, ChainHeader},
-    chain_storage::{error::ChainStorageError, MmrTree},
+    blocks::{Block, BlockHeader, BlockHeaderAccumulatedData, ChainBlock, ChainHeader, UpdateBlockAccumulatedData},
+    chain_storage::error::ChainStorageError,
     transactions::transaction::{TransactionKernel, TransactionOutput},
 };
 use croaring::Bitmap;
@@ -35,7 +35,6 @@ use tari_crypto::tari_utilities::{
     hex::{to_hex, Hex},
     Hashable,
 };
-use tari_mmr::pruned_hashset::PrunedHashSet;
 
 #[derive(Debug)]
 pub struct DbTransaction {
@@ -142,31 +141,26 @@ impl DbTransaction {
         self
     }
 
-    pub fn update_pruned_hash_set(
-        &mut self,
-        mmr_tree: MmrTree,
-        header_hash: HashOutput,
-        pruned_hash_set: PrunedHashSet,
-    ) -> &mut Self {
-        self.operations.push(WriteOperation::UpdatePrunedHashSet {
-            mmr_tree,
-            header_hash,
-            pruned_hash_set: Box::new(pruned_hash_set),
+    pub fn prune_outputs_at_positions(&mut self, output_mmr_positions: Vec<u32>) -> &mut Self {
+        self.operations.push(WriteOperation::PruneOutputsAtMmrPositions {
+            output_positions: output_mmr_positions,
         });
         self
     }
 
-    pub fn prune_outputs_and_update_horizon(&mut self, output_mmr_positions: Vec<u32>, horizon: u64) -> &mut Self {
-        self.operations.push(WriteOperation::PruneOutputsAndUpdateHorizon {
-            output_positions: output_mmr_positions,
-            horizon,
-        });
+    pub fn delete_all_inputs_in_block(&mut self, block_hash: BlockHash) -> &mut Self {
+        self.operations
+            .push(WriteOperation::DeleteAllInputsInBlock { block_hash });
         self
     }
 
-    pub fn update_deleted_with_diff(&mut self, header_hash: HashOutput, deleted: Bitmap) -> &mut Self {
+    pub fn update_block_accumulated_data(
+        &mut self,
+        header_hash: HashOutput,
+        values: UpdateBlockAccumulatedData,
+    ) -> &mut Self {
         self.operations
-            .push(WriteOperation::UpdateDeletedBlockAccumulatedDataWithDiff { header_hash, deleted });
+            .push(WriteOperation::UpdateBlockAccumulatedData { header_hash, values });
         self
     }
 
@@ -298,25 +292,18 @@ pub enum WriteOperation {
     DeleteOrphanChainTip(HashOutput),
     InsertOrphanChainTip(HashOutput),
     InsertMoneroSeedHeight(Vec<u8>, u64),
-    UpdatePrunedHashSet {
-        mmr_tree: MmrTree,
-        header_hash: HashOutput,
-        pruned_hash_set: Box<PrunedHashSet>,
-    },
-    UpdateDeletedBlockAccumulatedDataWithDiff {
+    UpdateBlockAccumulatedData {
         header_hash: HashOutput,
-        deleted: Bitmap,
+        values: UpdateBlockAccumulatedData,
     },
     UpdateDeletedBitmap {
         deleted: Bitmap,
     },
-    PruneOutputsAndUpdateHorizon {
+    PruneOutputsAtMmrPositions {
         output_positions: Vec<u32>,
-        horizon: u64,
     },
-    UpdateKernelSum {
-        header_hash: HashOutput,
-        kernel_sum: Commitment,
+    DeleteAllInputsInBlock {
+        block_hash: BlockHash,
     },
     SetAccumulatedDataForOrphan(BlockHeaderAccumulatedData),
     SetBestBlock {
@@ -383,14 +370,6 @@ impl fmt::Display for WriteOperation {
                 write!(f, "Insert Monero seed string {} for height: {}", data.to_hex(), height)
             },
             InsertChainOrphanBlock(block) => write!(f, "InsertChainOrphanBlock({})", block.hash().to_hex()),
-            UpdatePrunedHashSet {
-                mmr_tree, header_hash, ..
-            } => write!(
-                f,
-                "Update pruned hash set: {} header: {}",
-                mmr_tree,
-                header_hash.to_hex()
-            ),
             InsertPrunedOutput {
                 header_hash: _,
                 header_height: _,
@@ -398,23 +377,14 @@ impl fmt::Display for WriteOperation {
                 witness_hash: _,
                 mmr_position: _,
             } => write!(f, "Insert pruned output"),
-            UpdateDeletedBlockAccumulatedDataWithDiff {
-                header_hash: _,
-                deleted: _,
-            } => write!(f, "Add deleted data for block"),
+            UpdateBlockAccumulatedData { header_hash, .. } => {
+                write!(f, "Update Block data for block {}", header_hash.to_hex())
+            },
             UpdateDeletedBitmap { deleted } => {
                 write!(f, "Merge deleted bitmap at tip ({} new indexes)", deleted.cardinality())
             },
-            PruneOutputsAndUpdateHorizon {
-                output_positions,
-                horizon,
-            } => write!(
-                f,
-                "Prune {} outputs and set horizon to {}",
-                output_positions.len(),
-                horizon
-            ),
-            UpdateKernelSum { header_hash, .. } => write!(f, "Update kernel sum for block: {}", header_hash.to_hex()),
+            PruneOutputsAtMmrPositions { output_positions } => write!(f, "Prune {} output(s)", output_positions.len()),
+            DeleteAllInputsInBlock { block_hash } => write!(f, "Delete outputs in block {}", block_hash.to_hex()),
             SetAccumulatedDataForOrphan(accumulated_data) => {
                 write!(f, "Set accumulated data for orphan {}", accumulated_data)
             },
diff --git a/base_layer/core/src/chain_storage/error.rs b/base_layer/core/src/chain_storage/error.rs
index 14cbd7a53f..c776ec2222 100644
--- a/base_layer/core/src/chain_storage/error.rs
+++ b/base_layer/core/src/chain_storage/error.rs
@@ -169,13 +169,7 @@ pub trait OrNotFound<U> {
 
 impl<U> OrNotFound<U> for Result<Option<U>, ChainStorageError> {
     fn or_not_found(self, entity: &'static str, field: &'static str, value: String) -> Result<U, ChainStorageError> {
-        match self {
-            Ok(inner) => match inner {
-                None => Err(ChainStorageError::ValueNotFound { entity, field, value }),
-                Some(v) => Ok(v),
-            },
-            Err(err) => Err(err),
-        }
+        self.and_then(|inner| inner.ok_or(ChainStorageError::ValueNotFound { entity, field, value }))
     }
 }
 
diff --git a/base_layer/core/src/chain_storage/horizon_data.rs b/base_layer/core/src/chain_storage/horizon_data.rs
index 6213d490f3..ae6a120bb4 100644
--- a/base_layer/core/src/chain_storage/horizon_data.rs
+++ b/base_layer/core/src/chain_storage/horizon_data.rs
@@ -21,9 +21,8 @@
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 use serde::{Deserialize, Serialize};
 use tari_common_types::types::Commitment;
-use tari_crypto::tari_utilities::ByteArray;
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct HorizonData {
     kernel_sum: Commitment,
     utxo_sum: Commitment,
@@ -35,10 +34,7 @@ impl HorizonData {
     }
 
     pub fn zero() -> Self {
-        HorizonData {
-            kernel_sum: Commitment::from_bytes(&[0u8; 32]).expect("Could not create commitment"),
-            utxo_sum: Commitment::from_bytes(&[0u8; 32]).expect("Could not create commitment"),
-        }
+        Default::default()
     }
 
     pub fn kernel_sum(&self) -> &Commitment {
diff --git a/base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs b/base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs
index 0b8e6333af..5184a744ec 100644
--- a/base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs
+++ b/base_layer/core/src/chain_storage/lmdb_db/lmdb_db.rs
@@ -33,6 +33,7 @@ use crate::{
         ChainBlock,
         ChainHeader,
         DeletedBitmap,
+        UpdateBlockAccumulatedData,
     },
     chain_storage::{
         db_transaction::{DbKey, DbTransaction, DbValue, WriteOperation},
@@ -85,7 +86,7 @@ use tari_common_types::{
     types::{BlockHash, Commitment, HashDigest, HashOutput, Signature, BLOCK_HASH_LENGTH},
 };
 use tari_crypto::tari_utilities::{hash::Hashable, hex::Hex, ByteArray};
-use tari_mmr::{pruned_hashset::PrunedHashSet, Hash, MerkleMountainRange, MutableMmr};
+use tari_mmr::{Hash, MerkleMountainRange, MutableMmr};
 use tari_storage::lmdb_store::{db, LMDBBuilder, LMDBConfig, LMDBStore};
 
 type DatabaseRef = Arc<Database<'static>>;
@@ -311,32 +312,19 @@ impl LMDBDatabase {
                     self.insert_orphan_block(&write_txn, chain_block.block())?;
                     self.set_accumulated_data_for_orphan(&write_txn, chain_block.accumulated_data())?;
                 },
-                UpdatePrunedHashSet {
-                    mmr_tree,
-                    header_hash,
-                    pruned_hash_set,
-                } => {
-                    self.update_pruned_hash_set(&write_txn, *mmr_tree, header_hash, (**pruned_hash_set).clone())?;
-                },
-                UpdateDeletedBlockAccumulatedDataWithDiff { header_hash, deleted } => {
-                    self.update_deleted_block_accumulated_data_with_diff(&write_txn, header_hash, deleted.clone())?;
+                UpdateBlockAccumulatedData { header_hash, values } => {
+                    self.update_block_accumulated_data(&write_txn, header_hash, values.clone())?;
                 },
                 UpdateDeletedBitmap { deleted } => {
                     let mut bitmap = self.load_deleted_bitmap_model(&write_txn)?;
                     bitmap.merge(deleted)?;
                     bitmap.finish()?;
                 },
-                PruneOutputsAndUpdateHorizon {
-                    output_positions,
-                    horizon,
-                } => {
-                    self.prune_outputs_and_update_horizon(&write_txn, output_positions, *horizon)?;
+                PruneOutputsAtMmrPositions { output_positions } => {
+                    self.prune_outputs_at_positions(&write_txn, output_positions)?;
                 },
-                UpdateKernelSum {
-                    header_hash,
-                    kernel_sum,
-                } => {
-                    self.update_block_accumulated_data_kernel_sum(&write_txn, header_hash, kernel_sum.clone())?;
+                DeleteAllInputsInBlock { block_hash } => {
+                    self.delete_all_inputs_in_block(&write_txn, block_hash)?;
                 },
                 SetBestBlock {
                     height,
@@ -1040,24 +1028,24 @@ impl LMDBDatabase {
             self.fetch_block_accumulated_data(&*txn, header.height - 1)?
                 .ok_or_else(|| ChainStorageError::ValueNotFound {
                     entity: "BlockAccumulatedData",
-                    field: "prev_hash",
-                    value: header.prev_hash.to_hex(),
+                    field: "height",
+                    value: (header.height - 1).to_string(),
                 })?
         };
 
-        let mut total_kernel_sum = Commitment::default();
-        let mut total_utxo_sum = Commitment::default();
         let BlockAccumulatedData {
             kernels: pruned_kernel_set,
             outputs: pruned_output_set,
-            range_proofs: pruned_proof_set,
+            witness: pruned_proof_set,
+            mut kernel_sum,
+            mut utxo_sum,
             ..
         } = data;
 
         let mut kernel_mmr = MerkleMountainRange::<HashDigest, _>::new(pruned_kernel_set);
 
         for kernel in kernels {
-            total_kernel_sum = &total_kernel_sum + &kernel.excess;
+            kernel_sum = &kernel_sum + &kernel.excess;
             let pos = kernel_mmr.push(kernel.hash())?;
             trace!(
                 target: LOG_TARGET,
@@ -1070,7 +1058,7 @@ impl LMDBDatabase {
         let mut output_mmr = MutableMmr::<HashDigest, _>::new(pruned_output_set, Bitmap::create())?;
         let mut witness_mmr = MerkleMountainRange::<HashDigest, _>::new(pruned_proof_set);
         for output in outputs {
-            total_utxo_sum = &total_utxo_sum + &output.commitment;
+            utxo_sum = &utxo_sum + &output.commitment;
             output_mmr.push(output.hash())?;
             witness_mmr.push(output.witness_hash())?;
             debug!(target: LOG_TARGET, "Inserting output `{}`", output.commitment.to_hex());
@@ -1084,7 +1072,7 @@ impl LMDBDatabase {
         }
 
         for input in inputs {
-            total_utxo_sum = &total_utxo_sum - &input.commitment;
+            utxo_sum = &utxo_sum - &input.commitment;
             let index = self
                 .fetch_mmr_leaf_index(&**txn, MmrTree::Utxo, &input.output_hash())?
                 .ok_or(ChainStorageError::UnspendableInput)?;
@@ -1119,7 +1107,8 @@ impl LMDBDatabase {
                 output_mmr.mmr().get_pruned_hash_set()?,
                 witness_mmr.get_pruned_hash_set()?,
                 deleted_at_current_height,
-                total_kernel_sum,
+                kernel_sum,
+                utxo_sum,
             ),
         )?;
 
@@ -1142,31 +1131,11 @@ impl LMDBDatabase {
         )
     }
 
-    fn update_block_accumulated_data_kernel_sum(
-        &self,
-        write_txn: &WriteTransaction<'_>,
-        header_hash: &HashOutput,
-        kernel_sum: Commitment,
-    ) -> Result<(), ChainStorageError> {
-        let height = self.fetch_height_from_hash(write_txn, header_hash).or_not_found(
-            "BlockHash",
-            "hash",
-            header_hash.to_hex(),
-        )?;
-        let mut block_accum_data = self
-            .fetch_block_accumulated_data(write_txn, height)?
-            .unwrap_or_default();
-
-        block_accum_data.kernel_sum = kernel_sum;
-        lmdb_replace(write_txn, &self.block_accumulated_data_db, &height, &block_accum_data)?;
-        Ok(())
-    }
-
-    fn update_deleted_block_accumulated_data_with_diff(
+    fn update_block_accumulated_data(
         &self,
         write_txn: &WriteTransaction<'_>,
         header_hash: &HashOutput,
-        deleted: Bitmap,
+        values: UpdateBlockAccumulatedData,
     ) -> Result<(), ChainStorageError> {
         let height = self.fetch_height_from_hash(write_txn, header_hash).or_not_found(
             "BlockHash",
@@ -1175,10 +1144,28 @@ impl LMDBDatabase {
         )?;
 
         let mut block_accum_data = self
-            .fetch_block_accumulated_data(write_txn, height)?
+            .fetch_block_accumulated_data(&*write_txn, height)?
             .unwrap_or_default();
 
-        block_accum_data.deleted = deleted.into();
+        if let Some(deleted_diff) = values.deleted_diff {
+            block_accum_data.deleted = deleted_diff;
+        }
+        if let Some(utxo_sum) = values.utxo_sum {
+            block_accum_data.utxo_sum = utxo_sum;
+        }
+        if let Some(kernel_sum) = values.kernel_sum {
+            block_accum_data.kernel_sum = kernel_sum;
+        }
+        if let Some(kernel_hash_set) = values.kernel_hash_set {
+            block_accum_data.kernels = kernel_hash_set;
+        }
+        if let Some(utxo_hash_set) = values.utxo_hash_set {
+            block_accum_data.outputs = utxo_hash_set;
+        }
+        if let Some(witness_hash_set) = values.witness_hash_set {
+            block_accum_data.witness = witness_hash_set;
+        }
+
         lmdb_replace(write_txn, &self.block_accumulated_data_db, &height, &block_accum_data)?;
         Ok(())
     }
@@ -1206,36 +1193,20 @@ impl LMDBDatabase {
         Ok(())
     }
 
-    fn update_pruned_hash_set(
+    fn delete_all_inputs_in_block(
         &self,
-        write_txn: &WriteTransaction<'_>,
-        mmr_tree: MmrTree,
-        header_hash: &HashOutput,
-        pruned_hash_set: PrunedHashSet,
+        txn: &WriteTransaction<'_>,
+        block_hash: &BlockHash,
     ) -> Result<(), ChainStorageError> {
-        let height = self.fetch_height_from_hash(write_txn, header_hash).or_not_found(
-            "BlockHash",
-            "hash",
-            header_hash.to_hex(),
-        )?;
-        let mut block_accum_data = self
-            .fetch_block_accumulated_data(write_txn, height)?
-            .unwrap_or_default();
-        match mmr_tree {
-            MmrTree::Kernel => block_accum_data.kernels = pruned_hash_set,
-            MmrTree::Utxo => block_accum_data.outputs = pruned_hash_set,
-            MmrTree::Witness => block_accum_data.range_proofs = pruned_hash_set,
-        }
-
-        lmdb_replace(write_txn, &self.block_accumulated_data_db, &height, &block_accum_data)?;
+        let inputs = lmdb_delete_keys_starting_with::<Vec<u8>>(&txn, &self.inputs_db, block_hash.to_hex().as_str())?;
+        debug!(target: LOG_TARGET, "Deleted {} input(s)", inputs.len());
         Ok(())
     }
 
-    fn prune_outputs_and_update_horizon(
+    fn prune_outputs_at_positions(
         &self,
         write_txn: &WriteTransaction<'_>,
         output_positions: &[u32],
-        horizon: u64,
     ) -> Result<(), ChainStorageError> {
         for pos in output_positions {
             let (_height, hash) = lmdb_first_after::<_, (u64, Vec<u8>)>(
@@ -1249,12 +1220,6 @@ impl LMDBDatabase {
             self.prune_output(write_txn, &key)?;
         }
 
-        self.set_metadata(
-            write_txn,
-            MetadataKey::PrunedHeight,
-            MetadataValue::PrunedHeight(horizon),
-        )?;
-
         Ok(())
     }
 
diff --git a/base_layer/core/src/proof_of_work/randomx_factory.rs b/base_layer/core/src/proof_of_work/randomx_factory.rs
index 383bc0417f..79909c679b 100644
--- a/base_layer/core/src/proof_of_work/randomx_factory.rs
+++ b/base_layer/core/src/proof_of_work/randomx_factory.rs
@@ -15,7 +15,7 @@ pub struct RandomXVMInstance {
     // The cache and dataset for the VM need to be stored together with it since they are not
     // mix and match.
     instance: Arc<Mutex<(RandomXVM, RandomXCache, Option<RandomXDataset>)>>,
-    flags: RandomXFlag,
+    _flags: RandomXFlag,
 }
 
 impl RandomXVMInstance {
@@ -48,7 +48,7 @@ impl RandomXVMInstance {
 
         Ok(Self {
             instance: Arc::new(Mutex::new((vm, cache, None))),
-            flags,
+            _flags: flags,
         })
     }
 
diff --git a/base_layer/core/src/transactions/aggregated_body.rs b/base_layer/core/src/transactions/aggregated_body.rs
index a7f3134678..685ab6c47b 100644
--- a/base_layer/core/src/transactions/aggregated_body.rs
+++ b/base_layer/core/src/transactions/aggregated_body.rs
@@ -451,11 +451,7 @@ impl AggregateBody {
     fn validate_range_proofs(&self, range_proof_service: &RangeProofService) -> Result<(), TransactionError> {
         trace!(target: LOG_TARGET, "Checking range proofs");
         for o in &self.outputs {
-            if !o.verify_range_proof(range_proof_service)? {
-                return Err(TransactionError::ValidationError(
-                    "Range proof could not be verified".into(),
-                ));
-            }
+            o.verify_range_proof(range_proof_service)?;
         }
         Ok(())
     }
diff --git a/base_layer/core/src/transactions/coinbase_builder.rs b/base_layer/core/src/transactions/coinbase_builder.rs
index 3c75d7fa84..90041e5876 100644
--- a/base_layer/core/src/transactions/coinbase_builder.rs
+++ b/base_layer/core/src/transactions/coinbase_builder.rs
@@ -323,7 +323,7 @@ mod test {
         assert!(factories
             .commitment
             .open_value(&p.spend_key, block_reward.into(), utxo.commitment()));
-        assert!(utxo.verify_range_proof(&factories.range_proof).unwrap());
+        utxo.verify_range_proof(&factories.range_proof).unwrap();
         assert!(utxo.features.flags.contains(OutputFlags::COINBASE_OUTPUT));
         assert_eq!(
             tx.body.check_coinbase_output(
diff --git a/base_layer/core/src/transactions/transaction.rs b/base_layer/core/src/transactions/transaction.rs
index 9c59bbaddf..9dd488922a 100644
--- a/base_layer/core/src/transactions/transaction.rs
+++ b/base_layer/core/src/transactions/transaction.rs
@@ -263,6 +263,8 @@ pub enum TransactionError {
     NoSignatureError,
     #[error("A range proof construction or verification has produced an error: {0}")]
     RangeProofError(#[from] RangeProofError),
+    #[error("Range proof verification has failed")]
+    InvalidRangeProof,
     #[error("An error occurred while performing a commitment signature: {0}")]
     SigningError(#[from] CommitmentSignatureError),
     #[error("Invalid kernel in body")]
@@ -687,8 +689,12 @@ impl TransactionOutput {
     }
 
     /// Verify that range proof is valid
-    pub fn verify_range_proof(&self, prover: &RangeProofService) -> Result<bool, TransactionError> {
-        Ok(prover.verify(&self.proof.0, &self.commitment))
+    pub fn verify_range_proof(&self, prover: &RangeProofService) -> Result<(), TransactionError> {
+        if prover.verify(&self.proof.0, &self.commitment) {
+            Ok(())
+        } else {
+            Err(TransactionError::InvalidRangeProof)
+        }
     }
 
     /// Verify that the metadata signature is valid
@@ -1417,6 +1423,7 @@ mod test {
             test_helpers,
             test_helpers::{TestParams, UtxoTestParams},
             transaction::OutputFeatures,
+            transaction_protocol::TransactionProtocolError,
         },
         txn_schema,
     };
@@ -1477,7 +1484,7 @@ mod test {
         });
         let script = unblinded_output1.script.clone();
         let tx_output1 = unblinded_output1.as_transaction_output(&factories).unwrap();
-        assert!(tx_output1.verify_range_proof(&factories.range_proof).unwrap());
+        tx_output1.verify_range_proof(&factories.range_proof).unwrap();
 
         let unblinded_output2 = test_params_2.create_unblinded_output(UtxoTestParams {
             value: (2u64.pow(32) + 1u64).into(),
@@ -1517,7 +1524,11 @@ mod test {
             )
             .unwrap(),
         );
-        assert!(!tx_output3.verify_range_proof(&factories.range_proof).unwrap());
+        let err = tx_output3.verify_range_proof(&factories.range_proof).unwrap_err();
+        assert!(matches!(
+            err,
+            TransactionProtocolError::RangeProofError(RangeProofError::InvalidRangeProof)
+        ));
     }
 
     #[test]
diff --git a/base_layer/core/src/transactions/transaction_protocol/recipient.rs b/base_layer/core/src/transactions/transaction_protocol/recipient.rs
index c3c6f99ac1..f8cecc7c1e 100644
--- a/base_layer/core/src/transactions/transaction_protocol/recipient.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/recipient.rs
@@ -263,7 +263,7 @@ mod test {
         assert!(factories
             .commitment
             .open_value(&p.spend_key, 500, &data.output.commitment));
-        assert!(data.output.verify_range_proof(&factories.range_proof).unwrap());
+        data.output.verify_range_proof(&factories.range_proof).unwrap();
         let r_sum = &msg.public_nonce + &p.public_nonce;
         let e = build_challenge(&r_sum, &m);
         let s = Signature::sign(p.spend_key.clone(), p.nonce, &e).unwrap();
diff --git a/base_layer/core/src/transactions/transaction_protocol/sender.rs b/base_layer/core/src/transactions/transaction_protocol/sender.rs
index b38577a2ad..8f32e5358f 100644
--- a/base_layer/core/src/transactions/transaction_protocol/sender.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/sender.rs
@@ -385,11 +385,7 @@ impl SenderTransactionProtocol {
     ) -> Result<(), TPE> {
         match &mut self.state {
             SenderState::CollectingSingleSignature(info) => {
-                if !rec.output.verify_range_proof(prover)? {
-                    return Err(TPE::ValidationError(
-                        "Recipient output range proof failed to verify".into(),
-                    ));
-                }
+                rec.output.verify_range_proof(prover)?;
                 // Consolidate transaction info
                 info.outputs.push(rec.output.clone());
 
@@ -725,7 +721,7 @@ mod test {
         commitment::HomomorphicCommitmentFactory,
         common::Blake256,
         keys::{PublicKey as PublicKeyTrait, SecretKey as SecretKeyTrait},
-        range_proof::RangeProofService,
+        range_proof::{RangeProofError, RangeProofService},
         ristretto::pedersen::PedersenCommitmentFactory,
         script,
         script::{ExecutionStack, TariScript},
@@ -1027,13 +1023,13 @@ mod test {
         // Receiver gets message, deserializes it etc, and creates his response
         let bob_info =
             SingleReceiverTransactionProtocol::create(&msg, b.nonce, b.spend_key, features, &factories, None).unwrap(); // Alice gets message back, deserializes it, etc
-        match alice.add_single_recipient_info(bob_info, &factories.range_proof) {
-            Ok(_) => panic!("Range proof should have failed to verify"),
-            Err(e) => assert_eq!(
-                e,
-                TransactionProtocolError::ValidationError("Recipient output range proof failed to verify".into())
-            ),
-        }
+        let err = alice
+            .add_single_recipient_info(bob_info, &factories.range_proof)
+            .unwrap_err();
+        assert!(matches!(
+            err,
+            TransactionProtocolError::RangeProofError(RangeProofError::InvalidRangeProof)
+        ));
     }
 
     #[test]
diff --git a/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs b/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
index ab26e3e80c..3a15d6a134 100644
--- a/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/single_receiver.rs
@@ -219,10 +219,7 @@ mod test {
             factories.commitment.open_value(&k, info.amount.into(), &out.commitment),
             "Output commitment is invalid"
         );
-        assert!(
-            out.verify_range_proof(&factories.range_proof).unwrap(),
-            "Range proof is invalid"
-        );
+        out.verify_range_proof(&factories.range_proof).unwrap();
         assert!(out.features.flags.is_empty(), "Output features flags have changed");
     }
 }
diff --git a/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs b/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
index ef45b0a449..71780fb9a3 100644
--- a/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
+++ b/base_layer/core/src/transactions/transaction_protocol/transaction_initializer.rs
@@ -70,7 +70,6 @@ pub const LOG_TARGET: &str = "c::tx::tx_protocol::tx_initializer";
 /// methods, you can call `build()` which will return a
 #[derive(Debug, Clone)]
 pub struct SenderTransactionInitializer {
-    consensus_constants: ConsensusConstants,
     num_recipients: usize,
     amounts: FixedSet<MicroTari>,
     lock_height: Option<u64>,
@@ -113,7 +112,6 @@ impl SenderTransactionInitializer {
     pub fn new(num_recipients: usize, consensus_constants: ConsensusConstants) -> Self {
         Self {
             fee: Fee::new(*consensus_constants.transaction_weight()),
-            consensus_constants,
             num_recipients,
             amounts: FixedSet::new(num_recipients),
             lock_height: None,
diff --git a/base_layer/p2p/src/dns/client.rs b/base_layer/p2p/src/dns/client.rs
index 78093186ef..8a875e9429 100644
--- a/base_layer/p2p/src/dns/client.rs
+++ b/base_layer/p2p/src/dns/client.rs
@@ -106,7 +106,7 @@ impl DnsClient {
 #[derive(Clone)]
 pub struct Client<C> {
     inner: C,
-    shutdown: Arc<Shutdown>,
+    _shutdown: Arc<Shutdown>,
 }
 
 impl Client<AsyncDnssecClient> {
@@ -121,7 +121,7 @@ impl Client<AsyncDnssecClient> {
 
         Ok(Self {
             inner: client,
-            shutdown: Arc::new(shutdown),
+            _shutdown: Arc::new(shutdown),
         })
     }
 }
@@ -135,7 +135,7 @@ impl Client<AsyncClient> {
 
         Ok(Self {
             inner: client,
-            shutdown: Arc::new(shutdown),
+            _shutdown: Arc::new(shutdown),
         })
     }
 }
@@ -165,7 +165,7 @@ mod mock {
             let client = MockClientHandle::mock(messages);
             Ok(Self {
                 inner: client,
-                shutdown: Arc::new(Shutdown::new()),
+                _shutdown: Arc::new(Shutdown::new()),
             })
         }
     }
diff --git a/base_layer/p2p/src/dns/mock.rs b/base_layer/p2p/src/dns/mock.rs
index 9dec5155cb..1cd0c1bbad 100644
--- a/base_layer/p2p/src/dns/mock.rs
+++ b/base_layer/p2p/src/dns/mock.rs
@@ -34,7 +34,7 @@ use trust_dns_client::{
 #[derive(Clone)]
 pub struct MockClientHandle<O: OnSend, E> {
     messages: Arc<Vec<Result<DnsResponse, E>>>,
-    on_send: O,
+    _on_send: O,
 }
 
 impl<E> MockClientHandle<DefaultOnSend, E> {
@@ -44,7 +44,7 @@ impl<E> MockClientHandle<DefaultOnSend, E> {
 
         MockClientHandle {
             messages: Arc::new(messages),
-            on_send: DefaultOnSend,
+            _on_send: DefaultOnSend,
         }
     }
 }
diff --git a/base_layer/p2p/src/services/liveness/state.rs b/base_layer/p2p/src/services/liveness/state.rs
index 383652a2ab..f61f14a295 100644
--- a/base_layer/p2p/src/services/liveness/state.rs
+++ b/base_layer/p2p/src/services/liveness/state.rs
@@ -74,7 +74,6 @@ pub struct LivenessState {
     pongs_received: usize,
     pings_sent: usize,
     pongs_sent: usize,
-    num_active_peers: usize,
 
     local_metadata: Metadata,
 }
diff --git a/common/src/build/protobuf.rs b/common/src/build/protobuf.rs
index 6898052e94..875320a468 100644
--- a/common/src/build/protobuf.rs
+++ b/common/src/build/protobuf.rs
@@ -24,9 +24,12 @@ where P: AsRef<Path> + Display {
             .output()
             .unwrap();
 
-        if !out.status.success() {
-            panic!("status: {} - {}", out.status, String::from_utf8_lossy(&out.stderr));
-        }
+        assert!(
+            out.status.success(),
+            "status: {} - {}",
+            out.status,
+            String::from_utf8_lossy(&out.stderr)
+        );
     }
 }
 
diff --git a/comms/dht/src/network_discovery/discovering.rs b/comms/dht/src/network_discovery/discovering.rs
index e15e96ed8f..93cb55a5c7 100644
--- a/comms/dht/src/network_discovery/discovering.rs
+++ b/comms/dht/src/network_discovery/discovering.rs
@@ -41,10 +41,8 @@ const LOG_TARGET: &str = "comms::dht::network_discovery";
 pub(super) struct Discovering {
     params: DiscoveryParams,
     context: NetworkDiscoveryContext,
-    candidate_peers: Vec<PeerConnection>,
     stats: DhtNetworkDiscoveryRoundInfo,
     neighbourhood_threshold: NodeDistance,
-    excluded_peers: Vec<NodeId>,
 }
 
 impl Discovering {
@@ -52,10 +50,8 @@ impl Discovering {
         Self {
             params,
             context,
-            candidate_peers: Vec::new(),
             stats: Default::default(),
             neighbourhood_threshold: NodeDistance::max_distance(),
-            excluded_peers: Vec::new(),
         }
     }
 
diff --git a/comms/src/multiplexing/yamux.rs b/comms/src/multiplexing/yamux.rs
index 54696cecd7..811f485390 100644
--- a/comms/src/multiplexing/yamux.rs
+++ b/comms/src/multiplexing/yamux.rs
@@ -144,7 +144,7 @@ impl Control {
         let stream = self.inner.open_stream().await?;
         Ok(Substream {
             stream: stream.compat(),
-            counter_guard,
+            _counter_guard: counter_guard,
         })
     }
 
@@ -193,7 +193,7 @@ impl Stream for IncomingSubstreams {
         match futures::ready!(Pin::new(&mut self.inner).poll_recv(cx)) {
             Some(stream) => Poll::Ready(Some(Substream {
                 stream: stream.compat(),
-                counter_guard: self.substream_counter.new_guard(),
+                _counter_guard: self.substream_counter.new_guard(),
             })),
             None => Poll::Ready(None),
         }
@@ -209,7 +209,7 @@ impl Drop for IncomingSubstreams {
 #[derive(Debug)]
 pub struct Substream {
     stream: Compat<yamux::Stream>,
-    counter_guard: AtomicRefCounterGuard,
+    _counter_guard: AtomicRefCounterGuard,
 }
 
 impl StreamId for Substream {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 1fc0ea2ed0..a18e2a4852 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,4 +2,4 @@
 # and increment this number:
 # Hours spent updating the Rust Toolchain = 1
 [toolchain]
-channel = "nightly-2021-08-18"
+channel = "nightly-2021-10-18"