diff --git a/Cargo.lock b/Cargo.lock
index 007a5be..1cb68f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,20 +14,20 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
 dependencies = [
- "gimli 0.26.2",
+ "gimli",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
- "gimli 0.27.2",
+ "gimli",
 ]
 
 [[package]]
@@ -42,7 +42,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -51,10 +51,20 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "aes"
 version = "0.6.0"
@@ -79,17 +89,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "aes-gcm"
-version = "0.8.0"
+name = "aes"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
- "aead 0.3.2",
- "aes 0.6.0",
- "cipher 0.2.5",
- "ctr 0.6.0",
- "ghash 0.3.1",
- "subtle",
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
 ]
 
 [[package]]
@@ -106,6 +113,20 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "aes-gcm"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237"
+dependencies = [
+ "aead 0.5.2",
+ "aes 0.8.3",
+ "cipher 0.4.4",
+ "ctr 0.9.2",
+ "ghash 0.5.0",
+ "subtle",
+]
+
 [[package]]
 name = "aes-soft"
 version = "0.6.4"
@@ -132,7 +153,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
  "once_cell",
  "version_check",
 ]
@@ -144,7 +165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
  "once_cell",
  "version_check",
 ]
@@ -158,6 +179,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -176,11 +212,60 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.69"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
 [[package]]
 name = "approx"
@@ -203,11 +288,17 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
 
+[[package]]
+name = "array-bytes"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd"
+
 [[package]]
 name = "arrayref"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
 
 [[package]]
 name = "arrayvec"
@@ -217,9 +308,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "asn1-rs"
@@ -234,14 +325,14 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.19",
+ "time 0.3.23",
 ]
 
 [[package]]
 name = "asn1-rs"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 dependencies = [
  "asn1-rs-derive 0.4.0",
  "asn1-rs-impl",
@@ -250,7 +341,7 @@ dependencies = [
  "num-traits",
  "rusticata-macros",
  "thiserror",
- "time 0.3.19",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -261,7 +352,7 @@ checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "synstructure",
 ]
 
@@ -273,7 +364,7 @@ checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "synstructure",
 ]
 
@@ -285,15 +376,9 @@ checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
-[[package]]
-name = "asn1_der"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21"
-
 [[package]]
 name = "assert_matches"
 version = "1.5.0"
@@ -303,54 +388,104 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 [[package]]
 name = "assets-chain-extension-types"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.39#9bbcb8d6b16369ae3d9e7b7e7cc22f33dd55d80e"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
+dependencies = [
+ "num_enum",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+]
+
+[[package]]
+name = "astar-primitives"
+version = "0.1.0"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
 dependencies = [
+ "ethereum",
+ "ethereum-types",
+ "fp-evm",
+ "frame-support",
  "frame-system",
- "pallet-contracts",
+ "impl-trait-for-tuples",
+ "log",
+ "orml-traits",
+ "pallet-assets",
+ "pallet-evm",
+ "pallet-evm-precompile-assets-erc20",
+ "pallet-evm-precompile-dispatch",
+ "pallet-xc-asset-config",
  "parity-scale-codec",
  "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
  "sp-runtime",
+ "sp-std",
+ "xcm",
+ "xcm-builder",
+ "xcm-executor",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
 ]
 
 [[package]]
 name = "async-io"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
  "async-lock",
  "autocfg",
+ "cfg-if",
  "concurrent-queue",
  "futures-lite",
- "libc",
  "log",
  "parking",
  "polling",
+ "rustix 0.37.23",
  "slab",
- "socket2",
+ "socket2 0.4.9",
  "waker-fn",
- "windows-sys 0.42.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
 dependencies = [
  "event-listener",
- "futures-lite",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.64"
+version = "0.1.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -363,14 +498,14 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
 ]
 
 [[package]]
 name = "atomic-waker"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
 
 [[package]]
 name = "atty"
@@ -383,6 +518,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "auto_impl"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -391,16 +538,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
 dependencies = [
- "addr2line 0.19.0",
+ "addr2line 0.20.0",
  "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.30.3",
+ "object 0.31.1",
  "rustc-demangle",
 ]
 
@@ -417,10 +564,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
 
 [[package]]
-name = "base58"
+name = "base16ct"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base64"
@@ -430,15 +577,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
 [[package]]
 name = "base64ct"
-version = "1.5.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "beef"
@@ -452,9 +599,9 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "hash-db",
+ "hash-db 0.16.0",
  "log",
 ]
 
@@ -469,22 +616,23 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.64.0"
+version = "0.65.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cexpr",
  "clang-sys",
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease 0.2.15",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -493,6 +641,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -511,7 +665,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -521,8 +675,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
@@ -532,21 +686,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.4",
+ "constant_time_eq 0.2.6",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.3.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef"
+checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "cc",
  "cfg-if",
- "constant_time_eq",
+ "constant_time_eq 0.3.0",
 ]
 
 [[package]]
@@ -567,16 +721,16 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -606,9 +760,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "bounded-collections"
-version = "0.1.5"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a071c348a5ef6da1d3a87166b408170b46002382b1dda83992b5c2208cefb370"
+checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -624,9 +778,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
 [[package]]
 name = "bstr"
-version = "1.3.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
  "serde",
@@ -643,9 +797,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "byte-slice-cast"
@@ -690,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055"
+checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
 dependencies = [
  "serde",
 ]
@@ -714,12 +868,18 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.16",
+ "semver 1.0.17",
  "serde",
  "serde_json",
  "thiserror",
 ]
 
+[[package]]
+name = "case"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c"
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -751,9 +911,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.10.3"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c"
 dependencies = [
  "smallvec",
 ]
@@ -797,13 +957,13 @@ dependencies = [
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "js-sys",
- "num-integer",
  "num-traits",
  "time 0.1.45",
  "wasm-bindgen",
@@ -818,7 +978,7 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
 dependencies = [
  "core2",
  "multibase",
- "multihash",
+ "multihash 0.16.3",
  "serde",
  "unsigned-varint",
 ]
@@ -829,7 +989,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
@@ -838,7 +998,17 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
 ]
 
 [[package]]
@@ -852,9 +1022,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
+checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
@@ -863,40 +1033,45 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.1.6"
+version = "4.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
+checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
- "clap_lex",
- "is-terminal",
  "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
+ "clap_lex",
  "strsim",
- "termcolor",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
 
 [[package]]
 name = "codespan-reporting"
@@ -908,11 +1083,17 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "comfy-table"
-version = "6.1.4"
+version = "6.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d"
+checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
 dependencies = [
  "strum",
  "strum_macros",
@@ -921,24 +1102,49 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
 dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "const-oid"
-version = "0.9.1"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
+checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.2.4"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "core-foundation"
@@ -952,9 +1158,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "core2"
@@ -976,43 +1182,36 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "cpuid-bool"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
-
 [[package]]
 name = "cranelift-bforest"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7379abaacee0f14abf3204a7606118f0465785252169d186337bcb75030815a"
+checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9489fa336927df749631f1008007ced2871068544f40a202ce6d93fbf2366a7b"
+checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220"
 dependencies = [
- "arrayvec 0.7.2",
  "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli 0.26.2",
- "hashbrown 0.12.3",
+ "gimli",
+ "hashbrown 0.13.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1021,33 +1220,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05bbb67da91ec721ed57cef2f7c5ef7728e1cd9bde9ffd3ef8601022e73e3239"
+checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418ecb2f36032f6665dc1a5e2060a143dbab41d83b784882e97710e890a7a16d"
+checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cf583f7b093f291005f9fb1323e2c37f6ee4c7909e39ce016b2e8360d461705"
+checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b66bf9e916f57fbbd0f7703ec6286f4624866bf45000111627c70d272c8dda1"
+checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1057,15 +1256,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "649782a39ce99798dd6b4029e2bb318a2fbeaade1b4fa25330763c10c65bc358"
+checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba"
 
 [[package]]
 name = "cranelift-native"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "937e021e089c51f9749d09e7ad1c4f255c2f8686cb8c3df63a34b3ec9921bc41"
+checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1074,9 +1273,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.93.1"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d850cf6775477747c9dfda9ae23355dd70512ffebc70cf82b85a5b111ae668b5"
+checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1114,9 +1313,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
@@ -1124,9 +1323,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -1135,22 +1334,22 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.13"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset 0.7.1",
+ "memoffset 0.9.0",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.14"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
 dependencies = [
  "cfg-if",
 ]
@@ -1167,7 +1366,19 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15"
+dependencies = [
+ "generic-array 0.14.7",
  "rand_core 0.6.4",
  "subtle",
  "zeroize",
@@ -1179,7 +1390,8 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -1189,17 +1401,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
- "generic-array 0.14.6",
- "subtle",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a"
-dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "subtle",
 ]
 
@@ -1209,26 +1411,26 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "subtle",
 ]
 
 [[package]]
 name = "ctr"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f"
+checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
 dependencies = [
- "cipher 0.2.5",
+ "cipher 0.3.0",
 ]
 
 [[package]]
 name = "ctr"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.3.0",
+ "cipher 0.4.4",
 ]
 
 [[package]]
@@ -1259,9 +1461,9 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-rc.0"
+version = "4.0.0-rc.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da00a7a9a4eb92a0a0f8e75660926d48f0d0f3c537e455c457bcdaa1e16b1ac"
+checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16"
 dependencies = [
  "cfg-if",
  "fiat-crypto",
@@ -1273,9 +1475,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.91"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62"
+checksum = "e928d50d5858b744d1ea920b790641129c347a770d1530c3a85b77705a5ee031"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1285,9 +1487,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.91"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690"
+checksum = "8332ba63f8a8040ca479de693150129067304a3496674477fff6d0c372cc34ae"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1295,43 +1497,31 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.91"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf"
+checksum = "5966a5a87b6e9bb342f5fab7170a93c77096efe199872afffc4b477cfeb86957"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.91"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892"
+checksum = "81b2dab6991c7ab1572fea8cb049db819b1aeea1e2dac74c0869f244d9f21a7c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
-name = "dapps-staking-chain-extension-types"
-version = "1.1.0"
-source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.39#9bbcb8d6b16369ae3d9e7b7e7cc22f33dd55d80e"
-dependencies = [
- "frame-support",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-runtime",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
+name = "darling"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1339,40 +1529,40 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1380,12 +1570,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772"
 dependencies = [
  "data-encoding",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1399,6 +1589,16 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "der"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "der-parser"
 version = "7.0.0"
@@ -1415,11 +1615,11 @@ dependencies = [
 
 [[package]]
 name = "der-parser"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -1427,6 +1627,17 @@ dependencies = [
  "rusticata-macros",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "derive-syn-parse"
 version = "0.1.5"
@@ -1435,7 +1646,7 @@ checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1456,7 +1667,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1466,7 +1677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1475,9 +1686,11 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
- "syn",
+ "rustc_version 0.4.0",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1501,16 +1714,17 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
 ]
 
 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -1558,13 +1772,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -1581,9 +1795,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
 [[package]]
 name = "dtoa"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313"
+checksum = "519b83cd10f5f6e969625a409f735182bea5558cd8b64c655806ceaae36f1999"
 
 [[package]]
 name = "dyn-clonable"
@@ -1603,14 +1817,14 @@ checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
 
 [[package]]
 name = "ecdsa"
@@ -1618,10 +1832,24 @@ version = "0.14.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
 dependencies = [
- "der",
- "elliptic-curve",
- "rfc6979",
- "signature",
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428"
+dependencies = [
+ "der 0.7.7",
+ "digest 0.10.7",
+ "elliptic-curve 0.13.5",
+ "rfc6979 0.4.0",
+ "signature 2.1.0",
+ "spki 0.7.2",
 ]
 
 [[package]]
@@ -1630,7 +1858,7 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
 dependencies = [
- "signature",
+ "signature 1.6.4",
 ]
 
 [[package]]
@@ -1673,22 +1901,47 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
 dependencies = [
- "base16ct",
- "crypto-bigint",
- "der",
- "digest 0.10.6",
- "ff",
- "generic-array 0.14.6",
- "group",
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest 0.10.7",
+ "ff 0.12.1",
+ "generic-array 0.14.7",
+ "group 0.12.1",
  "hkdf",
  "pem-rfc7468",
- "pkcs8",
+ "pkcs8 0.9.0",
+ "rand_core 0.6.4",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.2",
+ "digest 0.10.7",
+ "ff 0.13.0",
+ "generic-array 0.14.7",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
  "rand_core 0.6.4",
- "sec1",
+ "sec1 0.7.2",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "enum-as-inner"
 version = "0.5.1"
@@ -1698,7 +1951,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1720,15 +1973,21 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b"
 
+[[package]]
+name = "equivalent"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1741,12 +2000,115 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a89fb87a9e103f71b903b80b670200b54cc67a07578f070681f1fffb7396fb7"
+dependencies = [
+ "bytes",
+ "ethereum-types",
+ "hash-db 0.15.2",
+ "hash256-std-hasher",
+ "parity-scale-codec",
+ "rlp",
+ "scale-info",
+ "serde",
+ "sha3",
+ "triehash",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "scale-info",
+ "uint",
+]
+
 [[package]]
 name = "event-listener"
 version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
+[[package]]
+name = "evm"
+version = "0.39.1"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+dependencies = [
+ "auto_impl",
+ "environmental",
+ "ethereum",
+ "evm-core",
+ "evm-gasometer",
+ "evm-runtime",
+ "log",
+ "parity-scale-codec",
+ "primitive-types",
+ "rlp",
+ "scale-info",
+ "serde",
+ "sha3",
+]
+
+[[package]]
+name = "evm-core"
+version = "0.39.0"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+dependencies = [
+ "parity-scale-codec",
+ "primitive-types",
+ "scale-info",
+ "serde",
+]
+
+[[package]]
+name = "evm-gasometer"
+version = "0.39.0"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+dependencies = [
+ "environmental",
+ "evm-core",
+ "evm-runtime",
+ "primitive-types",
+]
+
+[[package]]
+name = "evm-runtime"
+version = "0.39.0"
+source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65"
+dependencies = [
+ "auto_impl",
+ "environmental",
+ "evm-core",
+ "primitive-types",
+ "sha3",
+]
+
 [[package]]
 name = "exit-future"
 version = "0.2.0"
@@ -1756,6 +2118,19 @@ dependencies = [
  "futures",
 ]
 
+[[package]]
+name = "expander"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f360349150728553f92e4c997a16af8915f418d3a0f21b440d34c5632f16ed84"
+dependencies = [
+ "blake2",
+ "fs-err",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -1768,6 +2143,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
+[[package]]
+name = "faster-hex"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8"
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1777,6 +2158,12 @@ dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+
 [[package]]
 name = "fdlimit"
 version = "0.2.1"
@@ -1796,11 +2183,21 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
 [[package]]
 name = "fiat-crypto"
-version = "0.1.17"
+version = "0.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
 
 [[package]]
 name = "file-per-thread-logger"
@@ -1814,21 +2211,21 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
+checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "windows-sys 0.45.0",
+ "redox_syscall 0.2.16",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "finality-grandpa"
-version = "0.16.1"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34"
+checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3"
 dependencies = [
  "either",
  "futures",
@@ -1860,9 +2257,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
  "libz-sys",
@@ -1887,20 +2284,54 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
 ]
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fp-account"
+version = "1.0.0-dev"
+source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2"
+dependencies = [
+ "hex",
+ "impl-serde",
+ "libsecp256k1",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+]
+
+[[package]]
+name = "fp-evm"
+version = "3.0.0-dev"
+source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2"
+dependencies = [
+ "evm",
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "fragile"
 version = "2.0.0"
@@ -1910,7 +2341,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -1935,10 +2366,10 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "Inflector",
- "array-bytes",
+ "array-bytes 4.2.0",
  "chrono",
  "clap",
  "comfy-table",
@@ -1982,7 +2413,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1998,9 +2429,9 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "15.0.0"
+version = "15.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d"
+checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
 dependencies = [
  "cfg-if",
  "parity-scale-codec",
@@ -2011,25 +2442,31 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "async-recursion",
  "futures",
+ "indicatif",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
+ "spinners",
  "substrate-rpc-client",
  "tokio",
+ "tokio-retry",
 ]
 
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "environmental",
  "frame-metadata",
  "frame-support-procedural",
  "impl-trait-for-tuples",
@@ -2045,6 +2482,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
+ "sp-debug-derive",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
@@ -2059,45 +2497,47 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse",
  "frame-support-procedural-tools",
  "itertools",
+ "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "cfg-if",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -2114,7 +2554,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2129,7 +2569,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2138,7 +2578,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2147,6 +2587,12 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "fs-err"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"
+
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -2157,6 +2603,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "fs4"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
+dependencies = [
+ "rustix 0.38.3",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2165,9 +2621,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2180,9 +2636,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2190,15 +2646,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2208,34 +2664,34 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-lite"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
 dependencies = [
- "fastrand",
+ "fastrand 1.9.0",
  "futures-core",
  "futures-io",
  "memchr",
  "parking",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "waker-fn",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -2251,15 +2707,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "futures-task"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
 
 [[package]]
 name = "futures-timer"
@@ -2269,9 +2725,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2280,7 +2736,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "pin-utils",
  "slab",
 ]
@@ -2305,12 +2761,13 @@ dependencies = [
 
 [[package]]
 name = "generic-array"
-version = "0.14.6"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -2336,9 +2793,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2347,41 +2804,35 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.3.1"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375"
+checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
 dependencies = [
  "opaque-debug 0.3.0",
- "polyval 0.4.5",
+ "polyval 0.5.3",
 ]
 
 [[package]]
 name = "ghash"
-version = "0.4.4"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
+checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
  "opaque-debug 0.3.0",
- "polyval 0.5.3",
+ "polyval 0.6.1",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.26.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 dependencies = [
  "fallible-iterator",
- "indexmap",
+ "indexmap 1.9.3",
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.27.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4"
-
 [[package]]
 name = "glob"
 version = "0.3.1"
@@ -2394,7 +2845,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
- "aho-corasick",
+ "aho-corasick 0.7.20",
  "bstr",
  "fnv",
  "log",
@@ -2407,16 +2858,27 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
 dependencies = [
- "ff",
+ "ff 0.12.1",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
  "rand_core 0.6.4",
  "subtle",
 ]
 
 [[package]]
 name = "h2"
-version = "0.3.15"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
  "bytes",
  "fnv",
@@ -2424,7 +2886,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util",
@@ -2433,9 +2895,9 @@ dependencies = [
 
 [[package]]
 name = "handlebars"
-version = "4.3.6"
+version = "4.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a"
+checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
 dependencies = [
  "log",
  "pest",
@@ -2451,6 +2913,12 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a"
 
+[[package]]
+name = "hash-db"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4"
+
 [[package]]
 name = "hash256-std-hasher"
 version = "0.15.2"
@@ -2478,6 +2946,12 @@ dependencies = [
  "ahash 0.8.3",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -2495,18 +2969,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "hex"
@@ -2520,6 +2985,12 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
+[[package]]
+name = "hex-literal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
+
 [[package]]
 name = "hkdf"
 version = "0.12.3"
@@ -2539,16 +3010,6 @@ dependencies = [
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15"
-dependencies = [
- "crypto-mac 0.10.1",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.11.0"
@@ -2565,7 +3026,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -2575,7 +3036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1"
 dependencies = [
  "digest 0.9.0",
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
  "hmac 0.8.1",
 ]
 
@@ -2609,7 +3070,7 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
  "http",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
 ]
 
 [[package]]
@@ -2638,9 +3099,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.24"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2652,8 +3113,8 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project-lite 0.2.9",
- "socket2",
+ "pin-project-lite 0.2.13",
+ "socket2 0.4.9",
  "tokio",
  "tower-service",
  "tracing",
@@ -2673,30 +3134,30 @@ dependencies = [
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
+ "webpki-roots",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi",
+ "windows 0.48.0",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -2718,9 +3179,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -2738,9 +3199,9 @@ dependencies = [
 
 [[package]]
 name = "if-watch"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e"
+checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f"
 dependencies = [
  "async-io",
  "core-foundation",
@@ -2752,7 +3213,7 @@ dependencies = [
  "rtnetlink",
  "system-configuration",
  "tokio",
- "windows",
+ "windows 0.34.0",
 ]
 
 [[package]]
@@ -2764,6 +3225,15 @@ dependencies = [
  "parity-scale-codec",
 ]
 
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
 [[package]]
 name = "impl-serde"
 version = "0.4.0"
@@ -2781,26 +3251,58 @@ checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "indexmap"
-version = "1.9.2"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+]
+
 [[package]]
 name = "indexmap-nostd"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
 
+[[package]]
+name = "indicatif"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -2840,12 +3342,13 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
+ "hermit-abi 0.3.2",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2856,32 +3359,31 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1"
 
 [[package]]
 name = "ipconfig"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2",
+ "socket2 0.5.3",
  "widestring",
- "winapi",
+ "windows-sys 0.48.0",
  "winreg",
 ]
 
 [[package]]
 name = "ipnet"
-version = "2.7.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
+ "hermit-abi 0.3.2",
+ "rustix 0.38.3",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2895,24 +3397,24 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2924,6 +3426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e"
 dependencies = [
  "jsonrpsee-core",
+ "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
  "jsonrpsee-server",
  "jsonrpsee-types",
@@ -2959,7 +3462,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "async-lock",
  "async-trait",
  "beef",
@@ -2980,6 +3483,25 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "jsonrpsee-http-client"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad"
+dependencies = [
+ "async-trait",
+ "hyper",
+ "hyper-rustls",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "jsonrpsee-proc-macros"
 version = "0.16.2"
@@ -2990,7 +3512,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3043,21 +3565,22 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
 dependencies = [
  "cfg-if",
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "ecdsa 0.16.7",
+ "elliptic-curve 0.13.5",
+ "once_cell",
+ "sha2 0.10.7",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
 dependencies = [
  "cpufeatures",
 ]
@@ -3083,9 +3606,9 @@ dependencies = [
 
 [[package]]
 name = "kvdb-rocksdb"
-version = "0.17.0"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844"
+checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
@@ -3109,9 +3632,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libloading"
@@ -3131,28 +3654,30 @@ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
 
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
 [[package]]
 name = "libp2p"
-version = "0.50.0"
+version = "0.51.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819"
+checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
  "instant",
+ "libp2p-allow-block-list",
+ "libp2p-connection-limits",
  "libp2p-core",
  "libp2p-dns",
  "libp2p-identify",
+ "libp2p-identity",
  "libp2p-kad",
  "libp2p-mdns",
  "libp2p-metrics",
- "libp2p-mplex",
  "libp2p-noise",
  "libp2p-ping",
  "libp2p-quic",
@@ -3164,50 +3689,66 @@ dependencies = [
  "libp2p-websocket",
  "libp2p-yamux",
  "multiaddr",
- "parking_lot 0.12.1",
  "pin-project",
- "smallvec",
+]
+
+[[package]]
+name = "libp2p-allow-block-list"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
+]
+
+[[package]]
+name = "libp2p-connection-limits"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
 ]
 
 [[package]]
 name = "libp2p-core"
-version = "0.38.0"
+version = "0.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f"
+checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2"
 dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek",
  "either",
  "fnv",
  "futures",
  "futures-timer",
  "instant",
+ "libp2p-identity",
  "log",
  "multiaddr",
- "multihash",
+ "multihash 0.17.0",
  "multistream-select",
  "once_cell",
  "parking_lot 0.12.1",
  "pin-project",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
- "sec1",
- "sha2 0.10.6",
  "smallvec",
  "thiserror",
  "unsigned-varint",
  "void",
- "zeroize",
 ]
 
 [[package]]
 name = "libp2p-dns"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5"
+checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554"
 dependencies = [
  "futures",
  "libp2p-core",
@@ -3219,32 +3760,51 @@ dependencies = [
 
 [[package]]
 name = "libp2p-identify"
-version = "0.41.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf"
+checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c"
 dependencies = [
  "asynchronous-codec",
+ "either",
  "futures",
  "futures-timer",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
- "lru",
- "prost",
- "prost-build",
- "prost-codec",
+ "lru 0.10.1",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "smallvec",
  "thiserror",
  "void",
 ]
 
+[[package]]
+name = "libp2p-identity"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1"
+dependencies = [
+ "bs58",
+ "ed25519-dalek",
+ "log",
+ "multiaddr",
+ "multihash 0.17.0",
+ "quick-protobuf",
+ "rand 0.8.5",
+ "sha2 0.10.7",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "libp2p-kad"
-version = "0.42.1"
+version = "0.43.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2"
+checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "asynchronous-codec",
  "bytes",
  "either",
@@ -3253,12 +3813,12 @@ dependencies = [
  "futures-timer",
  "instant",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "smallvec",
  "thiserror",
  "uint",
@@ -3268,19 +3828,20 @@ dependencies = [
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.42.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b"
+checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b"
 dependencies = [
  "data-encoding",
  "futures",
  "if-watch",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "smallvec",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
  "trust-dns-proto",
  "void",
@@ -3288,9 +3849,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55"
+checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46"
 dependencies = [
  "libp2p-core",
  "libp2p-identify",
@@ -3300,40 +3861,22 @@ dependencies = [
  "prometheus-client",
 ]
 
-[[package]]
-name = "libp2p-mplex"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "futures",
- "libp2p-core",
- "log",
- "nohash-hasher",
- "parking_lot 0.12.1",
- "rand 0.8.5",
- "smallvec",
- "unsigned-varint",
-]
-
 [[package]]
 name = "libp2p-noise"
-version = "0.41.0"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e"
+checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e"
 dependencies = [
  "bytes",
  "curve25519-dalek 3.2.0",
  "futures",
  "libp2p-core",
+ "libp2p-identity",
  "log",
  "once_cell",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "snow",
  "static_assertions",
  "thiserror",
@@ -3343,10 +3886,11 @@ dependencies = [
 
 [[package]]
 name = "libp2p-ping"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f"
+checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202"
 dependencies = [
+ "either",
  "futures",
  "futures-timer",
  "instant",
@@ -3359,15 +3903,16 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.7.0-alpha"
+version = "0.7.0-alpha.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59"
+checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
  "if-watch",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-tls",
  "log",
  "parking_lot 0.12.1",
@@ -3380,27 +3925,25 @@ dependencies = [
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884"
+checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5"
 dependencies = [
  "async-trait",
- "bytes",
  "futures",
  "instant",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
- "log",
  "rand 0.8.5",
  "smallvec",
- "unsigned-varint",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.41.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0"
+checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296"
 dependencies = [
  "either",
  "fnv",
@@ -3408,32 +3951,31 @@ dependencies = [
  "futures-timer",
  "instant",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "pin-project",
  "rand 0.8.5",
  "smallvec",
- "thiserror",
  "tokio",
  "void",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
+checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f"
 dependencies = [
  "heck",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d"
+checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf"
 dependencies = [
  "futures",
  "futures-timer",
@@ -3441,19 +3983,20 @@ dependencies = [
  "libc",
  "libp2p-core",
  "log",
- "socket2",
+ "socket2 0.4.9",
  "tokio",
 ]
 
 [[package]]
 name = "libp2p-tls"
-version = "0.1.0-alpha"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8"
+checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
 dependencies = [
  "futures",
  "futures-rustls",
  "libp2p-core",
+ "libp2p-identity",
  "rcgen 0.10.0",
  "ring",
  "rustls 0.20.8",
@@ -3465,9 +4008,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.38.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069"
+checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43"
 dependencies = [
  "futures",
  "js-sys",
@@ -3479,9 +4022,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-webrtc"
-version = "0.4.0-alpha"
+version = "0.4.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a"
+checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -3491,12 +4034,12 @@ dependencies = [
  "hex",
  "if-watch",
  "libp2p-core",
+ "libp2p-identity",
  "libp2p-noise",
  "log",
- "multihash",
- "prost",
- "prost-build",
- "prost-codec",
+ "multihash 0.17.0",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "rand 0.8.5",
  "rcgen 0.9.3",
  "serde",
@@ -3510,9 +4053,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-websocket"
-version = "0.40.0"
+version = "0.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54"
+checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f"
 dependencies = [
  "either",
  "futures",
@@ -3529,23 +4072,22 @@ dependencies = [
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.42.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29"
+checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda"
 dependencies = [
  "futures",
  "libp2p-core",
  "log",
- "parking_lot 0.12.1",
  "thiserror",
  "yamux",
 ]
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.8.3+7.4.4"
+version = "0.11.0+8.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "557b255ff04123fcc176162f56ed0c9cd42d8f357cf55b3fabeb60f7413741b3"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -3606,9 +4148,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3617,9 +4159,9 @@ dependencies = [
 
 [[package]]
 name = "link-cplusplus"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
+checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
 dependencies = [
  "cc",
 ]
@@ -3641,9 +4183,9 @@ dependencies = [
 
 [[package]]
 name = "linregress"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52"
+checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45"
 dependencies = [
  "nalgebra",
 ]
@@ -3654,11 +4196,23 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -3666,12 +4220,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "lru"
@@ -3682,6 +4233,15 @@ dependencies = [
  "hashbrown 0.12.3",
 ]
 
+[[package]]
+name = "lru"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
 [[package]]
 name = "lru-cache"
 version = "0.1.2"
@@ -3720,6 +4280,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3732,7 +4298,7 @@ version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -3743,10 +4309,11 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.2"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84"
+checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77"
 dependencies = [
+ "autocfg",
  "rawpointer",
 ]
 
@@ -3756,7 +4323,7 @@ version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -3767,18 +4334,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "memfd"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
+checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e"
 dependencies = [
- "rustix",
+ "rustix 0.37.23",
 ]
 
 [[package]]
 name = "memmap2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af2c65375e552a67fe3829ca63e8a7c27a378a62824594f43b2851d682b5ec2"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
 dependencies = [
  "libc",
 ]
@@ -3794,21 +4361,29 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "memory-db"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66"
+checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe"
 dependencies = [
- "hash-db",
- "hashbrown 0.12.3",
+ "hash-db 0.16.0",
 ]
 
 [[package]]
@@ -3837,30 +4412,29 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mockall"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326"
+checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
 dependencies = [
  "cfg-if",
  "downcast",
@@ -3873,27 +4447,28 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0"
+checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "multiaddr"
-version = "0.16.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
+checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
 dependencies = [
  "arrayref",
  "byteorder",
  "data-encoding",
+ "log",
  "multibase",
- "multihash",
+ "multihash 0.17.0",
  "percent-encoding",
  "serde",
  "static_assertions",
@@ -3922,24 +4497,37 @@ dependencies = [
  "blake2s_simd",
  "blake3",
  "core2",
- "digest 0.10.6",
+ "digest 0.10.7",
  "multihash-derive",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "sha3",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
+dependencies = [
+ "core2",
+ "digest 0.10.7",
+ "multihash-derive",
+ "sha2 0.10.7",
+ "unsigned-varint",
+]
+
 [[package]]
 name = "multihash-derive"
-version = "0.8.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
+checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
 dependencies = [
  "proc-macro-crate",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "synstructure",
 ]
 
@@ -3965,9 +4553,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68d47bba83f9e2006d117a9a33af1524e655516b8919caac694427a6fb1e511"
+checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -3981,13 +4569,13 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766"
+checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4018,7 +4606,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
 dependencies = [
  "anyhow",
- "bitflags",
+ "bitflags 1.3.2",
  "byteorder",
  "libc",
  "netlink-packet-core",
@@ -4054,9 +4642,9 @@ dependencies = [
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260e21fbb6f3d253a14df90eb0000a6066780a15dd901a7519ce02d77a94985b"
+checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
 dependencies = [
  "bytes",
  "futures",
@@ -4071,30 +4659,16 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if",
  "libc",
  "memoffset 0.6.5",
 ]
 
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
- "memoffset 0.7.1",
- "pin-utils",
- "static_assertions",
-]
-
 [[package]]
 name = "node-primitives"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-system",
  "parity-scale-codec",
@@ -4152,7 +4726,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "itoa",
 ]
 
@@ -4189,31 +4763,58 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.2",
  "libc",
 ]
 
+[[package]]
+name = "num_enum"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+dependencies = [
+ "num_enum_derive",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "object"
-version = "0.29.0"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
 dependencies = [
  "crc32fast",
- "hashbrown 0.12.3",
- "indexmap",
+ "hashbrown 0.13.2",
+ "indexmap 1.9.3",
  "memchr",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.3"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
  "memchr",
 ]
@@ -4233,14 +4834,14 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
 dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "opaque-debug"
@@ -4261,20 +4862,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
+name = "orml-traits"
+version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a"
+dependencies = [
+ "frame-support",
+ "impl-trait-for-tuples",
+ "num-traits",
+ "orml-utilities",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "xcm",
+]
+
+[[package]]
+name = "orml-utilities"
+version = "0.4.1-dev"
+source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v0.9.43#28a2e6f0df9540d91db4018c7ecebb8bfc217a2a"
+dependencies = [
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "p256"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594"
 dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -4283,9 +4911,9 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
 dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.6",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -4301,7 +4929,7 @@ dependencies = [
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4316,7 +4944,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4330,7 +4958,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4343,7 +4971,7 @@ dependencies = [
  "scale-info",
  "sp-application-crypto",
  "sp-consensus-babe",
- "sp-consensus-vrf",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -4361,6 +4989,7 @@ dependencies = [
  "log",
  "pallet-transaction-payment",
  "parity-scale-codec",
+ "paste",
  "scale-info",
  "serde",
  "sp-core",
@@ -4369,6 +4998,21 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-balances"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-balances-rpc"
 version = "4.0.0-dev"
@@ -4377,7 +5021,7 @@ dependencies = [
  "hex",
  "jsonrpsee",
  "node-primitives",
- "pallet-balances",
+ "pallet-balances 4.0.0-dev",
  "pallet-balances-rpc-runtime-api",
  "parity-scale-codec",
  "sc-transaction-pool-api",
@@ -4394,7 +5038,7 @@ dependencies = [
 name = "pallet-balances-rpc-runtime-api"
 version = "4.0.0-dev"
 dependencies = [
- "pallet-balances",
+ "pallet-balances 4.0.0-dev",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
@@ -4404,7 +5048,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4413,7 +5057,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-beefy",
+ "sp-consensus-beefy",
  "sp-runtime",
  "sp-session",
  "sp-staking",
@@ -4423,9 +5067,9 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -4437,7 +5081,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-api",
- "sp-beefy",
+ "sp-consensus-beefy",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -4447,7 +5091,7 @@ dependencies = [
 [[package]]
 name = "pallet-chain-extension-assets"
 version = "0.1.0"
-source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.39#9bbcb8d6b16369ae3d9e7b7e7cc22f33dd55d80e"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
 dependencies = [
  "assets-chain-extension-types",
  "frame-support",
@@ -4464,32 +5108,13 @@ dependencies = [
  "sp-std",
 ]
 
-[[package]]
-name = "pallet-chain-extension-dapps-staking"
-version = "1.1.0"
-source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.39#9bbcb8d6b16369ae3d9e7b7e7cc22f33dd55d80e"
-dependencies = [
- "dapps-staking-chain-extension-types",
- "frame-support",
- "frame-system",
- "log",
- "num-traits",
- "pallet-contracts",
- "pallet-contracts-primitives",
- "pallet-dapps-staking",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+ "environmental",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -4509,16 +5134,16 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "wasm-instrument 0.4.0",
- "wasmi 0.20.0",
+ "wasmi 0.28.0",
  "wasmparser-nostd",
 ]
 
 [[package]]
 name = "pallet-contracts-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
@@ -4529,18 +5154,19 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "pallet-dapps-staking"
-version = "3.9.0"
-source = "git+https://github.com/AstarNetwork/astar-frame?branch=polkadot-v0.9.39#9bbcb8d6b16369ae3d9e7b7e7cc22f33dd55d80e"
+version = "3.10.0"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
 dependencies = [
+ "astar-primitives",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -4556,10 +5182,66 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-evm"
+version = "6.0.0-dev"
+source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2"
+dependencies = [
+ "environmental",
+ "evm",
+ "fp-account",
+ "fp-evm",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "hex-literal 0.4.1",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "rlp",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-evm-precompile-assets-erc20"
+version = "0.5.2"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
+dependencies = [
+ "fp-evm",
+ "frame-support",
+ "frame-system",
+ "log",
+ "num_enum",
+ "pallet-assets",
+ "pallet-balances 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43)",
+ "pallet-evm",
+ "parity-scale-codec",
+ "precompile-utils",
+ "slices",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "pallet-evm-precompile-dispatch"
+version = "2.0.0-dev"
+source = "git+https://github.com/AstarNetwork/frontier?branch=polkadot-v0.9.43#a5481542518ec420352d263adcb2f78835ac9bc2"
+dependencies = [
+ "fp-evm",
+ "frame-support",
+ "pallet-evm",
+]
+
 [[package]]
 name = "pallet-insecure-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4573,7 +5255,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4587,10 +5269,25 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-root-testing"
+version = "1.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4611,8 +5308,9 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "parity-scale-codec",
@@ -4625,7 +5323,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4643,7 +5341,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4659,7 +5357,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -4675,7 +5373,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -4687,7 +5385,7 @@ dependencies = [
 [[package]]
 name = "pallet-uniques"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4701,7 +5399,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4714,11 +5412,29 @@ dependencies = [
  "sp-std",
 ]
 
+[[package]]
+name = "pallet-xc-asset-config"
+version = "1.3.0"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "xcm",
+]
+
 [[package]]
 name = "parity-db"
-version = "0.4.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd684a725651d9588ef21f140a328b6b4f64e646b2e931f3e6f14f75eedf9980"
+checksum = "0dab3ac198341b2f0fec6e7f8a6eeed07a41201d98a124260611598c142e76df"
 dependencies = [
  "blake2",
  "crc32fast",
@@ -4730,16 +5446,17 @@ dependencies = [
  "memmap2",
  "parking_lot 0.12.1",
  "rand 0.8.5",
+ "siphasher",
  "snap",
 ]
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.4.0"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "637935964ff85a605d114591d4d2c13c5d1ba2806dae97cea6bf180238a749ac"
+checksum = "756d439303e94fae44f288ba881ad29670c65b0c4b0e05674ca81061bb65f2c5"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.4",
  "bitvec",
  "byte-slice-cast",
  "bytes",
@@ -4750,14 +5467,14 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.1.4"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b26a931f824dd4eca30b3e43bb4f31cd5f0d3a403c5f5ff27106b805bfde7b"
+checksum = "9d884d78fcf214d70b1e239fcd1c6e5e95aa3be1881918da2e488cc946c7a476"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4774,9 +5491,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
 
 [[package]]
 name = "parking"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
 
 [[package]]
 name = "parking_lot"
@@ -4796,7 +5513,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.7",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
@@ -4808,29 +5525,35 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.1",
 ]
 
+[[package]]
+name = "partial_sort"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
+
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
 
 [[package]]
 name = "pbkdf2"
@@ -4847,7 +5570,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -4876,15 +5599,15 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.5.5"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "028accff104c4e513bad663bbcd2ad7cfd5304144404c31ed0a77ac103d00660"
+checksum = "f73935e4d55e2abf7f130186537b19e7a4abc886a0252380b59248af473a3fc9"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -4892,9 +5615,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.5"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ac3922aac69a40733080f53c1ce7f91dcf57e1a5f6c52f421fadec7fbdc4b69"
+checksum = "aef623c9bbfa0eedf5a0efba11a5ee83209c326653ca31ff019bec3a95bfff2b"
 dependencies = [
  "pest",
  "pest_generator",
@@ -4902,26 +5625,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.5"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06646e185566b5961b4058dd107e0a7f56e77c3f484549fb119867773c0f202"
+checksum = "b3e8cba4ec22bada7fc55ffe51e2deb6a0e0db2d0b7ab0b103acc80d2510c190"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.5.5"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f60b2ba541577e2a0c307c8f39d1439108120eb7903adeb6497fa880c59616"
+checksum = "a01f71cb40bd8bb94232df14b946909e14660e33fc05db3e50ae2a82d7ea0ca0"
 dependencies = [
  "once_cell",
  "pest",
- "sha2 0.10.6",
+ "sha2 0.10.7",
 ]
 
 [[package]]
@@ -4931,27 +5654,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -4962,9 +5685,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -4978,15 +5701,25 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
 dependencies = [
- "der",
- "spki",
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.7",
+ "spki 0.7.2",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "platforms"
@@ -5000,18 +5733,49 @@ version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
 
+[[package]]
+name = "polkadot-core-primitives"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "polkadot-parachain"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "bounded-collections",
+ "derive_more",
+ "frame-support",
+ "parity-scale-codec",
+ "polkadot-core-primitives",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "polling"
-version = "2.5.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
  "autocfg",
+ "bitflags 1.3.2",
  "cfg-if",
+ "concurrent-queue",
  "libc",
  "log",
- "wepoll-ffi",
- "windows-sys 0.42.0",
+ "pin-project-lite 0.2.13",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -5022,38 +5786,82 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
 dependencies = [
  "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash",
+ "universal-hash 0.4.1",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.4.5"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
+checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
 dependencies = [
- "cpuid-bool",
+ "cfg-if",
+ "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash",
+ "universal-hash 0.4.1",
 ]
 
 [[package]]
 name = "polyval"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
+checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug 0.3.0",
- "universal-hash",
+ "universal-hash 0.5.1",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
+[[package]]
+name = "precompile-utils"
+version = "0.1.0"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
+dependencies = [
+ "environmental",
+ "evm",
+ "fp-evm",
+ "frame-support",
+ "frame-system",
+ "hex",
+ "impl-trait-for-tuples",
+ "log",
+ "num_enum",
+ "pallet-evm",
+ "parity-scale-codec",
+ "precompile-utils-macro-v2",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "precompile-utils-macro-v2"
+version = "0.1.0"
+source = "git+https://github.com/AstarNetwork/Astar?tag=v5.32.1#5e67f1b9069b7d9df3b8dd5d4c72dff6f8dc6316"
+dependencies = [
+ "case",
+ "num_enum",
+ "prettyplease 0.2.15",
+ "proc-macro2",
+ "quote",
+ "sp-core-hashing",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "predicates"
 version = "2.1.5"
@@ -5070,15 +5878,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -5086,12 +5894,22 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.1.23"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78"
+checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -5102,6 +5920,7 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
 dependencies = [
  "fixed-hash",
  "impl-codec",
+ "impl-rlp",
  "impl-serde",
  "scale-info",
  "uint",
@@ -5109,12 +5928,12 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.1.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "thiserror",
- "toml",
+ "once_cell",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5126,7 +5945,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -5141,11 +5960,22 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-warning"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.32",
+]
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
 dependencies = [
  "unicode-ident",
 ]
@@ -5166,32 +5996,32 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.18.1"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
+checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e"
 dependencies = [
  "dtoa",
  "itoa",
  "parking_lot 0.12.1",
- "prometheus-client-derive-text-encode",
+ "prometheus-client-derive-encode",
 ]
 
 [[package]]
-name = "prometheus-client-derive-text-encode"
-version = "0.3.0"
+name = "prometheus-client-derive-encode"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
+checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5199,9 +6029,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f8ad728fb08fe212df3c05169e940fbb6d9d16a877ddde14644a983ba2012e"
+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes",
  "heck",
@@ -5210,48 +6040,34 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prettyplease",
+ "prettyplease 0.1.25",
  "prost",
  "prost-types",
  "regex",
- "syn",
+ "syn 1.0.109",
  "tempfile",
  "which",
 ]
 
-[[package]]
-name = "prost-codec"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0"
-dependencies = [
- "asynchronous-codec",
- "bytes",
- "prost",
- "thiserror",
- "unsigned-varint",
-]
-
 [[package]]
 name = "prost-derive"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.11.6"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "bytes",
  "prost",
 ]
 
@@ -5270,6 +6086,28 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "quick-protobuf-codec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b"
+dependencies = [
+ "asynchronous-codec",
+ "bytes",
+ "quick-protobuf",
+ "thiserror",
+ "unsigned-varint",
+]
+
 [[package]]
 name = "quicksink"
 version = "0.1.2"
@@ -5283,9 +6121,9 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.9.2"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9"
+checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989"
 dependencies = [
  "bytes",
  "rand 0.8.5",
@@ -5301,9 +6139,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2",
 ]
@@ -5373,7 +6211,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -5402,9 +6240,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
 dependencies = [
  "either",
  "rayon-core",
@@ -5412,9 +6250,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.10.2"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -5430,7 +6268,7 @@ checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
 dependencies = [
  "pem",
  "ring",
- "time 0.3.19",
+ "time 0.3.23",
  "x509-parser 0.13.2",
  "yasna",
 ]
@@ -5443,7 +6281,7 @@ checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
 dependencies = [
  "pem",
  "ring",
- "time 0.3.19",
+ "time 0.3.23",
  "yasna",
 ]
 
@@ -5453,7 +6291,16 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -5462,36 +6309,36 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
 dependencies = [
- "getrandom 0.2.8",
- "redox_syscall",
+ "getrandom 0.2.10",
+ "redox_syscall 0.2.16",
  "thiserror",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
+checksum = "1641819477c319ef452a075ac34a4be92eb9ba09f6841f62d594d50fdcf0bf6b"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
+checksum = "68bf53dad9b6086826722cdc99140793afd9f62faa14a1ad07eb4f955e7a7216"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "regalloc2"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "300d4fbfb40c1c66a78ba3ddd41c1110247cf52f97b87d0f2fc9209bd49b030c"
+checksum = "80535183cae11b149d618fbd3c37e38d7cda589d82d7769e196ca9a9042d7621"
 dependencies = [
  "fxhash",
  "log",
@@ -5501,13 +6348,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
- "aho-corasick",
+ "aho-corasick 1.0.2",
  "memchr",
- "regex-syntax",
+ "regex-automata 0.3.2",
+ "regex-syntax 0.7.3",
 ]
 
 [[package]]
@@ -5516,35 +6364,31 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
-name = "regex-syntax"
-version = "0.6.28"
+name = "regex-automata"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
+dependencies = [
+ "aho-corasick 1.0.2",
+ "memchr",
+ "regex-syntax 0.7.3",
+]
 
 [[package]]
-name = "region"
-version = "3.0.0"
+name = "regex-syntax"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
-dependencies = [
- "bitflags",
- "libc",
- "mach",
- "winapi",
-]
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
-name = "remove_dir_all"
-version = "0.5.3"
+name = "regex-syntax"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
+checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
 
 [[package]]
 name = "resolv-conf"
@@ -5562,11 +6406,21 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
 dependencies = [
- "crypto-bigint",
+ "crypto-bigint 0.4.9",
  "hmac 0.12.1",
  "zeroize",
 ]
 
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac 0.12.1",
+ "subtle",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"
@@ -5582,11 +6436,33 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rlp-derive",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "rocksdb"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
 dependencies = [
  "libc",
  "librocksdb-sys",
@@ -5624,7 +6500,7 @@ dependencies = [
  "log",
  "netlink-packet-route",
  "netlink-proto",
- "nix 0.24.3",
+ "nix",
  "thiserror",
  "tokio",
 ]
@@ -5655,9 +6531,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -5686,7 +6562,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.16",
+ "semver 1.0.17",
 ]
 
 [[package]]
@@ -5700,18 +6576,45 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.36.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.1.4",
  "windows-sys 0.45.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.37.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.3",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.19.1"
@@ -5739,9 +6642,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
@@ -5751,18 +6654,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.0",
+ "base64 0.21.2",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"
 
 [[package]]
 name = "rw-stream-sink"
@@ -5777,9 +6680,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
 
 [[package]]
 name = "safe-mix"
@@ -5792,9 +6695,9 @@ dependencies = [
 
 [[package]]
 name = "safe_arch"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529"
+checksum = "62a7484307bd40f8f7ccbacccac730108f2cae119a3b11c74485b48aa9ea650f"
 dependencies = [
  "bytemuck",
 ]
@@ -5811,7 +6714,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "log",
  "sp-core",
@@ -5822,7 +6725,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "futures-timer",
@@ -5845,7 +6748,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5855,46 +6758,49 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-state-machine",
 ]
 
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
- "sc-network-common",
+ "sc-client-api",
+ "sc-executor",
+ "sc-network",
  "sc-telemetry",
  "serde",
  "serde_json",
+ "sp-blockchain",
  "sp-core",
  "sp-runtime",
+ "sp-state-machine",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "chrono",
  "clap",
  "fdlimit",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "names",
  "parity-scale-codec",
@@ -5927,7 +6833,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "fnv",
  "futures",
@@ -5946,6 +6852,7 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
+ "sp-statement-store",
  "sp-storage",
  "substrate-prometheus-endpoint",
 ]
@@ -5953,9 +6860,9 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "hash-db",
+ "hash-db 0.16.0",
  "kvdb",
  "kvdb-memorydb",
  "kvdb-rocksdb",
@@ -5979,12 +6886,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "log",
  "mockall",
  "parking_lot 0.12.1",
@@ -6004,7 +6911,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
@@ -6033,13 +6940,12 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "fork-tree",
  "futures",
  "log",
- "merlin",
  "num-bigint",
  "num-rational",
  "num-traits",
@@ -6052,7 +6958,6 @@ dependencies = [
  "sc-keystore",
  "sc-telemetry",
  "scale-info",
- "schnorrkel",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -6060,7 +6965,6 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-slots",
- "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
  "sp-keystore",
@@ -6072,7 +6976,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -6084,7 +6988,7 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-manual-seal"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -6124,7 +7028,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
@@ -6147,13 +7051,12 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "lru",
+ "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-executor-common",
- "sc-executor-wasmi",
  "sc-executor-wasmtime",
  "sp-api",
  "sp-core",
@@ -6165,46 +7068,31 @@ dependencies = [
  "sp-version",
  "sp-wasm-interface",
  "tracing",
- "wasmi 0.13.2",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface",
  "thiserror",
  "wasm-instrument 0.3.0",
- "wasmi 0.13.2",
-]
-
-[[package]]
-name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "log",
- "sc-allocator",
- "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
- "wasmi 0.13.2",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
  "once_cell",
- "rustix",
+ "rustix 0.36.15",
  "sc-allocator",
  "sc-executor-common",
  "sp-runtime-interface",
@@ -6215,13 +7103,14 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "ansi_term",
  "futures",
  "futures-timer",
  "log",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
  "sp-blockchain",
  "sp-runtime",
@@ -6230,10 +7119,9 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
- "async-trait",
+ "array-bytes 4.2.0",
  "parking_lot 0.12.1",
  "serde_json",
  "sp-application-crypto",
@@ -6245,12 +7133,12 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
+ "async-channel",
  "async-trait",
  "asynchronous-codec",
- "backtrace",
  "bytes",
  "either",
  "fnv",
@@ -6258,8 +7146,9 @@ dependencies = [
  "futures-timer",
  "ip_network",
  "libp2p",
+ "linked_hash_set",
  "log",
- "lru",
+ "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -6274,6 +7163,7 @@ dependencies = [
  "serde",
  "serde_json",
  "smallvec",
+ "snow",
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
@@ -6288,15 +7178,17 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "async-channel",
  "cid",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "prost",
  "prost-build",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
  "sp-blockchain",
  "sp-runtime",
@@ -6307,42 +7199,46 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "array-bytes 4.2.0",
  "async-trait",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "futures",
  "futures-timer",
- "libp2p",
- "linked_hash_set",
+ "libp2p-identity",
  "parity-scale-codec",
  "prost-build",
  "sc-consensus",
  "sc-peerset",
+ "sc-utils",
  "serde",
  "smallvec",
  "sp-blockchain",
  "sp-consensus",
- "sp-finality-grandpa",
+ "sp-consensus-grandpa",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "zeroize",
 ]
 
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
+ "async-channel",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "parity-scale-codec",
  "prost",
  "prost-build",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
  "sc-peerset",
  "sp-blockchain",
@@ -6354,21 +7250,24 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
+ "async-channel",
  "async-trait",
  "fork-tree",
  "futures",
+ "futures-timer",
  "libp2p",
  "log",
- "lru",
+ "lru 0.8.1",
  "mockall",
  "parity-scale-codec",
  "prost",
  "prost-build",
  "sc-client-api",
  "sc-consensus",
+ "sc-network",
  "sc-network-common",
  "sc-peerset",
  "sc-utils",
@@ -6376,8 +7275,8 @@ dependencies = [
  "sp-arithmetic",
  "sp-blockchain",
  "sp-consensus",
+ "sp-consensus-grandpa",
  "sp-core",
- "sp-finality-grandpa",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -6386,14 +7285,15 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "futures",
  "libp2p",
  "log",
  "parity-scale-codec",
  "pin-project",
+ "sc-network",
  "sc-network-common",
  "sc-peerset",
  "sc-utils",
@@ -6405,9 +7305,9 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "bytes",
  "fnv",
  "futures",
@@ -6421,6 +7321,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "rand 0.8.5",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
  "sc-peerset",
  "sc-utils",
@@ -6435,20 +7336,23 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
+ "parking_lot 0.12.1",
+ "partial_sort",
  "sc-utils",
  "serde_json",
+ "sp-arithmetic",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -6457,7 +7361,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -6480,6 +7384,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
+ "sp-statement-store",
  "sp-version",
  "tokio",
 ]
@@ -6487,7 +7392,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -6506,7 +7411,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -6521,9 +7426,9 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "futures",
  "futures-util",
  "hex",
@@ -6547,7 +7452,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "directories",
@@ -6613,7 +7518,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -6624,12 +7529,12 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "clap",
+ "fs4",
  "futures",
  "log",
- "nix 0.26.2",
  "sc-client-db",
  "sc-utils",
  "sp-core",
@@ -6640,7 +7545,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "libc",
@@ -6659,7 +7564,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "chrono",
  "futures",
@@ -6678,7 +7583,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "ansi_term",
  "atty",
@@ -6709,18 +7614,18 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
@@ -6747,7 +7652,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
@@ -6761,22 +7666,23 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "backtrace",
+ "async-channel",
  "futures",
  "futures-timer",
  "lazy_static",
  "log",
  "parking_lot 0.12.1",
  "prometheus",
+ "sp-arithmetic",
 ]
 
 [[package]]
 name = "scale-info"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfdef77228a4c05dc94211441595746732131ad7f6530c6c18f045da7b7ab937"
+checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -6788,23 +7694,23 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53012eae69e5aa5c14671942a5dd47de59d4cdcff8532a6dd0e081faf1119482"
+checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -6844,9 +7750,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
-version = "1.0.3"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "764cad9e7e1ca5fe15b552859ff5d96a314e6ed2934f2260168cd5dfa5891409"
 
 [[package]]
 name = "sct"
@@ -6886,10 +7792,24 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
 dependencies = [
- "base16ct",
- "der",
- "generic-array 0.14.6",
- "pkcs8",
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array 0.14.7",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0aec48e813d6b90b15f0b8948af3c63483992dee44c03e9930b3eebdabe046e"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.7",
+ "generic-array 0.14.7",
+ "pkcs8 0.10.2",
  "subtle",
  "zeroize",
 ]
@@ -6923,11 +7843,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.8.2"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254"
+checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -6936,9 +7856,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
+checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -6964,9 +7884,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 dependencies = [
  "serde",
 ]
@@ -6979,35 +7899,44 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -7021,6 +7950,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -7048,22 +7988,22 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
- "digest 0.10.6",
+ "digest 0.10.7",
 ]
 
 [[package]]
 name = "sha3"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
  "keccak",
 ]
 
@@ -7078,9 +8018,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
@@ -7097,7 +8037,17 @@ version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
 dependencies = [
- "digest 0.10.6",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.7",
  "rand_core 0.6.4",
 ]
 
@@ -7114,6 +8064,12 @@ dependencies = [
  "wide",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+
 [[package]]
 name = "slab"
 version = "0.4.8"
@@ -7125,15 +8081,27 @@ dependencies = [
 
 [[package]]
 name = "slice-group-by"
-version = "0.3.0"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
+
+[[package]]
+name = "slices"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec"
+checksum = "f2086e458a369cdca838e9f6ed04b4cc2e3ce636d99abb80c9e2eada107749cf"
+dependencies = [
+ "faster-hex",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "snap"
@@ -7143,31 +8111,41 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
 
 [[package]]
 name = "snow"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ba5f4d4ff12bdb6a169ed51b7c48c0e0ac4b0b4b31012b2571e97d78d3201d"
+checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733"
 dependencies = [
  "aes-gcm 0.9.4",
  "blake2",
  "chacha20poly1305",
- "curve25519-dalek 4.0.0-rc.0",
+ "curve25519-dalek 4.0.0-rc.1",
  "rand_core 0.6.4",
  "ring",
  "rustc_version 0.4.0",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "subtle",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "soketto"
 version = "0.7.1"
@@ -7188,13 +8166,15 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "hash-db",
+ "hash-db 0.16.0",
  "log",
  "parity-scale-codec",
+ "scale-info",
  "sp-api-proc-macro",
  "sp-core",
+ "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
@@ -7206,19 +8186,21 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "Inflector",
  "blake2",
+ "expander",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sp-application-crypto"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7231,7 +8213,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -7242,29 +8224,10 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "sp-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "lazy_static",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-application-crypto",
- "sp-core",
- "sp-io",
- "sp-mmr-primitives",
- "sp-runtime",
- "sp-std",
- "strum",
-]
-
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7276,11 +8239,11 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "log",
- "lru",
+ "lru 0.8.1",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sp-api",
@@ -7294,25 +8257,22 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures",
  "log",
- "parity-scale-codec",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
- "sp-version",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-consensus-aura"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -7330,10 +8290,9 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
- "merlin",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -7341,7 +8300,6 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
- "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
  "sp-keystore",
@@ -7351,44 +8309,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+name = "sp-consensus-beefy"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "lazy_static",
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-io",
+ "sp-mmr-primitives",
+ "sp-runtime",
  "sp-std",
- "sp-timestamp",
+ "strum",
 ]
 
 [[package]]
-name = "sp-consensus-vrf"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+name = "sp-consensus-grandpa"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
+ "finality-grandpa",
+ "log",
  "parity-scale-codec",
  "scale-info",
- "schnorrkel",
+ "serde",
+ "sp-api",
+ "sp-application-crypto",
  "sp-core",
+ "sp-keystore",
  "sp-runtime",
  "sp-std",
 ]
 
+[[package]]
+name = "sp-consensus-slots"
+version = "0.10.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-std",
+ "sp-timestamp",
+]
+
 [[package]]
 name = "sp-core"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
- "base58",
- "bitflags",
+ "array-bytes 4.2.0",
+ "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
+ "bs58",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
- "hash-db",
+ "hash-db 0.16.0",
  "hash256-std-hasher",
  "impl-serde",
  "lazy_static",
@@ -7397,6 +8379,7 @@ dependencies = [
  "merlin",
  "parity-scale-codec",
  "parking_lot 0.12.1",
+ "paste",
  "primitive-types",
  "rand 0.8.5",
  "regex",
@@ -7421,12 +8404,12 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "blake2",
+ "blake2b_simd",
  "byteorder",
- "digest 0.10.6",
- "sha2 0.10.6",
+ "digest 0.10.7",
+ "sha2 0.10.7",
  "sha3",
  "sp-std",
  "twox-hash",
@@ -7435,18 +8418,18 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro2",
  "quote",
  "sp-core-hashing",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -7455,17 +8438,17 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sp-externalities"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -7473,28 +8456,10 @@ dependencies = [
  "sp-storage",
 ]
 
-[[package]]
-name = "sp-finality-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
-dependencies = [
- "finality-grandpa",
- "log",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-api",
- "sp-application-crypto",
- "sp-core",
- "sp-keystore",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -7509,7 +8474,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "bytes",
  "ed25519",
@@ -7518,6 +8483,7 @@ dependencies = [
  "libsecp256k1",
  "log",
  "parity-scale-codec",
+ "rustversion",
  "secp256k1",
  "sp-core",
  "sp-externalities",
@@ -7534,7 +8500,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -7545,14 +8511,11 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "async-trait",
  "futures",
- "merlin",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "schnorrkel",
  "serde",
  "sp-core",
  "sp-externalities",
@@ -7562,16 +8525,27 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "thiserror",
- "zstd",
+ "zstd 0.12.3+zstd.1.5.2",
+]
+
+[[package]]
+name = "sp-metadata-ir"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
+dependencies = [
+ "frame-metadata",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-std",
 ]
 
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -7589,7 +8563,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -7599,7 +8573,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -7609,7 +8583,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -7619,7 +8593,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -7641,7 +8615,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -7659,19 +8633,19 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7685,10 +8659,11 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
+ "serde",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -7697,9 +8672,9 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.13.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "hash-db",
+ "hash-db 0.16.0",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -7714,15 +8689,33 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "sp-statement-store"
+version = "4.0.0-dev"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
+dependencies = [
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+ "thiserror",
+]
+
 [[package]]
 name = "sp-std"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 
 [[package]]
 name = "sp-storage"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -7735,7 +8728,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -7750,7 +8743,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -7762,7 +8755,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -7771,7 +8764,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "log",
@@ -7787,11 +8780,11 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "ahash 0.8.3",
- "hash-db",
- "hashbrown 0.12.3",
+ "hash-db 0.16.0",
+ "hashbrown 0.13.2",
  "lazy_static",
  "memory-db",
  "nohash-hasher",
@@ -7810,7 +8803,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -7827,18 +8820,18 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -7852,7 +8845,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -7872,9 +8865,20 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
 name = "spin"
-version = "0.9.5"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spinners"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc"
+checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
+dependencies = [
+ "lazy_static",
+ "maplit",
+ "strum",
+]
 
 [[package]]
 name = "spki"
@@ -7883,14 +8887,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
 dependencies = [
  "base64ct",
- "der",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der 0.7.7",
 ]
 
 [[package]]
 name = "ss58-registry"
-version = "1.38.0"
+version = "1.41.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40c020d72bc0a9c5660bb71e4a6fdef081493583062c474740a7d59f55f0e7b"
+checksum = "bfc443bad666016e012538782d9e3006213a7db43e9fb1dda91657dc06a6fa08"
 dependencies = [
  "Inflector",
  "num-format",
@@ -7919,7 +8933,7 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg_aliases",
  "libc",
  "parking_lot 0.11.2",
@@ -7938,7 +8952,7 @@ dependencies = [
  "memchr",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -7966,7 +8980,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -8004,7 +9018,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "platforms 2.0.0",
 ]
@@ -8012,7 +9026,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -8031,7 +9045,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "hyper",
  "log",
@@ -8043,7 +9057,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -8056,9 +9070,9 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "array-bytes",
+ "array-bytes 4.2.0",
  "async-trait",
  "futures",
  "parity-scale-codec",
@@ -8082,16 +9096,20 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
- "cfg-if",
+ "array-bytes 6.1.0",
+ "frame-executive",
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
  "log",
  "memory-db",
  "pallet-babe",
+ "pallet-balances 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43)",
  "pallet-beefy-mmr",
+ "pallet-root-testing",
+ "pallet-sudo",
  "pallet-timestamp",
  "parity-scale-codec",
  "sc-service",
@@ -8099,13 +9117,14 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-application-crypto",
- "sp-beefy",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-consensus-babe",
+ "sp-consensus-beefy",
+ "sp-consensus-grandpa",
  "sp-core",
+ "sp-debug-derive",
  "sp-externalities",
- "sp-finality-grandpa",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -8125,11 +9144,12 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "parity-scale-codec",
  "sc-block-builder",
+ "sc-chain-spec",
  "sc-client-api",
  "sc-consensus",
  "sp-api",
@@ -8144,7 +9164,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -8160,7 +9180,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -8169,7 +9189,7 @@ dependencies = [
  "sp-maybe-compressed-blob",
  "strum",
  "tempfile",
- "toml",
+ "toml 0.7.6",
  "walkdir",
  "wasm-opt",
 ]
@@ -8191,11 +9211,12 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "swanky-node"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "clap",
  "frame-benchmarking",
  "frame-benchmarking-cli",
+ "frame-support",
  "frame-system",
  "futures",
  "jsonrpsee",
@@ -8210,6 +9231,7 @@ dependencies = [
  "sc-consensus-manual-seal",
  "sc-executor",
  "sc-keystore",
+ "sc-network",
  "sc-rpc",
  "sc-rpc-api",
  "sc-service",
@@ -8222,6 +9244,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-database",
  "sp-inherents",
  "sp-keyring",
  "sp-runtime",
@@ -8234,7 +9257,7 @@ dependencies = [
 
 [[package]]
 name = "swanky-runtime"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
@@ -8243,13 +9266,12 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal",
+ "hex-literal 0.3.4",
  "log",
  "pallet-assets",
- "pallet-balances",
+ "pallet-balances 4.0.0-dev",
  "pallet-balances-rpc-runtime-api",
  "pallet-chain-extension-assets",
- "pallet-chain-extension-dapps-staking",
  "pallet-contracts",
  "pallet-contracts-primitives",
  "pallet-dapps-staking",
@@ -8277,9 +9299,20 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8294,17 +9327,17 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "unicode-xid",
 ]
 
 [[package]]
 name = "system-configuration"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "system-configuration-sys",
 ]
@@ -8327,22 +9360,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.6"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5"
+checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
- "fastrand",
- "libc",
- "redox_syscall",
- "remove_dir_all",
- "winapi",
+ "fastrand 2.0.0",
+ "redox_syscall 0.3.5",
+ "rustix 0.38.3",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -8356,28 +9388,28 @@ dependencies = [
 
 [[package]]
 name = "termtree"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.38"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.38"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -8428,9 +9460,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.19"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
  "itoa",
  "serde",
@@ -8440,15 +9472,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.7"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]
@@ -8465,13 +9497,22 @@ dependencies = [
  "pbkdf2 0.11.0",
  "rand 0.8.5",
  "rustc-hash",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
  "zeroize",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -8499,33 +9540,43 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.25.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
  "libc",
- "memchr",
  "mio",
  "num_cpus",
  "parking_lot 0.12.1",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "signal-hook-registry",
- "socket2",
+ "socket2 0.5.3",
  "tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
+]
+
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
 ]
 
 [[package]]
@@ -8541,27 +9592,27 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.12"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "tokio",
  "tokio-util",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "tokio",
  "tracing",
 ]
@@ -8575,6 +9626,40 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
+dependencies = [
+ "indexmap 2.0.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -8588,18 +9673,18 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c"
 dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
  "bytes",
  "futures-core",
  "futures-util",
  "http",
  "http-body",
  "http-range-header",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "tower-layer",
  "tower-service",
 ]
@@ -8624,27 +9709,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
  "log",
- "pin-project-lite 0.2.9",
+ "pin-project-lite 0.2.13",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.23"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
 dependencies = [
  "once_cell",
  "valuable",
@@ -8706,11 +9791,11 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3390c0409daaa6027d6681393316f4ccd3ff82e1590a1e4725014e3ae2bf1920"
+checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
 dependencies = [
- "hash-db",
+ "hash-db 0.16.0",
  "hashbrown 0.13.2",
  "log",
  "rustc-hex",
@@ -8719,11 +9804,21 @@ dependencies = [
 
 [[package]]
 name = "trie-root"
-version = "0.17.0"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b"
+dependencies = [
+ "hash-db 0.16.0",
+]
+
+[[package]]
+name = "triehash"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a36c5ca3911ed3c9a5416ee6c679042064b93fc637ded67e25f92e68d783891"
+checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c"
 dependencies = [
- "hash-db",
+ "hash-db 0.15.2",
+ "rlp",
 ]
 
 [[package]]
@@ -8744,7 +9839,7 @@ dependencies = [
  "lazy_static",
  "rand 0.8.5",
  "smallvec",
- "socket2",
+ "socket2 0.4.9",
  "thiserror",
  "tinyvec",
  "tokio",
@@ -8781,7 +9876,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.39#8c4b84520cee2d7de53cc33cb67605ce4efefba8"
+source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
 dependencies = [
  "async-trait",
  "clap",
@@ -8811,7 +9906,7 @@ dependencies = [
  "sp-version",
  "sp-weights",
  "substrate-rpc-client",
- "zstd",
+ "zstd 0.12.3+zstd.1.5.2",
 ]
 
 [[package]]
@@ -8846,7 +9941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
- "digest 0.10.6",
+ "digest 0.10.7",
  "rand 0.8.5",
  "static_assertions",
 ]
@@ -8859,9 +9954,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -8877,15 +9972,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
 
 [[package]]
 name = "unicode-normalization"
@@ -8914,7 +10009,17 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
 dependencies = [
- "generic-array 0.14.6",
+ "generic-array 0.14.7",
+ "subtle",
+]
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
  "subtle",
 ]
 
@@ -8938,22 +10043,28 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
+ "idna 0.4.0",
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "uuid"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
+checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
 dependencies = [
- "getrandom 0.2.8",
+ "getrandom 0.2.10",
 ]
 
 [[package]]
@@ -8997,22 +10108,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
 
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -9036,9 +10145,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -9046,24 +10155,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.34"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -9073,9 +10182,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -9083,22 +10192,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.32",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-instrument"
@@ -9120,9 +10229,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a303793cbc01fb96551badfc7367db6007396bba6bac97936b3c8b6f7fdb41"
+checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c"
 dependencies = [
  "anyhow",
  "libc",
@@ -9136,9 +10245,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c9deb56f8a9f2ec177b3bd642a8205621835944ed5da55f2388ef216aca5a4"
+checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445"
 dependencies = [
  "anyhow",
  "cxx",
@@ -9148,15 +10257,14 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.111.0"
+version = "0.112.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4432e28b542738a9776cedf92e8a99d8991c7b4667ee2c7ccddfb479dd2856a7"
+checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14"
 dependencies = [
  "anyhow",
  "cc",
  "cxx",
  "cxx-build",
- "regex",
 ]
 
 [[package]]
@@ -9187,13 +10295,13 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.20.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01bf50edb2ea9d922aa75a7bf3c15e26a6c9e2d18c56e862b49737a582901729"
+checksum = "8e61a7006b0fdf24f6bbe8dcfdad5ca1b350de80061fb2827f31c82fbbb9565a"
 dependencies = [
- "spin 0.9.5",
+ "spin 0.9.8",
  "wasmi_arena",
- "wasmi_core 0.5.0",
+ "wasmi_core 0.12.0",
  "wasmparser-nostd",
 ]
 
@@ -9208,9 +10316,9 @@ dependencies = [
 
 [[package]]
 name = "wasmi_arena"
-version = "0.1.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ea379cbb0b41f3a9f0bf7b47036d036aae7f43383d8cc487d4deccf40dee0a"
+checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468"
 
 [[package]]
 name = "wasmi_core"
@@ -9219,56 +10327,56 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
 dependencies = [
  "downcast-rs",
- "libm 0.2.6",
+ "libm 0.2.7",
  "memory_units",
  "num-rational",
  "num-traits",
- "region",
 ]
 
 [[package]]
 name = "wasmi_core"
-version = "0.5.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5bf998ab792be85e20e771fe14182b4295571ad1d4f89d3da521c1bef5f597a"
+checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
 dependencies = [
  "downcast-rs",
- "libm 0.2.6",
+ "libm 0.2.7",
  "num-traits",
+ "paste",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.100.0"
+version = "0.102.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
+checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
 dependencies = [
- "indexmap",
+ "indexmap 1.9.3",
  "url",
 ]
 
 [[package]]
 name = "wasmparser-nostd"
-version = "0.91.0"
+version = "0.100.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c37f310b5a62bfd5ae7c0f1d8e6f98af16a5d6d84ba764e9c36439ec14e318b"
+checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724"
 dependencies = [
  "indexmap-nostd",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6e89f9819523447330ffd70367ef4a18d8c832e24e8150fe054d1d912841632"
+checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
 dependencies = [
  "anyhow",
  "bincode",
  "cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
  "libc",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
  "paste",
  "psm",
@@ -9281,43 +10389,43 @@ dependencies = [
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bd3a5e46c198032da934469f3a6e48649d1f9142438e4fd4617b68a35644b8a"
+checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b389ae9b678b9c3851091a4804f4182d688d27aff7abc9aa37fa7be37d8ecffa"
+checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64 0.21.2",
  "bincode",
  "directories-next",
  "file-per-thread-logger",
  "log",
- "rustix",
+ "rustix 0.36.15",
  "serde",
- "sha2 0.10.6",
- "toml",
- "windows-sys 0.42.0",
- "zstd",
+ "sha2 0.10.7",
+ "toml 0.5.11",
+ "windows-sys 0.45.0",
+ "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b2c92a08c0db6efffd88fdc97d7aa9c7c63b03edb0971dbca745469f820e8c"
+checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -9325,27 +10433,43 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.26.2",
+ "gimli",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "target-lexicon",
  "thiserror",
  "wasmparser",
+ "wasmtime-cranelift-shared",
+ "wasmtime-environ",
+]
+
+[[package]]
+name = "wasmtime-cranelift-shared"
+version = "8.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd041e382ef5aea1b9fc78442394f1a4f6d676ce457e7076ca4cb3f397882f8b"
+dependencies = [
+ "anyhow",
+ "cranelift-codegen",
+ "cranelift-native",
+ "gimli",
+ "object 0.30.4",
+ "target-lexicon",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-environ"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a6db9fc52985ba06ca601f2ff0ff1f526c5d724c7ac267b47326304b0c97883"
+checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
 dependencies = [
  "anyhow",
  "cranelift-entity",
- "gimli 0.26.2",
- "indexmap",
+ "gimli",
+ "indexmap 1.9.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "serde",
  "target-lexicon",
  "thiserror",
@@ -9355,18 +10479,18 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77e3a52cd84d0f7f18554afa8060cfe564ccac61e3b0802d3fd4084772fa5f6"
+checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
 dependencies = [
- "addr2line 0.17.0",
+ "addr2line 0.19.0",
  "anyhow",
  "bincode",
  "cfg-if",
  "cpp_demangle",
- "gimli 0.26.2",
+ "gimli",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "rustc-demangle",
  "serde",
  "target-lexicon",
@@ -9374,60 +10498,60 @@ dependencies = [
  "wasmtime-jit-debug",
  "wasmtime-jit-icache-coherence",
  "wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-jit-debug"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0245e8a9347017c7185a72e215218a802ff561545c242953c11ba00fccc930f"
+checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
- "rustix",
+ "rustix 0.36.15",
 ]
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d412e9340ab1c83867051d8d1d7c90aa8c9afc91da086088068e2734e25064"
+checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
 dependencies = [
  "cfg-if",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d594e791b5fdd4dbaf8cf7ae62f2e4ff85018ce90f483ca6f42947688e48827d"
+checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
 dependencies = [
  "anyhow",
  "cc",
  "cfg-if",
- "indexmap",
+ "indexmap 1.9.3",
  "libc",
  "log",
  "mach",
  "memfd",
- "memoffset 0.6.5",
+ "memoffset 0.8.0",
  "paste",
  "rand 0.8.5",
- "rustix",
+ "rustix 0.36.15",
  "wasmtime-asm-macros",
  "wasmtime-environ",
  "wasmtime-jit-debug",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-types"
-version = "6.0.1"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6688d6f96d4dbc1f89fab626c56c1778936d122b5f4ae7a57c2eb42b8d982e2"
+checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
  "cranelift-entity",
  "serde",
@@ -9437,9 +10561,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.61"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -9497,10 +10621,10 @@ dependencies = [
  "sdp",
  "serde",
  "serde_json",
- "sha2 0.10.6",
+ "sha2 0.10.7",
  "stun",
  "thiserror",
- "time 0.3.19",
+ "time 0.3.23",
  "tokio",
  "turn",
  "url",
@@ -9532,22 +10656,22 @@ dependencies = [
 
 [[package]]
 name = "webrtc-dtls"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f"
+checksum = "942be5bd85f072c3128396f6e5a9bfb93ca8c1939ded735d177b7bcba9a13d05"
 dependencies = [
  "aes 0.6.0",
- "aes-gcm 0.8.0",
+ "aes-gcm 0.10.2",
  "async-trait",
  "bincode",
  "block-modes",
  "byteorder",
  "ccm",
  "curve25519-dalek 3.2.0",
- "der-parser 8.1.0",
- "elliptic-curve",
+ "der-parser 8.2.0",
+ "elliptic-curve 0.12.3",
  "hkdf",
- "hmac 0.10.1",
+ "hmac 0.12.1",
  "log",
  "oid-registry 0.6.1",
  "p256",
@@ -9557,11 +10681,11 @@ dependencies = [
  "rcgen 0.9.3",
  "ring",
  "rustls 0.19.1",
- "sec1",
+ "sec1 0.3.0",
  "serde",
- "sha-1",
- "sha2 0.9.9",
- "signature",
+ "sha1",
+ "sha2 0.10.7",
+ "signature 1.6.4",
  "subtle",
  "thiserror",
  "tokio",
@@ -9602,7 +10726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
 dependencies = [
  "log",
- "socket2",
+ "socket2 0.4.9",
  "thiserror",
  "tokio",
  "webrtc-util",
@@ -9610,18 +10734,15 @@ dependencies = [
 
 [[package]]
 name = "webrtc-media"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7"
+checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991"
 dependencies = [
  "byteorder",
  "bytes",
- "derive_builder",
- "displaydoc",
  "rand 0.8.5",
  "rtp",
  "thiserror",
- "webrtc-util",
 ]
 
 [[package]]
@@ -9672,29 +10793,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
 dependencies = [
  "async-trait",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes",
  "cc",
  "ipnet",
  "lazy_static",
  "libc",
  "log",
- "nix 0.24.3",
+ "nix",
  "rand 0.8.5",
  "thiserror",
  "tokio",
  "winapi",
 ]
 
-[[package]]
-name = "wepoll-ffi"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "which"
 version = "4.4.0"
@@ -9708,9 +10820,9 @@ dependencies = [
 
 [[package]]
 name = "wide"
-version = "0.7.8"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223"
+checksum = "40018623e2dba2602a9790faba8d33f2ebdebf4b86561b83928db735f8784728"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -9718,9 +10830,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "0.5.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
 
 [[package]]
 name = "winapi"
@@ -9767,18 +10879,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows-targets 0.48.1",
 ]
 
 [[package]]
@@ -9787,29 +10893,59 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.1",
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -9819,9 +10955,15 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -9831,9 +10973,15 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -9843,9 +10991,15 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -9855,15 +11009,27 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -9873,17 +11039,33 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -9933,7 +11115,7 @@ dependencies = [
  "ring",
  "rusticata-macros",
  "thiserror",
- "time 0.3.19",
+ "time 0.3.23",
 ]
 
 [[package]]
@@ -9942,16 +11124,84 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
 dependencies = [
- "asn1-rs 0.5.1",
+ "asn1-rs 0.5.2",
  "base64 0.13.1",
  "data-encoding",
- "der-parser 8.1.0",
+ "der-parser 8.2.0",
  "lazy_static",
  "nom",
  "oid-registry 0.6.1",
  "rusticata-macros",
  "thiserror",
- "time 0.3.19",
+ "time 0.3.23",
+]
+
+[[package]]
+name = "xcm"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "bounded-collections",
+ "derivative",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "serde",
+ "sp-weights",
+ "xcm-procedural",
+]
+
+[[package]]
+name = "xcm-builder"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "impl-trait-for-tuples",
+ "log",
+ "pallet-transaction-payment",
+ "parity-scale-codec",
+ "polkadot-parachain",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+ "xcm",
+ "xcm-executor",
+]
+
+[[package]]
+name = "xcm-executor"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "environmental",
+ "frame-support",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+ "xcm",
+]
+
+[[package]]
+name = "xcm-procedural"
+version = "0.9.43"
+source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.43#ba42b9ce51d25bdaf52d2c61e0763a6e3da50d25"
+dependencies = [
+ "Inflector",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -9970,32 +11220,31 @@ dependencies = [
 
 [[package]]
 name = "yasna"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
- "time 0.3.19",
+ "time 0.3.23",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.5.7"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
- "synstructure",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -10004,7 +11253,16 @@ version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
- "zstd-safe",
+ "zstd-safe 5.0.2+zstd.1.5.2",
+]
+
+[[package]]
+name = "zstd"
+version = "0.12.3+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+dependencies = [
+ "zstd-safe 6.0.5+zstd.1.5.4",
 ]
 
 [[package]]
@@ -10017,11 +11275,21 @@ dependencies = [
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "6.0.5+zstd.1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
-version = "2.0.7+zstd.1.5.4"
+version = "2.0.8+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index af4a8ad..c600299 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
 	"frame/balances/rpc/runtime-api",
 	"client/consensus/manual-seal",
 ]
+resolver = "2"
 exclude = [
 	"contracts",
 ]
diff --git a/README.md b/README.md
index 3314d65..bba4525 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,16 @@ Swanky node is a Substrate based blockchain configured to enable `pallet-contrac
   Blocks are sealed (1) as soon as a transaction get in the pool (2) when `engine_createBlock` RPC called. Blocks are finalized configured delay sec after blocks are sealed.
 - Users' account Balance manipulation
 - Block height manipulation. Developers can forward and revert blocks via RPC.
-- [pallet-dapps-staking](https://github.com/AstarNetwork/astar-frame/tree/polkadot-v0.9.39/frame/dapps-staking) and ChainExtension to interact with it.
-- [pallet-assets](https://github.com/paritytech/substrate/tree/polkadot-v0.9.39/frame/assets).
+- [pallet-dapps-staking](https://github.com/AstarNetwork/Astar/tree/v5.15.0/pallets/dapps-staking) and ChainExtension to interact with it.
+- [pallet-assets](https://github.com/paritytech/substrate/tree/polkadot-v0.9.43/frame/assets).
 - Pallet-assets chain-extension
 - dApps-staking chain-extension
 
 Swanky Node is optimized for local development, while removing unnecessary components such as P2P. Additional features and pallets, such as to interact between (Contract <-> Runtime), will be added in the future.
 
 ## Compatible ink! version
-Any ink! version from `v4.0.0` or `higher` is supported by pallet-contract polkadot-0.9.39 branch.
+
+Any ink! version from `v4.0.0` or `higher` is supported by pallet-contract polkadot-0.9.43 branch.
 
 ## Installation
 ### Download Binary
@@ -129,7 +130,7 @@ Swanky Node enables both Manual seal and Instant seal.
 We can tell the node to author a block by calling the `engine_createBlock` RPC.
 
 ```bash
-$ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d   '{
+$ curl http://127.0.0.1:9944 -H "Content-Type:application/json;charset=utf-8" -d   '{
      "jsonrpc":"2.0",
       "id":1,
       "method":"engine_createBlock",
@@ -151,7 +152,7 @@ $ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d
 In addition to finalizing blocks at the time of creating them, they may also be finalized later by using the RPC call `engine_finalizeBlock`.
 
 ```bash
-$ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d   '{
+$ curl http://127.0.0.1:9944 -H "Content-Type:application/json;charset=utf-8" -d   '{
      "jsonrpc":"2.0",
       "id":1,
       "method":"engine_finalizeBlock",
@@ -175,11 +176,11 @@ Developers can forward blocks and revert blocks to requested block heights.
 Forwarding blocks to requested block height by calling `engine_forwardBlocksTo`.
 
 ```bash
-$ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d   '{                                                                                  feat/forward-revert-blocks ✭
+$ curl http://127.0.0.1:9944 -H "Content-Type:application/json;charset=utf-8" -d   '{
      "jsonrpc":"2.0",
       "id":1,
       "method":"engine_forwardBlocksTo",
-      "params": [120, null]
+      "params": [120]  
     }'
 ```
 
@@ -191,14 +192,14 @@ $ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d
 Reverting blocks to requested block height by calling `engine_revertBlocksTo`.
 
 Note that reverting finalized blocks only works when node is launched with archive mode `--state-pruning archive` (or `--pruning archive`) since reverting blocks requires past blocks' states.
-When blocks' states are pruned, RPC won't revert finalized blocks.
+When blocks' states are pruned, **RPC won't revert finalized blocks**.
 
 ```bash
-$ curl http://localhost:9933 -H "Content-Type:application/json;charset=utf-8" -d   '{                                                                                  feat/forward-revert-blocks ✭
+$ curl http://127.0.0.1:9944 -H "Content-Type:application/json;charset=utf-8" -d   '{
      "jsonrpc":"2.0",
       "id":1,
       "method":"engine_revertBlocksTo",
-      "params": [50, null]
+      "params": [50]
     }'
 ```
 
diff --git a/client/consensus/manual-seal/Cargo.toml b/client/consensus/manual-seal/Cargo.toml
index ac62ddf..372348d 100644
--- a/client/consensus/manual-seal/Cargo.toml
+++ b/client/consensus/manual-seal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-consensus-manual-seal"
-version = "1.6.0"
+version = "1.7.0"
 authors = ["Astar Network"]
 description = "Manual sealing engine for Substrate"
 edition = "2021"
@@ -20,31 +20,31 @@ futures = "0.3.21"
 futures-timer = "3.0.1"
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
 log = "0.4.17"
-sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-consensus-epochs = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-consensus-epochs = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
-sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus-slots = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-consensus-babe = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-consensus-slots = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
 thiserror = "1.0"
 
 [dev-dependencies]
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-substrate-test-runtime-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+substrate-test-runtime-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
 tokio = { version = "1.22.0", features = ["rt-multi-thread", "macros"] }
diff --git a/client/consensus/manual-seal/src/consensus/babe.rs b/client/consensus/manual-seal/src/consensus/babe.rs
index 672b9a7..a12b953 100644
--- a/client/consensus/manual-seal/src/consensus/babe.rs
+++ b/client/consensus/manual-seal/src/consensus/babe.rs
@@ -8,13 +8,12 @@ use sc_consensus_babe::{
 use sc_consensus_epochs::{
 	descendent_query, EpochHeader, SharedEpochChanges, ViableEpochDescriptor,
 };
-use sp_keystore::SyncCryptoStorePtr;
+use sp_keystore::KeystorePtr;
 use std::{marker::PhantomData, sync::Arc};
 
 use sc_consensus::{BlockImportParams, ForkChoiceStrategy, Verifier};
 use sp_api::{ProvideRuntimeApi, TransactionFor};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
-use sp_consensus::CacheKeyId;
 use sp_consensus_babe::{
 	digests::{NextEpochDescriptor, PreDigest, SecondaryPlainPreDigest},
 	inherents::BabeInherentData,
@@ -33,7 +32,7 @@ use sp_timestamp::TimestampInherentData;
 /// Intended for use with BABE runtimes.
 pub struct BabeConsensusDataProvider<B: BlockT, C, P> {
 	/// shared reference to keystore
-	keystore: SyncCryptoStorePtr,
+	keystore: KeystorePtr,
 
 	/// Shared reference to the client.
 	client: Arc<C>,
@@ -78,7 +77,7 @@ where
 	async fn verify(
 		&mut self,
 		mut import_params: BlockImportParams<B, ()>,
-	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
+	) -> Result<BlockImportParams<B, ()>, String> {
 		import_params.finalized = false;
 		import_params.fork_choice = Some(ForkChoiceStrategy::LongestChain);
 
@@ -107,7 +106,7 @@ where
 		import_params
 			.insert_intermediate(INTERMEDIATE_KEY, BabeIntermediate::<B> { epoch_descriptor });
 
-		Ok((import_params, None))
+		Ok(import_params)
 	}
 }
 
@@ -123,12 +122,12 @@ where
 {
 	pub fn new(
 		client: Arc<C>,
-		keystore: SyncCryptoStorePtr,
+		keystore: KeystorePtr,
 		epoch_changes: SharedEpochChanges<B, Epoch>,
 		authorities: Vec<(AuthorityId, BabeAuthorityWeight)>,
 	) -> Result<Self, Error> {
 		if authorities.is_empty() {
-			return Err(Error::StringError("Cannot supply empty authority set!".into()))
+			return Err(Error::StringError("Cannot supply empty authority set!".into()));
 		}
 
 		let config = sc_consensus_babe::configuration(&*client)?;
@@ -278,14 +277,15 @@ where
 
 			// manually hard code epoch descriptor
 			epoch_descriptor = match epoch_descriptor {
-				ViableEpochDescriptor::Signaled(identifier, _header) =>
+				ViableEpochDescriptor::Signaled(identifier, _header) => {
 					ViableEpochDescriptor::Signaled(
 						identifier,
 						EpochHeader {
 							start_slot: slot,
 							end_slot: (*slot * self.config.epoch_length).into(),
 						},
-					),
+					)
+				},
 				_ => unreachable!(
 					"we're not in the authorities, so this isn't the genesis epoch; qed"
 				),
diff --git a/client/consensus/manual-seal/src/lib.rs b/client/consensus/manual-seal/src/lib.rs
index 6a6cfa9..106302c 100644
--- a/client/consensus/manual-seal/src/lib.rs
+++ b/client/consensus/manual-seal/src/lib.rs
@@ -9,7 +9,7 @@ use sc_consensus::{
 	import_queue::{BasicQueue, BoxBlockImport, Verifier},
 };
 use sp_blockchain::HeaderBackend;
-use sp_consensus::{CacheKeyId, Environment, Proposer, SelectChain};
+use sp_consensus::{Environment, Proposer, SelectChain};
 use sp_core::traits::SpawnNamed;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::{traits::Block as BlockT, ConsensusEngineId};
@@ -46,10 +46,10 @@ impl<B: BlockT> Verifier<B> for ManualSealVerifier {
 	async fn verify(
 		&mut self,
 		mut block: BlockImportParams<B, ()>,
-	) -> Result<(BlockImportParams<B, ()>, Option<Vec<(CacheKeyId, Vec<u8>)>>), String> {
+	) -> Result<BlockImportParams<B, ()>, String> {
 		block.finalized = false;
 		block.fork_choice = Some(ForkChoiceStrategy::LongestChain);
-		Ok((block, None))
+		Ok(block)
 	}
 }
 
@@ -68,7 +68,7 @@ where
 
 /// Params required to start the instant sealing authorship task.
 pub struct ManualSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC, CS, CIDP, P> {
-	/// Block import instance for well. importing blocks.
+	/// Block import instance.
 	pub block_import: BI,
 
 	/// The environment we are producing blocks for.
@@ -120,17 +120,19 @@ pub struct InstantSealParams<B: BlockT, BI, E, C: ProvideRuntimeApi<B>, TP, SC,
 	pub create_inherent_data_providers: CIDP,
 }
 
+/// Params required to start the delayed finalization task.
 pub struct DelayedFinalizeParams<C, S> {
-	/// Block import instance for well. importing blocks.
+	/// Block import instance.
 	pub client: Arc<C>,
 
+	/// Handle for spawning delayed finalization tasks.
 	pub spawn_handle: S,
 
 	/// The delay in seconds before a block is finalized.
 	pub delay_sec: u64,
 }
 
-/// Creates the background authorship task for the manual seal engine.
+/// Creates the background authorship task for the manually seal engine.
 pub async fn run_manual_seal<B, BI, CB, E, C, TP, SC, CS, CIDP, P>(
 	ManualSealParams {
 		mut block_import,
diff --git a/client/consensus/manual-seal/src/rpc.rs b/client/consensus/manual-seal/src/rpc.rs
index d719179..29abae6 100644
--- a/client/consensus/manual-seal/src/rpc.rs
+++ b/client/consensus/manual-seal/src/rpc.rs
@@ -170,7 +170,7 @@ where
 		if height <= best_number {
 			return Err(JsonRpseeError::Custom(
 				"Target height is lower than current best height".into(),
-			))
+			));
 		}
 
 		let diff = height - best_number;
@@ -200,7 +200,7 @@ where
 		if height >= best_number {
 			return Err(JsonRpseeError::Custom(
 				"Target height is higher than current best height".into(),
-			))
+			));
 		}
 
 		let diff = best_number - height;
diff --git a/client/consensus/manual-seal/src/seal_block.rs b/client/consensus/manual-seal/src/seal_block.rs
index 739487d..60d40d5 100644
--- a/client/consensus/manual-seal/src/seal_block.rs
+++ b/client/consensus/manual-seal/src/seal_block.rs
@@ -9,10 +9,10 @@ use sp_blockchain::HeaderBackend;
 use sp_consensus::{self, BlockOrigin, Environment, Proposer, SelectChain};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
-use std::{collections::HashMap, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 
 /// max duration for creating a proposal in secs
-pub const MAX_PROPOSAL_DURATION: u64 = 10;
+pub const MAX_PROPOSAL_DURATION: u64 = 180;
 
 /// params for sealing a new block
 pub struct SealBlockParams<'a, B: BlockT, BI, SC, C: ProvideRuntimeApi<B>, E, TP, CIDP, P> {
@@ -74,15 +74,16 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP, P>(
 {
 	let future = async {
 		if pool.status().ready == 0 && !create_empty {
-			return Err(Error::EmptyTransactionPool)
+			return Err(Error::EmptyTransactionPool);
 		}
 
 		// get the header to build this new block on.
 		// use the parent_hash supplied via `EngineCommand`
 		// or fetch the best_block.
 		let parent = match parent_hash {
-			Some(hash) =>
-				client.header(hash)?.ok_or_else(|| Error::BlockNotFound(format!("{}", hash)))?,
+			Some(hash) => {
+				client.header(hash)?.ok_or_else(|| Error::BlockNotFound(format!("{}", hash)))?
+			},
 			None => select_chain.best_chain().await?,
 		};
 
@@ -113,7 +114,7 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP, P>(
 			.await?;
 
 		if proposal.block.extrinsics().len() == inherents_len && !create_empty {
-			return Err(Error::EmptyTransactionPool)
+			return Err(Error::EmptyTransactionPool);
 		}
 
 		let (header, body) = proposal.block.deconstruct();
@@ -135,9 +136,10 @@ pub async fn seal_block<B, BI, SC, C, E, TP, CIDP, P>(
 		let mut post_header = header.clone();
 		post_header.digest_mut().logs.extend(params.post_digests.iter().cloned());
 
-		match block_import.import_block(params, HashMap::new()).await? {
-			ImportResult::Imported(aux) =>
-				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&post_header), aux }),
+		match block_import.import_block(params).await? {
+			ImportResult::Imported(aux) => {
+				Ok(CreatedBlock { hash: <B as BlockT>::Header::hash(&post_header), aux })
+			},
 			other => Err(other.into()),
 		}
 	};
diff --git a/frame/balances/Cargo.toml b/frame/balances/Cargo.toml
index 52f542c..5249ab1 100644
--- a/frame/balances/Cargo.toml
+++ b/frame/balances/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pallet-balances"
 version = "4.0.0-dev"
-authors = ["Astar Network <admin@parity.io>"]
+authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
@@ -14,19 +14,20 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive", "max-encoded-len"] }
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false, optional = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false, optional = true }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 log = { version = "0.4.17", default-features = false }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.136", optional = true }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+serde = { version = "1.0.151", features = ["derive"] }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 
 [dev-dependencies]
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+paste = "1.0.12"
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 
 [features]
 default = ["std"]
@@ -36,7 +37,6 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
-	"serde",
 	"scale-info/std",
 	"sp-runtime/std",
 	"sp-std/std",
diff --git a/frame/balances/rpc/Cargo.toml b/frame/balances/rpc/Cargo.toml
index 354282b..ccb209a 100644
--- a/frame/balances/rpc/Cargo.toml
+++ b/frame/balances/rpc/Cargo.toml
@@ -17,14 +17,14 @@ codec = { package = "parity-scale-codec", version = "3.2.2" }
 futures = "0.3.21"
 hex = "0.4.3"
 jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
-node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+node-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 pallet-balances = { path = "../../balances", default-features = false }
 pallet-balances-rpc-runtime-api = { version = "4.0.0-dev", path = "./runtime-api" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-swanky-runtime = { version = "1.6.0", path = "../../../runtime" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+swanky-runtime = { version = "1.7.0", path = "../../../runtime" }
diff --git a/frame/balances/rpc/runtime-api/Cargo.toml b/frame/balances/rpc/runtime-api/Cargo.toml
index 9103bf1..4eb5483 100644
--- a/frame/balances/rpc/runtime-api/Cargo.toml
+++ b/frame/balances/rpc/runtime-api/Cargo.toml
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
 pallet-balances = { version = "4.0.0-dev", default-features = false, path = "../../../balances" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 
 [features]
 default = ["std"]
diff --git a/frame/balances/src/benchmarking.rs b/frame/balances/src/benchmarking.rs
index b36fe1e..4c53732 100644
--- a/frame/balances/src/benchmarking.rs
+++ b/frame/balances/src/benchmarking.rs
@@ -24,6 +24,8 @@ use crate::Pallet as Balances;
 
 use frame_benchmarking::v2::*;
 use frame_system::RawOrigin;
+use sp_runtime::traits::Bounded;
+use types::ExtraFlags;
 
 const SEED: u32 = 0;
 // existential deposit multiplier
@@ -37,7 +39,7 @@ mod benchmarks {
 	// * Transfer will kill the sender account.
 	// * Transfer will create the recipient account.
 	#[benchmark]
-	fn transfer() {
+	fn transfer_allow_death() {
 		let existential_deposit = T::ExistentialDeposit::get();
 		let caller = whitelisted_caller();
 
@@ -79,7 +81,7 @@ mod benchmarks {
 		let transfer_amount = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
 
 		#[extrinsic_call]
-		transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount);
+		transfer_allow_death(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount);
 
 		assert!(!Balances::<T, I>::free_balance(&caller).is_zero());
 		assert!(!Balances::<T, I>::free_balance(&recipient).is_zero());
@@ -106,9 +108,9 @@ mod benchmarks {
 		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
 	}
 
-	// Benchmark `set_balance` coming from ROOT account. This always creates an account.
+	// Benchmark `force_set_balance` coming from ROOT account. This always creates an account.
 	#[benchmark]
-	fn set_balance_creating() {
+	fn force_set_balance_creating() {
 		let user: T::AccountId = account("user", 0, SEED);
 		let user_lookup = T::Lookup::unlookup(user.clone());
 
@@ -118,15 +120,14 @@ mod benchmarks {
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance_amount);
 
 		#[extrinsic_call]
-		set_balance(RawOrigin::Root, user_lookup, balance_amount, balance_amount);
+		force_set_balance(RawOrigin::Root, user_lookup, balance_amount);
 
 		assert_eq!(Balances::<T, I>::free_balance(&user), balance_amount);
-		assert_eq!(Balances::<T, I>::reserved_balance(&user), balance_amount);
 	}
 
-	// Benchmark `set_balance` coming from ROOT account. This always kills an account.
+	// Benchmark `force_set_balance` coming from ROOT account. This always kills an account.
 	#[benchmark]
-	fn set_balance_killing() {
+	fn force_set_balance_killing() {
 		let user: T::AccountId = account("user", 0, SEED);
 		let user_lookup = T::Lookup::unlookup(user.clone());
 
@@ -136,7 +137,7 @@ mod benchmarks {
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance_amount);
 
 		#[extrinsic_call]
-		set_balance(RawOrigin::Root, user_lookup, Zero::zero(), Zero::zero());
+		force_set_balance(RawOrigin::Root, user_lookup, Zero::zero());
 
 		assert!(Balances::<T, I>::free_balance(&user).is_zero());
 	}
@@ -158,8 +159,9 @@ mod benchmarks {
 		// and reap this user.
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup = T::Lookup::unlookup(recipient.clone());
-		let transfer_amount =
-			existential_deposit.saturating_mul((ED_MULTIPLIER - 1).into()) + 1u32.into();
+		let transfer_amount = existential_deposit
+			.saturating_mul((ED_MULTIPLIER - 1).into())
+			.saturating_add(1u32.into());
 
 		#[extrinsic_call]
 		_(RawOrigin::Root, source_lookup, recipient_lookup, transfer_amount);
@@ -197,7 +199,7 @@ mod benchmarks {
 		}
 
 		#[extrinsic_call]
-		transfer(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount);
+		transfer_allow_death(RawOrigin::Signed(caller.clone()), recipient_lookup, transfer_amount);
 
 		assert_eq!(Balances::<T, I>::free_balance(&caller), Zero::zero());
 		assert_eq!(Balances::<T, I>::free_balance(&recipient), transfer_amount);
@@ -230,27 +232,64 @@ mod benchmarks {
 		let user_lookup = T::Lookup::unlookup(user.clone());
 
 		// Give some multiple of the existential deposit
-		let existential_deposit = T::ExistentialDeposit::get();
-		let balance = existential_deposit.saturating_mul(ED_MULTIPLIER.into());
+		let ed = T::ExistentialDeposit::get();
+		let balance = ed.saturating_add(ed);
 		let _ = <Balances<T, I> as Currency<_>>::make_free_balance_be(&user, balance);
 
 		// Reserve the balance
-		<Balances<T, I> as ReservableCurrency<_>>::reserve(&user, balance)?;
-		assert_eq!(Balances::<T, I>::reserved_balance(&user), balance);
-		assert!(Balances::<T, I>::free_balance(&user).is_zero());
+		<Balances<T, I> as ReservableCurrency<_>>::reserve(&user, ed)?;
+		assert_eq!(Balances::<T, I>::reserved_balance(&user), ed);
+		assert_eq!(Balances::<T, I>::free_balance(&user), ed);
 
 		#[extrinsic_call]
 		_(RawOrigin::Root, user_lookup, balance);
 
 		assert!(Balances::<T, I>::reserved_balance(&user).is_zero());
-		assert_eq!(Balances::<T, I>::free_balance(&user), balance);
+		assert_eq!(Balances::<T, I>::free_balance(&user), ed.saturating_add(ed));
 
 		Ok(())
 	}
 
+	#[benchmark]
+	fn upgrade_accounts(u: Linear<1, 1_000>) {
+		let caller: T::AccountId = whitelisted_caller();
+		let who = (0..u)
+			.into_iter()
+			.map(|i| -> T::AccountId {
+				let user = account("old_user", i, SEED);
+				let account = AccountData {
+					free: T::ExistentialDeposit::get(),
+					reserved: T::ExistentialDeposit::get(),
+					frozen: Zero::zero(),
+					flags: ExtraFlags::old_logic(),
+				};
+				frame_system::Pallet::<T>::inc_providers(&user);
+				assert!(T::AccountStore::try_mutate_exists(&user, |a| -> DispatchResult {
+					*a = Some(account);
+					Ok(())
+				})
+				.is_ok());
+				assert!(!Balances::<T, I>::account(&user).flags.is_new_logic());
+				assert_eq!(frame_system::Pallet::<T>::providers(&user), 1);
+				assert_eq!(frame_system::Pallet::<T>::consumers(&user), 0);
+				user
+			})
+			.collect();
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(caller.clone()), who);
+
+		for i in 0..u {
+			let user: T::AccountId = account("old_user", i, SEED);
+			assert!(Balances::<T, I>::account(&user).flags.is_new_logic());
+			assert_eq!(frame_system::Pallet::<T>::providers(&user), 1);
+			assert_eq!(frame_system::Pallet::<T>::consumers(&user), 1);
+		}
+	}
+
 	impl_benchmark_test_suite! {
 		Balances,
-		crate::tests_composite::ExtBuilder::default().build(),
-		crate::tests_composite::Test,
+		crate::tests::ExtBuilder::default().build(),
+		crate::tests::Test,
 	}
 }
diff --git a/frame/balances/src/impl_currency.rs b/frame/balances/src/impl_currency.rs
new file mode 100644
index 0000000..533521f
--- /dev/null
+++ b/frame/balances/src/impl_currency.rs
@@ -0,0 +1,910 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementations for the `Currency` family of traits.
+//!
+//! Note that `WithdrawReasons` are intentionally not used for anything in this implementation and
+//! are expected to be removed in the near future, once migration to `fungible::*` traits is done.
+
+use super::*;
+use frame_support::{
+	ensure,
+	pallet_prelude::DispatchResult,
+	traits::{
+		tokens::{fungible, BalanceStatus as Status, Fortitude::Polite, Precision::BestEffort},
+		Currency, DefensiveSaturating, ExistenceRequirement,
+		ExistenceRequirement::AllowDeath,
+		Get, Imbalance, LockIdentifier, LockableCurrency, NamedReservableCurrency,
+		ReservableCurrency, SignedImbalance, TryDrop, WithdrawReasons,
+	},
+};
+pub use imbalances::{NegativeImbalance, PositiveImbalance};
+
+// wrapping these imbalances in a private module is necessary to ensure absolute privacy
+// of the inner member.
+mod imbalances {
+	use super::{result, Config, Imbalance, RuntimeDebug, Saturating, TryDrop, Zero};
+	use frame_support::traits::SameOrOther;
+	use sp_std::mem;
+
+	/// Opaque, move-only struct with private fields that serves as a token denoting that
+	/// funds have been created without any equal and opposite accounting.
+	#[must_use]
+	#[derive(RuntimeDebug, PartialEq, Eq)]
+	pub struct PositiveImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
+
+	impl<T: Config<I>, I: 'static> PositiveImbalance<T, I> {
+		/// Create a new positive imbalance from a balance.
+		pub fn new(amount: T::Balance) -> Self {
+			PositiveImbalance(amount)
+		}
+	}
+
+	/// Opaque, move-only struct with private fields that serves as a token denoting that
+	/// funds have been destroyed without any equal and opposite accounting.
+	#[must_use]
+	#[derive(RuntimeDebug, PartialEq, Eq)]
+	pub struct NegativeImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
+
+	impl<T: Config<I>, I: 'static> NegativeImbalance<T, I> {
+		/// Create a new negative imbalance from a balance.
+		pub fn new(amount: T::Balance) -> Self {
+			NegativeImbalance(amount)
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> TryDrop for PositiveImbalance<T, I> {
+		fn try_drop(self) -> result::Result<(), Self> {
+			self.drop_zero()
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Default for PositiveImbalance<T, I> {
+		fn default() -> Self {
+			Self::zero()
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for PositiveImbalance<T, I> {
+		type Opposite = NegativeImbalance<T, I>;
+
+		fn zero() -> Self {
+			Self(Zero::zero())
+		}
+		fn drop_zero(self) -> result::Result<(), Self> {
+			if self.0.is_zero() {
+				Ok(())
+			} else {
+				Err(self)
+			}
+		}
+		fn split(self, amount: T::Balance) -> (Self, Self) {
+			let first = self.0.min(amount);
+			let second = self.0 - first;
+
+			mem::forget(self);
+			(Self(first), Self(second))
+		}
+		fn merge(mut self, other: Self) -> Self {
+			self.0 = self.0.saturating_add(other.0);
+			mem::forget(other);
+
+			self
+		}
+		fn subsume(&mut self, other: Self) {
+			self.0 = self.0.saturating_add(other.0);
+			mem::forget(other);
+		}
+		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
+			let (a, b) = (self.0, other.0);
+			mem::forget((self, other));
+
+			if a > b {
+				SameOrOther::Same(Self(a - b))
+			} else if b > a {
+				SameOrOther::Other(NegativeImbalance::new(b - a))
+			} else {
+				SameOrOther::None
+			}
+		}
+		fn peek(&self) -> T::Balance {
+			self.0
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> TryDrop for NegativeImbalance<T, I> {
+		fn try_drop(self) -> result::Result<(), Self> {
+			self.drop_zero()
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Default for NegativeImbalance<T, I> {
+		fn default() -> Self {
+			Self::zero()
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for NegativeImbalance<T, I> {
+		type Opposite = PositiveImbalance<T, I>;
+
+		fn zero() -> Self {
+			Self(Zero::zero())
+		}
+		fn drop_zero(self) -> result::Result<(), Self> {
+			if self.0.is_zero() {
+				Ok(())
+			} else {
+				Err(self)
+			}
+		}
+		fn split(self, amount: T::Balance) -> (Self, Self) {
+			let first = self.0.min(amount);
+			let second = self.0 - first;
+
+			mem::forget(self);
+			(Self(first), Self(second))
+		}
+		fn merge(mut self, other: Self) -> Self {
+			self.0 = self.0.saturating_add(other.0);
+			mem::forget(other);
+
+			self
+		}
+		fn subsume(&mut self, other: Self) {
+			self.0 = self.0.saturating_add(other.0);
+			mem::forget(other);
+		}
+		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
+			let (a, b) = (self.0, other.0);
+			mem::forget((self, other));
+
+			if a > b {
+				SameOrOther::Same(Self(a - b))
+			} else if b > a {
+				SameOrOther::Other(PositiveImbalance::new(b - a))
+			} else {
+				SameOrOther::None
+			}
+		}
+		fn peek(&self) -> T::Balance {
+			self.0
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Drop for PositiveImbalance<T, I> {
+		/// Basic drop handler will just square up the total issuance.
+		fn drop(&mut self) {
+			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_add(self.0));
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> Drop for NegativeImbalance<T, I> {
+		/// Basic drop handler will just square up the total issuance.
+		fn drop(&mut self) {
+			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_sub(self.0));
+		}
+	}
+}
+
+impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
+{
+	type Balance = T::Balance;
+	type PositiveImbalance = PositiveImbalance<T, I>;
+	type NegativeImbalance = NegativeImbalance<T, I>;
+
+	fn total_balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).total()
+	}
+
+	// Check if `value` amount of free balance can be slashed from `who`.
+	fn can_slash(who: &T::AccountId, value: Self::Balance) -> bool {
+		if value.is_zero() {
+			return true;
+		}
+		Self::free_balance(who) >= value
+	}
+
+	fn total_issuance() -> Self::Balance {
+		TotalIssuance::<T, I>::get()
+	}
+
+	fn active_issuance() -> Self::Balance {
+		<Self as fungible::Inspect<_>>::active_issuance()
+	}
+
+	fn deactivate(amount: Self::Balance) {
+		<Self as fungible::Unbalanced<_>>::deactivate(amount);
+	}
+
+	fn reactivate(amount: Self::Balance) {
+		<Self as fungible::Unbalanced<_>>::reactivate(amount);
+	}
+
+	fn minimum_balance() -> Self::Balance {
+		T::ExistentialDeposit::get()
+	}
+
+	// Burn funds from the total issuance, returning a positive imbalance for the amount burned.
+	// Is a no-op if amount to be burned is zero.
+	fn burn(mut amount: Self::Balance) -> Self::PositiveImbalance {
+		if amount.is_zero() {
+			return PositiveImbalance::zero();
+		}
+		<TotalIssuance<T, I>>::mutate(|issued| {
+			*issued = issued.checked_sub(&amount).unwrap_or_else(|| {
+				amount = *issued;
+				Zero::zero()
+			});
+		});
+		PositiveImbalance::new(amount)
+	}
+
+	// Create new funds into the total issuance, returning a negative imbalance
+	// for the amount issued.
+	// Is a no-op if amount to be issued it zero.
+	fn issue(mut amount: Self::Balance) -> Self::NegativeImbalance {
+		if amount.is_zero() {
+			return NegativeImbalance::zero();
+		}
+		<TotalIssuance<T, I>>::mutate(|issued| {
+			*issued = issued.checked_add(&amount).unwrap_or_else(|| {
+				amount = Self::Balance::max_value() - *issued;
+				Self::Balance::max_value()
+			})
+		});
+		NegativeImbalance::new(amount)
+	}
+
+	fn free_balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).free
+	}
+
+	// Ensure that an account can withdraw from their free balance given any existing withdrawal
+	// restrictions like locks and vesting balance.
+	// Is a no-op if amount to be withdrawn is zero.
+	fn ensure_can_withdraw(
+		who: &T::AccountId,
+		amount: T::Balance,
+		_reasons: WithdrawReasons,
+		new_balance: T::Balance,
+	) -> DispatchResult {
+		if amount.is_zero() {
+			return Ok(());
+		}
+		ensure!(new_balance >= Self::account(who).frozen, Error::<T, I>::LiquidityRestrictions);
+		Ok(())
+	}
+
+	// Transfer some free balance from `transactor` to `dest`, respecting existence requirements.
+	// Is a no-op if value to be transferred is zero or the `transactor` is the same as `dest`.
+	fn transfer(
+		transactor: &T::AccountId,
+		dest: &T::AccountId,
+		value: Self::Balance,
+		existence_requirement: ExistenceRequirement,
+	) -> DispatchResult {
+		if value.is_zero() || transactor == dest {
+			return Ok(());
+		}
+		let keep_alive = match existence_requirement {
+			ExistenceRequirement::KeepAlive => Preserve,
+			ExistenceRequirement::AllowDeath => Expendable,
+		};
+		<Self as fungible::Mutate<_>>::transfer(transactor, dest, value, keep_alive)?;
+		Ok(())
+	}
+
+	/// Slash a target account `who`, returning the negative imbalance created and any left over
+	/// amount that could not be slashed.
+	///
+	/// Is a no-op if `value` to be slashed is zero or the account does not exist.
+	///
+	/// NOTE: `slash()` prefers free balance, but assumes that reserve balance can be drawn
+	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid
+	/// having to draw from reserved funds, however we err on the side of punishment if things are
+	/// inconsistent or `can_slash` wasn't used appropriately.
+	fn slash(who: &T::AccountId, value: Self::Balance) -> (Self::NegativeImbalance, Self::Balance) {
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero());
+		}
+		if Self::total_balance(who).is_zero() {
+			return (NegativeImbalance::zero(), value);
+		}
+
+		let result = match Self::try_mutate_account_handling_dust(
+			who,
+			|account, _is_new| -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
+				// Best value is the most amount we can slash following liveness rules.
+				let ed = T::ExistentialDeposit::get();
+				let actual = match system::Pallet::<T>::can_dec_provider(who) {
+					true => value.min(account.free),
+					false => value.min(account.free.saturating_sub(ed)),
+				};
+				account.free.saturating_reduce(actual);
+				let remaining = value.saturating_sub(actual);
+				Ok((NegativeImbalance::new(actual), remaining))
+			},
+		) {
+			Ok((imbalance, remaining)) => {
+				Self::deposit_event(Event::Slashed {
+					who: who.clone(),
+					amount: value.saturating_sub(remaining),
+				});
+				(imbalance, remaining)
+			},
+			Err(_) => (Self::NegativeImbalance::zero(), value),
+		};
+		result
+	}
+
+	/// Deposit some `value` into the free balance of an existing target account `who`.
+	///
+	/// Is a no-op if the `value` to be deposited is zero.
+	fn deposit_into_existing(
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> Result<Self::PositiveImbalance, DispatchError> {
+		if value.is_zero() {
+			return Ok(PositiveImbalance::zero());
+		}
+
+		Self::try_mutate_account_handling_dust(
+			who,
+			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
+				ensure!(!is_new, Error::<T, I>::DeadAccount);
+				account.free = account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
+				Self::deposit_event(Event::Deposit { who: who.clone(), amount: value });
+				Ok(PositiveImbalance::new(value))
+			},
+		)
+	}
+
+	/// Deposit some `value` into the free balance of `who`, possibly creating a new account.
+	///
+	/// This function is a no-op if:
+	/// - the `value` to be deposited is zero; or
+	/// - the `value` to be deposited is less than the required ED and the account does not yet
+	///   exist; or
+	/// - the deposit would necessitate the account to exist and there are no provider references;
+	///   or
+	/// - `value` is so large it would cause the balance of `who` to overflow.
+	fn deposit_creating(who: &T::AccountId, value: Self::Balance) -> Self::PositiveImbalance {
+		if value.is_zero() {
+			return Self::PositiveImbalance::zero();
+		}
+
+		Self::try_mutate_account_handling_dust(
+			who,
+			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
+				let ed = T::ExistentialDeposit::get();
+				ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
+
+				// defensive only: overflow should never happen, however in case it does, then this
+				// operation is a no-op.
+				account.free = match account.free.checked_add(&value) {
+					Some(x) => x,
+					None => return Ok(Self::PositiveImbalance::zero()),
+				};
+
+				Self::deposit_event(Event::Deposit { who: who.clone(), amount: value });
+				Ok(PositiveImbalance::new(value))
+			},
+		)
+		.unwrap_or_else(|_| Self::PositiveImbalance::zero())
+	}
+
+	/// Withdraw some free balance from an account, respecting existence requirements.
+	///
+	/// Is a no-op if value to be withdrawn is zero.
+	fn withdraw(
+		who: &T::AccountId,
+		value: Self::Balance,
+		reasons: WithdrawReasons,
+		liveness: ExistenceRequirement,
+	) -> result::Result<Self::NegativeImbalance, DispatchError> {
+		if value.is_zero() {
+			return Ok(NegativeImbalance::zero());
+		}
+
+		Self::try_mutate_account_handling_dust(
+			who,
+			|account, _| -> Result<Self::NegativeImbalance, DispatchError> {
+				let new_free_account =
+					account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
+
+				// bail if we need to keep the account alive and this would kill it.
+				let ed = T::ExistentialDeposit::get();
+				let would_be_dead = new_free_account < ed;
+				let would_kill = would_be_dead && account.free >= ed;
+				ensure!(liveness == AllowDeath || !would_kill, Error::<T, I>::Expendability);
+
+				Self::ensure_can_withdraw(who, value, reasons, new_free_account)?;
+
+				account.free = new_free_account;
+
+				Self::deposit_event(Event::Withdraw { who: who.clone(), amount: value });
+				Ok(NegativeImbalance::new(value))
+			},
+		)
+	}
+
+	/// Force the new free balance of a target account `who` to some new value `balance`.
+	fn make_free_balance_be(
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance> {
+		Self::try_mutate_account_handling_dust(
+			who,
+			|account,
+			 is_new|
+			 -> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, DispatchError> {
+				let ed = T::ExistentialDeposit::get();
+				// If we're attempting to set an existing account to less than ED, then
+				// bypass the entire operation. It's a no-op if you follow it through, but
+				// since this is an instance where we might account for a negative imbalance
+				// (in the dust cleaner of set_account) before we account for its actual
+				// equal and opposite cause (returned as an Imbalance), then in the
+				// instance that there's no other accounts on the system at all, we might
+				// underflow the issuance and our arithmetic will be off.
+				ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
+
+				let imbalance = if account.free <= value {
+					SignedImbalance::Positive(PositiveImbalance::new(value - account.free))
+				} else {
+					SignedImbalance::Negative(NegativeImbalance::new(account.free - value))
+				};
+				account.free = value;
+				Self::deposit_event(Event::BalanceSet { who: who.clone(), free: account.free });
+				Ok(imbalance)
+			},
+		)
+		.unwrap_or_else(|_| SignedImbalance::Positive(Self::PositiveImbalance::zero()))
+	}
+}
+
+impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
+{
+	/// Check if `who` can reserve `value` from their free balance.
+	///
+	/// Always `true` if value to be reserved is zero.
+	fn can_reserve(who: &T::AccountId, value: Self::Balance) -> bool {
+		if value.is_zero() {
+			return true;
+		}
+		Self::account(who).free.checked_sub(&value).map_or(false, |new_balance| {
+			new_balance >= T::ExistentialDeposit::get()
+				&& Self::ensure_can_withdraw(who, value, WithdrawReasons::RESERVE, new_balance)
+					.is_ok()
+		})
+	}
+
+	fn reserved_balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).reserved
+	}
+
+	/// Move `value` from the free balance from `who` to their reserved balance.
+	///
+	/// Is a no-op if value to be reserved is zero.
+	fn reserve(who: &T::AccountId, value: Self::Balance) -> DispatchResult {
+		if value.is_zero() {
+			return Ok(());
+		}
+
+		Self::try_mutate_account_handling_dust(who, |account, _| -> DispatchResult {
+			account.free =
+				account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
+			account.reserved =
+				account.reserved.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
+			Self::ensure_can_withdraw(&who, value, WithdrawReasons::RESERVE, account.free)
+		})?;
+
+		Self::deposit_event(Event::Reserved { who: who.clone(), amount: value });
+		Ok(())
+	}
+
+	/// Unreserve some funds, returning any amount that was unable to be unreserved.
+	///
+	/// Is a no-op if the value to be unreserved is zero or the account does not exist.
+	///
+	/// NOTE: returns amount value which wasn't successfully unreserved.
+	fn unreserve(who: &T::AccountId, value: Self::Balance) -> Self::Balance {
+		if value.is_zero() {
+			return Zero::zero();
+		}
+		if Self::total_balance(who).is_zero() {
+			return value;
+		}
+
+		let actual = match Self::mutate_account_handling_dust(who, |account| {
+			let actual = cmp::min(account.reserved, value);
+			account.reserved -= actual;
+			// defensive only: this can never fail since total issuance which is at least
+			// free+reserved fits into the same data type.
+			account.free = account.free.defensive_saturating_add(actual);
+			actual
+		}) {
+			Ok(x) => x,
+			Err(_) => {
+				// This should never happen since we don't alter the total amount in the account.
+				// If it ever does, then we should fail gracefully though, indicating that nothing
+				// could be done.
+				return value;
+			},
+		};
+
+		Self::deposit_event(Event::Unreserved { who: who.clone(), amount: actual });
+		value - actual
+	}
+
+	/// Slash from reserved balance, returning the negative imbalance created,
+	/// and any amount that was unable to be slashed.
+	///
+	/// Is a no-op if the value to be slashed is zero or the account does not exist.
+	fn slash_reserved(
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> (Self::NegativeImbalance, Self::Balance) {
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero());
+		}
+		if Self::total_balance(who).is_zero() {
+			return (NegativeImbalance::zero(), value);
+		}
+
+		// NOTE: `mutate_account` may fail if it attempts to reduce the balance to the point that an
+		//   account is attempted to be illegally destroyed.
+
+		match Self::mutate_account_handling_dust(who, |account| {
+			let actual = value.min(account.reserved);
+			account.reserved.saturating_reduce(actual);
+
+			// underflow should never happen, but it if does, there's nothing to be done here.
+			(NegativeImbalance::new(actual), value.saturating_sub(actual))
+		}) {
+			Ok((imbalance, not_slashed)) => {
+				Self::deposit_event(Event::Slashed {
+					who: who.clone(),
+					amount: value.saturating_sub(not_slashed),
+				});
+				(imbalance, not_slashed)
+			},
+			Err(_) => (Self::NegativeImbalance::zero(), value),
+		}
+	}
+
+	/// Move the reserved balance of one account into the balance of another, according to `status`.
+	///
+	/// Is a no-op if:
+	/// - the value to be moved is zero; or
+	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
+	///
+	/// This is `Polite` and thus will not repatriate any funds which would lead the total balance
+	/// to be less than the frozen amount. Returns `Ok` with the actual amount of funds moved,
+	/// which may be less than `value` since the operation is done an a `BestEffort` basis.
+	fn repatriate_reserved(
+		slashed: &T::AccountId,
+		beneficiary: &T::AccountId,
+		value: Self::Balance,
+		status: Status,
+	) -> Result<Self::Balance, DispatchError> {
+		let actual =
+			Self::do_transfer_reserved(slashed, beneficiary, value, BestEffort, Polite, status)?;
+		Ok(value.saturating_sub(actual))
+	}
+}
+
+impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
+{
+	type ReserveIdentifier = T::ReserveIdentifier;
+
+	fn reserved_balance_named(id: &Self::ReserveIdentifier, who: &T::AccountId) -> Self::Balance {
+		let reserves = Self::reserves(who);
+		reserves
+			.binary_search_by_key(id, |data| data.id)
+			.map(|index| reserves[index].amount)
+			.unwrap_or_default()
+	}
+
+	/// Move `value` from the free balance from `who` to a named reserve balance.
+	///
+	/// Is a no-op if value to be reserved is zero.
+	fn reserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> DispatchResult {
+		if value.is_zero() {
+			return Ok(());
+		}
+
+		Reserves::<T, I>::try_mutate(who, |reserves| -> DispatchResult {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					// this add can't overflow but just to be defensive.
+					reserves[index].amount = reserves[index].amount.defensive_saturating_add(value);
+				},
+				Err(index) => {
+					reserves
+						.try_insert(index, ReserveData { id: *id, amount: value })
+						.map_err(|_| Error::<T, I>::TooManyReserves)?;
+				},
+			};
+			<Self as ReservableCurrency<_>>::reserve(who, value)?;
+			Ok(())
+		})
+	}
+
+	/// Unreserve some funds, returning any amount that was unable to be unreserved.
+	///
+	/// Is a no-op if the value to be unreserved is zero.
+	fn unreserve_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> Self::Balance {
+		if value.is_zero() {
+			return Zero::zero();
+		}
+
+		Reserves::<T, I>::mutate_exists(who, |maybe_reserves| -> Self::Balance {
+			if let Some(reserves) = maybe_reserves.as_mut() {
+				match reserves.binary_search_by_key(id, |data| data.id) {
+					Ok(index) => {
+						let to_change = cmp::min(reserves[index].amount, value);
+
+						let remain = <Self as ReservableCurrency<_>>::unreserve(who, to_change);
+
+						// remain should always be zero but just to be defensive here.
+						let actual = to_change.defensive_saturating_sub(remain);
+
+						// `actual <= to_change` and `to_change <= amount`; qed;
+						reserves[index].amount -= actual;
+
+						if reserves[index].amount.is_zero() {
+							if reserves.len() == 1 {
+								// no more named reserves
+								*maybe_reserves = None;
+							} else {
+								// remove this named reserve
+								reserves.remove(index);
+							}
+						}
+
+						value - actual
+					},
+					Err(_) => value,
+				}
+			} else {
+				value
+			}
+		})
+	}
+
+	/// Slash from reserved balance, returning the negative imbalance created,
+	/// and any amount that was unable to be slashed.
+	///
+	/// Is a no-op if the value to be slashed is zero.
+	fn slash_reserved_named(
+		id: &Self::ReserveIdentifier,
+		who: &T::AccountId,
+		value: Self::Balance,
+	) -> (Self::NegativeImbalance, Self::Balance) {
+		if value.is_zero() {
+			return (NegativeImbalance::zero(), Zero::zero());
+		}
+
+		Reserves::<T, I>::mutate(who, |reserves| -> (Self::NegativeImbalance, Self::Balance) {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					let to_change = cmp::min(reserves[index].amount, value);
+
+					let (imb, remain) =
+						<Self as ReservableCurrency<_>>::slash_reserved(who, to_change);
+
+					// remain should always be zero but just to be defensive here.
+					let actual = to_change.defensive_saturating_sub(remain);
+
+					// `actual <= to_change` and `to_change <= amount`; qed;
+					reserves[index].amount -= actual;
+
+					Self::deposit_event(Event::Slashed { who: who.clone(), amount: actual });
+					(imb, value - actual)
+				},
+				Err(_) => (NegativeImbalance::zero(), value),
+			}
+		})
+	}
+
+	/// Move the reserved balance of one account into the balance of another, according to `status`.
+	/// If `status` is `Reserved`, the balance will be reserved with given `id`.
+	///
+	/// Is a no-op if:
+	/// - the value to be moved is zero; or
+	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
+	fn repatriate_reserved_named(
+		id: &Self::ReserveIdentifier,
+		slashed: &T::AccountId,
+		beneficiary: &T::AccountId,
+		value: Self::Balance,
+		status: Status,
+	) -> Result<Self::Balance, DispatchError> {
+		if value.is_zero() {
+			return Ok(Zero::zero());
+		}
+
+		if slashed == beneficiary {
+			return match status {
+				Status::Free => Ok(Self::unreserve_named(id, slashed, value)),
+				Status::Reserved => {
+					Ok(value.saturating_sub(Self::reserved_balance_named(id, slashed)))
+				},
+			};
+		}
+
+		Reserves::<T, I>::try_mutate(slashed, |reserves| -> Result<Self::Balance, DispatchError> {
+			match reserves.binary_search_by_key(id, |data| data.id) {
+				Ok(index) => {
+					let to_change = cmp::min(reserves[index].amount, value);
+
+					let actual = if status == Status::Reserved {
+						// make it the reserved under same identifier
+						Reserves::<T, I>::try_mutate(
+							beneficiary,
+							|reserves| -> Result<T::Balance, DispatchError> {
+								match reserves.binary_search_by_key(id, |data| data.id) {
+									Ok(index) => {
+										let remain =
+											<Self as ReservableCurrency<_>>::repatriate_reserved(
+												slashed,
+												beneficiary,
+												to_change,
+												status,
+											)?;
+
+										// remain should always be zero but just to be defensive
+										// here.
+										let actual = to_change.defensive_saturating_sub(remain);
+
+										// this add can't overflow but just to be defensive.
+										reserves[index].amount =
+											reserves[index].amount.defensive_saturating_add(actual);
+
+										Ok(actual)
+									},
+									Err(index) => {
+										let remain =
+											<Self as ReservableCurrency<_>>::repatriate_reserved(
+												slashed,
+												beneficiary,
+												to_change,
+												status,
+											)?;
+
+										// remain should always be zero but just to be defensive
+										// here
+										let actual = to_change.defensive_saturating_sub(remain);
+
+										reserves
+											.try_insert(
+												index,
+												ReserveData { id: *id, amount: actual },
+											)
+											.map_err(|_| Error::<T, I>::TooManyReserves)?;
+
+										Ok(actual)
+									},
+								}
+							},
+						)?
+					} else {
+						let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(
+							slashed,
+							beneficiary,
+							to_change,
+							status,
+						)?;
+
+						// remain should always be zero but just to be defensive here
+						to_change.defensive_saturating_sub(remain)
+					};
+
+					// `actual <= to_change` and `to_change <= amount`; qed;
+					reserves[index].amount -= actual;
+
+					Ok(value - actual)
+				},
+				Err(_) => Ok(value),
+			}
+		})
+	}
+}
+
+impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
+where
+	T::Balance: MaybeSerializeDeserialize + Debug,
+{
+	type Moment = T::BlockNumber;
+
+	type MaxLocks = T::MaxLocks;
+
+	// Set or alter a lock on the balance of `who`.
+	fn set_lock(
+		id: LockIdentifier,
+		who: &T::AccountId,
+		amount: T::Balance,
+		reasons: WithdrawReasons,
+	) {
+		if reasons.is_empty() || amount.is_zero() {
+			Self::remove_lock(id, who);
+			return;
+		}
+
+		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
+		let mut locks = Self::locks(who)
+			.into_iter()
+			.filter_map(|l| if l.id == id { new_lock.take() } else { Some(l) })
+			.collect::<Vec<_>>();
+		if let Some(lock) = new_lock {
+			locks.push(lock)
+		}
+		Self::update_locks(who, &locks[..]);
+	}
+
+	// Extend a lock on the balance of `who`.
+	// Is a no-op if lock amount is zero or `reasons` `is_none()`.
+	fn extend_lock(
+		id: LockIdentifier,
+		who: &T::AccountId,
+		amount: T::Balance,
+		reasons: WithdrawReasons,
+	) {
+		if amount.is_zero() || reasons.is_empty() {
+			return;
+		}
+		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
+		let mut locks = Self::locks(who)
+			.into_iter()
+			.filter_map(|l| {
+				if l.id == id {
+					new_lock.take().map(|nl| BalanceLock {
+						id: l.id,
+						amount: l.amount.max(nl.amount),
+						reasons: l.reasons | nl.reasons,
+					})
+				} else {
+					Some(l)
+				}
+			})
+			.collect::<Vec<_>>();
+		if let Some(lock) = new_lock {
+			locks.push(lock)
+		}
+		Self::update_locks(who, &locks[..]);
+	}
+
+	fn remove_lock(id: LockIdentifier, who: &T::AccountId) {
+		let mut locks = Self::locks(who);
+		locks.retain(|l| l.id != id);
+		Self::update_locks(who, &locks[..]);
+	}
+}
diff --git a/frame/balances/src/impl_fungible.rs b/frame/balances/src/impl_fungible.rs
new file mode 100644
index 0000000..f56caec
--- /dev/null
+++ b/frame/balances/src/impl_fungible.rs
@@ -0,0 +1,358 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of `fungible` traits for Balances pallet.
+use super::*;
+use frame_support::traits::tokens::{
+	Fortitude,
+	Preservation::{self, Preserve, Protect},
+	Provenance::{self, Minted},
+};
+
+impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I> {
+	type Balance = T::Balance;
+
+	fn total_issuance() -> Self::Balance {
+		TotalIssuance::<T, I>::get()
+	}
+	fn active_issuance() -> Self::Balance {
+		TotalIssuance::<T, I>::get().saturating_sub(InactiveIssuance::<T, I>::get())
+	}
+	fn minimum_balance() -> Self::Balance {
+		T::ExistentialDeposit::get()
+	}
+	fn total_balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).total()
+	}
+	fn balance(who: &T::AccountId) -> Self::Balance {
+		Self::account(who).free
+	}
+	fn reducible_balance(
+		who: &T::AccountId,
+		preservation: Preservation,
+		force: Fortitude,
+	) -> Self::Balance {
+		let a = Self::account(who);
+		let mut untouchable = Zero::zero();
+		if force == Polite {
+			// Frozen balance applies to total. Anything on hold therefore gets discounted from the
+			// limit given by the freezes.
+			untouchable = a.frozen.saturating_sub(a.reserved);
+		}
+		// If we want to keep our provider ref..
+		if preservation == Preserve
+			// ..or we don't want the account to die and our provider ref is needed for it to live..
+			|| preservation == Protect && !a.free.is_zero() &&
+				frame_system::Pallet::<T>::providers(who) == 1
+			// ..or we don't care about the account dying but our provider ref is required..
+			|| preservation == Expendable && !a.free.is_zero() &&
+				!frame_system::Pallet::<T>::can_dec_provider(who)
+		{
+			// ..then the ED needed..
+			untouchable = untouchable.max(T::ExistentialDeposit::get());
+		}
+		// Liquid balance is what is neither on hold nor frozen/required for provider.
+		a.free.saturating_sub(untouchable)
+	}
+	fn can_deposit(
+		who: &T::AccountId,
+		amount: Self::Balance,
+		provenance: Provenance,
+	) -> DepositConsequence {
+		if amount.is_zero() {
+			return DepositConsequence::Success;
+		}
+
+		if provenance == Minted && TotalIssuance::<T, I>::get().checked_add(&amount).is_none() {
+			return DepositConsequence::Overflow;
+		}
+
+		let account = Self::account(who);
+		let new_free = match account.free.checked_add(&amount) {
+			None => return DepositConsequence::Overflow,
+			Some(x) if x < T::ExistentialDeposit::get() => return DepositConsequence::BelowMinimum,
+			Some(x) => x,
+		};
+
+		match account.reserved.checked_add(&new_free) {
+			Some(_) => {},
+			None => return DepositConsequence::Overflow,
+		};
+
+		// NOTE: We assume that we are a provider, so don't need to do any checks in the
+		// case of account creation.
+
+		DepositConsequence::Success
+	}
+	fn can_withdraw(
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance> {
+		if amount.is_zero() {
+			return WithdrawConsequence::Success;
+		}
+
+		if TotalIssuance::<T, I>::get().checked_sub(&amount).is_none() {
+			return WithdrawConsequence::Underflow;
+		}
+
+		let account = Self::account(who);
+		let new_free_balance = match account.free.checked_sub(&amount) {
+			Some(x) => x,
+			None => return WithdrawConsequence::BalanceLow,
+		};
+
+		let liquid = Self::reducible_balance(who, Expendable, Polite);
+		if amount > liquid {
+			return WithdrawConsequence::Frozen;
+		}
+
+		// Provider restriction - total account balance cannot be reduced to zero if it cannot
+		// sustain the loss of a provider reference.
+		// NOTE: This assumes that the pallet is a provider (which is true). Is this ever changes,
+		// then this will need to adapt accordingly.
+		let ed = T::ExistentialDeposit::get();
+		let success = if new_free_balance < ed {
+			if frame_system::Pallet::<T>::can_dec_provider(who) {
+				WithdrawConsequence::ReducedToZero(new_free_balance)
+			} else {
+				return WithdrawConsequence::WouldDie;
+			}
+		} else {
+			WithdrawConsequence::Success
+		};
+
+		let new_total_balance = new_free_balance.saturating_add(account.reserved);
+
+		// Eventual free funds must be no less than the frozen balance.
+		if new_total_balance < account.frozen {
+			return WithdrawConsequence::Frozen;
+		}
+
+		success
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Unbalanced<T::AccountId> for Pallet<T, I> {
+	fn handle_dust(dust: fungible::Dust<T::AccountId, Self>) {
+		T::DustRemoval::on_unbalanced(dust.into_credit());
+	}
+	fn write_balance(
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> Result<Option<Self::Balance>, DispatchError> {
+		let max_reduction =
+			<Self as fungible::Inspect<_>>::reducible_balance(who, Expendable, Force);
+		let (result, maybe_dust) = Self::mutate_account(who, |account| -> DispatchResult {
+			// Make sure the reduction (if there is one) is no more than the maximum allowed.
+			let reduction = account.free.saturating_sub(amount);
+			ensure!(reduction <= max_reduction, Error::<T, I>::InsufficientBalance);
+
+			account.free = amount;
+			Ok(())
+		})?;
+		result?;
+		Ok(maybe_dust)
+	}
+
+	fn set_total_issuance(amount: Self::Balance) {
+		TotalIssuance::<T, I>::mutate(|t| *t = amount);
+	}
+
+	fn deactivate(amount: Self::Balance) {
+		InactiveIssuance::<T, I>::mutate(|b| b.saturating_accrue(amount));
+	}
+
+	fn reactivate(amount: Self::Balance) {
+		InactiveIssuance::<T, I>::mutate(|b| b.saturating_reduce(amount));
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
+	fn done_mint_into(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Minted { who: who.clone(), amount });
+	}
+	fn done_burn_from(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Burned { who: who.clone(), amount });
+	}
+	fn done_shelve(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Suspended { who: who.clone(), amount });
+	}
+	fn done_restore(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Restored { who: who.clone(), amount });
+	}
+	fn done_transfer(source: &T::AccountId, dest: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Transfer {
+			from: source.clone(),
+			to: dest.clone(),
+			amount,
+		});
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T, I> {}
+
+impl<T: Config<I>, I: 'static> fungible::InspectHold<T::AccountId> for Pallet<T, I> {
+	type Reason = T::HoldIdentifier;
+
+	fn total_balance_on_hold(who: &T::AccountId) -> T::Balance {
+		Self::account(who).reserved
+	}
+	fn reducible_total_balance_on_hold(who: &T::AccountId, force: Fortitude) -> Self::Balance {
+		// The total balance must never drop below the freeze requirements if we're not forcing:
+		let a = Self::account(who);
+		let unavailable = if force == Force {
+			Self::Balance::zero()
+		} else {
+			// The freeze lock applies to the total balance, so we can discount the free balance
+			// from the amount which the total reserved balance must provide to satisfy it.
+			a.frozen.saturating_sub(a.free)
+		};
+		a.reserved.saturating_sub(unavailable)
+	}
+	fn balance_on_hold(reason: &Self::Reason, who: &T::AccountId) -> T::Balance {
+		Holds::<T, I>::get(who)
+			.iter()
+			.find(|x| &x.id == reason)
+			.map_or_else(Zero::zero, |x| x.amount)
+	}
+	fn hold_available(reason: &Self::Reason, who: &T::AccountId) -> bool {
+		if frame_system::Pallet::<T>::providers(who) == 0 {
+			return false;
+		}
+		let holds = Holds::<T, I>::get(who);
+		if holds.is_full() && !holds.iter().any(|x| &x.id == reason) {
+			return false;
+		}
+		true
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::UnbalancedHold<T::AccountId> for Pallet<T, I> {
+	fn set_balance_on_hold(
+		reason: &Self::Reason,
+		who: &T::AccountId,
+		amount: Self::Balance,
+	) -> DispatchResult {
+		let mut new_account = Self::account(who);
+		let mut holds = Holds::<T, I>::get(who);
+		let mut increase = true;
+		let mut delta = amount;
+
+		if let Some(item) = holds.iter_mut().find(|x| &x.id == reason) {
+			delta = item.amount.max(amount) - item.amount.min(amount);
+			increase = amount > item.amount;
+			item.amount = amount;
+			holds.retain(|x| !x.amount.is_zero());
+		} else {
+			if !amount.is_zero() {
+				holds
+					.try_push(IdAmount { id: *reason, amount })
+					.map_err(|_| Error::<T, I>::TooManyHolds)?;
+			}
+		}
+
+		new_account.reserved = if increase {
+			new_account.reserved.checked_add(&delta).ok_or(ArithmeticError::Overflow)?
+		} else {
+			new_account.reserved.checked_sub(&delta).ok_or(ArithmeticError::Underflow)?
+		};
+
+		let (result, maybe_dust) = Self::try_mutate_account(who, |a, _| -> DispatchResult {
+			*a = new_account;
+			Ok(())
+		})?;
+		debug_assert!(
+			maybe_dust.is_none(),
+			"Does not alter main balance; dust only happens when it is altered; qed"
+		);
+		Holds::<T, I>::insert(who, holds);
+		Ok(result)
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::InspectFreeze<T::AccountId> for Pallet<T, I> {
+	type Id = T::FreezeIdentifier;
+
+	fn balance_frozen(id: &Self::Id, who: &T::AccountId) -> Self::Balance {
+		let locks = Freezes::<T, I>::get(who);
+		locks.into_iter().find(|l| &l.id == id).map_or(Zero::zero(), |l| l.amount)
+	}
+
+	fn can_freeze(id: &Self::Id, who: &T::AccountId) -> bool {
+		let l = Freezes::<T, I>::get(who);
+		!l.is_full() || l.iter().any(|x| &x.id == id)
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::MutateFreeze<T::AccountId> for Pallet<T, I> {
+	fn set_freeze(id: &Self::Id, who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+		if amount.is_zero() {
+			return Self::thaw(id, who);
+		}
+		let mut locks = Freezes::<T, I>::get(who);
+		if let Some(i) = locks.iter_mut().find(|x| &x.id == id) {
+			i.amount = amount;
+		} else {
+			locks
+				.try_push(IdAmount { id: *id, amount })
+				.map_err(|_| Error::<T, I>::TooManyFreezes)?;
+		}
+		Self::update_freezes(who, locks.as_bounded_slice())
+	}
+
+	fn extend_freeze(id: &Self::Id, who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
+		if amount.is_zero() {
+			return Ok(());
+		}
+		let mut locks = Freezes::<T, I>::get(who);
+		if let Some(i) = locks.iter_mut().find(|x| &x.id == id) {
+			i.amount = i.amount.max(amount);
+		} else {
+			locks
+				.try_push(IdAmount { id: *id, amount })
+				.map_err(|_| Error::<T, I>::TooManyFreezes)?;
+		}
+		Self::update_freezes(who, locks.as_bounded_slice())
+	}
+
+	fn thaw(id: &Self::Id, who: &T::AccountId) -> DispatchResult {
+		let mut locks = Freezes::<T, I>::get(who);
+		locks.retain(|l| &l.id != id);
+		Self::update_freezes(who, locks.as_bounded_slice())
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::Balanced<T::AccountId> for Pallet<T, I> {
+	type OnDropCredit = fungible::DecreaseIssuance<T::AccountId, Self>;
+	type OnDropDebt = fungible::IncreaseIssuance<T::AccountId, Self>;
+
+	fn done_deposit(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Deposit { who: who.clone(), amount });
+	}
+	fn done_withdraw(who: &T::AccountId, amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Withdraw { who: who.clone(), amount });
+	}
+	fn done_issue(amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Issued { amount });
+	}
+	fn done_rescind(amount: Self::Balance) {
+		Self::deposit_event(Event::<T, I>::Rescinded { amount });
+	}
+}
+
+impl<T: Config<I>, I: 'static> fungible::BalancedHold<T::AccountId> for Pallet<T, I> {}
diff --git a/frame/balances/src/lib.rs b/frame/balances/src/lib.rs
index 57550a5..085f963 100644
--- a/frame/balances/src/lib.rs
+++ b/frame/balances/src/lib.rs
@@ -89,8 +89,9 @@
 //!
 //! ### Dispatchable Functions
 //!
-//! - `transfer` - Transfer some liquid free balance to another account.
-//! - `set_balance` - Set the balances of a given account. The origin of this call must be root.
+//! - `transfer_allow_death` - Transfer some liquid free balance to another account.
+//! - `force_set_balance` - Set the balances of a given account. The origin of this call must be
+//!   root.
 //!
 //! ## Usage
 //!
@@ -150,47 +151,49 @@
 //! ## Assumptions
 //!
 //! * Total issued balanced of all accounts should be less than `Config::Balance::max_value()`.
+//! * Existential Deposit is set to a value greater than zero.
+//!
+//! Note, you may find the Balances pallet still functions with an ED of zero in some circumstances,
+//! however this is not a configuration which is generally supported, nor will it be.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-
-#[macro_use]
-mod tests;
 mod benchmarking;
+mod impl_currency;
+mod impl_fungible;
 pub mod migration;
-mod tests_composite;
-mod tests_local;
-#[cfg(test)]
-mod tests_reentrancy;
+mod tests;
+mod types;
 pub mod weights;
 
-pub use self::imbalances::{NegativeImbalance, PositiveImbalance};
-use codec::{Codec, Decode, Encode, MaxEncodedLen};
+use codec::{Codec, MaxEncodedLen};
 #[cfg(feature = "std")]
 use frame_support::traits::GenesisBuild;
 use frame_support::{
 	ensure,
 	pallet_prelude::DispatchResult,
 	traits::{
-		tokens::{fungible, BalanceStatus as Status, DepositConsequence, WithdrawConsequence},
-		Currency, DefensiveSaturating, ExistenceRequirement,
-		ExistenceRequirement::{AllowDeath, KeepAlive},
-		Get, Imbalance, LockIdentifier, LockableCurrency, NamedReservableCurrency, OnUnbalanced,
-		ReservableCurrency, SignedImbalance, StoredMap, TryDrop, WithdrawReasons,
+		tokens::{
+			fungible, BalanceStatus as Status, DepositConsequence,
+			Fortitude::{self, Force, Polite},
+			Preservation::{Expendable, Preserve, Protect},
+			WithdrawConsequence,
+		},
+		Currency, Defensive, Get, OnUnbalanced, ReservableCurrency, StoredMap,
 	},
-	WeakBoundedVec,
+	BoundedSlice, WeakBoundedVec,
 };
 use frame_system as system;
+pub use impl_currency::{NegativeImbalance, PositiveImbalance};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
 use sp_runtime::{
 	traits::{
 		AtLeast32BitUnsigned, Bounded, CheckedAdd, CheckedSub, MaybeSerializeDeserialize,
 		Saturating, StaticLookup, Zero,
 	},
-	ArithmeticError, DispatchError, FixedPointOperand, RuntimeDebug,
+	ArithmeticError, DispatchError, FixedPointOperand, Perbill, RuntimeDebug, TokenError,
 };
-use sp_std::{cmp, fmt::Debug, mem, ops::BitOr, prelude::*, result};
+use sp_std::{cmp, fmt::Debug, mem, prelude::*, result};
+pub use types::{AccountData, BalanceLock, DustCleaner, IdAmount, Reasons, ReserveData};
 pub use weights::WeightInfo;
 
 pub use pallet::*;
@@ -202,11 +205,23 @@ type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::pallet_prelude::*;
+	use frame_support::{
+		pallet_prelude::*,
+		traits::{fungible::Credit, tokens::Precision},
+	};
 	use frame_system::pallet_prelude::*;
 
+	pub type CreditOf<T, I> = Credit<<T as frame_system::Config>::AccountId, Pallet<T, I>>;
+
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
+		/// The overarching event type.
+		type RuntimeEvent: From<Event<Self, I>>
+			+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
+
+		/// Weight information for extrinsics in this pallet.
+		type WeightInfo: WeightInfo;
+
 		/// The balance of an account.
 		type Balance: Parameter
 			+ Member
@@ -221,21 +236,32 @@ pub mod pallet {
 			+ FixedPointOperand;
 
 		/// Handler for the unbalanced reduction when removing a dust account.
-		type DustRemoval: OnUnbalanced<NegativeImbalance<Self, I>>;
-
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self, I>>
-			+ IsType<<Self as frame_system::Config>::RuntimeEvent>;
+		type DustRemoval: OnUnbalanced<CreditOf<Self, I>>;
 
-		/// The minimum amount required to keep an account open.
+		/// The minimum amount required to keep an account open. MUST BE GREATER THAN ZERO!
+		///
+		/// If you *really* need it to be zero, you can enable the feature `insecure_zero_ed` for
+		/// this pallet. However, you do so at your own risk: this will open up a major DoS vector.
+		/// In case you have multiple sources of provider references, you may also get unexpected
+		/// behaviour if you set this to zero.
+		///
+		/// Bottom line: Do yourself a favour and make it at least one!
 		#[pallet::constant]
 		type ExistentialDeposit: Get<Self::Balance>;
 
 		/// The means of storing the balances of an account.
 		type AccountStore: StoredMap<Self::AccountId, AccountData<Self::Balance>>;
 
-		/// Weight information for extrinsics in this pallet.
-		type WeightInfo: WeightInfo;
+		/// The ID type for reserves.
+		///
+		/// Use of reserves is deprecated in favour of holds. See `https://github.com/paritytech/substrate/pull/12951/`
+		type ReserveIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
+
+		/// The ID type for holds.
+		type HoldIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
+
+		/// The ID type for freezes.
+		type FreezeIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
 
 		/// The maximum number of locks that should exist on an account.
 		/// Not strictly enforced, but used for weight estimation.
@@ -246,8 +272,13 @@ pub mod pallet {
 		#[pallet::constant]
 		type MaxReserves: Get<u32>;
 
-		/// The id type for named reserves.
-		type ReserveIdentifier: Parameter + Member + MaxEncodedLen + Ord + Copy;
+		/// The maximum number of holds that can exist on an account at any time.
+		#[pallet::constant]
+		type MaxHolds: Get<u32>;
+
+		/// The maximum number of individual freeze locks that can exist on an account at any time.
+		#[pallet::constant]
+		type MaxFreezes: Get<u32>;
 	}
 
 	/// The current storage version.
@@ -255,7 +286,6 @@ pub mod pallet {
 		frame_support::traits::StorageVersion::new(1);
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	#[pallet::storage_version(STORAGE_VERSION)]
 	pub struct Pallet<T, I = ()>(PhantomData<(T, I)>);
 
@@ -267,7 +297,7 @@ pub mod pallet {
 		type Call = Call<T>;
 
 		fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
-			if let Call::set_free_balance { who, new_free, magic_number } = call {
+			if let Call::force_set_balance { who, new_free } = call {
 				match source {
 					TransactionSource::Local | TransactionSource::InBlock => {
 						ValidTransaction::with_tag_prefix("BalancesOperations")
@@ -279,7 +309,7 @@ pub mod pallet {
 							// set_free_balance call if reciever and amount is the same,
 							// so recording unsigned extrinsic index each time and use it as an
 							// identifier.
-							.and_provides((who, new_free, magic_number))
+							.and_provides((who, new_free))
 							.propagate(true)
 							.build()
 					},
@@ -292,92 +322,303 @@ pub mod pallet {
 
 		fn pre_dispatch(call: &Self::Call) -> Result<(), TransactionValidityError> {
 			match call {
-				Call::set_free_balance { .. } => Ok(()),
+				Call::force_set_balance { .. } => Ok(()),
 				_ => Err(InvalidTransaction::Call.into()),
 			}
 		}
 	}
 
-	#[pallet::call]
+	#[pallet::event]
+	#[pallet::generate_deposit(pub(super) fn deposit_event)]
+	pub enum Event<T: Config<I>, I: 'static = ()> {
+		/// An account was created with some free balance.
+		Endowed { account: T::AccountId, free_balance: T::Balance },
+		/// An account was removed whose balance was non-zero but below ExistentialDeposit,
+		/// resulting in an outright loss.
+		DustLost { account: T::AccountId, amount: T::Balance },
+		/// Transfer succeeded.
+		Transfer { from: T::AccountId, to: T::AccountId, amount: T::Balance },
+		/// A balance was set by root.
+		BalanceSet { who: T::AccountId, free: T::Balance },
+		/// Some balance was reserved (moved from free to reserved).
+		Reserved { who: T::AccountId, amount: T::Balance },
+		/// Some balance was unreserved (moved from reserved to free).
+		Unreserved { who: T::AccountId, amount: T::Balance },
+		/// Some balance was moved from the reserve of the first account to the second account.
+		/// Final argument indicates the destination balance type.
+		ReserveRepatriated {
+			from: T::AccountId,
+			to: T::AccountId,
+			amount: T::Balance,
+			destination_status: Status,
+		},
+		/// Some amount was deposited (e.g. for transaction fees).
+		Deposit { who: T::AccountId, amount: T::Balance },
+		/// Some amount was withdrawn from the account (e.g. for transaction fees).
+		Withdraw { who: T::AccountId, amount: T::Balance },
+		/// Some amount was removed from the account (e.g. for misbehavior).
+		Slashed { who: T::AccountId, amount: T::Balance },
+		/// Some amount was minted into an account.
+		Minted { who: T::AccountId, amount: T::Balance },
+		/// Some amount was burned from an account.
+		Burned { who: T::AccountId, amount: T::Balance },
+		/// Some amount was suspended from an account (it can be restored later).
+		Suspended { who: T::AccountId, amount: T::Balance },
+		/// Some amount was restored into an account.
+		Restored { who: T::AccountId, amount: T::Balance },
+		/// An account was upgraded.
+		Upgraded { who: T::AccountId },
+		/// Total issuance was increased by `amount`, creating a credit to be balanced.
+		Issued { amount: T::Balance },
+		/// Total issuance was decreased by `amount`, creating a debt to be balanced.
+		Rescinded { amount: T::Balance },
+		/// Some balance was locked.
+		Locked { who: T::AccountId, amount: T::Balance },
+		/// Some balance was unlocked.
+		Unlocked { who: T::AccountId, amount: T::Balance },
+		/// Some balance was frozen.
+		Frozen { who: T::AccountId, amount: T::Balance },
+		/// Some balance was thawed.
+		Thawed { who: T::AccountId, amount: T::Balance },
+	}
+
+	#[pallet::error]
+	pub enum Error<T, I = ()> {
+		/// Vesting balance too high to send value.
+		VestingBalance,
+		/// Account liquidity restrictions prevent withdrawal.
+		LiquidityRestrictions,
+		/// Balance too low to send value.
+		InsufficientBalance,
+		/// Value too low to create account due to existential deposit.
+		ExistentialDeposit,
+		/// Transfer/payment would kill account.
+		Expendability,
+		/// A vesting schedule already exists for this account.
+		ExistingVestingSchedule,
+		/// Beneficiary account must pre-exist.
+		DeadAccount,
+		/// Number of named reserves exceed `MaxReserves`.
+		TooManyReserves,
+		/// Number of holds exceed `MaxHolds`.
+		TooManyHolds,
+		/// Number of freezes exceed `MaxFreezes`.
+		TooManyFreezes,
+	}
+
+	/// The total units issued in the system.
+	#[pallet::storage]
+	#[pallet::getter(fn total_issuance)]
+	#[pallet::whitelist_storage]
+	pub type TotalIssuance<T: Config<I>, I: 'static = ()> = StorageValue<_, T::Balance, ValueQuery>;
+
+	/// The total units of outstanding deactivated balance in the system.
+	#[pallet::storage]
+	#[pallet::getter(fn inactive_issuance)]
+	#[pallet::whitelist_storage]
+	pub type InactiveIssuance<T: Config<I>, I: 'static = ()> =
+		StorageValue<_, T::Balance, ValueQuery>;
+
+	/// The Balances pallet example of storing the balance of an account.
+	///
+	/// # Example
+	///
+	/// ```nocompile
+	///  impl pallet_balances::Config for Runtime {
+	///    type AccountStore = StorageMapShim<Self::Account<Runtime>, frame_system::Provider<Runtime>, AccountId, Self::AccountData<Balance>>
+	///  }
+	/// ```
+	///
+	/// You can also store the balance of an account in the `System` pallet.
+	///
+	/// # Example
+	///
+	/// ```nocompile
+	///  impl pallet_balances::Config for Runtime {
+	///   type AccountStore = System
+	///  }
+	/// ```
+	///
+	/// But this comes with tradeoffs, storing account balances in the system pallet stores
+	/// `frame_system` data alongside the account data contrary to storing account balances in the
+	/// `Balances` pallet, which uses a `StorageMap` to store balances data only.
+	/// NOTE: This is only used in the case that this pallet is used to store balances.
+	#[pallet::storage]
+	pub type Account<T: Config<I>, I: 'static = ()> =
+		StorageMap<_, Blake2_128Concat, T::AccountId, AccountData<T::Balance>, ValueQuery>;
+
+	/// Any liquidity locks on some account balances.
+	/// NOTE: Should only be accessed when setting, changing and freeing a lock.
+	#[pallet::storage]
+	#[pallet::getter(fn locks)]
+	pub type Locks<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		WeakBoundedVec<BalanceLock<T::Balance>, T::MaxLocks>,
+		ValueQuery,
+	>;
+
+	/// Named reserves on some account balances.
+	#[pallet::storage]
+	#[pallet::getter(fn reserves)]
+	pub type Reserves<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		BoundedVec<ReserveData<T::ReserveIdentifier, T::Balance>, T::MaxReserves>,
+		ValueQuery,
+	>;
+
+	/// Holds on account balances.
+	#[pallet::storage]
+	pub type Holds<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		BoundedVec<IdAmount<T::HoldIdentifier, T::Balance>, T::MaxHolds>,
+		ValueQuery,
+	>;
+
+	/// Freeze locks on account balances.
+	#[pallet::storage]
+	pub type Freezes<T: Config<I>, I: 'static = ()> = StorageMap<
+		_,
+		Blake2_128Concat,
+		T::AccountId,
+		BoundedVec<IdAmount<T::FreezeIdentifier, T::Balance>, T::MaxFreezes>,
+		ValueQuery,
+	>;
+
+	#[pallet::genesis_config]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		pub balances: Vec<(T::AccountId, T::Balance)>,
+	}
+
+	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
+		fn default() -> Self {
+			Self { balances: Default::default() }
+		}
+	}
+
+	#[pallet::genesis_build]
+	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+		fn build(&self) {
+			let total = self.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n);
+
+			<TotalIssuance<T, I>>::put(total);
+
+			for (_, balance) in &self.balances {
+				assert!(
+					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
+					"the balance of any account should always be at least the existential deposit.",
+				)
+			}
+
+			// ensure no duplicates exist.
+			let endowed_accounts = self
+				.balances
+				.iter()
+				.map(|(x, _)| x)
+				.cloned()
+				.collect::<sp_std::collections::btree_set::BTreeSet<_>>();
+
+			assert!(
+				endowed_accounts.len() == self.balances.len(),
+				"duplicate balances in genesis."
+			);
+
+			for &(ref who, free) in self.balances.iter() {
+				frame_system::Pallet::<T>::inc_providers(who);
+				assert!(T::AccountStore::insert(who, AccountData { free, ..Default::default() })
+					.is_ok());
+			}
+		}
+	}
+
+	#[cfg(feature = "std")]
+	impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
+		/// Direct implementation of `GenesisBuild::build_storage`.
+		///
+		/// Kept in order not to break dependency.
+		pub fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
+			<Self as GenesisBuild<T, I>>::build_storage(self)
+		}
+
+		/// Direct implementation of `GenesisBuild::assimilate_storage`.
+		///
+		/// Kept in order not to break dependency.
+		pub fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
+			<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
+		}
+	}
+
+	#[pallet::hooks]
+	impl<T: Config<I>, I: 'static> Hooks<T::BlockNumber> for Pallet<T, I> {
+		#[cfg(not(feature = "insecure_zero_ed"))]
+		fn integrity_test() {
+			assert!(
+				!<T as Config<I>>::ExistentialDeposit::get().is_zero(),
+				"The existential deposit must be greater than zero!"
+			);
+		}
+	}
+
+	#[pallet::call(weight(<T as Config<I>>::WeightInfo))]
 	impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		/// Transfer some liquid free balance to another account.
 		///
-		/// `transfer` will set the `FreeBalance` of the sender and receiver.
+		/// `transfer_allow_death` will set the `FreeBalance` of the sender and receiver.
 		/// If the sender's account is below the existential deposit as a result
 		/// of the transfer, the account will be reaped.
 		///
 		/// The dispatch origin for this call must be `Signed` by the transactor.
-		///
-		/// ## Complexity
-		/// - Dependent on arguments but not critical, given proper implementations for input config
-		///   types. See related functions below.
-		/// - It contains a limited number of reads and writes internally and no complex
-		///   computation.
-		///
-		/// Related functions:
-		///
-		///   - `ensure_can_withdraw` is always called internally but has a bounded complexity.
-		///   - Transferring balances to accounts that did not exist before will cause
-		///     `T::OnNewAccount::on_new_account` to be called.
-		///   - Removing enough funds from an account will trigger `T::DustRemoval::on_unbalanced`.
-		///   - `transfer_keep_alive` works the same way as `transfer`, but has an additional check
-		///     that the transfer will not kill the origin account.
 		#[pallet::call_index(0)]
-		#[pallet::weight(T::WeightInfo::transfer())]
-		pub fn transfer(
+		pub fn transfer_allow_death(
 			origin: OriginFor<T>,
 			dest: AccountIdLookupOf<T>,
 			#[pallet::compact] value: T::Balance,
 		) -> DispatchResultWithPostInfo {
-			let transactor = ensure_signed(origin)?;
+			let source = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(
-				&transactor,
-				&dest,
-				value,
-				ExistenceRequirement::AllowDeath,
-			)?;
+			<Self as fungible::Mutate<_>>::transfer(&source, &dest, value, Expendable)?;
 			Ok(().into())
 		}
 
-		/// Set the balances of a given account.
-		///
-		/// This will alter `FreeBalance` and `ReservedBalance` in storage. it will
-		/// also alter the total issuance of the system (`TotalIssuance`) appropriately.
-		/// If the new free or reserved balance is below the existential deposit,
-		/// it will reset the account nonce (`frame_system::AccountNonce`).
+		/// Set the regular balance of a given account; it also takes a reserved balance but this
+		/// must be the same as the account's current reserved balance.
 		///
 		/// The dispatch origin for this call is `root`.
+		///
+		/// WARNING: This call is DEPRECATED! Use `force_set_balance` instead.
 		#[pallet::call_index(1)]
 		#[pallet::weight(
-			T::WeightInfo::set_balance_creating() // Creates a new account.
-				.max(T::WeightInfo::set_balance_killing()) // Kills an existing account.
+			T::WeightInfo::force_set_balance_creating() // Creates a new account.
+				.max(T::WeightInfo::force_set_balance_killing()) // Kills an existing account.
 		)]
-		pub fn set_balance(
+		pub fn set_balance_deprecated(
 			origin: OriginFor<T>,
 			who: AccountIdLookupOf<T>,
 			#[pallet::compact] new_free: T::Balance,
-			#[pallet::compact] new_reserved: T::Balance,
+			#[pallet::compact] old_reserved: T::Balance,
 		) -> DispatchResultWithPostInfo {
-			// Converted from `ensure_root` to `ensure_none` for local development purposes.
 			ensure_root(origin)?;
 			let who = T::Lookup::lookup(who)?;
-			let existential_deposit = T::ExistentialDeposit::get();
+			let existential_deposit = Self::ed();
 
-			let wipeout = new_free + new_reserved < existential_deposit;
+			let wipeout = new_free < existential_deposit;
 			let new_free = if wipeout { Zero::zero() } else { new_free };
-			let new_reserved = if wipeout { Zero::zero() } else { new_reserved };
 
 			// First we try to modify the account's balance to the forced balance.
-			let (old_free, old_reserved) = Self::mutate_account(&who, |account| {
-				let old_free = account.free;
-				let old_reserved = account.reserved;
-
-				account.free = new_free;
-				account.reserved = new_reserved;
-
-				(old_free, old_reserved)
-			})?;
+			let old_free = Self::try_mutate_account_handling_dust(
+				&who,
+				|account, _is_new| -> Result<T::Balance, DispatchError> {
+					let old_free = account.free;
+					ensure!(account.reserved == old_reserved, TokenError::Unsupported);
+					account.free = new_free;
+					Ok(old_free)
+				},
+			)?;
 
 			// This will adjust the total issuance, which was not done by the `mutate_account`
 			// above.
@@ -387,13 +628,7 @@ pub mod pallet {
 				mem::drop(NegativeImbalance::<T, I>::new(old_free - new_free));
 			}
 
-			if new_reserved > old_reserved {
-				mem::drop(PositiveImbalance::<T, I>::new(new_reserved - old_reserved));
-			} else if new_reserved < old_reserved {
-				mem::drop(NegativeImbalance::<T, I>::new(old_reserved - new_reserved));
-			}
-
-			Self::deposit_event(Event::BalanceSet { who, free: new_free, reserved: new_reserved });
+			Self::deposit_event(Event::BalanceSet { who, free: new_free });
 			Ok(().into())
 		}
 
@@ -410,8 +645,8 @@ pub mod pallet {
 		/// The dispatch origin for this call is `root`.
 		#[pallet::call_index(2)]
 		#[pallet::weight(
-			T::WeightInfo::set_balance_creating() // Creates a new account.
-				.max(T::WeightInfo::set_balance_killing()) // Kills an existing account.
+			T::WeightInfo::force_set_balance_creating() // Creates a new account.
+				.max(T::WeightInfo::force_set_balance_killing()) // Kills an existing account.
 		)]
 		pub fn set_free_balance(
 			origin: OriginFor<T>,
@@ -438,15 +673,15 @@ pub mod pallet {
 
 			// First we try to modify the account's balance to the forced balance.
 			let (old_free, old_reserved, new_free, new_reserved) =
-				Self::mutate_account(&who, |account| {
+				Self::mutate_account_handling_dust(&who, |account| {
 					let old_free = account.free;
 					let old_reserved = account.reserved;
 
-					let wipeout = new_free + account.reserved < existential_deposit;
+					let wipeout = new_free < existential_deposit;
 
 					let new_free = if wipeout { Zero::zero() } else { new_free };
 					// No change on reserved_balance unless account is wiped out.
-					let new_reserved = if wipeout { Zero::zero() } else { account.reserved };
+					let new_reserved = if wipeout { Zero::zero() } else { old_reserved };
 
 					account.free = new_free;
 					account.reserved = new_reserved;
@@ -468,17 +703,13 @@ pub mod pallet {
 				mem::drop(NegativeImbalance::<T, I>::new(old_reserved - new_reserved));
 			}
 
-			Self::deposit_event(Event::BalanceSet { who, free: new_free, reserved: new_reserved });
+			Self::deposit_event(Event::BalanceSet { who, free: new_free });
 			Ok(().into())
 		}
 
-		/// Exactly as `transfer`, except the origin must be root and the source account may be
-		/// specified.
-		/// ## Complexity
-		/// - Same as transfer, but additional read and write because the source account is not
-		///   assumed to be in the overlay.
+		/// Exactly as `transfer_allow_death`, except the origin must be root and the source account
+		/// may be specified.
 		#[pallet::call_index(3)]
-		#[pallet::weight(T::WeightInfo::force_transfer())]
 		pub fn force_transfer(
 			origin: OriginFor<T>,
 			source: AccountIdLookupOf<T>,
@@ -488,31 +719,25 @@ pub mod pallet {
 			ensure_root(origin)?;
 			let source = T::Lookup::lookup(source)?;
 			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(
-				&source,
-				&dest,
-				value,
-				ExistenceRequirement::AllowDeath,
-			)?;
+			<Self as fungible::Mutate<_>>::transfer(&source, &dest, value, Expendable)?;
 			Ok(().into())
 		}
 
-		/// Same as the [`transfer`] call, but with a check that the transfer will not kill the
-		/// origin account.
+		/// Same as the [`transfer_allow_death`] call, but with a check that the transfer will not
+		/// kill the origin account.
 		///
-		/// 99% of the time you want [`transfer`] instead.
+		/// 99% of the time you want [`transfer_allow_death`] instead.
 		///
-		/// [`transfer`]: struct.Pallet.html#method.transfer
+		/// [`transfer_allow_death`]: struct.Pallet.html#method.transfer
 		#[pallet::call_index(4)]
-		#[pallet::weight(T::WeightInfo::transfer_keep_alive())]
 		pub fn transfer_keep_alive(
 			origin: OriginFor<T>,
 			dest: AccountIdLookupOf<T>,
 			#[pallet::compact] value: T::Balance,
 		) -> DispatchResultWithPostInfo {
-			let transactor = ensure_signed(origin)?;
+			let source = ensure_signed(origin)?;
 			let dest = T::Lookup::lookup(dest)?;
-			<Self as Currency<_>>::transfer(&transactor, &dest, value, KeepAlive)?;
+			<Self as fungible::Mutate<_>>::transfer(&source, &dest, value, Preserve)?;
 			Ok(().into())
 		}
 
@@ -530,21 +755,27 @@ pub mod pallet {
 		/// - `keep_alive`: A boolean to determine if the `transfer_all` operation should send all
 		///   of the funds the account has, causing the sender account to be killed (false), or
 		///   transfer everything except at least the existential deposit, which will guarantee to
-		///   keep the sender account alive (true). ## Complexity
-		/// - O(1). Just like transfer, but reading the user's transferable balance first.
+		///   keep the sender account alive (true).
 		#[pallet::call_index(5)]
-		#[pallet::weight(T::WeightInfo::transfer_all())]
 		pub fn transfer_all(
 			origin: OriginFor<T>,
 			dest: AccountIdLookupOf<T>,
 			keep_alive: bool,
 		) -> DispatchResult {
-			use fungible::Inspect;
 			let transactor = ensure_signed(origin)?;
-			let reducible_balance = Self::reducible_balance(&transactor, keep_alive);
+			let keep_alive = if keep_alive { Preserve } else { Expendable };
+			let reducible_balance = <Self as fungible::Inspect<_>>::reducible_balance(
+				&transactor,
+				keep_alive,
+				Fortitude::Polite,
+			);
 			let dest = T::Lookup::lookup(dest)?;
-			let keep_alive = if keep_alive { KeepAlive } else { AllowDeath };
-			<Self as Currency<_>>::transfer(&transactor, &dest, reducible_balance, keep_alive)?;
+			<Self as fungible::Mutate<_>>::transfer(
+				&transactor,
+				&dest,
+				reducible_balance,
+				keep_alive,
+			)?;
 			Ok(())
 		}
 
@@ -552,7 +783,6 @@ pub mod pallet {
 		///
 		/// Can only be called by ROOT.
 		#[pallet::call_index(6)]
-		#[pallet::weight(T::WeightInfo::force_unreserve())]
 		pub fn force_unreserve(
 			origin: OriginFor<T>,
 			who: AccountIdLookupOf<T>,
@@ -563,1760 +793,510 @@ pub mod pallet {
 			let _leftover = <Self as ReservableCurrency<_>>::unreserve(&who, amount);
 			Ok(())
 		}
-	}
 
-	#[pallet::event]
-	#[pallet::generate_deposit(pub(super) fn deposit_event)]
-	pub enum Event<T: Config<I>, I: 'static = ()> {
-		/// An account was created with some free balance.
-		Endowed { account: T::AccountId, free_balance: T::Balance },
-		/// An account was removed whose balance was non-zero but below ExistentialDeposit,
-		/// resulting in an outright loss.
-		DustLost { account: T::AccountId, amount: T::Balance },
-		/// Transfer succeeded.
-		Transfer { from: T::AccountId, to: T::AccountId, amount: T::Balance },
-		/// A balance was set by root.
-		BalanceSet { who: T::AccountId, free: T::Balance, reserved: T::Balance },
-		/// Some balance was reserved (moved from free to reserved).
-		Reserved { who: T::AccountId, amount: T::Balance },
-		/// Some balance was unreserved (moved from reserved to free).
-		Unreserved { who: T::AccountId, amount: T::Balance },
-		/// Some balance was moved from the reserve of the first account to the second account.
-		/// Final argument indicates the destination balance type.
-		ReserveRepatriated {
-			from: T::AccountId,
-			to: T::AccountId,
-			amount: T::Balance,
-			destination_status: Status,
-		},
-		/// Some amount was deposited (e.g. for transaction fees).
-		Deposit { who: T::AccountId, amount: T::Balance },
-		/// Some amount was withdrawn from the account (e.g. for transaction fees).
-		Withdraw { who: T::AccountId, amount: T::Balance },
-		/// Some amount was removed from the account (e.g. for misbehavior).
-		Slashed { who: T::AccountId, amount: T::Balance },
-	}
-
-	#[pallet::error]
-	pub enum Error<T, I = ()> {
-		/// Vesting balance too high to send value
-		VestingBalance,
-		/// Account liquidity restrictions prevent withdrawal
-		LiquidityRestrictions,
-		/// Balance too low to send value.
-		InsufficientBalance,
-		/// Value too low to create account due to existential deposit
-		ExistentialDeposit,
-		/// Transfer/payment would kill account
-		KeepAlive,
-		/// A vesting schedule already exists for this account
-		ExistingVestingSchedule,
-		/// Beneficiary account must pre-exist
-		DeadAccount,
-		/// Number of named reserves exceed MaxReserves
-		TooManyReserves,
-	}
-
-	/// The total units issued in the system.
-	#[pallet::storage]
-	#[pallet::getter(fn total_issuance)]
-	#[pallet::whitelist_storage]
-	pub type TotalIssuance<T: Config<I>, I: 'static = ()> = StorageValue<_, T::Balance, ValueQuery>;
-
-	/// The total units of outstanding deactivated balance in the system.
-	#[pallet::storage]
-	#[pallet::getter(fn inactive_issuance)]
-	#[pallet::whitelist_storage]
-	pub type InactiveIssuance<T: Config<I>, I: 'static = ()> =
-		StorageValue<_, T::Balance, ValueQuery>;
-
-	/// The Balances pallet example of storing the balance of an account.
-	///
-	/// # Example
-	///
-	/// ```nocompile
-	///  impl pallet_balances::Config for Runtime {
-	///    type AccountStore = StorageMapShim<Self::Account<Runtime>, frame_system::Provider<Runtime>, AccountId, Self::AccountData<Balance>>
-	///  }
-	/// ```
-	///
-	/// You can also store the balance of an account in the `System` pallet.
-	///
-	/// # Example
-	///
-	/// ```nocompile
-	///  impl pallet_balances::Config for Runtime {
-	///   type AccountStore = System
-	///  }
-	/// ```
-	///
-	/// But this comes with tradeoffs, storing account balances in the system pallet stores
-	/// `frame_system` data alongside the account data contrary to storing account balances in the
-	/// `Balances` pallet, which uses a `StorageMap` to store balances data only.
-	/// NOTE: This is only used in the case that this pallet is used to store balances.
-	#[pallet::storage]
-	pub type Account<T: Config<I>, I: 'static = ()> =
-		StorageMap<_, Blake2_128Concat, T::AccountId, AccountData<T::Balance>, ValueQuery>;
-
-	/// Any liquidity locks on some account balances.
-	/// NOTE: Should only be accessed when setting, changing and freeing a lock.
-	#[pallet::storage]
-	#[pallet::getter(fn locks)]
-	pub type Locks<T: Config<I>, I: 'static = ()> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AccountId,
-		WeakBoundedVec<BalanceLock<T::Balance>, T::MaxLocks>,
-		ValueQuery,
-	>;
-
-	/// Named reserves on some account balances.
-	#[pallet::storage]
-	#[pallet::getter(fn reserves)]
-	pub type Reserves<T: Config<I>, I: 'static = ()> = StorageMap<
-		_,
-		Blake2_128Concat,
-		T::AccountId,
-		BoundedVec<ReserveData<T::ReserveIdentifier, T::Balance>, T::MaxReserves>,
-		ValueQuery,
-	>;
-
-	#[pallet::genesis_config]
-	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
-		pub balances: Vec<(T::AccountId, T::Balance)>,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
-		fn default() -> Self {
-			Self { balances: Default::default() }
-		}
-	}
-
-	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
-		fn build(&self) {
-			let total = self.balances.iter().fold(Zero::zero(), |acc: T::Balance, &(_, n)| acc + n);
-			<TotalIssuance<T, I>>::put(total);
-
-			for (_, balance) in &self.balances {
-				assert!(
-					*balance >= <T as Config<I>>::ExistentialDeposit::get(),
-					"the balance of any account should always be at least the existential deposit.",
-				)
-			}
-
-			// ensure no duplicates exist.
-			let endowed_accounts = self
-				.balances
-				.iter()
-				.map(|(x, _)| x)
-				.cloned()
-				.collect::<std::collections::BTreeSet<_>>();
-
-			assert!(
-				endowed_accounts.len() == self.balances.len(),
-				"duplicate balances in genesis."
-			);
-
-			for &(ref who, free) in self.balances.iter() {
-				assert!(T::AccountStore::insert(who, AccountData { free, ..Default::default() })
-					.is_ok());
-			}
-		}
-	}
-}
-
-#[cfg(feature = "std")]
-impl<T: Config<I>, I: 'static> GenesisConfig<T, I> {
-	/// Direct implementation of `GenesisBuild::build_storage`.
-	///
-	/// Kept in order not to break dependency.
-	pub fn build_storage(&self) -> Result<sp_runtime::Storage, String> {
-		<Self as GenesisBuild<T, I>>::build_storage(self)
-	}
-
-	/// Direct implementation of `GenesisBuild::assimilate_storage`.
-	///
-	/// Kept in order not to break dependency.
-	pub fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> Result<(), String> {
-		<Self as GenesisBuild<T, I>>::assimilate_storage(self, storage)
-	}
-}
-
-/// Simplified reasons for withdrawing balance.
-#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-pub enum Reasons {
-	/// Paying system transaction fees.
-	Fee = 0,
-	/// Any reason other than paying system transaction fees.
-	Misc = 1,
-	/// Any reason at all.
-	All = 2,
-}
-
-impl From<WithdrawReasons> for Reasons {
-	fn from(r: WithdrawReasons) -> Reasons {
-		if r == WithdrawReasons::TRANSACTION_PAYMENT {
-			Reasons::Fee
-		} else if r.contains(WithdrawReasons::TRANSACTION_PAYMENT) {
-			Reasons::All
-		} else {
-			Reasons::Misc
-		}
-	}
-}
-
-impl BitOr for Reasons {
-	type Output = Reasons;
-	fn bitor(self, other: Reasons) -> Reasons {
-		if self == other {
-			return self
-		}
-		Reasons::All
-	}
-}
-
-/// A single lock on a balance. There can be many of these on an account and they "overlap", so the
-/// same balance is frozen by multiple locks.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-pub struct BalanceLock<Balance> {
-	/// An identifier for this lock. Only one lock may be in existence for each identifier.
-	pub id: LockIdentifier,
-	/// The amount which the free balance may not drop below when this lock is in effect.
-	pub amount: Balance,
-	/// If true, then the lock remains in effect even for payment of transaction fees.
-	pub reasons: Reasons,
-}
-
-/// Store named reserved balance.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-pub struct ReserveData<ReserveIdentifier, Balance> {
-	/// The identifier for the named reserve.
-	pub id: ReserveIdentifier,
-	/// The amount of the named reserve.
-	pub amount: Balance,
-}
-
-/// All balance information for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub struct AccountData<Balance> {
-	/// Non-reserved part of the balance. There may still be restrictions on this, but it is the
-	/// total pool what may in principle be transferred, reserved and used for tipping.
-	///
-	/// This is the only balance that matters in terms of most operations on tokens. It
-	/// alone is used to determine the balance when in the contract execution environment.
-	pub free: Balance,
-	/// Balance which is reserved and may not be used at all.
-	///
-	/// This can still get slashed, but gets slashed last of all.
-	///
-	/// This balance is a 'reserve' balance that other subsystems use in order to set aside tokens
-	/// that are still 'owned' by the account holder, but which are suspendable.
-	/// This includes named reserve and unnamed reserve.
-	pub reserved: Balance,
-	/// The amount that `free` may not drop below when withdrawing for *anything except transaction
-	/// fee payment*.
-	pub misc_frozen: Balance,
-	/// The amount that `free` may not drop below when withdrawing specifically for transaction
-	/// fee payment.
-	pub fee_frozen: Balance,
-}
-
-impl<Balance: Saturating + Copy + Ord> AccountData<Balance> {
-	/// How much this account's balance can be reduced for the given `reasons`.
-	fn usable(&self, reasons: Reasons) -> Balance {
-		self.free.saturating_sub(self.frozen(reasons))
-	}
-	/// The amount that this account's free balance may not be reduced beyond for the given
-	/// `reasons`.
-	fn frozen(&self, reasons: Reasons) -> Balance {
-		match reasons {
-			Reasons::All => self.misc_frozen.max(self.fee_frozen),
-			Reasons::Misc => self.misc_frozen,
-			Reasons::Fee => self.fee_frozen,
-		}
-	}
-	/// The total balance in this account including any that is reserved and ignoring any frozen.
-	fn total(&self) -> Balance {
-		self.free.saturating_add(self.reserved)
-	}
-}
-
-pub struct DustCleaner<T: Config<I>, I: 'static = ()>(
-	Option<(T::AccountId, NegativeImbalance<T, I>)>,
-);
-
-impl<T: Config<I>, I: 'static> Drop for DustCleaner<T, I> {
-	fn drop(&mut self) {
-		if let Some((who, dust)) = self.0.take() {
-			Pallet::<T, I>::deposit_event(Event::DustLost { account: who, amount: dust.peek() });
-			T::DustRemoval::on_unbalanced(dust);
-		}
-	}
-}
-
-impl<T: Config<I>, I: 'static> Pallet<T, I> {
-	/// Get the free balance of an account.
-	pub fn free_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Self::account(who.borrow()).free
-	}
-
-	/// Get the balance of an account that can be used for transfers, reservations, or any other
-	/// non-locking, non-transaction-fee activity. Will be at most `free_balance`.
-	pub fn usable_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Self::account(who.borrow()).usable(Reasons::Misc)
-	}
-
-	/// Get the balance of an account that can be used for paying transaction fees (not tipping,
-	/// or any other kind of fees, though). Will be at most `free_balance`.
-	pub fn usable_balance_for_fees(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Self::account(who.borrow()).usable(Reasons::Fee)
-	}
-
-	/// Get the reserved balance of an account.
-	pub fn reserved_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
-		Self::account(who.borrow()).reserved
-	}
-
-	/// Get both the free and reserved balances of an account.
-	/// Converted from private to public function.
-	pub fn account(who: &T::AccountId) -> AccountData<T::Balance> {
-		T::AccountStore::get(who)
-	}
-
-	/// Handles any steps needed after mutating an account.
-	///
-	/// This includes DustRemoval unbalancing, in the case than the `new` account's total balance
-	/// is non-zero but below ED.
-	///
-	/// Returns two values:
-	/// - `Some` containing the the `new` account, iff the account has sufficient balance.
-	/// - `Some` containing the dust to be dropped, iff some dust should be dropped.
-	fn post_mutation(
-		_who: &T::AccountId,
-		new: AccountData<T::Balance>,
-	) -> (Option<AccountData<T::Balance>>, Option<NegativeImbalance<T, I>>) {
-		let total = new.total();
-		if total < T::ExistentialDeposit::get() {
-			if total.is_zero() {
-				(None, None)
-			} else {
-				(None, Some(NegativeImbalance::new(total)))
-			}
-		} else {
-			(Some(new), None)
-		}
-	}
-
-	fn deposit_consequence(
-		_who: &T::AccountId,
-		amount: T::Balance,
-		account: &AccountData<T::Balance>,
-		mint: bool,
-	) -> DepositConsequence {
-		if amount.is_zero() {
-			return DepositConsequence::Success
-		}
-
-		if mint && TotalIssuance::<T, I>::get().checked_add(&amount).is_none() {
-			return DepositConsequence::Overflow
-		}
-
-		let new_total_balance = match account.total().checked_add(&amount) {
-			Some(x) => x,
-			None => return DepositConsequence::Overflow,
-		};
-
-		if new_total_balance < T::ExistentialDeposit::get() {
-			return DepositConsequence::BelowMinimum
-		}
-
-		// NOTE: We assume that we are a provider, so don't need to do any checks in the
-		// case of account creation.
-
-		DepositConsequence::Success
-	}
-
-	fn withdraw_consequence(
-		who: &T::AccountId,
-		amount: T::Balance,
-		account: &AccountData<T::Balance>,
-	) -> WithdrawConsequence<T::Balance> {
-		if amount.is_zero() {
-			return WithdrawConsequence::Success
-		}
-
-		if TotalIssuance::<T, I>::get().checked_sub(&amount).is_none() {
-			return WithdrawConsequence::Underflow
-		}
-
-		let new_total_balance = match account.total().checked_sub(&amount) {
-			Some(x) => x,
-			None => return WithdrawConsequence::NoFunds,
-		};
-
-		// Provider restriction - total account balance cannot be reduced to zero if it cannot
-		// sustain the loss of a provider reference.
-		// NOTE: This assumes that the pallet is a provider (which is true). Is this ever changes,
-		// then this will need to adapt accordingly.
-		let ed = T::ExistentialDeposit::get();
-		let success = if new_total_balance < ed {
-			if frame_system::Pallet::<T>::can_dec_provider(who) {
-				WithdrawConsequence::ReducedToZero(new_total_balance)
-			} else {
-				return WithdrawConsequence::WouldDie
-			}
-		} else {
-			WithdrawConsequence::Success
-		};
-
-		// Enough free funds to have them be reduced.
-		let new_free_balance = match account.free.checked_sub(&amount) {
-			Some(b) => b,
-			None => return WithdrawConsequence::NoFunds,
-		};
-
-		// Eventual free funds must be no less than the frozen balance.
-		let min_balance = account.frozen(Reasons::All);
-		if new_free_balance < min_balance {
-			return WithdrawConsequence::Frozen
-		}
-
-		success
-	}
-
-	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
-	/// `ExistentialDeposit` law, annulling the account as needed.
-	///
-	/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
-	/// when it is known that the account already exists.
-	///
-	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
-	/// the caller will do this.
-	pub fn mutate_account<R>(
-		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>) -> R,
-	) -> Result<R, DispatchError> {
-		Self::try_mutate_account(who, |a, _| -> Result<R, DispatchError> { Ok(f(a)) })
-	}
-
-	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
-	/// `ExistentialDeposit` law, annulling the account as needed. This will do nothing if the
-	/// result of `f` is an `Err`.
-	///
-	/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
-	/// when it is known that the account already exists.
-	///
-	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
-	/// the caller will do this.
-	fn try_mutate_account<R, E: From<DispatchError>>(
-		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
-	) -> Result<R, E> {
-		Self::try_mutate_account_with_dust(who, f).map(|(result, dust_cleaner)| {
-			drop(dust_cleaner);
-			result
-		})
-	}
-
-	/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
-	/// `ExistentialDeposit` law, annulling the account as needed. This will do nothing if the
-	/// result of `f` is an `Err`.
-	///
-	/// It returns both the result from the closure, and an optional `DustCleaner` instance which
-	/// should be dropped once it is known that all nested mutates that could affect storage items
-	/// what the dust handler touches have completed.
-	///
-	/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
-	/// when it is known that the account already exists.
-	///
-	/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
-	/// the caller will do this.
-	fn try_mutate_account_with_dust<R, E: From<DispatchError>>(
-		who: &T::AccountId,
-		f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
-	) -> Result<(R, DustCleaner<T, I>), E> {
-		let result = T::AccountStore::try_mutate_exists(who, |maybe_account| {
-			let is_new = maybe_account.is_none();
-			let mut account = maybe_account.take().unwrap_or_default();
-			f(&mut account, is_new).map(move |result| {
-				let maybe_endowed = if is_new { Some(account.free) } else { None };
-				let maybe_account_maybe_dust = Self::post_mutation(who, account);
-				*maybe_account = maybe_account_maybe_dust.0;
-				(maybe_endowed, maybe_account_maybe_dust.1, result)
-			})
-		});
-		result.map(|(maybe_endowed, maybe_dust, result)| {
-			if let Some(endowed) = maybe_endowed {
-				Self::deposit_event(Event::Endowed { account: who.clone(), free_balance: endowed });
-			}
-			let dust_cleaner = DustCleaner(maybe_dust.map(|dust| (who.clone(), dust)));
-			(result, dust_cleaner)
-		})
-	}
-
-	/// Update the account entry for `who`, given the locks.
-	fn update_locks(who: &T::AccountId, locks: &[BalanceLock<T::Balance>]) {
-		let bounded_locks = WeakBoundedVec::<_, T::MaxLocks>::force_from(
-			locks.to_vec(),
-			Some("Balances Update Locks"),
-		);
-
-		if locks.len() as u32 > T::MaxLocks::get() {
-			log::warn!(
-				target: LOG_TARGET,
-				"Warning: A user has more currency locks than expected. \
-				A runtime configuration adjustment may be needed."
-			);
-		}
-		// No way this can fail since we do not alter the existential balances.
-		let res = Self::mutate_account(who, |b| {
-			b.misc_frozen = Zero::zero();
-			b.fee_frozen = Zero::zero();
-			for l in locks.iter() {
-				if l.reasons == Reasons::All || l.reasons == Reasons::Misc {
-					b.misc_frozen = b.misc_frozen.max(l.amount);
-				}
-				if l.reasons == Reasons::All || l.reasons == Reasons::Fee {
-					b.fee_frozen = b.fee_frozen.max(l.amount);
-				}
-			}
-		});
-		debug_assert!(res.is_ok());
-
-		let existed = Locks::<T, I>::contains_key(who);
-		if locks.is_empty() {
-			Locks::<T, I>::remove(who);
-			if existed {
-				// TODO: use Locks::<T, I>::hashed_key
-				// https://github.com/paritytech/substrate/issues/4969
-				system::Pallet::<T>::dec_consumers(who);
-			}
-		} else {
-			Locks::<T, I>::insert(who, bounded_locks);
-			if !existed && system::Pallet::<T>::inc_consumers_without_limit(who).is_err() {
-				// No providers for the locks. This is impossible under normal circumstances
-				// since the funds that are under the lock will themselves be stored in the
-				// account and therefore will need a reference.
-				log::warn!(
-					target: LOG_TARGET,
-					"Warning: Attempt to introduce lock consumer reference, yet no providers. \
-					This is unexpected but should be safe."
-				);
-			}
-		}
-	}
-
-	/// Move the reserved balance of one account into the balance of another, according to `status`.
-	///
-	/// Is a no-op if:
-	/// - the value to be moved is zero; or
-	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
-	///
-	/// NOTE: returns actual amount of transferred value in `Ok` case.
-	fn do_transfer_reserved(
-		slashed: &T::AccountId,
-		beneficiary: &T::AccountId,
-		value: T::Balance,
-		best_effort: bool,
-		status: Status,
-	) -> Result<T::Balance, DispatchError> {
-		if value.is_zero() {
-			return Ok(Zero::zero())
-		}
-
-		if slashed == beneficiary {
-			return match status {
-				Status::Free => Ok(value.saturating_sub(Self::unreserve(slashed, value))),
-				Status::Reserved => Ok(value.saturating_sub(Self::reserved_balance(slashed))),
-			}
-		}
-
-		let ((actual, _maybe_one_dust), _maybe_other_dust) = Self::try_mutate_account_with_dust(
-			beneficiary,
-			|to_account, is_new| -> Result<(T::Balance, DustCleaner<T, I>), DispatchError> {
-				ensure!(!is_new, Error::<T, I>::DeadAccount);
-				Self::try_mutate_account_with_dust(
-					slashed,
-					|from_account, _| -> Result<T::Balance, DispatchError> {
-						let actual = cmp::min(from_account.reserved, value);
-						ensure!(best_effort || actual == value, Error::<T, I>::InsufficientBalance);
-						match status {
-							Status::Free =>
-								to_account.free = to_account
-									.free
-									.checked_add(&actual)
-									.ok_or(ArithmeticError::Overflow)?,
-							Status::Reserved =>
-								to_account.reserved = to_account
-									.reserved
-									.checked_add(&actual)
-									.ok_or(ArithmeticError::Overflow)?,
-						}
-						from_account.reserved -= actual;
-						Ok(actual)
-					},
-				)
-			},
-		)?;
-
-		Self::deposit_event(Event::ReserveRepatriated {
-			from: slashed.clone(),
-			to: beneficiary.clone(),
-			amount: actual,
-			destination_status: status,
-		});
-		Ok(actual)
-	}
-}
-
-impl<T: Config<I>, I: 'static> fungible::Inspect<T::AccountId> for Pallet<T, I> {
-	type Balance = T::Balance;
-
-	fn total_issuance() -> Self::Balance {
-		TotalIssuance::<T, I>::get()
-	}
-	fn active_issuance() -> Self::Balance {
-		TotalIssuance::<T, I>::get().saturating_sub(InactiveIssuance::<T, I>::get())
-	}
-	fn minimum_balance() -> Self::Balance {
-		T::ExistentialDeposit::get()
-	}
-	fn balance(who: &T::AccountId) -> Self::Balance {
-		Self::account(who).total()
-	}
-	fn reducible_balance(who: &T::AccountId, keep_alive: bool) -> Self::Balance {
-		let a = Self::account(who);
-		// Liquid balance is what is neither reserved nor locked/frozen.
-		let liquid = a.free.saturating_sub(a.fee_frozen.max(a.misc_frozen));
-		if frame_system::Pallet::<T>::can_dec_provider(who) && !keep_alive {
-			liquid
-		} else {
-			// `must_remain_to_exist` is the part of liquid balance which must remain to keep total
-			// over ED.
-			let must_remain_to_exist =
-				T::ExistentialDeposit::get().saturating_sub(a.total() - liquid);
-			liquid.saturating_sub(must_remain_to_exist)
-		}
-	}
-	fn can_deposit(who: &T::AccountId, amount: Self::Balance, mint: bool) -> DepositConsequence {
-		Self::deposit_consequence(who, amount, &Self::account(who), mint)
-	}
-	fn can_withdraw(
-		who: &T::AccountId,
-		amount: Self::Balance,
-	) -> WithdrawConsequence<Self::Balance> {
-		Self::withdraw_consequence(who, amount, &Self::account(who))
-	}
-}
-
-impl<T: Config<I>, I: 'static> fungible::Mutate<T::AccountId> for Pallet<T, I> {
-	fn mint_into(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
-		if amount.is_zero() {
-			return Ok(())
-		}
-		Self::try_mutate_account(who, |account, _is_new| -> DispatchResult {
-			Self::deposit_consequence(who, amount, account, true).into_result()?;
-			account.free += amount;
-			Ok(())
-		})?;
-		TotalIssuance::<T, I>::mutate(|t| *t += amount);
-		Self::deposit_event(Event::Deposit { who: who.clone(), amount });
-		Ok(())
-	}
-
-	fn burn_from(
-		who: &T::AccountId,
-		amount: Self::Balance,
-	) -> Result<Self::Balance, DispatchError> {
-		if amount.is_zero() {
-			return Ok(Self::Balance::zero())
-		}
-		let actual = Self::try_mutate_account(
-			who,
-			|account, _is_new| -> Result<T::Balance, DispatchError> {
-				let extra = Self::withdraw_consequence(who, amount, account).into_result()?;
-				let actual = amount + extra;
-				account.free -= actual;
-				Ok(actual)
-			},
-		)?;
-		TotalIssuance::<T, I>::mutate(|t| *t -= actual);
-		Self::deposit_event(Event::Withdraw { who: who.clone(), amount });
-		Ok(actual)
-	}
-}
-
-impl<T: Config<I>, I: 'static> fungible::Transfer<T::AccountId> for Pallet<T, I> {
-	fn transfer(
-		source: &T::AccountId,
-		dest: &T::AccountId,
-		amount: T::Balance,
-		keep_alive: bool,
-	) -> Result<T::Balance, DispatchError> {
-		let er = if keep_alive { KeepAlive } else { AllowDeath };
-		<Self as Currency<T::AccountId>>::transfer(source, dest, amount, er).map(|_| amount)
-	}
-
-	fn deactivate(amount: Self::Balance) {
-		InactiveIssuance::<T, I>::mutate(|b| b.saturating_accrue(amount));
-	}
-
-	fn reactivate(amount: Self::Balance) {
-		InactiveIssuance::<T, I>::mutate(|b| b.saturating_reduce(amount));
-	}
-}
-
-impl<T: Config<I>, I: 'static> fungible::Unbalanced<T::AccountId> for Pallet<T, I> {
-	fn set_balance(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
-		Self::mutate_account(who, |account| -> DispatchResult {
-			// fungibles::Unbalanced::decrease_balance didn't check account.reserved
-			// free = new_balance - reserved
-			account.free =
-				amount.checked_sub(&account.reserved).ok_or(ArithmeticError::Underflow)?;
-			Self::deposit_event(Event::BalanceSet {
-				who: who.clone(),
-				free: account.free,
-				reserved: account.reserved,
-			});
-
-			Ok(())
-		})?
-	}
-
-	fn set_total_issuance(amount: Self::Balance) {
-		TotalIssuance::<T, I>::mutate(|t| *t = amount);
-	}
-}
-
-impl<T: Config<I>, I: 'static> fungible::InspectHold<T::AccountId> for Pallet<T, I> {
-	fn balance_on_hold(who: &T::AccountId) -> T::Balance {
-		Self::account(who).reserved
-	}
-	fn can_hold(who: &T::AccountId, amount: T::Balance) -> bool {
-		let a = Self::account(who);
-		let min_balance = T::ExistentialDeposit::get().max(a.frozen(Reasons::All));
-		if a.reserved.checked_add(&amount).is_none() {
-			return false
-		}
-		// We require it to be min_balance + amount to ensure that the full reserved funds may be
-		// slashed without compromising locked funds or destroying the account.
-		let required_free = match min_balance.checked_add(&amount) {
-			Some(x) => x,
-			None => return false,
-		};
-		a.free >= required_free
-	}
-}
-impl<T: Config<I>, I: 'static> fungible::MutateHold<T::AccountId> for Pallet<T, I> {
-	fn hold(who: &T::AccountId, amount: Self::Balance) -> DispatchResult {
-		if amount.is_zero() {
-			return Ok(())
-		}
-		ensure!(Self::can_reserve(who, amount), Error::<T, I>::InsufficientBalance);
-		Self::mutate_account(who, |a| {
-			a.free -= amount;
-			a.reserved += amount;
-		})?;
-		Ok(())
-	}
-	fn release(
-		who: &T::AccountId,
-		amount: Self::Balance,
-		best_effort: bool,
-	) -> Result<T::Balance, DispatchError> {
-		if amount.is_zero() {
-			return Ok(amount)
-		}
-		// Done on a best-effort basis.
-		Self::try_mutate_account(who, |a, _| {
-			let new_free = a.free.saturating_add(amount.min(a.reserved));
-			let actual = new_free - a.free;
-			ensure!(best_effort || actual == amount, Error::<T, I>::InsufficientBalance);
-			// ^^^ Guaranteed to be <= amount and <= a.reserved
-			a.free = new_free;
-			a.reserved = a.reserved.saturating_sub(actual);
-			Ok(actual)
-		})
-	}
-	fn transfer_held(
-		source: &T::AccountId,
-		dest: &T::AccountId,
-		amount: Self::Balance,
-		best_effort: bool,
-		on_hold: bool,
-	) -> Result<Self::Balance, DispatchError> {
-		let status = if on_hold { Status::Reserved } else { Status::Free };
-		Self::do_transfer_reserved(source, dest, amount, best_effort, status)
-	}
-}
-
-// wrapping these imbalances in a private module is necessary to ensure absolute privacy
-// of the inner member.
-mod imbalances {
-	use super::{result, Config, Imbalance, RuntimeDebug, Saturating, TryDrop, Zero};
-	use frame_support::traits::SameOrOther;
-	use sp_std::mem;
-
-	/// Opaque, move-only struct with private fields that serves as a token denoting that
-	/// funds have been created without any equal and opposite accounting.
-	#[must_use]
-	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct PositiveImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
-
-	impl<T: Config<I>, I: 'static> PositiveImbalance<T, I> {
-		/// Create a new positive imbalance from a balance.
-		pub fn new(amount: T::Balance) -> Self {
-			PositiveImbalance(amount)
-		}
-	}
-
-	/// Opaque, move-only struct with private fields that serves as a token denoting that
-	/// funds have been destroyed without any equal and opposite accounting.
-	#[must_use]
-	#[derive(RuntimeDebug, PartialEq, Eq)]
-	pub struct NegativeImbalance<T: Config<I>, I: 'static = ()>(T::Balance);
-
-	impl<T: Config<I>, I: 'static> NegativeImbalance<T, I> {
-		/// Create a new negative imbalance from a balance.
-		pub fn new(amount: T::Balance) -> Self {
-			NegativeImbalance(amount)
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> TryDrop for PositiveImbalance<T, I> {
-		fn try_drop(self) -> result::Result<(), Self> {
-			self.drop_zero()
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Default for PositiveImbalance<T, I> {
-		fn default() -> Self {
-			Self::zero()
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for PositiveImbalance<T, I> {
-		type Opposite = NegativeImbalance<T, I>;
-
-		fn zero() -> Self {
-			Self(Zero::zero())
-		}
-		fn drop_zero(self) -> result::Result<(), Self> {
-			if self.0.is_zero() {
-				Ok(())
-			} else {
-				Err(self)
-			}
-		}
-		fn split(self, amount: T::Balance) -> (Self, Self) {
-			let first = self.0.min(amount);
-			let second = self.0 - first;
-
-			mem::forget(self);
-			(Self(first), Self(second))
-		}
-		fn merge(mut self, other: Self) -> Self {
-			self.0 = self.0.saturating_add(other.0);
-			mem::forget(other);
-
-			self
-		}
-		fn subsume(&mut self, other: Self) {
-			self.0 = self.0.saturating_add(other.0);
-			mem::forget(other);
-		}
-		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
-			let (a, b) = (self.0, other.0);
-			mem::forget((self, other));
-
-			if a > b {
-				SameOrOther::Same(Self(a - b))
-			} else if b > a {
-				SameOrOther::Other(NegativeImbalance::new(b - a))
-			} else {
-				SameOrOther::None
-			}
-		}
-		fn peek(&self) -> T::Balance {
-			self.0
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> TryDrop for NegativeImbalance<T, I> {
-		fn try_drop(self) -> result::Result<(), Self> {
-			self.drop_zero()
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Default for NegativeImbalance<T, I> {
-		fn default() -> Self {
-			Self::zero()
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Imbalance<T::Balance> for NegativeImbalance<T, I> {
-		type Opposite = PositiveImbalance<T, I>;
-
-		fn zero() -> Self {
-			Self(Zero::zero())
-		}
-		fn drop_zero(self) -> result::Result<(), Self> {
-			if self.0.is_zero() {
-				Ok(())
-			} else {
-				Err(self)
+		/// Upgrade a specified account.
+		///
+		/// - `origin`: Must be `Signed`.
+		/// - `who`: The account to be upgraded.
+		///
+		/// This will waive the transaction fee if at least all but 10% of the accounts needed to
+		/// be upgraded. (We let some not have to be upgraded just in order to allow for the
+		/// possibililty of churn).
+		#[pallet::call_index(7)]
+		#[pallet::weight(T::WeightInfo::upgrade_accounts(who.len() as u32))]
+		pub fn upgrade_accounts(
+			origin: OriginFor<T>,
+			who: Vec<T::AccountId>,
+		) -> DispatchResultWithPostInfo {
+			ensure_signed(origin)?;
+			if who.is_empty() {
+				return Ok(Pays::Yes.into());
 			}
-		}
-		fn split(self, amount: T::Balance) -> (Self, Self) {
-			let first = self.0.min(amount);
-			let second = self.0 - first;
-
-			mem::forget(self);
-			(Self(first), Self(second))
-		}
-		fn merge(mut self, other: Self) -> Self {
-			self.0 = self.0.saturating_add(other.0);
-			mem::forget(other);
-
-			self
-		}
-		fn subsume(&mut self, other: Self) {
-			self.0 = self.0.saturating_add(other.0);
-			mem::forget(other);
-		}
-		fn offset(self, other: Self::Opposite) -> SameOrOther<Self, Self::Opposite> {
-			let (a, b) = (self.0, other.0);
-			mem::forget((self, other));
-
-			if a > b {
-				SameOrOther::Same(Self(a - b))
-			} else if b > a {
-				SameOrOther::Other(PositiveImbalance::new(b - a))
+			let mut upgrade_count = 0;
+			for i in &who {
+				let upgraded = Self::ensure_upgraded(i);
+				if upgraded {
+					upgrade_count.saturating_inc();
+				}
+			}
+			let proportion_upgraded = Perbill::from_rational(upgrade_count, who.len() as u32);
+			if proportion_upgraded >= Perbill::from_percent(90) {
+				Ok(Pays::No.into())
 			} else {
-				SameOrOther::None
+				Ok(Pays::Yes.into())
 			}
 		}
-		fn peek(&self) -> T::Balance {
-			self.0
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Drop for PositiveImbalance<T, I> {
-		/// Basic drop handler will just square up the total issuance.
-		fn drop(&mut self) {
-			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_add(self.0));
-		}
-	}
-
-	impl<T: Config<I>, I: 'static> Drop for NegativeImbalance<T, I> {
-		/// Basic drop handler will just square up the total issuance.
-		fn drop(&mut self) {
-			<super::TotalIssuance<T, I>>::mutate(|v| *v = v.saturating_sub(self.0));
-		}
-	}
-}
-
-impl<T: Config<I>, I: 'static> Currency<T::AccountId> for Pallet<T, I>
-where
-	T::Balance: MaybeSerializeDeserialize + Debug,
-{
-	type Balance = T::Balance;
-	type PositiveImbalance = PositiveImbalance<T, I>;
-	type NegativeImbalance = NegativeImbalance<T, I>;
 
-	fn total_balance(who: &T::AccountId) -> Self::Balance {
-		Self::account(who).total()
-	}
-
-	// Check if `value` amount of free balance can be slashed from `who`.
-	fn can_slash(who: &T::AccountId, value: Self::Balance) -> bool {
-		if value.is_zero() {
-			return true
+		/// Alias for `transfer_allow_death`, provided only for name-wise compatibility.
+		///
+		/// WARNING: DEPRECATED! Will be released in approximately 3 months.
+		#[pallet::call_index(8)]
+		#[pallet::weight(T::WeightInfo::transfer_allow_death())]
+		pub fn transfer(
+			origin: OriginFor<T>,
+			dest: AccountIdLookupOf<T>,
+			#[pallet::compact] value: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			let source = ensure_signed(origin)?;
+			let dest = T::Lookup::lookup(dest)?;
+			<Self as fungible::Mutate<_>>::transfer(&source, &dest, value, Expendable)?;
+			Ok(().into())
 		}
-		Self::free_balance(who) >= value
-	}
 
-	fn total_issuance() -> Self::Balance {
-		TotalIssuance::<T, I>::get()
-	}
+		/// Set the regular balance of a given account.
+		///
+		/// The dispatch origin for this call is `root`.
+		#[pallet::call_index(9)]
+		#[pallet::weight(
+			T::WeightInfo::force_set_balance_creating() // Creates a new account.
+				.max(T::WeightInfo::force_set_balance_killing()) // Kills an existing account.
+		)]
+		pub fn force_set_balance(
+			origin: OriginFor<T>,
+			who: AccountIdLookupOf<T>,
+			#[pallet::compact] new_free: T::Balance,
+		) -> DispatchResultWithPostInfo {
+			ensure_root(origin)?;
+			let who = T::Lookup::lookup(who)?;
+			let existential_deposit = Self::ed();
 
-	fn active_issuance() -> Self::Balance {
-		<Self as fungible::Inspect<T::AccountId>>::active_issuance()
-	}
+			let wipeout = new_free < existential_deposit;
+			let new_free = if wipeout { Zero::zero() } else { new_free };
 
-	fn deactivate(amount: Self::Balance) {
-		<Self as fungible::Transfer<T::AccountId>>::deactivate(amount);
-	}
+			// First we try to modify the account's balance to the forced balance.
+			let old_free = Self::mutate_account_handling_dust(&who, |account| {
+				let old_free = account.free;
+				account.free = new_free;
+				old_free
+			})?;
 
-	fn reactivate(amount: Self::Balance) {
-		<Self as fungible::Transfer<T::AccountId>>::reactivate(amount);
-	}
+			// This will adjust the total issuance, which was not done by the `mutate_account`
+			// above.
+			if new_free > old_free {
+				mem::drop(PositiveImbalance::<T, I>::new(new_free - old_free));
+			} else if new_free < old_free {
+				mem::drop(NegativeImbalance::<T, I>::new(old_free - new_free));
+			}
 
-	fn minimum_balance() -> Self::Balance {
-		T::ExistentialDeposit::get()
+			Self::deposit_event(Event::BalanceSet { who, free: new_free });
+			Ok(().into())
+		}
 	}
 
-	// Burn funds from the total issuance, returning a positive imbalance for the amount burned.
-	// Is a no-op if amount to be burned is zero.
-	fn burn(mut amount: Self::Balance) -> Self::PositiveImbalance {
-		if amount.is_zero() {
-			return PositiveImbalance::zero()
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		fn ed() -> T::Balance {
+			T::ExistentialDeposit::get()
 		}
-		<TotalIssuance<T, I>>::mutate(|issued| {
-			*issued = issued.checked_sub(&amount).unwrap_or_else(|| {
-				amount = *issued;
-				Zero::zero()
+		/// Ensure the account `who` is using the new logic.
+		///
+		/// Returns `true` if the account did get upgraded, `false` if it didn't need upgrading.
+		pub fn ensure_upgraded(who: &T::AccountId) -> bool {
+			let mut a = T::AccountStore::get(who);
+			if a.flags.is_new_logic() {
+				return false;
+			}
+			a.flags.set_new_logic();
+			if !a.reserved.is_zero() && a.frozen.is_zero() {
+				if system::Pallet::<T>::providers(who) == 0 {
+					// Gah!! We have no provider refs :(
+					// This shouldn't practically happen, but we need a failsafe anyway: let's give
+					// them enough for an ED.
+					log::warn!(
+						target: LOG_TARGET,
+						"account with a non-zero reserve balance has no provider refs, account_id: '{:?}'.",
+						who
+					);
+					a.free = a.free.max(Self::ed());
+					system::Pallet::<T>::inc_providers(who);
+				}
+				let _ = system::Pallet::<T>::inc_consumers_without_limit(who).defensive();
+			}
+			// Should never fail - we're only setting a bit.
+			let _ = T::AccountStore::try_mutate_exists(who, |account| -> DispatchResult {
+				*account = Some(a);
+				Ok(())
 			});
-		});
-		PositiveImbalance::new(amount)
-	}
-
-	// Create new funds into the total issuance, returning a negative imbalance
-	// for the amount issued.
-	// Is a no-op if amount to be issued it zero.
-	fn issue(mut amount: Self::Balance) -> Self::NegativeImbalance {
-		if amount.is_zero() {
-			return NegativeImbalance::zero()
+			Self::deposit_event(Event::Upgraded { who: who.clone() });
+			return true;
 		}
-		<TotalIssuance<T, I>>::mutate(|issued| {
-			*issued = issued.checked_add(&amount).unwrap_or_else(|| {
-				amount = Self::Balance::max_value() - *issued;
-				Self::Balance::max_value()
-			})
-		});
-		NegativeImbalance::new(amount)
-	}
-
-	fn free_balance(who: &T::AccountId) -> Self::Balance {
-		Self::account(who).free
-	}
 
-	// Ensure that an account can withdraw from their free balance given any existing withdrawal
-	// restrictions like locks and vesting balance.
-	// Is a no-op if amount to be withdrawn is zero.
-	//
-	// ## Complexity
-	// Despite iterating over a list of locks, they are limited by the number of
-	// lock IDs, which means the number of runtime pallets that intend to use and create locks.
-	fn ensure_can_withdraw(
-		who: &T::AccountId,
-		amount: T::Balance,
-		reasons: WithdrawReasons,
-		new_balance: T::Balance,
-	) -> DispatchResult {
-		if amount.is_zero() {
-			return Ok(())
+		/// Get the free balance of an account.
+		pub fn free_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
+			Self::account(who.borrow()).free
 		}
-		let min_balance = Self::account(who).frozen(reasons.into());
-		ensure!(new_balance >= min_balance, Error::<T, I>::LiquidityRestrictions);
-		Ok(())
-	}
 
-	// Transfer some free balance from `transactor` to `dest`, respecting existence requirements.
-	// Is a no-op if value to be transferred is zero or the `transactor` is the same as `dest`.
-	fn transfer(
-		transactor: &T::AccountId,
-		dest: &T::AccountId,
-		value: Self::Balance,
-		existence_requirement: ExistenceRequirement,
-	) -> DispatchResult {
-		if value.is_zero() || transactor == dest {
-			return Ok(())
+		/// Get the balance of an account that can be used for transfers, reservations, or any other
+		/// non-locking, non-transaction-fee activity. Will be at most `free_balance`.
+		pub fn usable_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
+			<Self as fungible::Inspect<_>>::reducible_balance(who.borrow(), Expendable, Polite)
 		}
 
-		Self::try_mutate_account_with_dust(
-			dest,
-			|to_account, _| -> Result<DustCleaner<T, I>, DispatchError> {
-				Self::try_mutate_account_with_dust(
-					transactor,
-					|from_account, _| -> DispatchResult {
-						from_account.free = from_account
-							.free
-							.checked_sub(&value)
-							.ok_or(Error::<T, I>::InsufficientBalance)?;
-
-						// NOTE: total stake being stored in the same type means that this could
-						// never overflow but better to be safe than sorry.
-						to_account.free =
-							to_account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
-
-						let ed = T::ExistentialDeposit::get();
-						ensure!(to_account.total() >= ed, Error::<T, I>::ExistentialDeposit);
-
-						Self::ensure_can_withdraw(
-							transactor,
-							value,
-							WithdrawReasons::TRANSFER,
-							from_account.free,
-						)
-						.map_err(|_| Error::<T, I>::LiquidityRestrictions)?;
-
-						// TODO: This is over-conservative. There may now be other providers, and
-						// this pallet may not even be a provider.
-						let allow_death = existence_requirement == ExistenceRequirement::AllowDeath;
-						let allow_death =
-							allow_death && system::Pallet::<T>::can_dec_provider(transactor);
-						ensure!(
-							allow_death || from_account.total() >= ed,
-							Error::<T, I>::KeepAlive
-						);
-
-						Ok(())
-					},
-				)
-				.map(|(_, maybe_dust_cleaner)| maybe_dust_cleaner)
-			},
-		)?;
-
-		// Emit transfer event.
-		Self::deposit_event(Event::Transfer {
-			from: transactor.clone(),
-			to: dest.clone(),
-			amount: value,
-		});
-
-		Ok(())
-	}
-
-	/// Slash a target account `who`, returning the negative imbalance created and any left over
-	/// amount that could not be slashed.
-	///
-	/// Is a no-op if `value` to be slashed is zero or the account does not exist.
-	///
-	/// NOTE: `slash()` prefers free balance, but assumes that reserve balance can be drawn
-	/// from in extreme circumstances. `can_slash()` should be used prior to `slash()` to avoid
-	/// having to draw from reserved funds, however we err on the side of punishment if things are
-	/// inconsistent or `can_slash` wasn't used appropriately.
-	fn slash(who: &T::AccountId, value: Self::Balance) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() {
-			return (NegativeImbalance::zero(), Zero::zero())
-		}
-		if Self::total_balance(who).is_zero() {
-			return (NegativeImbalance::zero(), value)
+		/// Get the balance of an account that can be used for paying transaction fees (not tipping,
+		/// or any other kind of fees, though). Will be at most `free_balance`.
+		///
+		/// This requires that the account stays alive.
+		pub fn usable_balance_for_fees(
+			who: impl sp_std::borrow::Borrow<T::AccountId>,
+		) -> T::Balance {
+			<Self as fungible::Inspect<_>>::reducible_balance(who.borrow(), Protect, Polite)
 		}
 
-		for attempt in 0..2 {
-			match Self::try_mutate_account(
-				who,
-				|account,
-				 _is_new|
-				 -> Result<(Self::NegativeImbalance, Self::Balance), DispatchError> {
-					// Best value is the most amount we can slash following liveness rules.
-					let best_value = match attempt {
-						// First attempt we try to slash the full amount, and see if liveness issues
-						// happen.
-						0 => value,
-						// If acting as a critical provider (i.e. first attempt failed), then slash
-						// as much as possible while leaving at least at ED.
-						_ => value.min(
-							(account.free + account.reserved)
-								.saturating_sub(T::ExistentialDeposit::get()),
-						),
-					};
-
-					let free_slash = cmp::min(account.free, best_value);
-					account.free -= free_slash; // Safe because of above check
-					let remaining_slash = best_value - free_slash; // Safe because of above check
-
-					if !remaining_slash.is_zero() {
-						// If we have remaining slash, take it from reserved balance.
-						let reserved_slash = cmp::min(account.reserved, remaining_slash);
-						account.reserved -= reserved_slash; // Safe because of above check
-						Ok((
-							NegativeImbalance::new(free_slash + reserved_slash),
-							value - free_slash - reserved_slash, /* Safe because value is gt or
-							                                      * eq total slashed */
-						))
-					} else {
-						// Else we are done!
-						Ok((
-							NegativeImbalance::new(free_slash),
-							value - free_slash, // Safe because value is gt or eq to total slashed
-						))
-					}
-				},
-			) {
-				Ok((imbalance, not_slashed)) => {
-					Self::deposit_event(Event::Slashed {
-						who: who.clone(),
-						amount: value.saturating_sub(not_slashed),
-					});
-					return (imbalance, not_slashed)
-				},
-				Err(_) => (),
-			}
+		/// Get the reserved balance of an account.
+		pub fn reserved_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> T::Balance {
+			Self::account(who.borrow()).reserved
 		}
 
-		// Should never get here. But we'll be defensive anyway.
-		(Self::NegativeImbalance::zero(), value)
-	}
-
-	/// Deposit some `value` into the free balance of an existing target account `who`.
-	///
-	/// Is a no-op if the `value` to be deposited is zero.
-	fn deposit_into_existing(
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> Result<Self::PositiveImbalance, DispatchError> {
-		if value.is_zero() {
-			return Ok(PositiveImbalance::zero())
+		/// Get both the free and reserved balances of an account.
+		pub fn account(who: &T::AccountId) -> AccountData<T::Balance> {
+			T::AccountStore::get(who)
 		}
 
-		Self::try_mutate_account(
-			who,
-			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
-				ensure!(!is_new, Error::<T, I>::DeadAccount);
-				account.free = account.free.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
-				Self::deposit_event(Event::Deposit { who: who.clone(), amount: value });
-				Ok(PositiveImbalance::new(value))
-			},
-		)
-	}
-
-	/// Deposit some `value` into the free balance of `who`, possibly creating a new account.
-	///
-	/// This function is a no-op if:
-	/// - the `value` to be deposited is zero; or
-	/// - the `value` to be deposited is less than the required ED and the account does not yet
-	///   exist; or
-	/// - the deposit would necessitate the account to exist and there are no provider references;
-	///   or
-	/// - `value` is so large it would cause the balance of `who` to overflow.
-	fn deposit_creating(who: &T::AccountId, value: Self::Balance) -> Self::PositiveImbalance {
-		if value.is_zero() {
-			return Self::PositiveImbalance::zero()
+		/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
+		/// `ExistentialDeposit` law, annulling the account as needed.
+		///
+		/// It returns the result from the closure. Any dust is handled through the low-level
+		/// `fungible::Unbalanced` trap-door for legacy dust management.
+		///
+		/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
+		/// when it is known that the account already exists.
+		///
+		/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
+		/// the caller will do this.
+		pub(crate) fn mutate_account_handling_dust<R>(
+			who: &T::AccountId,
+			f: impl FnOnce(&mut AccountData<T::Balance>) -> R,
+		) -> Result<R, DispatchError> {
+			let (r, maybe_dust) = Self::mutate_account(who, f)?;
+			if let Some(dust) = maybe_dust {
+				<Self as fungible::Unbalanced<_>>::handle_raw_dust(dust);
+			}
+			Ok(r)
 		}
 
-		Self::try_mutate_account(
-			who,
-			|account, is_new| -> Result<Self::PositiveImbalance, DispatchError> {
-				let ed = T::ExistentialDeposit::get();
-				ensure!(value >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
-
-				// defensive only: overflow should never happen, however in case it does, then this
-				// operation is a no-op.
-				account.free = match account.free.checked_add(&value) {
-					Some(x) => x,
-					None => return Ok(Self::PositiveImbalance::zero()),
-				};
-
-				Self::deposit_event(Event::Deposit { who: who.clone(), amount: value });
-				Ok(PositiveImbalance::new(value))
-			},
-		)
-		.unwrap_or_else(|_| Self::PositiveImbalance::zero())
-	}
-
-	/// Withdraw some free balance from an account, respecting existence requirements.
-	///
-	/// Is a no-op if value to be withdrawn is zero.
-	fn withdraw(
-		who: &T::AccountId,
-		value: Self::Balance,
-		reasons: WithdrawReasons,
-		liveness: ExistenceRequirement,
-	) -> result::Result<Self::NegativeImbalance, DispatchError> {
-		if value.is_zero() {
-			return Ok(NegativeImbalance::zero())
+		/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
+		/// `ExistentialDeposit` law, annulling the account as needed.
+		///
+		/// It returns the result from the closure. Any dust is handled through the low-level
+		/// `fungible::Unbalanced` trap-door for legacy dust management.
+		///
+		/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
+		/// when it is known that the account already exists.
+		///
+		/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
+		/// the caller will do this.
+		pub(crate) fn try_mutate_account_handling_dust<R, E: From<DispatchError>>(
+			who: &T::AccountId,
+			f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
+		) -> Result<R, E> {
+			let (r, maybe_dust) = Self::try_mutate_account(who, f)?;
+			if let Some(dust) = maybe_dust {
+				<Self as fungible::Unbalanced<_>>::handle_raw_dust(dust);
+			}
+			Ok(r)
 		}
 
-		Self::try_mutate_account(
-			who,
-			|account, _| -> Result<Self::NegativeImbalance, DispatchError> {
-				let new_free_account =
-					account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
-
-				// bail if we need to keep the account alive and this would kill it.
-				let ed = T::ExistentialDeposit::get();
-				let would_be_dead = new_free_account + account.reserved < ed;
-				let would_kill = would_be_dead && account.free + account.reserved >= ed;
-				ensure!(liveness == AllowDeath || !would_kill, Error::<T, I>::KeepAlive);
-
-				Self::ensure_can_withdraw(who, value, reasons, new_free_account)?;
-
-				account.free = new_free_account;
-
-				Self::deposit_event(Event::Withdraw { who: who.clone(), amount: value });
-				Ok(NegativeImbalance::new(value))
-			},
-		)
-	}
-
-	/// Force the new free balance of a target account `who` to some new value `balance`.
-	fn make_free_balance_be(
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> SignedImbalance<Self::Balance, Self::PositiveImbalance> {
-		Self::try_mutate_account(
-			who,
-			|account,
-			 is_new|
-			 -> Result<SignedImbalance<Self::Balance, Self::PositiveImbalance>, DispatchError> {
-				let ed = T::ExistentialDeposit::get();
-				let total = value.saturating_add(account.reserved);
-				// If we're attempting to set an existing account to less than ED, then
-				// bypass the entire operation. It's a no-op if you follow it through, but
-				// since this is an instance where we might account for a negative imbalance
-				// (in the dust cleaner of set_account) before we account for its actual
-				// equal and opposite cause (returned as an Imbalance), then in the
-				// instance that there's no other accounts on the system at all, we might
-				// underflow the issuance and our arithmetic will be off.
-				ensure!(total >= ed || !is_new, Error::<T, I>::ExistentialDeposit);
-
-				let imbalance = if account.free <= value {
-					SignedImbalance::Positive(PositiveImbalance::new(value - account.free))
-				} else {
-					SignedImbalance::Negative(NegativeImbalance::new(account.free - value))
-				};
-				account.free = value;
-				Self::deposit_event(Event::BalanceSet {
-					who: who.clone(),
-					free: account.free,
-					reserved: account.reserved,
-				});
-				Ok(imbalance)
-			},
-		)
-		.unwrap_or_else(|_| SignedImbalance::Positive(Self::PositiveImbalance::zero()))
-	}
-}
-
-impl<T: Config<I>, I: 'static> ReservableCurrency<T::AccountId> for Pallet<T, I>
-where
-	T::Balance: MaybeSerializeDeserialize + Debug,
-{
-	/// Check if `who` can reserve `value` from their free balance.
-	///
-	/// Always `true` if value to be reserved is zero.
-	fn can_reserve(who: &T::AccountId, value: Self::Balance) -> bool {
-		if value.is_zero() {
-			return true
+		/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
+		/// `ExistentialDeposit` law, annulling the account as needed.
+		///
+		/// It returns both the result from the closure, and an optional amount of dust
+		/// which should be handled once it is known that all nested mutates that could affect
+		/// storage items what the dust handler touches have completed.
+		///
+		/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
+		/// when it is known that the account already exists.
+		///
+		/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
+		/// the caller will do this.
+		pub(crate) fn mutate_account<R>(
+			who: &T::AccountId,
+			f: impl FnOnce(&mut AccountData<T::Balance>) -> R,
+		) -> Result<(R, Option<T::Balance>), DispatchError> {
+			Self::try_mutate_account(who, |a, _| -> Result<R, DispatchError> { Ok(f(a)) })
 		}
-		Self::account(who).free.checked_sub(&value).map_or(false, |new_balance| {
-			Self::ensure_can_withdraw(who, value, WithdrawReasons::RESERVE, new_balance).is_ok()
-		})
-	}
-
-	fn reserved_balance(who: &T::AccountId) -> Self::Balance {
-		Self::account(who).reserved
-	}
 
-	/// Move `value` from the free balance from `who` to their reserved balance.
-	///
-	/// Is a no-op if value to be reserved is zero.
-	fn reserve(who: &T::AccountId, value: Self::Balance) -> DispatchResult {
-		if value.is_zero() {
-			return Ok(())
+		/// Returns `true` when `who` has some providers or `insecure_zero_ed` feature is disnabled.
+		/// Returns `false` otherwise.
+		#[cfg(not(feature = "insecure_zero_ed"))]
+		fn have_providers_or_no_zero_ed(_: &T::AccountId) -> bool {
+			true
 		}
 
-		Self::try_mutate_account(who, |account, _| -> DispatchResult {
-			account.free =
-				account.free.checked_sub(&value).ok_or(Error::<T, I>::InsufficientBalance)?;
-			account.reserved =
-				account.reserved.checked_add(&value).ok_or(ArithmeticError::Overflow)?;
-			Self::ensure_can_withdraw(&who, value, WithdrawReasons::RESERVE, account.free)
-		})?;
-
-		Self::deposit_event(Event::Reserved { who: who.clone(), amount: value });
-		Ok(())
-	}
-
-	/// Unreserve some funds, returning any amount that was unable to be unreserved.
-	///
-	/// Is a no-op if the value to be unreserved is zero or the account does not exist.
-	///
-	/// NOTE: returns amount value which wasn't successfully unreserved.
-	fn unreserve(who: &T::AccountId, value: Self::Balance) -> Self::Balance {
-		if value.is_zero() {
-			return Zero::zero()
-		}
-		if Self::total_balance(who).is_zero() {
-			return value
+		/// Returns `true` when `who` has some providers or `insecure_zero_ed` feature is disnabled.
+		/// Returns `false` otherwise.
+		#[cfg(feature = "insecure_zero_ed")]
+		fn have_providers_or_no_zero_ed(who: &T::AccountId) -> bool {
+			frame_system::Pallet::<T>::providers(who) > 0
 		}
 
-		let actual = match Self::mutate_account(who, |account| {
-			let actual = cmp::min(account.reserved, value);
-			account.reserved -= actual;
-			// defensive only: this can never fail since total issuance which is at least
-			// free+reserved fits into the same data type.
-			account.free = account.free.defensive_saturating_add(actual);
-			actual
-		}) {
-			Ok(x) => x,
-			Err(_) => {
-				// This should never happen since we don't alter the total amount in the account.
-				// If it ever does, then we should fail gracefully though, indicating that nothing
-				// could be done.
-				return value
-			},
-		};
-
-		Self::deposit_event(Event::Unreserved { who: who.clone(), amount: actual });
-		value - actual
-	}
+		/// Mutate an account to some new value, or delete it entirely with `None`. Will enforce
+		/// `ExistentialDeposit` law, annulling the account as needed. This will do nothing if the
+		/// result of `f` is an `Err`.
+		///
+		/// It returns both the result from the closure, and an optional amount of dust
+		/// which should be handled once it is known that all nested mutates that could affect
+		/// storage items what the dust handler touches have completed.
+		///
+		/// NOTE: Doesn't do any preparatory work for creating a new account, so should only be used
+		/// when it is known that the account already exists.
+		///
+		/// NOTE: LOW-LEVEL: This will not attempt to maintain total issuance. It is expected that
+		/// the caller will do this.
+		pub(crate) fn try_mutate_account<R, E: From<DispatchError>>(
+			who: &T::AccountId,
+			f: impl FnOnce(&mut AccountData<T::Balance>, bool) -> Result<R, E>,
+		) -> Result<(R, Option<T::Balance>), E> {
+			Self::ensure_upgraded(who);
+			let result = T::AccountStore::try_mutate_exists(who, |maybe_account| {
+				let is_new = maybe_account.is_none();
+				let mut account = maybe_account.take().unwrap_or_default();
+				let did_provide =
+					account.free >= Self::ed() && Self::have_providers_or_no_zero_ed(who);
+				let did_consume =
+					!is_new && (!account.reserved.is_zero() || !account.frozen.is_zero());
+
+				let result = f(&mut account, is_new)?;
+
+				let does_provide = account.free >= Self::ed();
+				let does_consume = !account.reserved.is_zero() || !account.frozen.is_zero();
+
+				if !did_provide && does_provide {
+					frame_system::Pallet::<T>::inc_providers(who);
+				}
+				if did_consume && !does_consume {
+					frame_system::Pallet::<T>::dec_consumers(who);
+				}
+				if !did_consume && does_consume {
+					frame_system::Pallet::<T>::inc_consumers(who)?;
+				}
+				if did_provide && !does_provide {
+					// This could reap the account so must go last.
+					frame_system::Pallet::<T>::dec_providers(who).map_err(|r| {
+						if did_consume && !does_consume {
+							// best-effort revert consumer change.
+							let _ = frame_system::Pallet::<T>::inc_consumers(who).defensive();
+						}
+						if !did_consume && does_consume {
+							let _ = frame_system::Pallet::<T>::dec_consumers(who);
+						}
+						r
+					})?;
+				}
 
-	/// Slash from reserved balance, returning the negative imbalance created,
-	/// and any amount that was unable to be slashed.
-	///
-	/// Is a no-op if the value to be slashed is zero or the account does not exist.
-	fn slash_reserved(
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() {
-			return (NegativeImbalance::zero(), Zero::zero())
-		}
-		if Self::total_balance(who).is_zero() {
-			return (NegativeImbalance::zero(), value)
-		}
+				let maybe_endowed = if is_new { Some(account.free) } else { None };
 
-		// NOTE: `mutate_account` may fail if it attempts to reduce the balance to the point that an
-		//   account is attempted to be illegally destroyed.
-
-		for attempt in 0..2 {
-			match Self::mutate_account(who, |account| {
-				let best_value = match attempt {
-					0 => value,
-					// If acting as a critical provider (i.e. first attempt failed), then ensure
-					// slash leaves at least the ED.
-					_ => value.min(
-						(account.free + account.reserved)
-							.saturating_sub(T::ExistentialDeposit::get()),
-					),
+				// Handle any steps needed after mutating an account.
+				//
+				// This includes DustRemoval unbalancing, in the case than the `new` account's total
+				// balance is non-zero but below ED.
+				//
+				// Updates `maybe_account` to `Some` iff the account has sufficient balance.
+				// Evaluates `maybe_dust`, which is `Some` containing the dust to be dropped, iff
+				// some dust should be dropped.
+				//
+				// We should never be dropping if reserved is non-zero. Reserved being non-zero
+				// should imply that we have a consumer ref, so this is economically safe.
+				let ed = Self::ed();
+				let maybe_dust = if account.free < ed && account.reserved.is_zero() {
+					if account.free.is_zero() {
+						None
+					} else {
+						Some(account.free)
+					}
+				} else {
+					assert!(
+						account.free.is_zero() || account.free >= ed || !account.reserved.is_zero()
+					);
+					*maybe_account = Some(account);
+					None
 				};
-
-				let actual = cmp::min(account.reserved, best_value);
-				account.reserved -= actual;
-
-				// underflow should never happen, but it if does, there's nothing to be done here.
-				(NegativeImbalance::new(actual), value - actual)
-			}) {
-				Ok((imbalance, not_slashed)) => {
-					Self::deposit_event(Event::Slashed {
-						who: who.clone(),
-						amount: value.saturating_sub(not_slashed),
+				Ok((maybe_endowed, maybe_dust, result))
+			});
+			result.map(|(maybe_endowed, maybe_dust, result)| {
+				if let Some(endowed) = maybe_endowed {
+					Self::deposit_event(Event::Endowed {
+						account: who.clone(),
+						free_balance: endowed,
 					});
-					return (imbalance, not_slashed)
-				},
-				Err(_) => (),
-			}
+				}
+				if let Some(amount) = maybe_dust {
+					Pallet::<T, I>::deposit_event(Event::DustLost { account: who.clone(), amount });
+				}
+				(result, maybe_dust)
+			})
 		}
-		// Should never get here as we ensure that ED is left in the second attempt.
-		// In case we do, though, then we fail gracefully.
-		(Self::NegativeImbalance::zero(), value)
-	}
-
-	/// Move the reserved balance of one account into the balance of another, according to `status`.
-	///
-	/// Is a no-op if:
-	/// - the value to be moved is zero; or
-	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
-	fn repatriate_reserved(
-		slashed: &T::AccountId,
-		beneficiary: &T::AccountId,
-		value: Self::Balance,
-		status: Status,
-	) -> Result<Self::Balance, DispatchError> {
-		let actual = Self::do_transfer_reserved(slashed, beneficiary, value, true, status)?;
-		Ok(value.saturating_sub(actual))
-	}
-}
 
-impl<T: Config<I>, I: 'static> NamedReservableCurrency<T::AccountId> for Pallet<T, I>
-where
-	T::Balance: MaybeSerializeDeserialize + Debug,
-{
-	type ReserveIdentifier = T::ReserveIdentifier;
-
-	fn reserved_balance_named(id: &Self::ReserveIdentifier, who: &T::AccountId) -> Self::Balance {
-		let reserves = Self::reserves(who);
-		reserves
-			.binary_search_by_key(id, |data| data.id)
-			.map(|index| reserves[index].amount)
-			.unwrap_or_default()
-	}
+		/// Update the account entry for `who`, given the locks.
+		pub(crate) fn update_locks(who: &T::AccountId, locks: &[BalanceLock<T::Balance>]) {
+			let bounded_locks = WeakBoundedVec::<_, T::MaxLocks>::force_from(
+				locks.to_vec(),
+				Some("Balances Update Locks"),
+			);
 
-	/// Move `value` from the free balance from `who` to a named reserve balance.
-	///
-	/// Is a no-op if value to be reserved is zero.
-	fn reserve_named(
-		id: &Self::ReserveIdentifier,
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> DispatchResult {
-		if value.is_zero() {
-			return Ok(())
-		}
+			if locks.len() as u32 > T::MaxLocks::get() {
+				log::warn!(
+					target: LOG_TARGET,
+					"Warning: A user has more currency locks than expected. \
+					A runtime configuration adjustment may be needed."
+				);
+			}
+			let freezes = Freezes::<T, I>::get(who);
+			let mut prev_frozen = Zero::zero();
+			let mut after_frozen = Zero::zero();
+			// TODO: Revisit this assumption. We no manipulate consumer/provider refs.
+			// No way this can fail since we do not alter the existential balances.
+			let res = Self::mutate_account(who, |b| {
+				prev_frozen = b.frozen;
+				b.frozen = Zero::zero();
+				for l in locks.iter() {
+					b.frozen = b.frozen.max(l.amount);
+				}
+				for l in freezes.iter() {
+					b.frozen = b.frozen.max(l.amount);
+				}
+				after_frozen = b.frozen;
+			});
+			debug_assert!(res.is_ok());
+			if let Ok((_, maybe_dust)) = res {
+				debug_assert!(maybe_dust.is_none(), "Not altering main balance; qed");
+			}
 
-		Reserves::<T, I>::try_mutate(who, |reserves| -> DispatchResult {
-			match reserves.binary_search_by_key(id, |data| data.id) {
-				Ok(index) => {
-					// this add can't overflow but just to be defensive.
-					reserves[index].amount = reserves[index].amount.defensive_saturating_add(value);
-				},
-				Err(index) => {
-					reserves
-						.try_insert(index, ReserveData { id: *id, amount: value })
-						.map_err(|_| Error::<T, I>::TooManyReserves)?;
-				},
-			};
-			<Self as ReservableCurrency<_>>::reserve(who, value)?;
-			Ok(())
-		})
-	}
+			let existed = Locks::<T, I>::contains_key(who);
+			if locks.is_empty() {
+				Locks::<T, I>::remove(who);
+				if existed {
+					// TODO: use Locks::<T, I>::hashed_key
+					// https://github.com/paritytech/substrate/issues/4969
+					system::Pallet::<T>::dec_consumers(who);
+				}
+			} else {
+				Locks::<T, I>::insert(who, bounded_locks);
+				if !existed && system::Pallet::<T>::inc_consumers_without_limit(who).is_err() {
+					// No providers for the locks. This is impossible under normal circumstances
+					// since the funds that are under the lock will themselves be stored in the
+					// account and therefore will need a reference.
+					log::warn!(
+						target: LOG_TARGET,
+						"Warning: Attempt to introduce lock consumer reference, yet no providers. \
+						This is unexpected but should be safe."
+					);
+				}
+			}
 
-	/// Unreserve some funds, returning any amount that was unable to be unreserved.
-	///
-	/// Is a no-op if the value to be unreserved is zero.
-	fn unreserve_named(
-		id: &Self::ReserveIdentifier,
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> Self::Balance {
-		if value.is_zero() {
-			return Zero::zero()
+			if prev_frozen > after_frozen {
+				let amount = prev_frozen.saturating_sub(after_frozen);
+				Self::deposit_event(Event::Unlocked { who: who.clone(), amount });
+			} else if after_frozen > prev_frozen {
+				let amount = after_frozen.saturating_sub(prev_frozen);
+				Self::deposit_event(Event::Locked { who: who.clone(), amount });
+			}
 		}
 
-		Reserves::<T, I>::mutate_exists(who, |maybe_reserves| -> Self::Balance {
-			if let Some(reserves) = maybe_reserves.as_mut() {
-				match reserves.binary_search_by_key(id, |data| data.id) {
-					Ok(index) => {
-						let to_change = cmp::min(reserves[index].amount, value);
-
-						let remain = <Self as ReservableCurrency<_>>::unreserve(who, to_change);
-
-						// remain should always be zero but just to be defensive here.
-						let actual = to_change.defensive_saturating_sub(remain);
-
-						// `actual <= to_change` and `to_change <= amount`; qed;
-						reserves[index].amount -= actual;
-
-						if reserves[index].amount.is_zero() {
-							if reserves.len() == 1 {
-								// no more named reserves
-								*maybe_reserves = None;
-							} else {
-								// remove this named reserve
-								reserves.remove(index);
-							}
-						}
-
-						value - actual
-					},
-					Err(_) => value,
+		/// Update the account entry for `who`, given the locks.
+		pub(crate) fn update_freezes(
+			who: &T::AccountId,
+			freezes: BoundedSlice<IdAmount<T::FreezeIdentifier, T::Balance>, T::MaxFreezes>,
+		) -> DispatchResult {
+			let mut prev_frozen = Zero::zero();
+			let mut after_frozen = Zero::zero();
+			let (_, maybe_dust) = Self::mutate_account(who, |b| {
+				prev_frozen = b.frozen;
+				b.frozen = Zero::zero();
+				for l in Locks::<T, I>::get(who).iter() {
+					b.frozen = b.frozen.max(l.amount);
+				}
+				for l in freezes.iter() {
+					b.frozen = b.frozen.max(l.amount);
 				}
+				after_frozen = b.frozen;
+			})?;
+			debug_assert!(maybe_dust.is_none(), "Not altering main balance; qed");
+			if freezes.is_empty() {
+				Freezes::<T, I>::remove(who);
 			} else {
-				value
+				Freezes::<T, I>::insert(who, freezes);
 			}
-		})
-	}
-
-	/// Slash from reserved balance, returning the negative imbalance created,
-	/// and any amount that was unable to be slashed.
-	///
-	/// Is a no-op if the value to be slashed is zero.
-	fn slash_reserved_named(
-		id: &Self::ReserveIdentifier,
-		who: &T::AccountId,
-		value: Self::Balance,
-	) -> (Self::NegativeImbalance, Self::Balance) {
-		if value.is_zero() {
-			return (NegativeImbalance::zero(), Zero::zero())
+			if prev_frozen > after_frozen {
+				let amount = prev_frozen.saturating_sub(after_frozen);
+				Self::deposit_event(Event::Thawed { who: who.clone(), amount });
+			} else if after_frozen > prev_frozen {
+				let amount = after_frozen.saturating_sub(prev_frozen);
+				Self::deposit_event(Event::Frozen { who: who.clone(), amount });
+			}
+			Ok(())
 		}
 
-		Reserves::<T, I>::mutate(who, |reserves| -> (Self::NegativeImbalance, Self::Balance) {
-			match reserves.binary_search_by_key(id, |data| data.id) {
-				Ok(index) => {
-					let to_change = cmp::min(reserves[index].amount, value);
-
-					let (imb, remain) =
-						<Self as ReservableCurrency<_>>::slash_reserved(who, to_change);
-
-					// remain should always be zero but just to be defensive here.
-					let actual = to_change.defensive_saturating_sub(remain);
-
-					// `actual <= to_change` and `to_change <= amount`; qed;
-					reserves[index].amount -= actual;
-
-					Self::deposit_event(Event::Slashed { who: who.clone(), amount: actual });
-					(imb, value - actual)
-				},
-				Err(_) => (NegativeImbalance::zero(), value),
+		/// Move the reserved balance of one account into the balance of another, according to
+		/// `status`. This will respect freezes/locks only if `fortitude` is `Polite`.
+		///
+		/// Is a no-op if the value to be moved is zero.
+		///
+		/// NOTE: returns actual amount of transferred value in `Ok` case.
+		pub(crate) fn do_transfer_reserved(
+			slashed: &T::AccountId,
+			beneficiary: &T::AccountId,
+			value: T::Balance,
+			precision: Precision,
+			fortitude: Fortitude,
+			status: Status,
+		) -> Result<T::Balance, DispatchError> {
+			if value.is_zero() {
+				return Ok(Zero::zero());
 			}
-		})
-	}
 
-	/// Move the reserved balance of one account into the balance of another, according to `status`.
-	/// If `status` is `Reserved`, the balance will be reserved with given `id`.
-	///
-	/// Is a no-op if:
-	/// - the value to be moved is zero; or
-	/// - the `slashed` id equal to `beneficiary` and the `status` is `Reserved`.
-	fn repatriate_reserved_named(
-		id: &Self::ReserveIdentifier,
-		slashed: &T::AccountId,
-		beneficiary: &T::AccountId,
-		value: Self::Balance,
-		status: Status,
-	) -> Result<Self::Balance, DispatchError> {
-		if value.is_zero() {
-			return Ok(Zero::zero())
-		}
-
-		if slashed == beneficiary {
-			return match status {
-				Status::Free => Ok(Self::unreserve_named(id, slashed, value)),
-				Status::Reserved =>
-					Ok(value.saturating_sub(Self::reserved_balance_named(id, slashed))),
+			let max = <Self as fungible::InspectHold<_>>::reducible_total_balance_on_hold(
+				slashed, fortitude,
+			);
+			let actual = match precision {
+				Precision::BestEffort => value.min(max),
+				Precision::Exact => value,
+			};
+			ensure!(actual <= max, TokenError::FundsUnavailable);
+			if slashed == beneficiary {
+				return match status {
+					Status::Free => Ok(actual.saturating_sub(Self::unreserve(slashed, actual))),
+					Status::Reserved => Ok(actual),
+				};
 			}
-		}
 
-		Reserves::<T, I>::try_mutate(slashed, |reserves| -> Result<Self::Balance, DispatchError> {
-			match reserves.binary_search_by_key(id, |data| data.id) {
-				Ok(index) => {
-					let to_change = cmp::min(reserves[index].amount, value);
-
-					let actual = if status == Status::Reserved {
-						// make it the reserved under same identifier
-						Reserves::<T, I>::try_mutate(
-							beneficiary,
-							|reserves| -> Result<T::Balance, DispatchError> {
-								match reserves.binary_search_by_key(id, |data| data.id) {
-									Ok(index) => {
-										let remain =
-											<Self as ReservableCurrency<_>>::repatriate_reserved(
-												slashed,
-												beneficiary,
-												to_change,
-												status,
-											)?;
-
-										// remain should always be zero but just to be defensive
-										// here.
-										let actual = to_change.defensive_saturating_sub(remain);
-
-										// this add can't overflow but just to be defensive.
-										reserves[index].amount =
-											reserves[index].amount.defensive_saturating_add(actual);
-
-										Ok(actual)
-									},
-									Err(index) => {
-										let remain =
-											<Self as ReservableCurrency<_>>::repatriate_reserved(
-												slashed,
-												beneficiary,
-												to_change,
-												status,
-											)?;
-
-										// remain should always be zero but just to be defensive
-										// here
-										let actual = to_change.defensive_saturating_sub(remain);
-
-										reserves
-											.try_insert(
-												index,
-												ReserveData { id: *id, amount: actual },
-											)
-											.map_err(|_| Error::<T, I>::TooManyReserves)?;
-
-										Ok(actual)
-									},
-								}
+			let ((_, maybe_dust_1), maybe_dust_2) = Self::try_mutate_account(
+				beneficiary,
+				|to_account, is_new| -> Result<((), Option<T::Balance>), DispatchError> {
+					ensure!(!is_new, Error::<T, I>::DeadAccount);
+					Self::try_mutate_account(slashed, |from_account, _| -> DispatchResult {
+						match status {
+							Status::Free => {
+								to_account.free = to_account
+									.free
+									.checked_add(&actual)
+									.ok_or(ArithmeticError::Overflow)?
 							},
-						)?
-					} else {
-						let remain = <Self as ReservableCurrency<_>>::repatriate_reserved(
-							slashed,
-							beneficiary,
-							to_change,
-							status,
-						)?;
-
-						// remain should always be zero but just to be defensive here
-						to_change.defensive_saturating_sub(remain)
-					};
-
-					// `actual <= to_change` and `to_change <= amount`; qed;
-					reserves[index].amount -= actual;
-
-					Ok(value - actual)
+							Status::Reserved => {
+								to_account.reserved = to_account
+									.reserved
+									.checked_add(&actual)
+									.ok_or(ArithmeticError::Overflow)?
+							},
+						}
+						from_account.reserved.saturating_reduce(actual);
+						Ok(())
+					})
 				},
-				Err(_) => Ok(value),
-			}
-		})
-	}
-}
+			)?;
 
-impl<T: Config<I>, I: 'static> LockableCurrency<T::AccountId> for Pallet<T, I>
-where
-	T::Balance: MaybeSerializeDeserialize + Debug,
-{
-	type Moment = T::BlockNumber;
-
-	type MaxLocks = T::MaxLocks;
-
-	// Set a lock on the balance of `who`.
-	// Is a no-op if lock amount is zero or `reasons` `is_none()`.
-	fn set_lock(
-		id: LockIdentifier,
-		who: &T::AccountId,
-		amount: T::Balance,
-		reasons: WithdrawReasons,
-	) {
-		if amount.is_zero() || reasons.is_empty() {
-			return
-		}
-		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
-		let mut locks = Self::locks(who)
-			.into_iter()
-			.filter_map(|l| if l.id == id { new_lock.take() } else { Some(l) })
-			.collect::<Vec<_>>();
-		if let Some(lock) = new_lock {
-			locks.push(lock)
-		}
-		Self::update_locks(who, &locks[..]);
-	}
+			if let Some(dust) = maybe_dust_1 {
+				<Self as fungible::Unbalanced<_>>::handle_raw_dust(dust);
+			}
+			if let Some(dust) = maybe_dust_2 {
+				<Self as fungible::Unbalanced<_>>::handle_raw_dust(dust);
+			}
 
-	// Extend a lock on the balance of `who`.
-	// Is a no-op if lock amount is zero or `reasons` `is_none()`.
-	fn extend_lock(
-		id: LockIdentifier,
-		who: &T::AccountId,
-		amount: T::Balance,
-		reasons: WithdrawReasons,
-	) {
-		if amount.is_zero() || reasons.is_empty() {
-			return
-		}
-		let mut new_lock = Some(BalanceLock { id, amount, reasons: reasons.into() });
-		let mut locks = Self::locks(who)
-			.into_iter()
-			.filter_map(|l| {
-				if l.id == id {
-					new_lock.take().map(|nl| BalanceLock {
-						id: l.id,
-						amount: l.amount.max(nl.amount),
-						reasons: l.reasons | nl.reasons,
-					})
-				} else {
-					Some(l)
-				}
-			})
-			.collect::<Vec<_>>();
-		if let Some(lock) = new_lock {
-			locks.push(lock)
+			Self::deposit_event(Event::ReserveRepatriated {
+				from: slashed.clone(),
+				to: beneficiary.clone(),
+				amount: actual,
+				destination_status: status,
+			});
+			Ok(actual)
 		}
-		Self::update_locks(who, &locks[..]);
-	}
-
-	fn remove_lock(id: LockIdentifier, who: &T::AccountId) {
-		let mut locks = Self::locks(who);
-		locks.retain(|l| l.id != id);
-		Self::update_locks(who, &locks[..]);
 	}
 }
diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
deleted file mode 100644
index 82a6ee5..0000000
--- a/frame/balances/src/tests.rs
+++ /dev/null
@@ -1,1460 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Macro for creating the tests for the module.
-
-#![cfg(test)]
-
-#[macro_export]
-macro_rules! decl_tests {
-	($test:ty, $ext_builder:ty, $existential_deposit:expr) => {
-
-		use crate::*;
-		use sp_runtime::{ArithmeticError, TokenError, FixedPointNumber, traits::{SignedExtension, BadOrigin}};
-		use frame_support::{
-			assert_noop, assert_storage_noop, assert_ok, assert_err,
-			traits::{
-				LockableCurrency, LockIdentifier, WithdrawReasons,
-				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath
-			}
-		};
-		use pallet_transaction_payment::{ChargeTransactionPayment, Multiplier};
-		use frame_system::RawOrigin;
-
-		const ID_1: LockIdentifier = *b"1       ";
-		const ID_2: LockIdentifier = *b"2       ";
-
-		pub const CALL: &<$test as frame_system::Config>::RuntimeCall =
-			&RuntimeCall::Balances(pallet_balances::Call::transfer { dest: 0, value: 0 });
-
-		/// create a transaction info struct from weight. Handy to avoid building the whole struct.
-		pub fn info_from_weight(w: Weight) -> DispatchInfo {
-			DispatchInfo { weight: w, ..Default::default() }
-		}
-
-		fn events() -> Vec<RuntimeEvent> {
-			let evt = System::events().into_iter().map(|evt| evt.event).collect::<Vec<_>>();
-
-			System::reset_events();
-
-			evt
-		}
-
-		#[test]
-		fn basic_locking_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				assert_eq!(Balances::free_balance(1), 10);
-				Balances::set_lock(ID_1, &1, 9, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 5, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-			});
-		}
-
-		#[test]
-		fn account_should_be_reaped() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				assert_eq!(Balances::free_balance(1), 10);
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
-				// Check that the account is dead.
-				assert!(!frame_system::Account::<Test>::contains_key(&1));
-			});
-		}
-
-		#[test]
-		fn reap_failed_due_to_provider_and_consumer() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				// SCENARIO: only one provider and there are remaining consumers.
-				assert_ok!(System::inc_consumers(&1));
-				assert!(!System::can_dec_provider(&1));
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath),
-					Error::<$test, _>::KeepAlive
-				);
-				assert!(System::account_exists(&1));
-				assert_eq!(Balances::free_balance(1), 10);
-
-				// SCENARIO: more than one provider, but will not kill account due to other provider.
-				assert_eq!(System::inc_providers(&1), frame_system::IncRefStatus::Existed);
-				assert_eq!(System::providers(&1), 2);
-				assert!(System::can_dec_provider(&1));
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
-				assert_eq!(System::providers(&1), 1);
-				assert!(System::account_exists(&1));
-				assert_eq!(Balances::free_balance(1), 0);
-			});
-		}
-
-		#[test]
-		fn partial_locking_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-			});
-		}
-
-		#[test]
-		fn lock_removal_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
-				Balances::remove_lock(ID_1, &1);
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-			});
-		}
-
-		#[test]
-		fn lock_replacement_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
-				Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-			});
-		}
-
-		#[test]
-		fn double_locking_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
-				Balances::set_lock(ID_2, &1, 5, WithdrawReasons::all());
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-			});
-		}
-
-		#[test]
-		fn combination_locking_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::empty());
-				Balances::set_lock(ID_2, &1, 0, WithdrawReasons::all());
-				assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-			});
-		}
-
-		#[test]
-		fn lock_value_extension_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				Balances::extend_lock(ID_1, &1, 2, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				Balances::extend_lock(ID_1, &1, 8, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 3, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-			});
-		}
-
-		#[test]
-		fn lock_reasons_should_work() {
-			<$ext_builder>::default()
-				.existential_deposit(1)
-				.monied(true)
-				.build()
-				.execute_with(|| {
-					pallet_transaction_payment::NextFeeMultiplier::<$test>::put(
-						Multiplier::saturating_from_integer(1)
-					);
-					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
-					assert_noop!(
-						<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),
-						Error::<$test, _>::LiquidityRestrictions
-					);
-					assert_noop!(
-						<Balances as ReservableCurrency<_>>::reserve(&1, 1),
-						Error::<$test, _>::LiquidityRestrictions,
-					);
-					assert!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
-						ChargeTransactionPayment::from(1),
-						&1,
-						CALL,
-						&info_from_weight(Weight::from_ref_time(1)),
-						1,
-					).is_err());
-					assert_ok!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
-						ChargeTransactionPayment::from(0),
-						&1,
-						CALL,
-						&info_from_weight(Weight::from_ref_time(1)),
-						1,
-					));
-
-					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSACTION_PAYMENT);
-					assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
-					assert_ok!(<Balances as ReservableCurrency<_>>::reserve(&1, 1));
-					assert!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
-						ChargeTransactionPayment::from(1),
-						&1,
-						CALL,
-						&info_from_weight(Weight::from_ref_time(1)),
-						1,
-					).is_err());
-					assert!(<ChargeTransactionPayment<$test> as SignedExtension>::pre_dispatch(
-						ChargeTransactionPayment::from(0),
-						&1,
-						CALL,
-						&info_from_weight(Weight::from_ref_time(1)),
-						1,
-					).is_err());
-				});
-		}
-
-		#[test]
-		fn lock_block_number_extension_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 10, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				System::set_block_number(2);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::all());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 3, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-			});
-		}
-
-		#[test]
-		fn lock_reasons_extension_should_work() {
-			<$ext_builder>::default().existential_deposit(1).monied(true).build().execute_with(|| {
-				Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSFER);
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::empty());
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-				Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
-				assert_noop!(
-					<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
-					Error::<$test, _>::LiquidityRestrictions
-				);
-			});
-		}
-
-		#[test]
-		fn default_indexing_on_new_accounts_should_not_work2() {
-			<$ext_builder>::default()
-				.existential_deposit(10)
-				.monied(true)
-				.build()
-				.execute_with(|| {
-					// account 5 should not exist
-					// ext_deposit is 10, value is 9, not satisfies for ext_deposit
-					assert_noop!(
-						Balances::transfer(Some(1).into(), 5, 9),
-						Error::<$test, _>::ExistentialDeposit,
-					);
-					assert_eq!(Balances::free_balance(1), 100);
-				});
-		}
-
-		#[test]
-		fn reserved_balance_should_prevent_reclaim_count() {
-			<$ext_builder>::default()
-				.existential_deposit(256 * 1)
-				.monied(true)
-				.build()
-				.execute_with(|| {
-					System::inc_account_nonce(&2);
-					assert_eq!(Balances::total_balance(&2), 256 * 20);
-
-					assert_ok!(Balances::reserve(&2, 256 * 19 + 1)); // account 2 becomes mostly reserved
-					assert_eq!(Balances::free_balance(2), 255); // "free" account deleted."
-					assert_eq!(Balances::total_balance(&2), 256 * 20); // reserve still exists.
-					assert_eq!(System::account_nonce(&2), 1);
-
-					// account 4 tries to take index 1 for account 5.
-					assert_ok!(Balances::transfer(Some(4).into(), 5, 256 * 1 + 0x69));
-					assert_eq!(Balances::total_balance(&5), 256 * 1 + 0x69);
-
-					assert!(Balances::slash(&2, 256 * 19 + 2).1.is_zero()); // account 2 gets slashed
-					// "reserve" account reduced to 255 (below ED) so account deleted
-					assert_eq!(Balances::total_balance(&2), 0);
-					assert_eq!(System::account_nonce(&2), 0);    // nonce zero
-
-					// account 4 tries to take index 1 again for account 6.
-					assert_ok!(Balances::transfer(Some(4).into(), 6, 256 * 1 + 0x69));
-					assert_eq!(Balances::total_balance(&6), 256 * 1 + 0x69);
-				});
-		}
-
-		#[test]
-		fn reward_should_work() {
-			<$ext_builder>::default().monied(true).build().execute_with(|| {
-				assert_eq!(Balances::total_balance(&1), 10);
-				assert_ok!(Balances::deposit_into_existing(&1, 10).map(drop));
-				System::assert_last_event(RuntimeEvent::Balances(crate::Event::Deposit { who: 1, amount: 10 }));
-				assert_eq!(Balances::total_balance(&1), 20);
-				assert_eq!(<TotalIssuance<$test>>::get(), 120);
-			});
-		}
-
-		#[test]
-		fn dust_account_removal_should_work() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.monied(true)
-				.build()
-				.execute_with(|| {
-					System::inc_account_nonce(&2);
-					assert_eq!(System::account_nonce(&2), 1);
-					assert_eq!(Balances::total_balance(&2), 2000);
-					 // index 1 (account 2) becomes zombie
-					assert_ok!(Balances::transfer(Some(2).into(), 5, 1901));
-					assert_eq!(Balances::total_balance(&2), 0);
-					assert_eq!(Balances::total_balance(&5), 1901);
-					assert_eq!(System::account_nonce(&2), 0);
-				});
-		}
-
-		#[test]
-		fn balance_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 42);
-				System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit { who: 1, amount: 42 }));
-				assert_eq!(Balances::free_balance(1), 42);
-				assert_eq!(Balances::reserved_balance(1), 0);
-				assert_eq!(Balances::total_balance(&1), 42);
-				assert_eq!(Balances::free_balance(2), 0);
-				assert_eq!(Balances::reserved_balance(2), 0);
-				assert_eq!(Balances::total_balance(&2), 0);
-			});
-		}
-
-		#[test]
-		fn balance_transfer_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::transfer(Some(1).into(), 2, 69));
-				assert_eq!(Balances::total_balance(&1), 42);
-				assert_eq!(Balances::total_balance(&2), 69);
-			});
-		}
-
-		#[test]
-		fn force_transfer_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_noop!(
-					Balances::force_transfer(Some(2).into(), 1, 2, 69),
-					BadOrigin,
-				);
-				assert_ok!(Balances::force_transfer(RawOrigin::Root.into(), 1, 2, 69));
-				assert_eq!(Balances::total_balance(&1), 42);
-				assert_eq!(Balances::total_balance(&2), 69);
-			});
-		}
-
-		#[test]
-		fn reserving_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-
-				assert_eq!(Balances::total_balance(&1), 111);
-				assert_eq!(Balances::free_balance(1), 111);
-				assert_eq!(Balances::reserved_balance(1), 0);
-
-				assert_ok!(Balances::reserve(&1, 69));
-
-				assert_eq!(Balances::total_balance(&1), 111);
-				assert_eq!(Balances::free_balance(1), 42);
-				assert_eq!(Balances::reserved_balance(1), 69);
-			});
-		}
-
-		#[test]
-		fn balance_transfer_when_reserved_should_not_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 69));
-				assert_noop!(
-					Balances::transfer(Some(1).into(), 2, 69),
-					Error::<$test, _>::InsufficientBalance,
-				);
-			});
-		}
-
-		#[test]
-		fn deducting_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 69));
-				assert_eq!(Balances::free_balance(1), 42);
-			});
-		}
-
-		#[test]
-		fn refunding_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 42);
-				assert_ok!(Balances::mutate_account(&1, |a| a.reserved = 69));
-				Balances::unreserve(&1, 69);
-				assert_eq!(Balances::free_balance(1), 111);
-				assert_eq!(Balances::reserved_balance(1), 0);
-			});
-		}
-
-		#[test]
-		fn slashing_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 69));
-				assert!(Balances::slash(&1, 69).1.is_zero());
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(Balances::reserved_balance(1), 42);
-				assert_eq!(<TotalIssuance<$test>>::get(), 42);
-			});
-		}
-
-		#[test]
-		fn withdrawing_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&2, 111);
-				let _ = Balances::withdraw(
-					&2, 11, WithdrawReasons::TRANSFER, ExistenceRequirement::KeepAlive
-				);
-				System::assert_last_event(RuntimeEvent::Balances(crate::Event::Withdraw { who: 2, amount: 11 }));
-				assert_eq!(Balances::free_balance(2), 100);
-				assert_eq!(<TotalIssuance<$test>>::get(), 100);
-			});
-		}
-
-		#[test]
-		fn slashing_incomplete_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 42);
-				assert_ok!(Balances::reserve(&1, 21));
-				assert_eq!(Balances::slash(&1, 69).1, 27);
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(Balances::reserved_balance(1), 0);
-				assert_eq!(<TotalIssuance<$test>>::get(), 0);
-			});
-		}
-
-		#[test]
-		fn unreserving_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 111));
-				Balances::unreserve(&1, 42);
-				assert_eq!(Balances::reserved_balance(1), 69);
-				assert_eq!(Balances::free_balance(1), 42);
-			});
-		}
-
-		#[test]
-		fn slashing_reserved_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 111));
-				assert_eq!(Balances::slash_reserved(&1, 42).1, 0);
-				assert_eq!(Balances::reserved_balance(1), 69);
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(<TotalIssuance<$test>>::get(), 69);
-			});
-		}
-
-		#[test]
-		fn slashing_incomplete_reserved_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 42));
-				assert_eq!(Balances::slash_reserved(&1, 69).1, 27);
-				assert_eq!(Balances::free_balance(1), 69);
-				assert_eq!(Balances::reserved_balance(1), 0);
-				assert_eq!(<TotalIssuance<$test>>::get(), 69);
-			});
-		}
-
-		#[test]
-		fn repatriating_reserved_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 110);
-				let _ = Balances::deposit_creating(&2, 1);
-				assert_ok!(Balances::reserve(&1, 110));
-				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Free), 0);
-				System::assert_last_event(
-					RuntimeEvent::Balances(crate::Event::ReserveRepatriated { from: 1, to: 2, amount: 41, destination_status: Status::Free })
-				);
-				assert_eq!(Balances::reserved_balance(1), 69);
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(Balances::reserved_balance(2), 0);
-				assert_eq!(Balances::free_balance(2), 42);
-			});
-		}
-
-		#[test]
-		fn transferring_reserved_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 110);
-				let _ = Balances::deposit_creating(&2, 1);
-				assert_ok!(Balances::reserve(&1, 110));
-				assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Status::Reserved), 0);
-				assert_eq!(Balances::reserved_balance(1), 69);
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(Balances::reserved_balance(2), 41);
-				assert_eq!(Balances::free_balance(2), 1);
-			});
-		}
-
-		#[test]
-		fn transferring_reserved_balance_to_yourself_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 110);
-				assert_ok!(Balances::reserve(&1, 50));
-				assert_ok!(Balances::repatriate_reserved(&1, &1, 50, Status::Free), 0);
-				assert_eq!(Balances::free_balance(1), 110);
-				assert_eq!(Balances::reserved_balance(1), 0);
-
-				assert_ok!(Balances::reserve(&1, 50));
-				assert_ok!(Balances::repatriate_reserved(&1, &1, 60, Status::Free), 10);
-				assert_eq!(Balances::free_balance(1), 110);
-				assert_eq!(Balances::reserved_balance(1), 0);
-			});
-		}
-
-		#[test]
-		fn transferring_reserved_balance_to_nonexistent_should_fail() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				assert_ok!(Balances::reserve(&1, 111));
-				assert_noop!(Balances::repatriate_reserved(&1, &2, 42, Status::Free), Error::<$test, _>::DeadAccount);
-			});
-		}
-
-		#[test]
-		fn transferring_incomplete_reserved_balance_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 110);
-				let _ = Balances::deposit_creating(&2, 1);
-				assert_ok!(Balances::reserve(&1, 41));
-				assert_ok!(Balances::repatriate_reserved(&1, &2, 69, Status::Free), 28);
-				assert_eq!(Balances::reserved_balance(1), 0);
-				assert_eq!(Balances::free_balance(1), 69);
-				assert_eq!(Balances::reserved_balance(2), 0);
-				assert_eq!(Balances::free_balance(2), 42);
-			});
-		}
-
-		#[test]
-		fn transferring_too_high_value_should_not_panic() {
-			<$ext_builder>::default().build().execute_with(|| {
-				Balances::make_free_balance_be(&1, u64::MAX);
-				Balances::make_free_balance_be(&2, 1);
-
-				assert_err!(
-					Balances::transfer(Some(1).into(), 2, u64::MAX),
-					ArithmeticError::Overflow,
-				);
-
-				assert_eq!(Balances::free_balance(1), u64::MAX);
-				assert_eq!(Balances::free_balance(2), 1);
-			});
-		}
-
-		#[test]
-		fn account_create_on_free_too_low_with_other() {
-			<$ext_builder>::default().existential_deposit(100).build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 100);
-				assert_eq!(<TotalIssuance<$test>>::get(), 100);
-
-				// No-op.
-				let _ = Balances::deposit_creating(&2, 50);
-				assert_eq!(Balances::free_balance(2), 0);
-				assert_eq!(<TotalIssuance<$test>>::get(), 100);
-			})
-		}
-
-		#[test]
-		fn account_create_on_free_too_low() {
-			<$ext_builder>::default().existential_deposit(100).build().execute_with(|| {
-				// No-op.
-				let _ = Balances::deposit_creating(&2, 50);
-				assert_eq!(Balances::free_balance(2), 0);
-				assert_eq!(<TotalIssuance<$test>>::get(), 0);
-			})
-		}
-
-		#[test]
-		fn account_removal_on_free_too_low() {
-			<$ext_builder>::default().existential_deposit(100).build().execute_with(|| {
-				assert_eq!(<TotalIssuance<$test>>::get(), 0);
-
-				// Setup two accounts with free balance above the existential threshold.
-				let _ = Balances::deposit_creating(&1, 110);
-				let _ = Balances::deposit_creating(&2, 110);
-
-				assert_eq!(Balances::free_balance(1), 110);
-				assert_eq!(Balances::free_balance(2), 110);
-				assert_eq!(<TotalIssuance<$test>>::get(), 220);
-
-				// Transfer funds from account 1 of such amount that after this transfer
-				// the balance of account 1 will be below the existential threshold.
-				// This should lead to the removal of all balance of this account.
-				assert_ok!(Balances::transfer(Some(1).into(), 2, 20));
-
-				// Verify free balance removal of account 1.
-				assert_eq!(Balances::free_balance(1), 0);
-				assert_eq!(Balances::free_balance(2), 130);
-
-				// Verify that TotalIssuance tracks balance removal when free balance is too low.
-				assert_eq!(<TotalIssuance<$test>>::get(), 130);
-			});
-		}
-
-		#[test]
-		fn burn_must_work() {
-			<$ext_builder>::default().monied(true).build().execute_with(|| {
-				let init_total_issuance = Balances::total_issuance();
-				let imbalance = Balances::burn(10);
-				assert_eq!(Balances::total_issuance(), init_total_issuance - 10);
-				drop(imbalance);
-				assert_eq!(Balances::total_issuance(), init_total_issuance);
-			});
-		}
-
-		#[test]
-		fn transfer_keep_alive_works() {
-			<$ext_builder>::default().existential_deposit(1).build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 100);
-				assert_noop!(
-					Balances::transfer_keep_alive(Some(1).into(), 2, 100),
-					Error::<$test, _>::KeepAlive
-				);
-				assert_eq!(Balances::total_balance(&1), 100);
-				assert_eq!(Balances::total_balance(&2), 0);
-			});
-		}
-
-		#[test]
-		#[should_panic = "the balance of any account should always be at least the existential deposit."]
-		fn cannot_set_genesis_value_below_ed() {
-			($existential_deposit).with(|v| *v.borrow_mut() = 11);
-			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
-			let _ = pallet_balances::GenesisConfig::<$test> {
-				balances: vec![(1, 10)],
-			}.assimilate_storage(&mut t).unwrap();
-		}
-
-		#[test]
-		#[should_panic = "duplicate balances in genesis."]
-		fn cannot_set_genesis_value_twice() {
-			let mut t = frame_system::GenesisConfig::default().build_storage::<$test>().unwrap();
-			let _ = pallet_balances::GenesisConfig::<$test> {
-				balances: vec![(1, 10), (2, 20), (1, 15)],
-			}.assimilate_storage(&mut t).unwrap();
-		}
-
-		#[test]
-		fn dust_moves_between_free_and_reserved() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					// Set balance to free and reserved at the existential deposit
-					assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
-					// Check balance
-					assert_eq!(Balances::free_balance(1), 100);
-					assert_eq!(Balances::reserved_balance(1), 0);
-
-					// Reserve some free balance
-					assert_ok!(Balances::reserve(&1, 50));
-					// Check balance, the account should be ok.
-					assert_eq!(Balances::free_balance(1), 50);
-					assert_eq!(Balances::reserved_balance(1), 50);
-
-					// Reserve the rest of the free balance
-					assert_ok!(Balances::reserve(&1, 50));
-					// Check balance, the account should be ok.
-					assert_eq!(Balances::free_balance(1), 0);
-					assert_eq!(Balances::reserved_balance(1), 100);
-
-					// Unreserve everything
-					Balances::unreserve(&1, 100);
-					// Check balance, all 100 should move to free_balance
-					assert_eq!(Balances::free_balance(1), 100);
-					assert_eq!(Balances::reserved_balance(1), 0);
-				});
-		}
-
-		#[test]
-		fn account_deleted_when_just_dust() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					// Set balance to free and reserved at the existential deposit
-					assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 50, 50));
-					// Check balance
-					assert_eq!(Balances::free_balance(1), 50);
-					assert_eq!(Balances::reserved_balance(1), 50);
-
-					// Reserve some free balance
-					let res = Balances::slash(&1, 1);
-					assert_eq!(res, (NegativeImbalance::new(1), 0));
-
-					// The account should be dead.
-					assert_eq!(Balances::free_balance(1), 0);
-					assert_eq!(Balances::reserved_balance(1), 0);
-				});
-		}
-
-		#[test]
-		fn emit_events_with_reserve_and_unreserve() {
-			<$ext_builder>::default()
-				.build()
-				.execute_with(|| {
-					let _ = Balances::deposit_creating(&1, 100);
-
-					System::set_block_number(2);
-					assert_ok!(Balances::reserve(&1, 10));
-
-					System::assert_last_event(RuntimeEvent::Balances(crate::Event::Reserved { who: 1, amount: 10 }));
-
-					System::set_block_number(3);
-					assert!(Balances::unreserve(&1, 5).is_zero());
-
-					System::assert_last_event(RuntimeEvent::Balances(crate::Event::Unreserved { who: 1, amount: 5 }));
-
-					System::set_block_number(4);
-					assert_eq!(Balances::unreserve(&1, 6), 1);
-
-					// should only unreserve 5
-					System::assert_last_event(RuntimeEvent::Balances(crate::Event::Unreserved { who: 1, amount: 5 }));
-				});
-		}
-
-		#[test]
-		fn emit_events_with_existential_deposit() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
-
-					assert_eq!(
-						events(),
-						[
-							RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
-							RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
-							RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100, reserved: 0 }),
-						]
-					);
-
-					let res = Balances::slash(&1, 1);
-					assert_eq!(res, (NegativeImbalance::new(1), 0));
-
-					assert_eq!(
-						events(),
-						[
-							RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
-							RuntimeEvent::Balances(crate::Event::DustLost { account: 1, amount: 99 }),
-							RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 1 }),
-						]
-					);
-				});
-		}
-
-		#[test]
-		fn emit_events_with_no_existential_deposit_suicide() {
-			<$ext_builder>::default()
-				.existential_deposit(1)
-				.build()
-				.execute_with(|| {
-					assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
-
-					assert_eq!(
-						events(),
-						[
-							RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
-							RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
-							RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100, reserved: 0 }),
-						]
-					);
-
-					let res = Balances::slash(&1, 100);
-					assert_eq!(res, (NegativeImbalance::new(100), 0));
-
-					assert_eq!(
-						events(),
-						[
-							RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
-							RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 100 }),
-						]
-					);
-				});
-		}
-
-		#[test]
-		fn slash_loop_works() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					/* User has no reference counter, so they can die in these scenarios */
-
-					// SCENARIO: Slash would not kill account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					// Slashed completed in full
-					assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-					System::assert_last_event(RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 900 }));
-
-					// SCENARIO: Slash will kill account because not enough balance left.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					// Slashed completed in full
-					assert_eq!(Balances::slash(&1, 950), (NegativeImbalance::new(950), 0));
-					// Account is killed
-					assert!(!System::account_exists(&1));
-
-					// SCENARIO: Over-slash will kill account, and report missing slash amount.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					// Slashed full free_balance, and reports 300 not slashed
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1000), 300));
-					// Account is dead
-					assert!(!System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take from reserved, but keep alive.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 400));
-					// Slashed full free_balance and 300 of reserved balance
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take from reserved, and kill.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 350));
-					// Slashed full free_balance and 300 of reserved balance
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
-					// Account is dead because 50 reserved balance is not enough to keep alive
-					assert!(!System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take as much as possible from reserved, kill, and report missing amount.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 250));
-					// Slashed full free_balance and 300 of reserved balance
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1250), 50));
-					// Account is super dead
-					assert!(!System::account_exists(&1));
-
-					/* User will now have a reference counter on them, keeping them alive in these scenarios */
-
-					// SCENARIO: Slash would not kill account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
-					// Slashed completed in full
-					assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Slash will take as much as possible without killing account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					// Slashed completed in full
-					assert_eq!(Balances::slash(&1, 950), (NegativeImbalance::new(900), 50));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash will not kill account, and report missing slash amount.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 0));
-					// Slashed full free_balance minus ED, and reports 400 not slashed
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(900), 400));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take from reserved, but keep alive.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 400));
-					// Slashed full free_balance and 300 of reserved balance
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1300), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take from reserved, but keep alive.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 350));
-					// Slashed full free_balance and 250 of reserved balance to leave ED
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1250), 50));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash can take as much as possible from reserved and report missing amount.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 1_000, 250));
-					// Slashed full free_balance and 300 of reserved balance
-					assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1150), 150));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// Slash on non-existent account is okay.
-					assert_eq!(Balances::slash(&12345, 1_300), (NegativeImbalance::new(0), 1300));
-				});
-		}
-
-		#[test]
-		fn slash_reserved_loop_works() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					/* User has no reference counter, so they can die in these scenarios */
-
-					// SCENARIO: Slash would not kill account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					// Slashed completed in full
-					assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(900), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Slash would kill account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					// Slashed completed in full
-					assert_eq!(Balances::slash_reserved(&1, 1_000), (NegativeImbalance::new(1_000), 0));
-					// Account is dead
-					assert!(!System::account_exists(&1));
-
-					// SCENARIO: Over-slash would kill account, and reports left over slash.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					// Slashed completed in full
-					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
-					// Account is dead
-					assert!(!System::account_exists(&1));
-
-					// SCENARIO: Over-slash does not take from free balance.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 300, 1_000));
-					// Slashed completed in full
-					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
-					// Account is alive because of free balance
-					assert!(System::account_exists(&1));
-
-					/* User has a reference counter, so they cannot die */
-
-					// SCENARIO: Slash would not kill account.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
-					// Slashed completed in full
-					assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(900), 0));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Slash as much as possible without killing.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					// Slashed as much as possible
-					assert_eq!(Balances::slash_reserved(&1, 1_000), (NegativeImbalance::new(950), 50));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash reports correctly, where reserved is needed to keep alive.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 50, 1_000));
-					// Slashed as much as possible
-					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(950), 350));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// SCENARIO: Over-slash reports correctly, where full reserved is removed.
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 200, 1_000));
-					// Slashed as much as possible
-					assert_eq!(Balances::slash_reserved(&1, 1_300), (NegativeImbalance::new(1_000), 300));
-					// Account is still alive
-					assert!(System::account_exists(&1));
-
-					// Slash on non-existent account is okay.
-					assert_eq!(Balances::slash_reserved(&12345, 1_300), (NegativeImbalance::new(0), 1300));
-				});
-		}
-
-		#[test]
-		fn operations_on_dead_account_should_not_change_state() {
-			// These functions all use `mutate_account` which may introduce a storage change when
-			// the account never existed to begin with, and shouldn't exist in the end.
-			<$ext_builder>::default()
-				.existential_deposit(0)
-				.build()
-				.execute_with(|| {
-					assert!(!frame_system::Account::<Test>::contains_key(&1337));
-
-					// Unreserve
-					assert_storage_noop!(assert_eq!(Balances::unreserve(&1337, 42), 42));
-					// Reserve
-					assert_noop!(Balances::reserve(&1337, 42), Error::<Test, _>::InsufficientBalance);
-					// Slash Reserve
-					assert_storage_noop!(assert_eq!(Balances::slash_reserved(&1337, 42).1, 42));
-					// Repatriate Reserve
-					assert_noop!(Balances::repatriate_reserved(&1337, &1338, 42, Status::Free), Error::<Test, _>::DeadAccount);
-					// Slash
-					assert_storage_noop!(assert_eq!(Balances::slash(&1337, 42).1, 42));
-				});
-		}
-
-		#[test]
-		fn transfer_keep_alive_all_free_succeed() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 100, 100));
-					assert_ok!(Balances::transfer_keep_alive(Some(1).into(), 2, 100));
-					assert_eq!(Balances::total_balance(&1), 100);
-					assert_eq!(Balances::total_balance(&2), 100);
-				});
-		}
-
-		#[test]
-		fn transfer_all_works() {
-			<$ext_builder>::default()
-				.existential_deposit(100)
-				.build()
-				.execute_with(|| {
-					// setup
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 200, 0));
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 2, 0, 0));
-					// transfer all and allow death
-					assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
-					assert_eq!(Balances::total_balance(&1), 0);
-					assert_eq!(Balances::total_balance(&2), 200);
-
-					// setup
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 200, 0));
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 2, 0, 0));
-					// transfer all and keep alive
-					assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
-					assert_eq!(Balances::total_balance(&1), 100);
-					assert_eq!(Balances::total_balance(&2), 100);
-
-					// setup
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 200, 10));
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 2, 0, 0));
-					// transfer all and allow death w/ reserved
-					assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
-					assert_eq!(Balances::total_balance(&1), 0);
-					assert_eq!(Balances::total_balance(&2), 200);
-
-					// setup
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1, 200, 10));
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 2, 0, 0));
-					// transfer all and keep alive w/ reserved
-					assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
-					assert_eq!(Balances::total_balance(&1), 100);
-					assert_eq!(Balances::total_balance(&2), 110);
-				});
-		}
-
-		#[test]
-		fn named_reserve_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-
-				let id_1 = [1u8; 8];
-				let id_2 = [2u8; 8];
-				let id_3 = [3u8; 8];
-
-				// reserve
-
-				assert_noop!(Balances::reserve_named(&id_1, &1, 112), Error::<Test, _>::InsufficientBalance);
-
-				assert_ok!(Balances::reserve_named(&id_1, &1, 12));
-
-				assert_eq!(Balances::reserved_balance(1), 12);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 12);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
-
-				assert_ok!(Balances::reserve_named(&id_1, &1, 2));
-
-				assert_eq!(Balances::reserved_balance(1), 14);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
-
-				assert_ok!(Balances::reserve_named(&id_2, &1, 23));
-
-				assert_eq!(Balances::reserved_balance(1), 37);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
-
-				assert_ok!(Balances::reserve(&1, 34));
-
-				assert_eq!(Balances::reserved_balance(1), 71);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
-
-				assert_eq!(Balances::total_balance(&1), 111);
-				assert_eq!(Balances::free_balance(1), 40);
-
-				assert_noop!(Balances::reserve_named(&id_3, &1, 2), Error::<Test, _>::TooManyReserves);
-
-				// unreserve
-
-				assert_eq!(Balances::unreserve_named(&id_1, &1, 10), 0);
-
-				assert_eq!(Balances::reserved_balance(1), 61);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 4);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
-
-				assert_eq!(Balances::unreserve_named(&id_1, &1, 5), 1);
-
-				assert_eq!(Balances::reserved_balance(1), 57);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
-
-				assert_eq!(Balances::unreserve_named(&id_2, &1, 3), 0);
-
-				assert_eq!(Balances::reserved_balance(1), 54);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
-
-				assert_eq!(Balances::total_balance(&1), 111);
-				assert_eq!(Balances::free_balance(1), 57);
-
-				// slash_reserved_named
-
-				assert_ok!(Balances::reserve_named(&id_1, &1, 10));
-
-				assert_eq!(Balances::slash_reserved_named(&id_1, &1, 25).1, 15);
-
-				assert_eq!(Balances::reserved_balance(1), 54);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
-				assert_eq!(Balances::total_balance(&1), 101);
-
-				assert_eq!(Balances::slash_reserved_named(&id_2, &1, 5).1, 0);
-
-				assert_eq!(Balances::reserved_balance(1), 49);
-				assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
-				assert_eq!(Balances::total_balance(&1), 96);
-
-				// repatriate_reserved_named
-
-				let _ = Balances::deposit_creating(&2, 100);
-
-				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Status::Reserved).unwrap(), 0);
-
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 10);
-				assert_eq!(Balances::reserved_balance(&2), 10);
-
-				assert_eq!(Balances::repatriate_reserved_named(&id_2, &2, &1, 11, Status::Reserved).unwrap(), 1);
-
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
-				assert_eq!(Balances::reserved_balance(&2), 0);
-
-				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Status::Free).unwrap(), 0);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
-				assert_eq!(Balances::free_balance(&2), 110);
-
-				// repatriate_reserved_named to self
-
-				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 10, Status::Reserved).unwrap(), 5);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
-
-				assert_eq!(Balances::free_balance(&1), 47);
-
-				assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 15, Status::Free).unwrap(), 10);
-				assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
-
-				assert_eq!(Balances::free_balance(&1), 52);
-			});
-		}
-
-		#[test]
-		fn reserved_named_to_yourself_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 110);
-
-				let id = [1u8; 8];
-
-				assert_ok!(Balances::reserve_named(&id, &1, 50));
-				assert_ok!(Balances::repatriate_reserved_named(&id, &1, &1, 50, Status::Free), 0);
-				assert_eq!(Balances::free_balance(1), 110);
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
-
-				assert_ok!(Balances::reserve_named(&id, &1, 50));
-				assert_ok!(Balances::repatriate_reserved_named(&id, &1, &1, 60, Status::Free), 10);
-				assert_eq!(Balances::free_balance(1), 110);
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
-			});
-		}
-
-		#[test]
-		fn ensure_reserved_named_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-
-				let id = [1u8; 8];
-
-				assert_ok!(Balances::ensure_reserved_named(&id, &1, 15));
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 15);
-
-				assert_ok!(Balances::ensure_reserved_named(&id, &1, 10));
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 10);
-
-				assert_ok!(Balances::ensure_reserved_named(&id, &1, 20));
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 20);
-			});
-		}
-
-		#[test]
-		fn unreserve_all_named_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-
-				let id = [1u8; 8];
-
-				assert_ok!(Balances::reserve_named(&id, &1, 15));
-
-				assert_eq!(Balances::unreserve_all_named(&id, &1), 15);
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
-				assert_eq!(Balances::free_balance(&1), 111);
-
-				assert_eq!(Balances::unreserve_all_named(&id, &1), 0);
-			});
-		}
-
-		#[test]
-		fn slash_all_reserved_named_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-
-				let id = [1u8; 8];
-
-				assert_ok!(Balances::reserve_named(&id, &1, 15));
-
-				assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 15);
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
-				assert_eq!(Balances::free_balance(&1), 96);
-
-				assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 0);
-			});
-		}
-
-		#[test]
-		fn repatriate_all_reserved_named_should_work() {
-			<$ext_builder>::default().build().execute_with(|| {
-				let _ = Balances::deposit_creating(&1, 111);
-				let _ = Balances::deposit_creating(&2, 10);
-				let _ = Balances::deposit_creating(&3, 10);
-
-				let id = [1u8; 8];
-
-				assert_ok!(Balances::reserve_named(&id, &1, 15));
-
-				assert_ok!(Balances::repatriate_all_reserved_named(&id, &1, &2, Status::Reserved));
-				assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
-				assert_eq!(Balances::reserved_balance_named(&id, &2), 15);
-
-				assert_ok!(Balances::repatriate_all_reserved_named(&id, &2, &3, Status::Free));
-				assert_eq!(Balances::reserved_balance_named(&id, &2), 0);
-				assert_eq!(Balances::free_balance(&3), 25);
-			});
-		}
-
-		#[test]
-		fn set_balance_handles_killing_account() {
-			<$ext_builder>::default().build().execute_with(|| {
-					let _ = Balances::deposit_creating(&1, 111);
-					assert_ok!(frame_system::Pallet::<Test>::inc_consumers(&1));
-					assert_noop!(
-						Balances::set_balance(RuntimeOrigin::root(), 1, 0, 0),
-						DispatchError::ConsumerRemaining,
-					);
-			});
-		}
-
-		#[test]
-		fn set_balance_handles_total_issuance() {
-			<$ext_builder>::default().build().execute_with(|| {
-					let old_total_issuance = Balances::total_issuance();
-					assert_ok!(Balances::set_balance(RuntimeOrigin::root(), 1337, 69, 42));
-					assert_eq!(Balances::total_issuance(), old_total_issuance + 69 + 42);
-					assert_eq!(Balances::total_balance(&1337), 69 + 42);
-					assert_eq!(Balances::free_balance(&1337), 69);
-					assert_eq!(Balances::reserved_balance(&1337), 42);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_set_balance_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
-
-				assert_ok!(Balances::reserve(&1337, 60));
-				assert_eq!(Balances::free_balance(1337) , 40);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-
-				assert_noop!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 0), ArithmeticError::Underflow);
-
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 60));
-				assert_eq!(Balances::free_balance(1337) , 0);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_set_total_issuance_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_eq!(<Balances as fungible::Inspect<_>>::total_issuance(), 0);
-				<Balances as fungible::Unbalanced<_>>::set_total_issuance(100);
-				assert_eq!(<Balances as fungible::Inspect<_>>::total_issuance(), 100);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_decrease_balance_simple_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				// An Account that starts at 100
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				// and reserves 50
-				assert_ok!(Balances::reserve(&1337, 50));
-				// and is decreased by 20
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::decrease_balance(&1337, 20));
-				// should end up at 80.
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 80);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_decrease_balance_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
-
-				assert_noop!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance(&1337, 101),
-					TokenError::NoFunds
-				);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance(&1337, 100),
-					Ok(100)
-				);
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
-
-				// free: 40, reserved: 60
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_ok!(Balances::reserve(&1337, 60));
-				assert_eq!(Balances::free_balance(1337) , 40);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-				assert_noop!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance(&1337, 41),
-					TokenError::NoFunds
-				);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance(&1337, 40),
-					Ok(40)
-				);
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 60);
-				assert_eq!(Balances::free_balance(1337), 0);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_decrease_balance_at_most_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
-
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance_at_most(&1337, 101),
-					100
-				);
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
-
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance_at_most(&1337, 100),
-					100
-				);
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
-
-				// free: 40, reserved: 60
-				assert_ok!(<Balances as fungible::Unbalanced<_>>::set_balance(&1337, 100));
-				assert_ok!(Balances::reserve(&1337, 60));
-				assert_eq!(Balances::free_balance(1337) , 40);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance_at_most(&1337, 0),
-					0
-				);
-				assert_eq!(Balances::free_balance(1337) , 40);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance_at_most(&1337, 10),
-					10
-				);
-				assert_eq!(Balances::free_balance(1337), 30);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::decrease_balance_at_most(&1337, 200),
-					30
-				);
-				assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 60);
-				assert_eq!(Balances::free_balance(1337), 0);
-				assert_eq!(Balances::reserved_balance(1337), 60);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_increase_balance_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_noop!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance(&1337, 0),
-					TokenError::BelowMinimum
-				);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance(&1337, 1),
-					Ok(1)
-				);
-				assert_noop!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance(&1337, u64::MAX),
-					ArithmeticError::Overflow
-				);
-			});
-		}
-
-		#[test]
-		fn fungible_unbalanced_trait_increase_balance_at_most_works() {
-			<$ext_builder>::default().build().execute_with(|| {
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance_at_most(&1337, 0),
-					0
-				);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance_at_most(&1337, 1),
-					1
-				);
-				assert_eq!(
-					<Balances as fungible::Unbalanced<_>>::increase_balance_at_most(&1337, u64::MAX),
-					u64::MAX - 1
-				);
-			});
-		}
-	}
-}
diff --git a/frame/balances/src/tests/currency_tests.rs b/frame/balances/src/tests/currency_tests.rs
new file mode 100644
index 0000000..e25b122
--- /dev/null
+++ b/frame/balances/src/tests/currency_tests.rs
@@ -0,0 +1,1307 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests regarding the functionality of the `Currency` trait set implementations.
+
+use super::*;
+use crate::NegativeImbalance;
+use frame_support::traits::{
+	BalanceStatus::{Free, Reserved},
+	Currency,
+	ExistenceRequirement::{self, AllowDeath},
+	Hooks, LockIdentifier, LockableCurrency, NamedReservableCurrency, ReservableCurrency,
+	WithdrawReasons,
+};
+
+const ID_1: LockIdentifier = *b"1       ";
+const ID_2: LockIdentifier = *b"2       ";
+
+pub const CALL: &<Test as frame_system::Config>::RuntimeCall =
+	&RuntimeCall::Balances(crate::Call::transfer_allow_death { dest: 0, value: 0 });
+
+#[test]
+fn basic_locking_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_eq!(Balances::free_balance(1), 10);
+			Balances::set_lock(ID_1, &1, 9, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 5, AllowDeath),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn account_should_be_reaped() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_eq!(Balances::free_balance(1), 10);
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
+			assert_eq!(System::providers(&1), 0);
+			assert_eq!(System::consumers(&1), 0);
+			// Check that the account is dead.
+			assert!(!frame_system::Account::<Test>::contains_key(&1));
+		});
+}
+
+#[test]
+fn reap_failed_due_to_provider_and_consumer() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			// SCENARIO: only one provider and there are remaining consumers.
+			assert_ok!(System::inc_consumers(&1));
+			assert!(!System::can_dec_provider(&1));
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath),
+				TokenError::Frozen
+			);
+			assert!(System::account_exists(&1));
+			assert_eq!(Balances::free_balance(1), 10);
+
+			// SCENARIO: more than one provider, but will not kill account due to other provider.
+			assert_eq!(System::inc_providers(&1), frame_system::IncRefStatus::Existed);
+			assert_eq!(System::providers(&1), 2);
+			assert!(System::can_dec_provider(&1));
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 10, AllowDeath));
+			assert_eq!(System::providers(&1), 1);
+			assert!(System::account_exists(&1));
+			assert_eq!(Balances::free_balance(1), 0);
+		});
+}
+
+#[test]
+fn partial_locking_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
+		});
+}
+
+#[test]
+fn lock_removal_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
+			Balances::remove_lock(ID_1, &1);
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
+		});
+}
+
+#[test]
+fn lock_replacement_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::all());
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
+		});
+}
+
+#[test]
+fn double_locking_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			Balances::set_lock(ID_2, &1, 5, WithdrawReasons::all());
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
+		});
+}
+
+#[test]
+fn combination_locking_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, u64::MAX, WithdrawReasons::empty());
+			Balances::set_lock(ID_2, &1, 0, WithdrawReasons::all());
+			assert_ok!(<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath));
+		});
+}
+
+#[test]
+fn lock_value_extension_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			Balances::extend_lock(ID_1, &1, 2, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			Balances::extend_lock(ID_1, &1, 8, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 3, AllowDeath),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn lock_should_work_reserve() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			pallet_transaction_payment::NextFeeMultiplier::<Test>::put(
+				Multiplier::saturating_from_integer(1),
+			);
+			Balances::set_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),
+				TokenError::Frozen
+			);
+			assert_noop!(Balances::reserve(&1, 1), Error::<Test>::LiquidityRestrictions,);
+			assert!(<ChargeTransactionPayment<Test> as SignedExtension>::pre_dispatch(
+				ChargeTransactionPayment::from(1),
+				&1,
+				CALL,
+				&info_from_weight(Weight::from_parts(1, 0)),
+				1,
+			)
+			.is_err());
+			assert!(<ChargeTransactionPayment<Test> as SignedExtension>::pre_dispatch(
+				ChargeTransactionPayment::from(0),
+				&1,
+				CALL,
+				&info_from_weight(Weight::from_parts(1, 0)),
+				1,
+			)
+			.is_err());
+		});
+}
+
+#[test]
+fn lock_should_work_tx_fee() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSACTION_PAYMENT);
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),
+				TokenError::Frozen
+			);
+			assert_noop!(Balances::reserve(&1, 1), Error::<Test>::LiquidityRestrictions,);
+			assert!(<ChargeTransactionPayment<Test> as SignedExtension>::pre_dispatch(
+				ChargeTransactionPayment::from(1),
+				&1,
+				CALL,
+				&info_from_weight(Weight::from_parts(1, 0)),
+				1,
+			)
+			.is_err());
+			assert!(<ChargeTransactionPayment<Test> as SignedExtension>::pre_dispatch(
+				ChargeTransactionPayment::from(0),
+				&1,
+				CALL,
+				&info_from_weight(Weight::from_parts(1, 0)),
+				1,
+			)
+			.is_err());
+		});
+}
+
+#[test]
+fn lock_block_number_extension_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 10, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			System::set_block_number(2);
+			Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::all());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 3, AllowDeath),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn lock_reasons_extension_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			Balances::set_lock(ID_1, &1, 10, WithdrawReasons::TRANSFER);
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::empty());
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+			Balances::extend_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
+			assert_noop!(
+				<Balances as Currency<_>>::transfer(&1, &2, 6, AllowDeath),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn reserved_balance_should_prevent_reclaim_count() {
+	ExtBuilder::default()
+		.existential_deposit(256 * 1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			System::inc_account_nonce(&2);
+			assert_eq!(Balances::total_balance(&2), 256 * 20);
+			assert_eq!(System::providers(&2), 1);
+			System::inc_providers(&2);
+			assert_eq!(System::providers(&2), 2);
+
+			assert_ok!(Balances::reserve(&2, 256 * 19 + 1)); // account 2 becomes mostly reserved
+			assert_eq!(System::providers(&2), 1);
+			assert_eq!(Balances::free_balance(2), 255); // "free" account would be deleted.
+			assert_eq!(Balances::total_balance(&2), 256 * 20); // reserve still exists.
+			assert_eq!(System::account_nonce(&2), 1);
+
+			// account 4 tries to take index 1 for account 5.
+			assert_ok!(Balances::transfer_allow_death(Some(4).into(), 5, 256 * 1 + 0x69));
+			assert_eq!(Balances::total_balance(&5), 256 * 1 + 0x69);
+
+			assert!(Balances::slash_reserved(&2, 256 * 19 + 1).1.is_zero()); // account 2 gets slashed
+
+			// "reserve" account reduced to 255 (below ED) so account no longer consuming
+			assert_ok!(System::dec_providers(&2));
+			assert_eq!(System::providers(&2), 0);
+			// account deleted
+			assert_eq!(System::account_nonce(&2), 0); // nonce zero
+			assert_eq!(Balances::total_balance(&2), 0);
+
+			// account 4 tries to take index 1 again for account 6.
+			assert_ok!(Balances::transfer_allow_death(Some(4).into(), 6, 256 * 1 + 0x69));
+			assert_eq!(Balances::total_balance(&6), 256 * 1 + 0x69);
+		});
+}
+
+#[test]
+fn reward_should_work() {
+	ExtBuilder::default().monied(true).build_and_execute_with(|| {
+		assert_eq!(Balances::total_balance(&1), 10);
+		assert_ok!(Balances::deposit_into_existing(&1, 10).map(drop));
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Deposit {
+			who: 1,
+			amount: 10,
+		}));
+		assert_eq!(Balances::total_balance(&1), 20);
+		assert_eq!(Balances::total_issuance(), 120);
+	});
+}
+
+#[test]
+fn balance_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 42);
+		System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
+			who: 1,
+			amount: 42,
+		}));
+		assert_eq!(Balances::free_balance(1), 42);
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(Balances::total_balance(&1), 42);
+		assert_eq!(Balances::free_balance(2), 0);
+		assert_eq!(Balances::reserved_balance(2), 0);
+		assert_eq!(Balances::total_balance(&2), 0);
+	});
+}
+
+#[test]
+fn reserving_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+
+		assert_eq!(Balances::total_balance(&1), 111);
+		assert_eq!(Balances::free_balance(1), 111);
+		assert_eq!(Balances::reserved_balance(1), 0);
+
+		assert_ok!(Balances::reserve(&1, 69));
+
+		assert_eq!(Balances::total_balance(&1), 111);
+		assert_eq!(Balances::free_balance(1), 42);
+		assert_eq!(Balances::reserved_balance(1), 69);
+	});
+}
+
+#[test]
+fn deducting_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		assert_ok!(Balances::reserve(&1, 69));
+		assert_eq!(Balances::free_balance(1), 42);
+	});
+}
+
+#[test]
+fn refunding_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 42);
+		assert_ok!(Balances::mutate_account(&1, |a| a.reserved = 69));
+		Balances::unreserve(&1, 69);
+		assert_eq!(Balances::free_balance(1), 111);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn slashing_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 112);
+		assert_ok!(Balances::reserve(&1, 69));
+		assert!(Balances::slash(&1, 42).1.is_zero());
+		assert_eq!(Balances::free_balance(1), 1);
+		assert_eq!(Balances::reserved_balance(1), 69);
+		assert_eq!(Balances::total_issuance(), 70);
+	});
+}
+
+#[test]
+fn withdrawing_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&2, 111);
+		let _ =
+			Balances::withdraw(&2, 11, WithdrawReasons::TRANSFER, ExistenceRequirement::KeepAlive);
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Withdraw {
+			who: 2,
+			amount: 11,
+		}));
+		assert_eq!(Balances::free_balance(2), 100);
+		assert_eq!(Balances::total_issuance(), 100);
+	});
+}
+
+#[test]
+fn withdrawing_balance_should_fail_when_not_expendable() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		ExistentialDeposit::set(10);
+		let _ = Balances::deposit_creating(&2, 20);
+		assert_ok!(Balances::reserve(&2, 5));
+		assert_noop!(
+			Balances::withdraw(&2, 6, WithdrawReasons::TRANSFER, ExistenceRequirement::KeepAlive),
+			Error::<Test>::Expendability,
+		);
+		assert_ok!(Balances::withdraw(
+			&2,
+			5,
+			WithdrawReasons::TRANSFER,
+			ExistenceRequirement::KeepAlive
+		),);
+	});
+}
+
+#[test]
+fn slashing_incomplete_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 42);
+		assert_ok!(Balances::reserve(&1, 21));
+		assert_eq!(Balances::slash(&1, 69).1, 49);
+		assert_eq!(Balances::free_balance(1), 1);
+		assert_eq!(Balances::reserved_balance(1), 21);
+		assert_eq!(Balances::total_issuance(), 22);
+	});
+}
+
+#[test]
+fn unreserving_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		assert_ok!(Balances::reserve(&1, 110));
+		Balances::unreserve(&1, 41);
+		assert_eq!(Balances::reserved_balance(1), 69);
+		assert_eq!(Balances::free_balance(1), 42);
+	});
+}
+
+#[test]
+fn slashing_reserved_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 112);
+		assert_ok!(Balances::reserve(&1, 111));
+		assert_eq!(Balances::slash_reserved(&1, 42).1, 0);
+		assert_eq!(Balances::reserved_balance(1), 69);
+		assert_eq!(Balances::free_balance(1), 1);
+		assert_eq!(Balances::total_issuance(), 70);
+	});
+}
+
+#[test]
+fn slashing_incomplete_reserved_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		assert_ok!(Balances::reserve(&1, 42));
+		assert_eq!(Balances::slash_reserved(&1, 69).1, 27);
+		assert_eq!(Balances::free_balance(1), 69);
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(Balances::total_issuance(), 69);
+	});
+}
+
+#[test]
+fn repatriating_reserved_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		let _ = Balances::deposit_creating(&2, 1);
+		assert_ok!(Balances::reserve(&1, 110));
+		assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Free), 0);
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::ReserveRepatriated {
+			from: 1,
+			to: 2,
+			amount: 41,
+			destination_status: Free,
+		}));
+		assert_eq!(Balances::reserved_balance(1), 69);
+		assert_eq!(Balances::free_balance(1), 1);
+		assert_eq!(Balances::reserved_balance(2), 0);
+		assert_eq!(Balances::free_balance(2), 42);
+	});
+}
+
+#[test]
+fn transferring_reserved_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		let _ = Balances::deposit_creating(&2, 1);
+		assert_ok!(Balances::reserve(&1, 110));
+		assert_ok!(Balances::repatriate_reserved(&1, &2, 41, Reserved), 0);
+		assert_eq!(Balances::reserved_balance(1), 69);
+		assert_eq!(Balances::free_balance(1), 1);
+		assert_eq!(Balances::reserved_balance(2), 41);
+		assert_eq!(Balances::free_balance(2), 1);
+	});
+}
+
+#[test]
+fn transferring_reserved_balance_to_yourself_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 110);
+		assert_ok!(Balances::reserve(&1, 50));
+		assert_ok!(Balances::repatriate_reserved(&1, &1, 50, Free), 0);
+		assert_eq!(Balances::free_balance(1), 110);
+		assert_eq!(Balances::reserved_balance(1), 0);
+
+		assert_ok!(Balances::reserve(&1, 50));
+		assert_ok!(Balances::repatriate_reserved(&1, &1, 60, Free), 10);
+		assert_eq!(Balances::free_balance(1), 110);
+		assert_eq!(Balances::reserved_balance(1), 0);
+	});
+}
+
+#[test]
+fn transferring_reserved_balance_to_nonexistent_should_fail() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		assert_ok!(Balances::reserve(&1, 110));
+		assert_noop!(
+			Balances::repatriate_reserved(&1, &2, 42, Free),
+			Error::<Test, _>::DeadAccount
+		);
+	});
+}
+
+#[test]
+fn transferring_incomplete_reserved_balance_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 110);
+		let _ = Balances::deposit_creating(&2, 1);
+		assert_ok!(Balances::reserve(&1, 41));
+		assert_ok!(Balances::repatriate_reserved(&1, &2, 69, Free), 28);
+		assert_eq!(Balances::reserved_balance(1), 0);
+		assert_eq!(Balances::free_balance(1), 69);
+		assert_eq!(Balances::reserved_balance(2), 0);
+		assert_eq!(Balances::free_balance(2), 42);
+	});
+}
+
+#[test]
+fn transferring_too_high_value_should_not_panic() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, u64::MAX);
+		Balances::make_free_balance_be(&2, 1);
+
+		assert_err!(
+			<Balances as Currency<_>>::transfer(&1, &2, u64::MAX, AllowDeath),
+			ArithmeticError::Overflow,
+		);
+
+		assert_eq!(Balances::free_balance(1), u64::MAX);
+		assert_eq!(Balances::free_balance(2), 1);
+	});
+}
+
+#[test]
+fn account_create_on_free_too_low_with_other() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 100);
+		assert_eq!(Balances::total_issuance(), 100);
+
+		// No-op.
+		let _ = Balances::deposit_creating(&2, 50);
+		assert_eq!(Balances::free_balance(2), 0);
+		assert_eq!(Balances::total_issuance(), 100);
+	})
+}
+
+#[test]
+fn account_create_on_free_too_low() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// No-op.
+		let _ = Balances::deposit_creating(&2, 50);
+		assert_eq!(Balances::free_balance(2), 0);
+		assert_eq!(Balances::total_issuance(), 0);
+	})
+}
+
+#[test]
+fn account_removal_on_free_too_low() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		assert_eq!(Balances::total_issuance(), 0);
+
+		// Setup two accounts with free balance above the existential threshold.
+		let _ = Balances::deposit_creating(&1, 110);
+		let _ = Balances::deposit_creating(&2, 110);
+
+		assert_eq!(Balances::free_balance(1), 110);
+		assert_eq!(Balances::free_balance(2), 110);
+		assert_eq!(Balances::total_issuance(), 220);
+
+		// Transfer funds from account 1 of such amount that after this transfer
+		// the balance of account 1 will be below the existential threshold.
+		// This should lead to the removal of all balance of this account.
+		assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 20));
+
+		// Verify free balance removal of account 1.
+		assert_eq!(Balances::free_balance(1), 0);
+		assert_eq!(Balances::free_balance(2), 130);
+
+		// Verify that TotalIssuance tracks balance removal when free balance is too low.
+		assert_eq!(Balances::total_issuance(), 130);
+	});
+}
+
+#[test]
+fn burn_must_work() {
+	ExtBuilder::default().monied(true).build_and_execute_with(|| {
+		let init_total_issuance = Balances::total_issuance();
+		let imbalance = Balances::burn(10);
+		assert_eq!(Balances::total_issuance(), init_total_issuance - 10);
+		drop(imbalance);
+		assert_eq!(Balances::total_issuance(), init_total_issuance);
+	});
+}
+
+#[test]
+#[should_panic = "the balance of any account should always be at least the existential deposit."]
+fn cannot_set_genesis_value_below_ed() {
+	EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = 11);
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let _ = crate::GenesisConfig::<Test> { balances: vec![(1, 10)] }
+		.assimilate_storage(&mut t)
+		.unwrap();
+}
+
+#[test]
+#[should_panic = "duplicate balances in genesis."]
+fn cannot_set_genesis_value_twice() {
+	let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let _ = crate::GenesisConfig::<Test> { balances: vec![(1, 10), (2, 20), (1, 15)] }
+		.assimilate_storage(&mut t)
+		.unwrap();
+}
+
+#[test]
+fn existential_deposit_respected_when_reserving() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// Set balance to free and reserved at the existential deposit
+		assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 101));
+		// Check balance
+		assert_eq!(Balances::free_balance(1), 101);
+		assert_eq!(Balances::reserved_balance(1), 0);
+
+		// Reserve some free balance
+		assert_ok!(Balances::reserve(&1, 1));
+		// Check balance, the account should be ok.
+		assert_eq!(Balances::free_balance(1), 100);
+		assert_eq!(Balances::reserved_balance(1), 1);
+
+		// Cannot reserve any more of the free balance.
+		assert_noop!(Balances::reserve(&1, 1), DispatchError::ConsumerRemaining);
+	});
+}
+
+#[test]
+fn slash_fails_when_account_needed() {
+	ExtBuilder::default().existential_deposit(50).build_and_execute_with(|| {
+		// Set balance to free and reserved at the existential deposit
+		assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 52));
+		assert_ok!(Balances::reserve(&1, 1));
+		// Check balance
+		assert_eq!(Balances::free_balance(1), 51);
+		assert_eq!(Balances::reserved_balance(1), 1);
+
+		// Slash a small amount
+		let res = Balances::slash(&1, 1);
+		assert_eq!(res, (NegativeImbalance::new(1), 0));
+
+		// The account should be dead.
+		assert_eq!(Balances::free_balance(1), 50);
+		assert_eq!(Balances::reserved_balance(1), 1);
+
+		// Slashing again doesn't work since we require the ED
+		let res = Balances::slash(&1, 1);
+		assert_eq!(res, (NegativeImbalance::new(0), 1));
+
+		// The account should be dead.
+		assert_eq!(Balances::free_balance(1), 50);
+		assert_eq!(Balances::reserved_balance(1), 1);
+	});
+}
+
+#[test]
+fn account_deleted_when_just_dust() {
+	ExtBuilder::default().existential_deposit(50).build_and_execute_with(|| {
+		// Set balance to free and reserved at the existential deposit
+		assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 50));
+		// Check balance
+		assert_eq!(Balances::free_balance(1), 50);
+
+		// Slash a small amount
+		let res = Balances::slash(&1, 1);
+		assert_eq!(res, (NegativeImbalance::new(1), 0));
+
+		// The account should be dead.
+		assert_eq!(Balances::free_balance(1), 0);
+	});
+}
+
+#[test]
+fn emit_events_with_reserve_and_unreserve() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 100);
+
+		System::set_block_number(2);
+		assert_ok!(Balances::reserve(&1, 10));
+
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Reserved {
+			who: 1,
+			amount: 10,
+		}));
+
+		System::set_block_number(3);
+		assert!(Balances::unreserve(&1, 5).is_zero());
+
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Unreserved {
+			who: 1,
+			amount: 5,
+		}));
+
+		System::set_block_number(4);
+		assert_eq!(Balances::unreserve(&1, 6), 1);
+
+		// should only unreserve 5
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Unreserved {
+			who: 1,
+			amount: 5,
+		}));
+	});
+}
+
+#[test]
+fn emit_events_with_changing_locks() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 100);
+		System::reset_events();
+
+		// Locks = [] --> [10]
+		Balances::set_lock(*b"LOCK_000", &1, 10, WithdrawReasons::TRANSFER);
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Locked { who: 1, amount: 10 })]);
+
+		// Locks = [10] --> [15]
+		Balances::set_lock(*b"LOCK_000", &1, 15, WithdrawReasons::TRANSFER);
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Locked { who: 1, amount: 5 })]);
+
+		// Locks = [15] --> [15, 20]
+		Balances::set_lock(*b"LOCK_001", &1, 20, WithdrawReasons::TRANSACTION_PAYMENT);
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Locked { who: 1, amount: 5 })]);
+
+		// Locks = [15, 20] --> [17, 20]
+		Balances::set_lock(*b"LOCK_000", &1, 17, WithdrawReasons::TRANSACTION_PAYMENT);
+		for event in events() {
+			match event {
+				RuntimeEvent::Balances(crate::Event::Locked { .. }) => {
+					assert!(false, "unexpected lock event")
+				},
+				RuntimeEvent::Balances(crate::Event::Unlocked { .. }) => {
+					assert!(false, "unexpected unlock event")
+				},
+				_ => continue,
+			}
+		}
+
+		// Locks = [17, 20] --> [17, 15]
+		Balances::set_lock(*b"LOCK_001", &1, 15, WithdrawReasons::TRANSFER);
+		assert_eq!(
+			events(),
+			[RuntimeEvent::Balances(crate::Event::Unlocked { who: 1, amount: 3 })]
+		);
+
+		// Locks = [17, 15] --> [15]
+		Balances::remove_lock(*b"LOCK_000", &1);
+		assert_eq!(
+			events(),
+			[RuntimeEvent::Balances(crate::Event::Unlocked { who: 1, amount: 2 })]
+		);
+
+		// Locks = [15] --> []
+		Balances::remove_lock(*b"LOCK_001", &1);
+		assert_eq!(
+			events(),
+			[RuntimeEvent::Balances(crate::Event::Unlocked { who: 1, amount: 15 })]
+		);
+	});
+}
+
+#[test]
+fn emit_events_with_existential_deposit() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 100));
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
+				RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100 }),
+			]
+		);
+
+		let res = Balances::slash(&1, 1);
+		assert_eq!(res, (NegativeImbalance::new(1), 0));
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::DustLost { account: 1, amount: 99 }),
+				RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 1 }),
+			]
+		);
+	});
+}
+
+#[test]
+fn emit_events_with_no_existential_deposit_suicide() {
+	ExtBuilder::default().existential_deposit(1).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 100);
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100 }),
+				RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
+			]
+		);
+
+		let res = Balances::slash(&1, 100);
+		assert_eq!(res, (NegativeImbalance::new(100), 0));
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 100 }),
+			]
+		);
+	});
+}
+
+#[test]
+fn slash_over_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// SCENARIO: Over-slash will kill account, and report missing slash amount.
+		Balances::make_free_balance_be(&1, 1_000);
+		// Slashed full free_balance, and reports 300 not slashed
+		assert_eq!(Balances::slash(&1, 1_300), (NegativeImbalance::new(1000), 300));
+		// Account is dead
+		assert!(!System::account_exists(&1));
+	});
+}
+
+#[test]
+fn slash_full_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		// Slashed completed in full
+		assert_eq!(Balances::slash(&1, 1_000), (NegativeImbalance::new(1000), 0));
+		// Account is still alive
+		assert!(!System::account_exists(&1));
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Slashed {
+			who: 1,
+			amount: 1000,
+		}));
+	});
+}
+
+#[test]
+fn slash_partial_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		// Slashed completed in full
+		assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
+		// Account is still alive
+		assert!(System::account_exists(&1));
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Slashed {
+			who: 1,
+			amount: 900,
+		}));
+	});
+}
+
+#[test]
+fn slash_dusting_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		// Slashed completed in full
+		assert_eq!(Balances::slash(&1, 950), (NegativeImbalance::new(950), 0));
+		assert!(!System::account_exists(&1));
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Slashed {
+			who: 1,
+			amount: 950,
+		}));
+	});
+}
+
+#[test]
+fn slash_does_not_take_from_reserve() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(Balances::reserve(&1, 100));
+		// Slashed completed in full
+		assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(800), 100));
+		assert_eq!(Balances::reserved_balance(&1), 100);
+		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Slashed {
+			who: 1,
+			amount: 800,
+		}));
+	});
+}
+
+#[test]
+fn slash_consumed_slash_full_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
+									   // Slashed completed in full
+		assert_eq!(Balances::slash(&1, 900), (NegativeImbalance::new(900), 0));
+		// Account is still alive
+		assert!(System::account_exists(&1));
+	});
+}
+
+#[test]
+fn slash_consumed_slash_over_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
+									   // Slashed completed in full
+		assert_eq!(Balances::slash(&1, 1_000), (NegativeImbalance::new(900), 100));
+		// Account is still alive
+		assert!(System::account_exists(&1));
+	});
+}
+
+#[test]
+fn slash_consumed_slash_partial_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(System::inc_consumers(&1)); // <-- Reference counter added here is enough for all tests
+									   // Slashed completed in full
+		assert_eq!(Balances::slash(&1, 800), (NegativeImbalance::new(800), 0));
+		// Account is still alive
+		assert!(System::account_exists(&1));
+	});
+}
+
+#[test]
+fn slash_on_non_existant_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// Slash on non-existent account is okay.
+		assert_eq!(Balances::slash(&12345, 1_300), (NegativeImbalance::new(0), 1300));
+	});
+}
+
+#[test]
+fn slash_reserved_slash_partial_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(Balances::reserve(&1, 900));
+		// Slashed completed in full
+		assert_eq!(Balances::slash_reserved(&1, 800), (NegativeImbalance::new(800), 0));
+		assert_eq!(System::consumers(&1), 1);
+		assert_eq!(Balances::reserved_balance(&1), 100);
+		assert_eq!(Balances::free_balance(&1), 100);
+	});
+}
+
+#[test]
+fn slash_reserved_slash_everything_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(Balances::reserve(&1, 900));
+		assert_eq!(System::consumers(&1), 1);
+		// Slashed completed in full
+		assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(900), 0));
+		assert_eq!(System::consumers(&1), 0);
+		// Account is still alive
+		assert!(System::account_exists(&1));
+	});
+}
+
+#[test]
+fn slash_reserved_overslash_does_not_touch_free_balance() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// SCENARIO: Over-slash doesn't touch free balance.
+		Balances::make_free_balance_be(&1, 1_000);
+		assert_ok!(Balances::reserve(&1, 800));
+		// Slashed done
+		assert_eq!(Balances::slash_reserved(&1, 900), (NegativeImbalance::new(800), 100));
+		assert_eq!(Balances::free_balance(&1), 200);
+	});
+}
+
+#[test]
+fn slash_reserved_on_non_existant_works() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		// Slash on non-existent account is okay.
+		assert_eq!(Balances::slash_reserved(&12345, 1_300), (NegativeImbalance::new(0), 1300));
+	});
+}
+
+#[test]
+fn operations_on_dead_account_should_not_change_state() {
+	// These functions all use `mutate_account` which may introduce a storage change when
+	// the account never existed to begin with, and shouldn't exist in the end.
+	ExtBuilder::default().existential_deposit(1).build_and_execute_with(|| {
+		assert!(!frame_system::Account::<Test>::contains_key(&1337));
+
+		// Unreserve
+		assert_storage_noop!(assert_eq!(Balances::unreserve(&1337, 42), 42));
+		// Reserve
+		assert_noop!(Balances::reserve(&1337, 42), Error::<Test, _>::InsufficientBalance);
+		// Slash Reserve
+		assert_storage_noop!(assert_eq!(Balances::slash_reserved(&1337, 42).1, 42));
+		// Repatriate Reserve
+		assert_noop!(
+			Balances::repatriate_reserved(&1337, &1338, 42, Free),
+			Error::<Test, _>::DeadAccount
+		);
+		// Slash
+		assert_storage_noop!(assert_eq!(Balances::slash(&1337, 42).1, 42));
+	});
+}
+
+#[test]
+#[should_panic = "The existential deposit must be greater than zero!"]
+fn zero_ed_is_prohibited() {
+	// These functions all use `mutate_account` which may introduce a storage change when
+	// the account never existed to begin with, and shouldn't exist in the end.
+	ExtBuilder::default().existential_deposit(0).build_and_execute_with(|| {
+		Balances::integrity_test();
+	});
+}
+
+#[test]
+fn named_reserve_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+
+		let id_1 = TestId::Foo;
+		let id_2 = TestId::Bar;
+		let id_3 = TestId::Baz;
+
+		// reserve
+
+		assert_noop!(
+			Balances::reserve_named(&id_1, &1, 112),
+			Error::<Test, _>::InsufficientBalance
+		);
+
+		assert_ok!(Balances::reserve_named(&id_1, &1, 12));
+
+		assert_eq!(Balances::reserved_balance(1), 12);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 12);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+		assert_ok!(Balances::reserve_named(&id_1, &1, 2));
+
+		assert_eq!(Balances::reserved_balance(1), 14);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+		assert_ok!(Balances::reserve_named(&id_2, &1, 23));
+
+		assert_eq!(Balances::reserved_balance(1), 37);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+		assert_ok!(Balances::reserve(&1, 34));
+
+		assert_eq!(Balances::reserved_balance(1), 71);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 14);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+		assert_eq!(Balances::total_balance(&1), 111);
+		assert_eq!(Balances::free_balance(1), 40);
+
+		assert_noop!(Balances::reserve_named(&id_3, &1, 2), Error::<Test, _>::TooManyReserves);
+
+		// unreserve
+
+		assert_eq!(Balances::unreserve_named(&id_1, &1, 10), 0);
+
+		assert_eq!(Balances::reserved_balance(1), 61);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 4);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+		assert_eq!(Balances::unreserve_named(&id_1, &1, 5), 1);
+
+		assert_eq!(Balances::reserved_balance(1), 57);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 23);
+
+		assert_eq!(Balances::unreserve_named(&id_2, &1, 3), 0);
+
+		assert_eq!(Balances::reserved_balance(1), 54);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
+
+		assert_eq!(Balances::total_balance(&1), 111);
+		assert_eq!(Balances::free_balance(1), 57);
+
+		// slash_reserved_named
+
+		assert_ok!(Balances::reserve_named(&id_1, &1, 10));
+
+		assert_eq!(Balances::slash_reserved_named(&id_1, &1, 25).1, 15);
+
+		assert_eq!(Balances::reserved_balance(1), 54);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 20);
+		assert_eq!(Balances::total_balance(&1), 101);
+
+		assert_eq!(Balances::slash_reserved_named(&id_2, &1, 5).1, 0);
+
+		assert_eq!(Balances::reserved_balance(1), 49);
+		assert_eq!(Balances::reserved_balance_named(&id_1, &1), 0);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
+		assert_eq!(Balances::total_balance(&1), 96);
+
+		// repatriate_reserved_named
+
+		let _ = Balances::deposit_creating(&2, 100);
+
+		assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Reserved).unwrap(), 0);
+
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &2), 10);
+		assert_eq!(Balances::reserved_balance(&2), 10);
+
+		assert_eq!(Balances::repatriate_reserved_named(&id_2, &2, &1, 11, Reserved).unwrap(), 1);
+
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 15);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
+		assert_eq!(Balances::reserved_balance(&2), 0);
+
+		assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &2, 10, Free).unwrap(), 0);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &2), 0);
+		assert_eq!(Balances::free_balance(&2), 110);
+
+		// repatriate_reserved_named to self
+
+		assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 10, Reserved).unwrap(), 5);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 5);
+
+		assert_eq!(Balances::free_balance(&1), 47);
+
+		assert_eq!(Balances::repatriate_reserved_named(&id_2, &1, &1, 15, Free).unwrap(), 10);
+		assert_eq!(Balances::reserved_balance_named(&id_2, &1), 0);
+
+		assert_eq!(Balances::free_balance(&1), 52);
+	});
+}
+
+#[test]
+fn reserve_must_succeed_if_can_reserve_does() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 1);
+		let _ = Balances::deposit_creating(&2, 2);
+		assert!(Balances::can_reserve(&1, 1) == Balances::reserve(&1, 1).is_ok());
+		assert!(Balances::can_reserve(&2, 1) == Balances::reserve(&2, 1).is_ok());
+	});
+}
+
+#[test]
+fn reserved_named_to_yourself_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 110);
+
+		let id = TestId::Foo;
+
+		assert_ok!(Balances::reserve_named(&id, &1, 50));
+		assert_ok!(Balances::repatriate_reserved_named(&id, &1, &1, 50, Free), 0);
+		assert_eq!(Balances::free_balance(1), 110);
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+
+		assert_ok!(Balances::reserve_named(&id, &1, 50));
+		assert_ok!(Balances::repatriate_reserved_named(&id, &1, &1, 60, Free), 10);
+		assert_eq!(Balances::free_balance(1), 110);
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+	});
+}
+
+#[test]
+fn ensure_reserved_named_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+
+		let id = TestId::Foo;
+
+		assert_ok!(Balances::ensure_reserved_named(&id, &1, 15));
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 15);
+
+		assert_ok!(Balances::ensure_reserved_named(&id, &1, 10));
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 10);
+
+		assert_ok!(Balances::ensure_reserved_named(&id, &1, 20));
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 20);
+	});
+}
+
+#[test]
+fn unreserve_all_named_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+
+		let id = TestId::Foo;
+
+		assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+		assert_eq!(Balances::unreserve_all_named(&id, &1), 15);
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+		assert_eq!(Balances::free_balance(&1), 111);
+
+		assert_eq!(Balances::unreserve_all_named(&id, &1), 0);
+	});
+}
+
+#[test]
+fn slash_all_reserved_named_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+
+		let id = TestId::Foo;
+
+		assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+		assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 15);
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+		assert_eq!(Balances::free_balance(&1), 96);
+
+		assert_eq!(Balances::slash_all_reserved_named(&id, &1).peek(), 0);
+	});
+}
+
+#[test]
+fn repatriate_all_reserved_named_should_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::deposit_creating(&1, 111);
+		let _ = Balances::deposit_creating(&2, 10);
+		let _ = Balances::deposit_creating(&3, 10);
+
+		let id = TestId::Foo;
+
+		assert_ok!(Balances::reserve_named(&id, &1, 15));
+
+		assert_ok!(Balances::repatriate_all_reserved_named(&id, &1, &2, Reserved));
+		assert_eq!(Balances::reserved_balance_named(&id, &1), 0);
+		assert_eq!(Balances::reserved_balance_named(&id, &2), 15);
+
+		assert_ok!(Balances::repatriate_all_reserved_named(&id, &2, &3, Free));
+		assert_eq!(Balances::reserved_balance_named(&id, &2), 0);
+		assert_eq!(Balances::free_balance(&3), 25);
+	});
+}
+
+#[test]
+fn freezing_and_locking_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 4));
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_eq!(System::consumers(&1), 2);
+			assert_eq!(Balances::account(&1).frozen, 5);
+			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 6));
+			assert_eq!(Balances::account(&1).frozen, 6);
+			assert_ok!(<Balances as fungible::MutateFreeze<_>>::set_freeze(&TestId::Foo, &1, 4));
+			assert_eq!(Balances::account(&1).frozen, 5);
+			Balances::set_lock(ID_1, &1, 3, WithdrawReasons::all());
+			assert_eq!(Balances::account(&1).frozen, 4);
+			Balances::set_lock(ID_1, &1, 5, WithdrawReasons::all());
+			assert_eq!(Balances::account(&1).frozen, 5);
+			Balances::remove_lock(ID_1, &1);
+			assert_eq!(Balances::account(&1).frozen, 4);
+			assert_eq!(System::consumers(&1), 1);
+		});
+}
diff --git a/frame/balances/src/tests/dispatchable_tests.rs b/frame/balances/src/tests/dispatchable_tests.rs
new file mode 100644
index 0000000..76d0961
--- /dev/null
+++ b/frame/balances/src/tests/dispatchable_tests.rs
@@ -0,0 +1,224 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests regarding the functionality of the dispatchables/extrinsics.
+
+use super::*;
+use frame_support::traits::tokens::Preservation::Expendable;
+use fungible::{hold::Mutate as HoldMutate, Inspect, Mutate};
+
+#[test]
+fn default_indexing_on_new_accounts_should_not_work2() {
+	ExtBuilder::default()
+		.existential_deposit(10)
+		.monied(true)
+		.build_and_execute_with(|| {
+			// account 5 should not exist
+			// ext_deposit is 10, value is 9, not satisfies for ext_deposit
+			assert_noop!(
+				Balances::transfer_allow_death(Some(1).into(), 5, 9),
+				TokenError::BelowMinimum,
+			);
+			assert_eq!(Balances::free_balance(1), 100);
+		});
+}
+
+#[test]
+fn dust_account_removal_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.monied(true)
+		.build_and_execute_with(|| {
+			System::inc_account_nonce(&2);
+			assert_eq!(System::account_nonce(&2), 1);
+			assert_eq!(Balances::total_balance(&2), 2000);
+			// index 1 (account 2) becomes zombie
+			assert_ok!(Balances::transfer_allow_death(Some(2).into(), 5, 1901));
+			assert_eq!(Balances::total_balance(&2), 0);
+			assert_eq!(Balances::total_balance(&5), 1901);
+			assert_eq!(System::account_nonce(&2), 0);
+		});
+}
+
+#[test]
+fn balance_transfer_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::mint_into(&1, 111);
+		assert_ok!(Balances::transfer_allow_death(Some(1).into(), 2, 69));
+		assert_eq!(Balances::total_balance(&1), 42);
+		assert_eq!(Balances::total_balance(&2), 69);
+	});
+}
+
+#[test]
+fn force_transfer_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::mint_into(&1, 111);
+		assert_noop!(Balances::force_transfer(Some(2).into(), 1, 2, 69), BadOrigin,);
+		assert_ok!(Balances::force_transfer(RawOrigin::Root.into(), 1, 2, 69));
+		assert_eq!(Balances::total_balance(&1), 42);
+		assert_eq!(Balances::total_balance(&2), 69);
+	});
+}
+
+#[test]
+fn balance_transfer_when_on_hold_should_not_work() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::mint_into(&1, 111);
+		assert_ok!(Balances::hold(&TestId::Foo, &1, 69));
+		assert_noop!(
+			Balances::transfer_allow_death(Some(1).into(), 2, 69),
+			TokenError::FundsUnavailable,
+		);
+	});
+}
+
+#[test]
+fn transfer_keep_alive_works() {
+	ExtBuilder::default().existential_deposit(1).build_and_execute_with(|| {
+		let _ = Balances::mint_into(&1, 100);
+		assert_noop!(
+			Balances::transfer_keep_alive(Some(1).into(), 2, 100),
+			TokenError::NotExpendable
+		);
+		assert_eq!(Balances::total_balance(&1), 100);
+		assert_eq!(Balances::total_balance(&2), 0);
+	});
+}
+
+#[test]
+fn transfer_keep_alive_all_free_succeed() {
+	ExtBuilder::default().existential_deposit(100).build_and_execute_with(|| {
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 300));
+		assert_ok!(Balances::hold(&TestId::Foo, &1, 100));
+		assert_ok!(Balances::transfer_keep_alive(Some(1).into(), 2, 100));
+		assert_eq!(Balances::total_balance(&1), 200);
+		assert_eq!(Balances::total_balance(&2), 100);
+	});
+}
+
+#[test]
+fn transfer_all_works_1() {
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// setup
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 200));
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 2, 0));
+		// transfer all and allow death
+		assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
+		assert_eq!(Balances::total_balance(&1), 0);
+		assert_eq!(Balances::total_balance(&2), 200);
+	});
+}
+
+#[test]
+fn transfer_all_works_2() {
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// setup
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 200));
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 2, 0));
+		// transfer all and keep alive
+		assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
+		assert_eq!(Balances::total_balance(&1), 100);
+		assert_eq!(Balances::total_balance(&2), 100);
+	});
+}
+
+#[test]
+fn transfer_all_works_3() {
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// setup
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 210));
+		assert_ok!(Balances::hold(&TestId::Foo, &1, 10));
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 2, 0));
+		// transfer all and allow death w/ reserved
+		assert_ok!(Balances::transfer_all(Some(1).into(), 2, false));
+		assert_eq!(Balances::total_balance(&1), 110);
+		assert_eq!(Balances::total_balance(&2), 100);
+	});
+}
+
+#[test]
+fn transfer_all_works_4() {
+	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
+		// setup
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1, 210));
+		assert_ok!(Balances::hold(&TestId::Foo, &1, 10));
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 2, 0));
+		// transfer all and keep alive w/ reserved
+		assert_ok!(Balances::transfer_all(Some(1).into(), 2, true));
+		assert_eq!(Balances::total_balance(&1), 110);
+		assert_eq!(Balances::total_balance(&2), 100);
+	});
+}
+
+#[test]
+fn set_balance_handles_killing_account() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::mint_into(&1, 111);
+		assert_ok!(frame_system::Pallet::<Test>::inc_consumers(&1));
+		assert_noop!(
+			Balances::force_set_balance(RuntimeOrigin::root(), 1, 0),
+			DispatchError::ConsumerRemaining,
+		);
+	});
+}
+
+#[test]
+fn set_balance_handles_total_issuance() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let old_total_issuance = Balances::total_issuance();
+		assert_ok!(Balances::force_set_balance(RuntimeOrigin::root(), 1337, 69));
+		assert_eq!(Balances::total_issuance(), old_total_issuance + 69);
+		assert_eq!(Balances::total_balance(&1337), 69);
+		assert_eq!(Balances::free_balance(&1337), 69);
+	});
+}
+
+#[test]
+fn upgrade_accounts_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			System::inc_providers(&7);
+			assert_ok!(<Test as Config>::AccountStore::try_mutate_exists(
+				&7,
+				|a| -> DispatchResult {
+					*a = Some(AccountData {
+						free: 5,
+						reserved: 5,
+						frozen: Zero::zero(),
+						flags: crate::types::ExtraFlags::old_logic(),
+					});
+					Ok(())
+				}
+			));
+			assert!(!Balances::account(&7).flags.is_new_logic());
+			assert_eq!(System::providers(&7), 1);
+			assert_eq!(System::consumers(&7), 0);
+			assert_ok!(Balances::upgrade_accounts(Some(1).into(), vec![7]));
+			assert!(Balances::account(&7).flags.is_new_logic());
+			assert_eq!(System::providers(&7), 1);
+			assert_eq!(System::consumers(&7), 1);
+
+			<Balances as frame_support::traits::ReservableCurrency<_>>::unreserve(&7, 5);
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&7, &1, 10, Expendable));
+			assert_eq!(Balances::total_balance(&7), 0);
+			assert_eq!(System::providers(&7), 0);
+			assert_eq!(System::consumers(&7), 0);
+		});
+}
diff --git a/frame/balances/src/tests/fungible_conformance_tests.rs b/frame/balances/src/tests/fungible_conformance_tests.rs
new file mode 100644
index 0000000..6262aa0
--- /dev/null
+++ b/frame/balances/src/tests/fungible_conformance_tests.rs
@@ -0,0 +1,88 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use super::*;
+use frame_support::traits::fungible::{conformance_tests, Inspect, Mutate};
+use paste::paste;
+
+macro_rules! run_tests {
+    ($path:path, $ext_deposit:expr, $($name:ident),*) => {
+		$(
+			paste! {
+				#[test]
+				fn [< $name _existential_deposit_ $ext_deposit _dust_trap_on >]() {
+					let trap_account = <Test as frame_system::Config>::AccountId::from(65174286u64);
+					let builder = ExtBuilder::default().existential_deposit($ext_deposit).dust_trap(trap_account);
+					builder.build_and_execute_with(|| {
+						Balances::set_balance(&trap_account, Balances::minimum_balance());
+						$path::$name::<
+							Balances,
+							<Test as frame_system::Config>::AccountId,
+						>(Some(trap_account));
+					});
+				}
+
+				#[test]
+				fn [< $name _existential_deposit_ $ext_deposit _dust_trap_off >]() {
+					let builder = ExtBuilder::default().existential_deposit($ext_deposit);
+					builder.build_and_execute_with(|| {
+						$path::$name::<
+							Balances,
+							<Test as frame_system::Config>::AccountId,
+						>(None);
+					});
+				}
+			}
+		)*
+	};
+	($path:path, $ext_deposit:expr) => {
+		run_tests!(
+			$path,
+			$ext_deposit,
+			mint_into_success,
+			mint_into_overflow,
+			mint_into_below_minimum,
+			burn_from_exact_success,
+			burn_from_best_effort_success,
+			burn_from_exact_insufficient_funds,
+			restore_success,
+			restore_overflow,
+			restore_below_minimum,
+			shelve_success,
+			shelve_insufficient_funds,
+			transfer_success,
+			transfer_expendable_all,
+			transfer_expendable_dust,
+			transfer_protect_preserve,
+			set_balance_mint_success,
+			set_balance_burn_success,
+			can_deposit_success,
+			can_deposit_below_minimum,
+			can_deposit_overflow,
+			can_withdraw_success,
+			can_withdraw_reduced_to_zero,
+			can_withdraw_balance_low,
+			reducible_balance_expendable,
+			reducible_balance_protect_preserve
+		);
+	};
+}
+
+run_tests!(conformance_tests::inspect_mutate, 1);
+run_tests!(conformance_tests::inspect_mutate, 2);
+run_tests!(conformance_tests::inspect_mutate, 5);
+run_tests!(conformance_tests::inspect_mutate, 1000);
diff --git a/frame/balances/src/tests/fungible_tests.rs b/frame/balances/src/tests/fungible_tests.rs
new file mode 100644
index 0000000..ab2606c
--- /dev/null
+++ b/frame/balances/src/tests/fungible_tests.rs
@@ -0,0 +1,470 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests regarding the functionality of the `fungible` trait set implementations.
+
+use super::*;
+use frame_support::traits::tokens::{
+	Fortitude::{Force, Polite},
+	Precision::{BestEffort, Exact},
+	Preservation::{Expendable, Preserve, Protect},
+	Restriction::Free,
+};
+use fungible::{Inspect, InspectFreeze, InspectHold, Mutate, MutateFreeze, MutateHold, Unbalanced};
+
+#[test]
+fn inspect_trait_reducible_balance_basic_works() {
+	ExtBuilder::default().existential_deposit(10).build_and_execute_with(|| {
+		Balances::set_balance(&1, 100);
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Polite), 100);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Polite), 90);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Polite), 90);
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Force), 100);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Force), 90);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Force), 90);
+	});
+}
+
+#[test]
+fn inspect_trait_reducible_balance_other_provide_works() {
+	ExtBuilder::default().existential_deposit(10).build_and_execute_with(|| {
+		Balances::set_balance(&1, 100);
+		System::inc_providers(&1);
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Polite), 100);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Polite), 100);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Polite), 90);
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Force), 100);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Force), 100);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Force), 90);
+	});
+}
+
+#[test]
+fn inspect_trait_reducible_balance_frozen_works() {
+	ExtBuilder::default().existential_deposit(10).build_and_execute_with(|| {
+		Balances::set_balance(&1, 100);
+		assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 50));
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Polite), 50);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Polite), 50);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Polite), 50);
+		assert_eq!(Balances::reducible_balance(&1, Expendable, Force), 90);
+		assert_eq!(Balances::reducible_balance(&1, Protect, Force), 90);
+		assert_eq!(Balances::reducible_balance(&1, Preserve, Force), 90);
+	});
+}
+
+#[test]
+fn unbalanced_trait_set_balance_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
+
+		assert_ok!(<Balances as fungible::MutateHold<_>>::hold(&TestId::Foo, &1337, 60));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 40);
+		assert_eq!(<Balances as fungible::InspectHold<_>>::total_balance_on_hold(&1337), 60);
+		assert_eq!(
+			<Balances as fungible::InspectHold<_>>::balance_on_hold(&TestId::Foo, &1337),
+			60
+		);
+
+		assert_noop!(Balances::write_balance(&1337, 0), Error::<Test>::InsufficientBalance);
+
+		assert_ok!(Balances::write_balance(&1337, 1));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 1);
+		assert_eq!(
+			<Balances as fungible::InspectHold<_>>::balance_on_hold(&TestId::Foo, &1337),
+			60
+		);
+
+		assert_ok!(<Balances as fungible::MutateHold<_>>::release(&TestId::Foo, &1337, 60, Exact));
+		assert_eq!(<Balances as fungible::InspectHold<_>>::balance_on_hold(&TestId::Foo, &1337), 0);
+		assert_eq!(<Balances as fungible::InspectHold<_>>::total_balance_on_hold(&1337), 0);
+	});
+}
+
+#[test]
+fn unbalanced_trait_set_total_issuance_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_eq!(<Balances as fungible::Inspect<_>>::total_issuance(), 0);
+		Balances::set_total_issuance(100);
+		assert_eq!(<Balances as fungible::Inspect<_>>::total_issuance(), 100);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_simple_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		// An Account that starts at 100
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
+		// and reserves 50
+		assert_ok!(<Balances as fungible::MutateHold<_>>::hold(&TestId::Foo, &1337, 50));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 50);
+		// and is decreased by 20
+		assert_ok!(Balances::decrease_balance(&1337, 20, Exact, Expendable, Polite));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 30);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_works_1() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
+
+		assert_noop!(
+			Balances::decrease_balance(&1337, 101, Exact, Expendable, Polite),
+			TokenError::FundsUnavailable
+		);
+		assert_eq!(Balances::decrease_balance(&1337, 100, Exact, Expendable, Polite), Ok(100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_works_2() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		// free: 40, reserved: 60
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_ok!(Balances::hold(&TestId::Foo, &1337, 60));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 40);
+		assert_eq!(Balances::total_balance_on_hold(&1337), 60);
+		assert_noop!(
+			Balances::decrease_balance(&1337, 40, Exact, Expendable, Polite),
+			Error::<Test>::InsufficientBalance
+		);
+		assert_eq!(Balances::decrease_balance(&1337, 39, Exact, Expendable, Polite), Ok(39));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 1);
+		assert_eq!(Balances::total_balance_on_hold(&1337), 60);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_at_most_works_1() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 100);
+
+		assert_eq!(Balances::decrease_balance(&1337, 101, BestEffort, Expendable, Polite), Ok(100));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_at_most_works_2() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_ok!(Balances::write_balance(&1337, 99));
+		assert_eq!(Balances::decrease_balance(&1337, 99, BestEffort, Expendable, Polite), Ok(99));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 0);
+	});
+}
+
+#[test]
+fn unbalanced_trait_decrease_balance_at_most_works_3() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		// free: 40, reserved: 60
+		assert_ok!(Balances::write_balance(&1337, 100));
+		assert_ok!(Balances::hold(&TestId::Foo, &1337, 60));
+		assert_eq!(Balances::free_balance(1337), 40);
+		assert_eq!(Balances::total_balance_on_hold(&1337), 60);
+		assert_eq!(Balances::decrease_balance(&1337, 0, BestEffort, Expendable, Polite), Ok(0));
+		assert_eq!(Balances::free_balance(1337), 40);
+		assert_eq!(Balances::total_balance_on_hold(&1337), 60);
+		assert_eq!(Balances::decrease_balance(&1337, 10, BestEffort, Expendable, Polite), Ok(10));
+		assert_eq!(Balances::free_balance(1337), 30);
+		assert_eq!(Balances::decrease_balance(&1337, 200, BestEffort, Expendable, Polite), Ok(29));
+		assert_eq!(<Balances as fungible::Inspect<_>>::balance(&1337), 1);
+		assert_eq!(Balances::free_balance(1337), 1);
+		assert_eq!(Balances::total_balance_on_hold(&1337), 60);
+	});
+}
+
+#[test]
+fn unbalanced_trait_increase_balance_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_noop!(Balances::increase_balance(&1337, 0, Exact), TokenError::BelowMinimum);
+		assert_eq!(Balances::increase_balance(&1337, 1, Exact), Ok(1));
+		assert_noop!(Balances::increase_balance(&1337, u64::MAX, Exact), ArithmeticError::Overflow);
+	});
+}
+
+#[test]
+fn unbalanced_trait_increase_balance_at_most_works() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		assert_eq!(Balances::increase_balance(&1337, 0, BestEffort), Ok(0));
+		assert_eq!(Balances::increase_balance(&1337, 1, BestEffort), Ok(1));
+		assert_eq!(Balances::increase_balance(&1337, u64::MAX, BestEffort), Ok(u64::MAX - 1));
+	});
+}
+
+#[test]
+fn freezing_and_holds_should_overlap() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 10));
+			assert_ok!(Balances::hold(&TestId::Foo, &1, 9));
+			assert_eq!(Balances::account(&1).free, 1);
+			assert_eq!(System::consumers(&1), 1);
+			assert_eq!(Balances::account(&1).free, 1);
+			assert_eq!(Balances::account(&1).frozen, 10);
+			assert_eq!(Balances::account(&1).reserved, 9);
+			assert_eq!(Balances::total_balance_on_hold(&1), 9);
+		});
+}
+
+#[test]
+fn frozen_hold_balance_cannot_be_moved_without_force() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 10));
+			assert_ok!(Balances::hold(&TestId::Foo, &1, 9));
+			assert_eq!(Balances::reducible_total_balance_on_hold(&1, Force), 9);
+			assert_eq!(Balances::reducible_total_balance_on_hold(&1, Polite), 0);
+			let e = TokenError::Frozen;
+			assert_noop!(
+				Balances::transfer_on_hold(&TestId::Foo, &1, &2, 1, Exact, Free, Polite),
+				e
+			);
+			assert_ok!(Balances::transfer_on_hold(&TestId::Foo, &1, &2, 1, Exact, Free, Force));
+		});
+}
+
+#[test]
+fn frozen_hold_balance_best_effort_transfer_works() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 5));
+			assert_ok!(Balances::hold(&TestId::Foo, &1, 9));
+			assert_eq!(Balances::reducible_total_balance_on_hold(&1, Force), 9);
+			assert_eq!(Balances::reducible_total_balance_on_hold(&1, Polite), 5);
+			assert_ok!(Balances::transfer_on_hold(
+				&TestId::Foo,
+				&1,
+				&2,
+				10,
+				BestEffort,
+				Free,
+				Polite
+			));
+			assert_eq!(Balances::total_balance(&1), 5);
+			assert_eq!(Balances::total_balance(&2), 25);
+		});
+}
+
+#[test]
+fn partial_freezing_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 5));
+			assert_eq!(System::consumers(&1), 1);
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &2, 5, Expendable));
+			assert_noop!(
+				<Balances as fungible::Mutate<_>>::transfer(&1, &2, 1, Expendable),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn thaw_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, u64::MAX));
+			assert_ok!(Balances::thaw(&TestId::Foo, &1));
+			assert_eq!(System::consumers(&1), 0);
+			assert_eq!(Balances::balance_frozen(&TestId::Foo, &1), 0);
+			assert_eq!(Balances::account(&1).frozen, 0);
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &2, 10, Expendable));
+		});
+}
+
+#[test]
+fn set_freeze_zero_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, u64::MAX));
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 0));
+			assert_eq!(System::consumers(&1), 0);
+			assert_eq!(Balances::balance_frozen(&TestId::Foo, &1), 0);
+			assert_eq!(Balances::account(&1).frozen, 0);
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &2, 10, Expendable));
+		});
+}
+
+#[test]
+fn set_freeze_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, u64::MAX));
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 5));
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &2, 5, Expendable));
+			assert_noop!(
+				<Balances as fungible::Mutate<_>>::transfer(&1, &2, 1, Expendable),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn extend_freeze_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 5));
+			assert_ok!(Balances::extend_freeze(&TestId::Foo, &1, 10));
+			assert_eq!(Balances::account(&1).frozen, 10);
+			assert_eq!(Balances::balance_frozen(&TestId::Foo, &1), 10);
+			assert_noop!(
+				<Balances as fungible::Mutate<_>>::transfer(&1, &2, 1, Expendable),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn double_freezing_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 5));
+			assert_ok!(Balances::set_freeze(&TestId::Bar, &1, 5));
+			assert_eq!(System::consumers(&1), 1);
+			assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &2, 5, Expendable));
+			assert_noop!(
+				<Balances as fungible::Mutate<_>>::transfer(&1, &2, 1, Expendable),
+				TokenError::Frozen
+			);
+		});
+}
+
+#[test]
+fn can_hold_entire_balance_when_second_provider() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(false)
+		.build_and_execute_with(|| {
+			<Balances as fungible::Mutate<_>>::set_balance(&1, 100);
+			assert_noop!(Balances::hold(&TestId::Foo, &1, 100), TokenError::FundsUnavailable);
+			System::inc_providers(&1);
+			assert_eq!(System::providers(&1), 2);
+			assert_ok!(Balances::hold(&TestId::Foo, &1, 100));
+			assert_eq!(System::providers(&1), 1);
+			assert_noop!(System::dec_providers(&1), DispatchError::ConsumerRemaining);
+		});
+}
+
+#[test]
+fn unholding_frees_hold_slot() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(false)
+		.build_and_execute_with(|| {
+			<Balances as fungible::Mutate<_>>::set_balance(&1, 100);
+			assert_ok!(Balances::hold(&TestId::Foo, &1, 10));
+			assert_ok!(Balances::hold(&TestId::Bar, &1, 10));
+			assert_ok!(Balances::release(&TestId::Foo, &1, 10, Exact));
+			assert_ok!(Balances::hold(&TestId::Baz, &1, 10));
+		});
+}
+
+#[test]
+fn sufficients_work_properly_with_reference_counting() {
+	ExtBuilder::default()
+		.existential_deposit(1)
+		.monied(true)
+		.build_and_execute_with(|| {
+			// Only run PoC when the system pallet is enabled, since the underlying bug is in the
+			// system pallet it won't work with BalancesAccountStore
+			if UseSystem::get() {
+				// Start with a balance of 100
+				<Balances as fungible::Mutate<_>>::set_balance(&1, 100);
+				// Emulate a sufficient, in reality this could be reached by transferring a
+				// sufficient asset to the account
+				System::inc_sufficients(&1);
+				// Spend the same balance multiple times
+				assert_ok!(<Balances as fungible::Mutate<_>>::transfer(&1, &1337, 100, Expendable));
+				assert_eq!(Balances::free_balance(&1), 0);
+				assert_noop!(
+					<Balances as fungible::Mutate<_>>::transfer(&1, &1337, 100, Expendable),
+					TokenError::FundsUnavailable
+				);
+			}
+		});
+}
+
+#[test]
+fn emit_events_with_changing_freezes() {
+	ExtBuilder::default().build_and_execute_with(|| {
+		let _ = Balances::set_balance(&1, 100);
+		System::reset_events();
+
+		// Freeze = [] --> [10]
+		assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 10));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Frozen { who: 1, amount: 10 })]);
+
+		// Freeze = [10] --> [15]
+		assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 15));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Frozen { who: 1, amount: 5 })]);
+
+		// Freeze = [15] --> [15, 20]
+		assert_ok!(Balances::set_freeze(&TestId::Bar, &1, 20));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Frozen { who: 1, amount: 5 })]);
+
+		// Freeze = [15, 20] --> [17, 20]
+		assert_ok!(Balances::set_freeze(&TestId::Foo, &1, 17));
+		for event in events() {
+			match event {
+				RuntimeEvent::Balances(crate::Event::Frozen { .. }) => {
+					assert!(false, "unexpected freeze event")
+				},
+				RuntimeEvent::Balances(crate::Event::Thawed { .. }) => {
+					assert!(false, "unexpected thaw event")
+				},
+				_ => continue,
+			}
+		}
+
+		// Freeze = [17, 20] --> [17, 15]
+		assert_ok!(Balances::set_freeze(&TestId::Bar, &1, 15));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Thawed { who: 1, amount: 3 })]);
+
+		// Freeze = [17, 15] --> [15]
+		assert_ok!(Balances::thaw(&TestId::Foo, &1));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Thawed { who: 1, amount: 2 })]);
+
+		// Freeze = [15] --> []
+		assert_ok!(Balances::thaw(&TestId::Bar, &1));
+		assert_eq!(events(), [RuntimeEvent::Balances(crate::Event::Thawed { who: 1, amount: 15 })]);
+	});
+}
diff --git a/frame/balances/src/tests/mod.rs b/frame/balances/src/tests/mod.rs
new file mode 100644
index 0000000..4731dbf
--- /dev/null
+++ b/frame/balances/src/tests/mod.rs
@@ -0,0 +1,319 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2018-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests.
+
+#![cfg(test)]
+
+use crate::{self as pallet_balances, AccountData, Config, CreditOf, Error, Pallet};
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::{
+	assert_err, assert_noop, assert_ok, assert_storage_noop,
+	dispatch::{DispatchInfo, GetDispatchInfo},
+	parameter_types,
+	traits::{
+		tokens::fungible, ConstU32, ConstU64, ConstU8, Imbalance as ImbalanceT, OnUnbalanced,
+		StorageMapShim, StoredMap, WhitelistedStorageKeys,
+	},
+	weights::{IdentityFee, Weight},
+	RuntimeDebug,
+};
+use frame_system::{self as system, RawOrigin};
+use pallet_transaction_payment::{ChargeTransactionPayment, CurrencyAdapter, Multiplier};
+use scale_info::TypeInfo;
+use sp_core::{hexdisplay::HexDisplay, H256};
+use sp_io;
+use sp_runtime::{
+	testing::Header,
+	traits::{BadOrigin, IdentityLookup, SignedExtension, Zero},
+	ArithmeticError, DispatchError, DispatchResult, FixedPointNumber, TokenError,
+};
+use std::collections::BTreeSet;
+
+mod currency_tests;
+mod dispatchable_tests;
+mod fungible_conformance_tests;
+mod fungible_tests;
+mod reentrancy_tests;
+
+type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
+type Block = frame_system::mocking::MockBlock<Test>;
+
+#[derive(
+	Encode,
+	Decode,
+	Copy,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	MaxEncodedLen,
+	TypeInfo,
+	RuntimeDebug,
+)]
+pub enum TestId {
+	Foo,
+	Bar,
+	Baz,
+}
+
+frame_support::construct_runtime!(
+	pub struct Test where
+		Block = Block,
+		NodeBlock = Block,
+		UncheckedExtrinsic = UncheckedExtrinsic,
+	{
+		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
+	}
+);
+
+parameter_types! {
+	pub BlockWeights: frame_system::limits::BlockWeights =
+		frame_system::limits::BlockWeights::simple_max(
+			frame_support::weights::Weight::from_parts(1024, u64::MAX),
+		);
+	pub static ExistentialDeposit: u64 = 1;
+}
+impl frame_system::Config for Test {
+	type BaseCallFilter = frame_support::traits::Everything;
+	type BlockWeights = BlockWeights;
+	type BlockLength = ();
+	type DbWeight = ();
+	type RuntimeOrigin = RuntimeOrigin;
+	type Index = u64;
+	type BlockNumber = u64;
+	type RuntimeCall = RuntimeCall;
+	type Hash = H256;
+	type Hashing = ::sp_runtime::traits::BlakeTwo256;
+	type AccountId = u64;
+	type Lookup = IdentityLookup<Self::AccountId>;
+	type Header = Header;
+	type RuntimeEvent = RuntimeEvent;
+	type BlockHashCount = ConstU64<250>;
+	type Version = ();
+	type PalletInfo = PalletInfo;
+	type AccountData = super::AccountData<u64>;
+	type OnNewAccount = ();
+	type OnKilledAccount = ();
+	type SystemWeightInfo = ();
+	type SS58Prefix = ();
+	type OnSetCode = ();
+	type MaxConsumers = frame_support::traits::ConstU32<16>;
+}
+
+impl pallet_transaction_payment::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
+	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
+	type OperationalFeeMultiplier = ConstU8<5>;
+	type WeightToFee = IdentityFee<u64>;
+	type LengthToFee = IdentityFee<u64>;
+	type FeeMultiplierUpdate = ();
+}
+
+impl Config for Test {
+	type Balance = u64;
+	type DustRemoval = DustTrap;
+	type RuntimeEvent = RuntimeEvent;
+	type ExistentialDeposit = ExistentialDeposit;
+	type AccountStore = TestAccountStore;
+	type MaxLocks = ConstU32<50>;
+	type MaxReserves = ConstU32<2>;
+	type ReserveIdentifier = TestId;
+	type WeightInfo = ();
+	type HoldIdentifier = TestId;
+	type FreezeIdentifier = TestId;
+	type MaxFreezes = ConstU32<2>;
+	type MaxHolds = ConstU32<2>;
+}
+
+#[derive(Clone)]
+pub struct ExtBuilder {
+	existential_deposit: u64,
+	monied: bool,
+	dust_trap: Option<u64>,
+}
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self { existential_deposit: 1, monied: false, dust_trap: None }
+	}
+}
+impl ExtBuilder {
+	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
+		self.existential_deposit = existential_deposit;
+		self
+	}
+	pub fn monied(mut self, monied: bool) -> Self {
+		self.monied = monied;
+		if self.existential_deposit == 0 {
+			self.existential_deposit = 1;
+		}
+		self
+	}
+	pub fn dust_trap(mut self, account: u64) -> Self {
+		self.dust_trap = Some(account);
+		self
+	}
+	pub fn set_associated_consts(&self) {
+		DUST_TRAP_TARGET.with(|v| v.replace(self.dust_trap));
+		EXISTENTIAL_DEPOSIT.with(|v| v.replace(self.existential_deposit));
+	}
+	pub fn build(self) -> sp_io::TestExternalities {
+		self.set_associated_consts();
+		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+		pallet_balances::GenesisConfig::<Test> {
+			balances: if self.monied {
+				vec![
+					(1, 10 * self.existential_deposit),
+					(2, 20 * self.existential_deposit),
+					(3, 30 * self.existential_deposit),
+					(4, 40 * self.existential_deposit),
+					(12, 10 * self.existential_deposit),
+				]
+			} else {
+				vec![]
+			},
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+	pub fn build_and_execute_with(self, f: impl Fn()) {
+		let other = self.clone();
+		UseSystem::set(false);
+		other.build().execute_with(|| f());
+		UseSystem::set(true);
+		self.build().execute_with(|| f());
+	}
+}
+
+parameter_types! {
+	static DustTrapTarget: Option<u64> = None;
+}
+
+pub struct DustTrap;
+
+impl OnUnbalanced<CreditOf<Test, ()>> for DustTrap {
+	fn on_nonzero_unbalanced(amount: CreditOf<Test, ()>) {
+		match DustTrapTarget::get() {
+			None => drop(amount),
+			Some(a) => {
+				let result = <Balances as fungible::Balanced<_>>::resolve(&a, amount);
+				debug_assert!(result.is_ok());
+			},
+		}
+	}
+}
+
+parameter_types! {
+	pub static UseSystem: bool = false;
+}
+
+type BalancesAccountStore = StorageMapShim<super::Account<Test>, u64, super::AccountData<u64>>;
+type SystemAccountStore = frame_system::Pallet<Test>;
+
+pub struct TestAccountStore;
+impl StoredMap<u64, super::AccountData<u64>> for TestAccountStore {
+	fn get(k: &u64) -> super::AccountData<u64> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::get(k)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::get(k)
+		}
+	}
+	fn try_mutate_exists<R, E: From<DispatchError>>(
+		k: &u64,
+		f: impl FnOnce(&mut Option<super::AccountData<u64>>) -> Result<R, E>,
+	) -> Result<R, E> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::try_mutate_exists(k, f)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::try_mutate_exists(k, f)
+		}
+	}
+	fn mutate<R>(
+		k: &u64,
+		f: impl FnOnce(&mut super::AccountData<u64>) -> R,
+	) -> Result<R, DispatchError> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::mutate(k, f)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::mutate(k, f)
+		}
+	}
+	fn mutate_exists<R>(
+		k: &u64,
+		f: impl FnOnce(&mut Option<super::AccountData<u64>>) -> R,
+	) -> Result<R, DispatchError> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::mutate_exists(k, f)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::mutate_exists(k, f)
+		}
+	}
+	fn insert(k: &u64, t: super::AccountData<u64>) -> Result<(), DispatchError> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::insert(k, t)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::insert(k, t)
+		}
+	}
+	fn remove(k: &u64) -> Result<(), DispatchError> {
+		if UseSystem::get() {
+			<SystemAccountStore as StoredMap<_, _>>::remove(k)
+		} else {
+			<BalancesAccountStore as StoredMap<_, _>>::remove(k)
+		}
+	}
+}
+
+pub fn events() -> Vec<RuntimeEvent> {
+	let evt = System::events().into_iter().map(|evt| evt.event).collect::<Vec<_>>();
+	System::reset_events();
+	evt
+}
+
+/// create a transaction info struct from weight. Handy to avoid building the whole struct.
+pub fn info_from_weight(w: Weight) -> DispatchInfo {
+	DispatchInfo { weight: w, ..Default::default() }
+}
+
+#[test]
+fn weights_sane() {
+	let info = crate::Call::<Test>::transfer_allow_death { dest: 10, value: 4 }.get_dispatch_info();
+	assert_eq!(<() as crate::WeightInfo>::transfer_allow_death(), info.weight);
+
+	let info = crate::Call::<Test>::force_unreserve { who: 10, amount: 4 }.get_dispatch_info();
+	assert_eq!(<() as crate::WeightInfo>::force_unreserve(), info.weight);
+}
+
+#[test]
+fn check_whitelist() {
+	let whitelist: BTreeSet<String> = AllPalletsWithSystem::whitelisted_storage_keys()
+		.iter()
+		.map(|s| HexDisplay::from(&s.key).to_string())
+		.collect();
+	// Inactive Issuance
+	assert!(whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f1ccde6872881f893a21de93dfe970cd5"));
+	// Total Issuance
+	assert!(whitelist.contains("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80"));
+}
diff --git a/frame/balances/src/tests/reentrancy_tests.rs b/frame/balances/src/tests/reentrancy_tests.rs
new file mode 100644
index 0000000..e97bf2e
--- /dev/null
+++ b/frame/balances/src/tests/reentrancy_tests.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Tests regarding the reentrancy functionality.
+
+use super::*;
+use frame_support::traits::tokens::{
+	Fortitude::Force,
+	Precision::BestEffort,
+	Preservation::{Expendable, Protect},
+};
+use fungible::Balanced;
+
+#[test]
+fn transfer_dust_removal_tst1_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.dust_trap(1)
+		.build_and_execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 1000));
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 2, 500));
+
+			// In this transaction, account 2 free balance
+			// drops below existential balance
+			// and dust balance is removed from account 2
+			assert_ok!(Balances::transfer_allow_death(RawOrigin::Signed(2).into(), 3, 450));
+
+			// As expected dust balance is removed.
+			assert_eq!(Balances::free_balance(&2), 0);
+
+			// As expected beneficiary account 3
+			// received the transfered fund.
+			assert_eq!(Balances::free_balance(&3), 450);
+
+			// Dust balance is deposited to account 1
+			// during the process of dust removal.
+			assert_eq!(Balances::free_balance(&1), 1050);
+
+			// Verify the events
+			assert_eq!(System::events().len(), 12);
+
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Transfer {
+				from: 2,
+				to: 3,
+				amount: 450,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
+				account: 2,
+				amount: 50,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
+				who: 1,
+				amount: 50,
+			}));
+		});
+}
+
+#[test]
+fn transfer_dust_removal_tst2_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.dust_trap(1)
+		.build_and_execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 1000));
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 2, 500));
+
+			// In this transaction, account 2 free balance
+			// drops below existential balance
+			// and dust balance is removed from account 2
+			assert_ok!(Balances::transfer_allow_death(RawOrigin::Signed(2).into(), 1, 450));
+
+			// As expected dust balance is removed.
+			assert_eq!(Balances::free_balance(&2), 0);
+
+			// Dust balance is deposited to account 1
+			// during the process of dust removal.
+			assert_eq!(Balances::free_balance(&1), 1500);
+
+			// Verify the events
+			assert_eq!(System::events().len(), 10);
+
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Transfer {
+				from: 2,
+				to: 1,
+				amount: 450,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
+				account: 2,
+				amount: 50,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
+				who: 1,
+				amount: 50,
+			}));
+		});
+}
+
+#[test]
+fn repatriating_reserved_balance_dust_removal_should_work() {
+	ExtBuilder::default()
+		.existential_deposit(100)
+		.dust_trap(1)
+		.build_and_execute_with(|| {
+			// Verification of reentrancy in dust removal
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 1000));
+			assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 2, 500));
+
+			// Reserve a value on account 2,
+			// Such that free balance is lower than
+			// Exestintial deposit.
+			assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(2), 1, 450));
+
+			// Since free balance of account 2 is lower than
+			// existential deposit, dust amount is
+			// removed from the account 2
+			assert_eq!(Balances::reserved_balance(2), 0);
+			assert_eq!(Balances::free_balance(2), 0);
+
+			// account 1 is credited with reserved amount
+			// together with dust balance during dust
+			// removal.
+			assert_eq!(Balances::reserved_balance(1), 0);
+			assert_eq!(Balances::free_balance(1), 1500);
+
+			// Verify the events
+			assert_eq!(System::events().len(), 10);
+
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Transfer {
+				from: 2,
+				to: 1,
+				amount: 450,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
+				account: 2,
+				amount: 50,
+			}));
+			System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
+				who: 1,
+				amount: 50,
+			}));
+		});
+}
+
+#[test]
+fn emit_events_with_no_existential_deposit_suicide_with_dust() {
+	ExtBuilder::default().existential_deposit(2).build_and_execute_with(|| {
+		assert_ok!(Balances::force_set_balance(RawOrigin::Root.into(), 1, 100));
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
+				RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100 }),
+			]
+		);
+
+		let res = Balances::withdraw(&1, 98, BestEffort, Protect, Force);
+		assert_eq!(res.unwrap().peek(), 98);
+
+		// no events
+		assert_eq!(
+			events(),
+			[RuntimeEvent::Balances(crate::Event::Withdraw { who: 1, amount: 98 })]
+		);
+
+		let res = Balances::withdraw(&1, 1, BestEffort, Expendable, Force);
+		assert_eq!(res.unwrap().peek(), 1);
+
+		assert_eq!(
+			events(),
+			[
+				RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
+				RuntimeEvent::Balances(crate::Event::DustLost { account: 1, amount: 1 }),
+				RuntimeEvent::Balances(crate::Event::Withdraw { who: 1, amount: 1 })
+			]
+		);
+	});
+}
diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
deleted file mode 100644
index 6f371f1..0000000
--- a/frame/balances/src/tests_composite.rs
+++ /dev/null
@@ -1,149 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Test utilities
-
-#![cfg(test)]
-
-use crate::{self as pallet_balances, decl_tests, Config, Pallet};
-use frame_support::{
-	dispatch::DispatchInfo,
-	parameter_types,
-	traits::{ConstU32, ConstU64, ConstU8},
-	weights::{IdentityFee, Weight},
-};
-use pallet_transaction_payment::CurrencyAdapter;
-use sp_core::H256;
-use sp_io;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
-	}
-);
-
-parameter_types! {
-	pub BlockWeights: frame_system::limits::BlockWeights =
-		frame_system::limits::BlockWeights::simple_max(
-			frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX),
-		);
-	pub static ExistentialDeposit: u64 = 0;
-}
-impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Hashing = ::sp_runtime::traits::BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = super::AccountData<u64>;
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-impl pallet_transaction_payment::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
-	type OperationalFeeMultiplier = ConstU8<5>;
-	type WeightToFee = IdentityFee<u64>;
-	type LengthToFee = IdentityFee<u64>;
-	type FeeMultiplierUpdate = ();
-}
-
-impl Config for Test {
-	type Balance = u64;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore = frame_system::Pallet<Test>;
-	type MaxLocks = ();
-	type MaxReserves = ConstU32<2>;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = ();
-}
-
-pub struct ExtBuilder {
-	existential_deposit: u64,
-	monied: bool,
-}
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self { existential_deposit: 1, monied: false }
-	}
-}
-impl ExtBuilder {
-	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
-		self.existential_deposit = existential_deposit;
-		self
-	}
-	pub fn monied(mut self, monied: bool) -> Self {
-		self.monied = monied;
-		self
-	}
-	pub fn set_associated_consts(&self) {
-		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
-	}
-	pub fn build(self) -> sp_io::TestExternalities {
-		self.set_associated_consts();
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: if self.monied {
-				vec![
-					(1, 10 * self.existential_deposit),
-					(2, 20 * self.existential_deposit),
-					(3, 30 * self.existential_deposit),
-					(4, 40 * self.existential_deposit),
-					(12, 10 * self.existential_deposit),
-				]
-			} else {
-				vec![]
-			},
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext
-	}
-}
-
-decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
deleted file mode 100644
index 0d57a33..0000000
--- a/frame/balances/src/tests_local.rs
+++ /dev/null
@@ -1,191 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Test utilities
-
-#![cfg(test)]
-
-use crate::{self as pallet_balances, decl_tests, Config, Pallet};
-use frame_support::{
-	dispatch::DispatchInfo,
-	parameter_types,
-	traits::{ConstU32, ConstU64, ConstU8, StorageMapShim},
-	weights::{IdentityFee, Weight},
-};
-use pallet_transaction_payment::CurrencyAdapter;
-use sp_core::H256;
-use sp_io;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
-
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub struct Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
-	}
-);
-
-parameter_types! {
-	pub BlockWeights: frame_system::limits::BlockWeights =
-		frame_system::limits::BlockWeights::simple_max(
-			frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX),
-		);
-	pub static ExistentialDeposit: u64 = 0;
-}
-impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Hashing = ::sp_runtime::traits::BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-impl pallet_transaction_payment::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
-	type OnChargeTransaction = CurrencyAdapter<Pallet<Test>, ()>;
-	type OperationalFeeMultiplier = ConstU8<5>;
-	type WeightToFee = IdentityFee<u64>;
-	type LengthToFee = IdentityFee<u64>;
-	type FeeMultiplierUpdate = ();
-}
-
-impl Config for Test {
-	type Balance = u64;
-	type DustRemoval = ();
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore =
-		StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
-	type MaxLocks = ConstU32<50>;
-	type MaxReserves = ConstU32<2>;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = ();
-}
-
-pub struct ExtBuilder {
-	existential_deposit: u64,
-	monied: bool,
-}
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self { existential_deposit: 1, monied: false }
-	}
-}
-impl ExtBuilder {
-	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
-		self.existential_deposit = existential_deposit;
-		self
-	}
-	pub fn monied(mut self, monied: bool) -> Self {
-		self.monied = monied;
-		if self.existential_deposit == 0 {
-			self.existential_deposit = 1;
-		}
-		self
-	}
-	pub fn set_associated_consts(&self) {
-		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
-	}
-	pub fn build(self) -> sp_io::TestExternalities {
-		self.set_associated_consts();
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> {
-			balances: if self.monied {
-				vec![
-					(1, 10 * self.existential_deposit),
-					(2, 20 * self.existential_deposit),
-					(3, 30 * self.existential_deposit),
-					(4, 40 * self.existential_deposit),
-					(12, 10 * self.existential_deposit),
-				]
-			} else {
-				vec![]
-			},
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext
-	}
-}
-
-decl_tests! { Test, ExtBuilder, EXISTENTIAL_DEPOSIT }
-
-#[test]
-fn emit_events_with_no_existential_deposit_suicide_with_dust() {
-	<ExtBuilder>::default().existential_deposit(2).build().execute_with(|| {
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 100, 0));
-
-		assert_eq!(
-			events(),
-			[
-				RuntimeEvent::System(system::Event::NewAccount { account: 1 }),
-				RuntimeEvent::Balances(crate::Event::Endowed { account: 1, free_balance: 100 }),
-				RuntimeEvent::Balances(crate::Event::BalanceSet { who: 1, free: 100, reserved: 0 }),
-			]
-		);
-
-		let res = Balances::slash(&1, 98);
-		assert_eq!(res, (NegativeImbalance::new(98), 0));
-
-		// no events
-		assert_eq!(
-			events(),
-			[RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 98 })]
-		);
-
-		let res = Balances::slash(&1, 1);
-		assert_eq!(res, (NegativeImbalance::new(1), 0));
-
-		assert_eq!(
-			events(),
-			[
-				RuntimeEvent::System(system::Event::KilledAccount { account: 1 }),
-				RuntimeEvent::Balances(crate::Event::DustLost { account: 1, amount: 1 }),
-				RuntimeEvent::Balances(crate::Event::Slashed { who: 1, amount: 1 })
-			]
-		);
-	});
-}
diff --git a/frame/balances/src/tests_reentrancy.rs b/frame/balances/src/tests_reentrancy.rs
deleted file mode 100644
index 1699a87..0000000
--- a/frame/balances/src/tests_reentrancy.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// 	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Test setup for potential reentracy and lost updates of nested mutations.
-
-#![cfg(test)]
-
-use crate::{self as pallet_balances, Config};
-use frame_support::{
-	parameter_types,
-	traits::{ConstU32, ConstU64, StorageMapShim},
-};
-use sp_core::H256;
-use sp_io;
-use sp_runtime::{testing::Header, traits::IdentityLookup};
-
-use crate::*;
-use frame_support::{
-	assert_ok,
-	traits::{Currency, ReservableCurrency},
-};
-use frame_system::RawOrigin;
-
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
-
-frame_support::construct_runtime!(
-	pub enum Test where
-		Block = Block,
-		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic,
-	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-	}
-);
-
-parameter_types! {
-	pub BlockWeights: frame_system::limits::BlockWeights =
-		frame_system::limits::BlockWeights::simple_max(
-			frame_support::weights::Weight::from_ref_time(1024).set_proof_size(u64::MAX),
-		);
-	pub static ExistentialDeposit: u64 = 0;
-}
-impl frame_system::Config for Test {
-	type BaseCallFilter = frame_support::traits::Everything;
-	type BlockWeights = BlockWeights;
-	type BlockLength = ();
-	type DbWeight = ();
-	type RuntimeOrigin = RuntimeOrigin;
-	type Index = u64;
-	type BlockNumber = u64;
-	type RuntimeCall = RuntimeCall;
-	type Hash = H256;
-	type Hashing = ::sp_runtime::traits::BlakeTwo256;
-	type AccountId = u64;
-	type Lookup = IdentityLookup<Self::AccountId>;
-	type Header = Header;
-	type RuntimeEvent = RuntimeEvent;
-	type BlockHashCount = ConstU64<250>;
-	type Version = ();
-	type PalletInfo = PalletInfo;
-	type AccountData = ();
-	type OnNewAccount = ();
-	type OnKilledAccount = ();
-	type SystemWeightInfo = ();
-	type SS58Prefix = ();
-	type OnSetCode = ();
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-}
-
-pub struct OnDustRemoval;
-impl OnUnbalanced<NegativeImbalance<Test>> for OnDustRemoval {
-	fn on_nonzero_unbalanced(amount: NegativeImbalance<Test>) {
-		assert_ok!(Balances::resolve_into_existing(&1, amount));
-	}
-}
-
-impl Config for Test {
-	type Balance = u64;
-	type DustRemoval = OnDustRemoval;
-	type RuntimeEvent = RuntimeEvent;
-	type ExistentialDeposit = ExistentialDeposit;
-	type AccountStore =
-		StorageMapShim<super::Account<Test>, system::Provider<Test>, u64, super::AccountData<u64>>;
-	type MaxLocks = ConstU32<50>;
-	type MaxReserves = ConstU32<2>;
-	type ReserveIdentifier = [u8; 8];
-	type WeightInfo = ();
-}
-
-pub struct ExtBuilder {
-	existential_deposit: u64,
-}
-impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self { existential_deposit: 1 }
-	}
-}
-impl ExtBuilder {
-	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
-		self.existential_deposit = existential_deposit;
-		self
-	}
-
-	pub fn set_associated_consts(&self) {
-		EXISTENTIAL_DEPOSIT.with(|v| *v.borrow_mut() = self.existential_deposit);
-	}
-
-	pub fn build(self) -> sp_io::TestExternalities {
-		self.set_associated_consts();
-		let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
-		pallet_balances::GenesisConfig::<Test> { balances: vec![] }
-			.assimilate_storage(&mut t)
-			.unwrap();
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext
-	}
-}
-
-#[test]
-fn transfer_dust_removal_tst1_should_work() {
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		// Verification of reentrancy in dust removal
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-		// In this transaction, account 2 free balance
-		// drops below existential balance
-		// and dust balance is removed from account 2
-		assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 3, 450));
-
-		// As expected dust balance is removed.
-		assert_eq!(Balances::free_balance(&2), 0);
-
-		// As expected beneficiary account 3
-		// received the transfered fund.
-		assert_eq!(Balances::free_balance(&3), 450);
-
-		// Dust balance is deposited to account 1
-		// during the process of dust removal.
-		assert_eq!(Balances::free_balance(&1), 1050);
-
-		// Verify the events
-		assert_eq!(System::events().len(), 12);
-
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::Transfer {
-			from: 2,
-			to: 3,
-			amount: 450,
-		}));
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
-			account: 2,
-			amount: 50,
-		}));
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
-			who: 1,
-			amount: 50,
-		}));
-	});
-}
-
-#[test]
-fn transfer_dust_removal_tst2_should_work() {
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		// Verification of reentrancy in dust removal
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-		// In this transaction, account 2 free balance
-		// drops below existential balance
-		// and dust balance is removed from account 2
-		assert_ok!(Balances::transfer(RawOrigin::Signed(2).into(), 1, 450));
-
-		// As expected dust balance is removed.
-		assert_eq!(Balances::free_balance(&2), 0);
-
-		// Dust balance is deposited to account 1
-		// during the process of dust removal.
-		assert_eq!(Balances::free_balance(&1), 1500);
-
-		// Verify the events
-		assert_eq!(System::events().len(), 10);
-
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::Transfer {
-			from: 2,
-			to: 1,
-			amount: 450,
-		}));
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
-			account: 2,
-			amount: 50,
-		}));
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::Deposit {
-			who: 1,
-			amount: 50,
-		}));
-	});
-}
-
-#[test]
-fn repatriating_reserved_balance_dust_removal_should_work() {
-	ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
-		// Verification of reentrancy in dust removal
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 1, 1000, 0));
-		assert_ok!(Balances::set_balance(RawOrigin::Root.into(), 2, 500, 0));
-
-		// Reserve a value on account 2,
-		// Such that free balance is lower than
-		// Exestintial deposit.
-		assert_ok!(Balances::reserve(&2, 450));
-
-		// Transfer of reserved fund from slashed account 2 to
-		// beneficiary account 1
-		assert_ok!(Balances::repatriate_reserved(&2, &1, 450, Status::Free), 0);
-
-		// Since free balance of account 2 is lower than
-		// existential deposit, dust amount is
-		// removed from the account 2
-		assert_eq!(Balances::reserved_balance(2), 0);
-		assert_eq!(Balances::free_balance(2), 0);
-
-		// account 1 is credited with reserved amount
-		// together with dust balance during dust
-		// removal.
-		assert_eq!(Balances::reserved_balance(1), 0);
-		assert_eq!(Balances::free_balance(1), 1500);
-
-		// Verify the events
-		assert_eq!(System::events().len(), 11);
-
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::ReserveRepatriated {
-			from: 2,
-			to: 1,
-			amount: 450,
-			destination_status: Status::Free,
-		}));
-
-		System::assert_has_event(RuntimeEvent::Balances(crate::Event::DustLost {
-			account: 2,
-			amount: 50,
-		}));
-
-		System::assert_last_event(RuntimeEvent::Balances(crate::Event::Deposit {
-			who: 1,
-			amount: 50,
-		}));
-	});
-}
diff --git a/frame/balances/src/types.rs b/frame/balances/src/types.rs
new file mode 100644
index 0000000..3878802
--- /dev/null
+++ b/frame/balances/src/types.rs
@@ -0,0 +1,161 @@
+// This file is part of Substrate.
+
+// Copyright (C) 2017-2022 Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Types used in the pallet.
+
+use crate::{Config, CreditOf, Event, Pallet};
+use codec::{Decode, Encode, MaxEncodedLen};
+use core::ops::BitOr;
+use frame_support::{
+	traits::{Imbalance, LockIdentifier, OnUnbalanced, WithdrawReasons},
+	RuntimeDebug,
+};
+use scale_info::TypeInfo;
+#[cfg(feature = "std")]
+use serde::{Deserialize, Serialize};
+use sp_runtime::Saturating;
+
+/// Simplified reasons for withdrawing balance.
+#[derive(Encode, Decode, Clone, Copy, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+pub enum Reasons {
+	/// Paying system transaction fees.
+	Fee = 0,
+	/// Any reason other than paying system transaction fees.
+	Misc = 1,
+	/// Any reason at all.
+	All = 2,
+}
+
+impl From<WithdrawReasons> for Reasons {
+	fn from(r: WithdrawReasons) -> Reasons {
+		if r == WithdrawReasons::TRANSACTION_PAYMENT {
+			Reasons::Fee
+		} else if r.contains(WithdrawReasons::TRANSACTION_PAYMENT) {
+			Reasons::All
+		} else {
+			Reasons::Misc
+		}
+	}
+}
+
+impl BitOr for Reasons {
+	type Output = Reasons;
+	fn bitor(self, other: Reasons) -> Reasons {
+		if self == other {
+			return self;
+		}
+		Reasons::All
+	}
+}
+
+/// A single lock on a balance. There can be many of these on an account and they "overlap", so the
+/// same balance is frozen by multiple locks.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+pub struct BalanceLock<Balance> {
+	/// An identifier for this lock. Only one lock may be in existence for each identifier.
+	pub id: LockIdentifier,
+	/// The amount which the free balance may not drop below when this lock is in effect.
+	pub amount: Balance,
+	/// If true, then the lock remains in effect even for payment of transaction fees.
+	pub reasons: Reasons,
+}
+
+/// Store named reserved balance.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+pub struct ReserveData<ReserveIdentifier, Balance> {
+	/// The identifier for the named reserve.
+	pub id: ReserveIdentifier,
+	/// The amount of the named reserve.
+	pub amount: Balance,
+}
+
+/// An identifier and balance.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+pub struct IdAmount<Id, Balance> {
+	/// An identifier for this item.
+	pub id: Id,
+	/// Some amount for this item.
+	pub amount: Balance,
+}
+
+/// All balance information for an account.
+#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub struct AccountData<Balance> {
+	/// Non-reserved part of the balance which the account holder may be able to control.
+	///
+	/// This is the only balance that matters in terms of most operations on tokens.
+	pub free: Balance,
+	/// Balance which is has active holds on it and may not be used at all.
+	///
+	/// This is the sum of all individual holds together with any sums still under the (deprecated)
+	/// reserves API.
+	pub reserved: Balance,
+	/// The amount that `free + reserved` may not drop below when reducing the balance, except for
+	/// actions where the account owner cannot reasonably benefit from the balance reduction, such
+	/// as slashing.
+	pub frozen: Balance,
+	/// Extra information about this account. The MSB is a flag indicating whether the new ref-
+	/// counting logic is in place for this account.
+	pub flags: ExtraFlags,
+}
+
+const IS_NEW_LOGIC: u128 = 0x80000000_00000000_00000000_00000000u128;
+
+#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub struct ExtraFlags(u128);
+impl Default for ExtraFlags {
+	fn default() -> Self {
+		Self(IS_NEW_LOGIC)
+	}
+}
+impl ExtraFlags {
+	pub fn old_logic() -> Self {
+		Self(0)
+	}
+	pub fn set_new_logic(&mut self) {
+		self.0 = self.0 | IS_NEW_LOGIC
+	}
+	pub fn is_new_logic(&self) -> bool {
+		(self.0 & IS_NEW_LOGIC) == IS_NEW_LOGIC
+	}
+}
+
+impl<Balance: Saturating + Copy + Ord> AccountData<Balance> {
+	pub fn usable(&self) -> Balance {
+		self.free.saturating_sub(self.frozen)
+	}
+
+	/// The total balance in this account including any that is reserved and ignoring any frozen.
+	pub fn total(&self) -> Balance {
+		self.free.saturating_add(self.reserved)
+	}
+}
+
+pub struct DustCleaner<T: Config<I>, I: 'static = ()>(
+	pub(crate) Option<(T::AccountId, CreditOf<T, I>)>,
+);
+
+impl<T: Config<I>, I: 'static> Drop for DustCleaner<T, I> {
+	fn drop(&mut self) {
+		if let Some((who, dust)) = self.0.take() {
+			Pallet::<T, I>::deposit_event(Event::DustLost { account: who, amount: dust.peek() });
+			T::DustRemoval::on_unbalanced(dust);
+		}
+	}
+}
diff --git a/frame/balances/src/weights.rs b/frame/balances/src/weights.rs
index 6bd7d75..f35d9c6 100644
--- a/frame/balances/src/weights.rs
+++ b/frame/balances/src/weights.rs
@@ -18,7 +18,7 @@
 //! Autogenerated weights for pallet_balances
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-01-24, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2023-04-06, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
@@ -48,13 +48,14 @@ use sp_std::marker::PhantomData;
 
 /// Weight functions needed for pallet_balances.
 pub trait WeightInfo {
-	fn transfer() -> Weight;
+	fn transfer_allow_death() -> Weight;
 	fn transfer_keep_alive() -> Weight;
-	fn set_balance_creating() -> Weight;
-	fn set_balance_killing() -> Weight;
+	fn force_set_balance_creating() -> Weight;
+	fn force_set_balance_killing() -> Weight;
 	fn force_transfer() -> Weight;
 	fn transfer_all() -> Weight;
 	fn force_unreserve() -> Weight;
+	fn upgrade_accounts(u: u32, ) -> Weight;
 }
 
 /// Weights for pallet_balances using the Substrate node and recommended hardware.
@@ -62,12 +63,12 @@ pub struct SubstrateWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer() -> Weight {
+	fn transfer_allow_death() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1723`
-		//  Estimated: `2603`
-		// Minimum execution time: 47_557 nanoseconds.
-		Weight::from_parts(48_314_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 59_458_000 picoseconds.
+		Weight::from_parts(60_307_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -75,32 +76,32 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 36_372 nanoseconds.
-		Weight::from_parts(37_432_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 43_056_000 picoseconds.
+		Weight::from_parts(43_933_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_balance_creating() -> Weight {
+	fn force_set_balance_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 26_671 nanoseconds.
-		Weight::from_parts(28_287_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 17_428_000 picoseconds.
+		Weight::from_parts(17_731_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_balance_killing() -> Weight {
+	fn force_set_balance_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 30_122 nanoseconds.
-		Weight::from_parts(30_615_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 22_809_000 picoseconds.
+		Weight::from_parts(23_225_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -108,10 +109,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1719`
-		//  Estimated: `5206`
-		// Minimum execution time: 47_891 nanoseconds.
-		Weight::from_parts(48_496_000, 5206)
+		//  Measured:  `103`
+		//  Estimated: `6196`
+		// Minimum execution time: 56_929_000 picoseconds.
+		Weight::from_parts(57_688_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -119,10 +120,10 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 42_470 nanoseconds.
-		Weight::from_parts(42_950_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 49_820_000 picoseconds.
+		Weight::from_parts(50_832_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -130,25 +131,40 @@ impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_unreserve() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1641`
-		//  Estimated: `2603`
-		// Minimum execution time: 23_230 nanoseconds.
-		Weight::from_parts(23_951_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 20_270_000 picoseconds.
+		Weight::from_parts(20_597_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: System Account (r:999 w:999)
+	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// The range of component `u` is `[1, 1000]`.
+	fn upgrade_accounts(u: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + u * (135 ±0)`
+		//  Estimated: `990 + u * (2603 ±0)`
+		// Minimum execution time: 19_847_000 picoseconds.
+		Weight::from_parts(20_053_000, 990)
+			// Standard Error: 11_643
+			.saturating_add(Weight::from_parts(14_563_782, 0).saturating_mul(u.into()))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
+			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
+	}
 }
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn transfer() -> Weight {
+	fn transfer_allow_death() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1723`
-		//  Estimated: `2603`
-		// Minimum execution time: 47_557 nanoseconds.
-		Weight::from_parts(48_314_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 59_458_000 picoseconds.
+		Weight::from_parts(60_307_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -156,32 +172,32 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 36_372 nanoseconds.
-		Weight::from_parts(37_432_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 43_056_000 picoseconds.
+		Weight::from_parts(43_933_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_balance_creating() -> Weight {
+	fn force_set_balance_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 26_671 nanoseconds.
-		Weight::from_parts(28_287_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 17_428_000 picoseconds.
+		Weight::from_parts(17_731_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: System Account (r:1 w:1)
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	fn set_balance_killing() -> Weight {
+	fn force_set_balance_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1757`
-		//  Estimated: `2603`
-		// Minimum execution time: 30_122 nanoseconds.
-		Weight::from_parts(30_615_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 22_809_000 picoseconds.
+		Weight::from_parts(23_225_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -189,10 +205,10 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1719`
-		//  Estimated: `5206`
-		// Minimum execution time: 47_891 nanoseconds.
-		Weight::from_parts(48_496_000, 5206)
+		//  Measured:  `103`
+		//  Estimated: `6196`
+		// Minimum execution time: 56_929_000 picoseconds.
+		Weight::from_parts(57_688_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -200,10 +216,10 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1607`
-		//  Estimated: `2603`
-		// Minimum execution time: 42_470 nanoseconds.
-		Weight::from_parts(42_950_000, 2603)
+		//  Measured:  `0`
+		//  Estimated: `3593`
+		// Minimum execution time: 49_820_000 picoseconds.
+		Weight::from_parts(50_832_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -211,11 +227,26 @@ impl WeightInfo for () {
 	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
 	fn force_unreserve() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1641`
-		//  Estimated: `2603`
-		// Minimum execution time: 23_230 nanoseconds.
-		Weight::from_parts(23_951_000, 2603)
+		//  Measured:  `174`
+		//  Estimated: `3593`
+		// Minimum execution time: 20_270_000 picoseconds.
+		Weight::from_parts(20_597_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: System Account (r:999 w:999)
+	/// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
+	/// The range of component `u` is `[1, 1000]`.
+	fn upgrade_accounts(u: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + u * (135 ±0)`
+		//  Estimated: `990 + u * (2603 ±0)`
+		// Minimum execution time: 19_847_000 picoseconds.
+		Weight::from_parts(20_053_000, 990)
+			// Standard Error: 11_643
+			.saturating_add(Weight::from_parts(14_563_782, 0).saturating_mul(u.into()))
+			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(u.into())))
+			.saturating_add(RocksDbWeight::get().writes((1_u64).saturating_mul(u.into())))
+			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
+	}
 }
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 9965433..6ab9651 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swanky-node"
-version = "1.6.0"
+version = "1.7.0"
 description = "Local Substrate node for wasm contract development & testing"
 authors = ["Astar Network"]
 homepage = "https://astar.network"
@@ -17,56 +17,60 @@ targets = ["x86_64-unknown-linux-gnu"]
 name = "swanky-node"
 
 [dependencies]
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "=4.2.5", features = ["derive"] }
+
 futures = { version = '0.3.21' }
 log = { version = "0.4.17" }
 serde_json = "1.0"
 
-frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 sc-consensus-manual-seal = { path = "../client/consensus/manual-seal" }
-sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-telemetry = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+sc-executor = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-network = { git = "https://github.com/paritytech/substrate", package = "sc-network", branch = "polkadot-v0.9.43" }
+sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-telemetry = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-transaction-pool = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-consensus = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-database = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-timestamp = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 # These dependencies are used for the node template's RPCs
 pallet-balances-rpc = { path = "../frame/balances/rpc" }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sc-rpc-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 # Local Dependencies
-swanky-runtime = { version = "1.6.0", path = "../runtime" }
+swanky-runtime = { version = "1.7.0", path = "../runtime" }
 
 # RPC related dependencies
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 
 # CLI-specific dependencies
-try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 [build-dependencies]
-substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 [features]
 default = []
diff --git a/node/src/command.rs b/node/src/command.rs
index 62dea5e..1de970a 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -109,7 +109,7 @@ pub fn run() -> sc_cli::Result<()> {
 								"Runtime benchmarking wasn't enabled when building the node. \
 							You can enable it with `--features runtime-benchmarks`."
 									.into(),
-							)
+							);
 						}
 
 						cmd.run::<Block, service::ExecutorDispatch>(config)
@@ -128,8 +128,9 @@ pub fn run() -> sc_cli::Result<()> {
 					},
 					BenchmarkCmd::Overhead(_) => Err("Benchmark overhead not supported.".into()),
 					BenchmarkCmd::Extrinsic(_) => Err("Benchmark extrinsic not supported.".into()),
-					BenchmarkCmd::Machine(cmd) =>
-						cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()),
+					BenchmarkCmd::Machine(cmd) => {
+						cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())
+					},
 				}
 			})
 		},
diff --git a/node/src/service.rs b/node/src/service.rs
index 4a49a32..162df94 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -3,7 +3,6 @@
 use futures::prelude::*;
 
 pub use sc_executor::NativeElseWasmExecutor;
-use sc_keystore::LocalKeystore;
 use sc_service::{error::Error as ServiceError, Configuration, TaskManager};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::TransactionPool;
@@ -34,6 +33,7 @@ pub(crate) type FullClient =
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
+#[allow(clippy::type_complexity)]
 pub fn new_partial(
 	config: &Configuration,
 ) -> Result<
@@ -47,10 +47,6 @@ pub fn new_partial(
 	>,
 	ServiceError,
 > {
-	if config.keystore_remote.is_some() {
-		return Err(ServiceError::Other("Remote Keystores are not supported.".into()))
-	}
-
 	let telemetry = config
 		.telemetry_endpoints
 		.clone()
@@ -62,12 +58,7 @@ pub fn new_partial(
 		})
 		.transpose()?;
 
-	let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
-		config.wasm_method,
-		config.default_heap_pages,
-		config.max_runtime_instances,
-		config.runtime_cache_size,
-	);
+	let executor = sc_service::new_native_or_wasm_executor(config);
 
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -110,13 +101,6 @@ pub fn new_partial(
 	})
 }
 
-fn remote_keystore(_url: &String) -> Result<Arc<LocalKeystore>, &'static str> {
-	// FIXME: here would the concrete keystore be built,
-	//        must return a concrete type (NOT `LocalKeystore`) that
-	//        implements `CryptoStore` and `SyncCryptoStore`
-	Err("Remote Keystore not supported.")
-}
-
 /// Builds a new service for a full client.
 pub fn new_full(
 	config: Configuration,
@@ -127,26 +111,18 @@ pub fn new_full(
 		backend,
 		mut task_manager,
 		import_queue,
-		mut keystore_container,
+		keystore_container,
 		select_chain,
 		transaction_pool,
 		other: (mut telemetry,),
 	} = new_partial(&config)?;
 
-	if let Some(url) = &config.keystore_remote {
-		match remote_keystore(url) {
-			Ok(k) => keystore_container.set_remote_keystore(k),
-			Err(e) =>
-				return Err(ServiceError::Other(format!(
-					"Error hooking up remote keystore for {}: {}",
-					url, e
-				))),
-		};
-	}
+	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
 
-	let (network, system_rpc_tx, tx_handler_controller, network_starter) =
+	let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
+			net_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
@@ -187,13 +163,14 @@ pub fn new_full(
 	let _rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
 		network: network.clone(),
 		client: client.clone(),
-		keystore: keystore_container.sync_keystore(),
+		keystore: keystore_container.keystore(),
 		task_manager: &mut task_manager,
 		transaction_pool: transaction_pool.clone(),
 		rpc_builder: rpc_extensions_builder,
 		backend,
 		system_rpc_tx,
 		tx_handler_controller,
+		sync_service: sync_service.clone(),
 		config,
 		telemetry: telemetry.as_mut(),
 	})?;
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 90c1c74..5d16d06 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swanky-runtime"
-version = "1.6.0"
+version = "1.7.0"
 description = "A fresh FRAME-based Substrate runtime, ready for hacking."
 authors = ["Astar Network"]
 homepage = "https://astar.network"
@@ -8,61 +8,61 @@ edition = "2021"
 license = "Unlicense"
 publish = false
 repository = "https://github.com/shunsukew/swanky-node/"
+build = "build.rs"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 
-frame-executive = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", optional = true }
-pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+frame-try-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", optional = true }
+pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 pallet-balances = { path = "../frame/balances", default-features = false }
-pallet-insecure-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-uniques = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
-sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+pallet-insecure-randomness-collective-flip = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-uniques = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-block-builder = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-inherents = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-offchain = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-session = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-transaction-pool = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
+sp-version = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 # Contracts specific packages
-pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
-pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.39", default-features = false }
+pallet-contracts = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
+pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43", default-features = false }
 
 # dApps staking
-pallet-chain-extension-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.39", default-features = false }
-pallet-dapps-staking = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.39", default-features = false }
+pallet-dapps-staking = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.32.1", default-features = false }
 
 # pallet-asset chain-extension
-pallet-chain-extension-assets = { git = "https://github.com/AstarNetwork/astar-frame", branch = "polkadot-v0.9.39", default-features = false }
+pallet-chain-extension-assets = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.32.1", default-features = false }
 
 # Used for the node template's RPCs
-frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+frame-system-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 pallet-balances-rpc-runtime-api = { path = "../frame/balances/rpc/runtime-api", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 # Used for runtime benchmarking
-frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", optional = true }
-frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39", optional = true }
+frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", optional = true }
+frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43", optional = true }
 hex-literal = { version = "0.3.4", optional = true }
 log = { version = "0.4.17", optional = true }
 
 [build-dependencies]
-substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.39" }
+substrate-wasm-builder = { version = "5.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.43" }
 
 [features]
 default = [
diff --git a/runtime/build.rs b/runtime/build.rs
index 9b53d24..c03d618 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -1,9 +1,10 @@
-use substrate_wasm_builder::WasmBuilder;
-
 fn main() {
-	WasmBuilder::new()
-		.with_current_project()
-		.export_heap_base()
-		.import_memory()
-		.build()
+	#[cfg(feature = "std")]
+	{
+		substrate_wasm_builder::WasmBuilder::new()
+			.with_current_project()
+			.export_heap_base()
+			.import_memory()
+			.build();
+	}
 }
diff --git a/runtime/src/chain_extensions.rs b/runtime/src/chain_extensions.rs
index b017627..2e210d0 100644
--- a/runtime/src/chain_extensions.rs
+++ b/runtime/src/chain_extensions.rs
@@ -1,16 +1,11 @@
 //!
 use super::Runtime;
-pub use pallet_chain_extension_assets::{weights::WeightInfo, AssetsExtension};
-pub use pallet_chain_extension_dapps_staking::DappsStakingExtension;
+pub use pallet_chain_extension_assets::AssetsExtension;
 /// Registered WASM contracts chain extensions.
 use pallet_contracts::chain_extension::RegisteredChainExtension;
 
 // Following impls defines chain extension IDs.
 
-impl RegisteredChainExtension<Runtime> for DappsStakingExtension<Runtime> {
-	const ID: u16 = 0x0000;
-}
-
-impl<W: WeightInfo> RegisteredChainExtension<Runtime> for AssetsExtension<Runtime, W> {
+impl RegisteredChainExtension<Runtime> for AssetsExtension<Runtime> {
 	const ID: u16 = 2;
 }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index a0c3847..3d0e0a0 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -46,8 +46,6 @@ use frame_system::{
 	EnsureSigned,
 };
 pub use pallet_balances::Call as BalancesCall;
-use pallet_chain_extension_assets::weights::SubstrateWeight;
-pub use pallet_chain_extension_assets::weights::WeightInfo as ChainExtensionWeightInfo;
 pub use pallet_timestamp::Call as TimestampCall;
 use pallet_transaction_payment::CurrencyAdapter;
 
@@ -57,7 +55,7 @@ pub use sp_runtime::{Perbill, Permill};
 
 // Chain extensions
 use pallet_chain_extension_assets::AssetsExtension;
-use pallet_chain_extension_dapps_staking::DappsStakingExtension;
+// use pallet_chain_extension_dapps_staking::DappsStakingExtension;
 
 mod chain_extensions;
 
@@ -113,7 +111,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	//   `spec_version`, and `authoring_version` are the same between Wasm and native.
 	// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
 	//   the compatible custom types.
-	spec_version: 3,
+	spec_version: 4,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -129,10 +127,6 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 /// 2^128-1         Relay chain token (KSM)
 pub type AssetId = u128;
 
-// Prints debug output of the `contracts` pallet to stdout if the node is
-// started with `-lruntime::contracts=debug`.
-pub const CONTRACTS_DEBUG_OUTPUT: bool = true;
-
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
 pub fn native_version() -> NativeVersion {
@@ -147,10 +141,18 @@ const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 const MAXIMUM_BLOCK_WEIGHT: Weight =
 	Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);
 
+// Prints debug output of the `contracts` pallet to stdout if the node is
+// started with `-lruntime::contracts=debug`.
+const CONTRACTS_DEBUG_OUTPUT: pallet_contracts::DebugInfo =
+	pallet_contracts::DebugInfo::UnsafeDebug;
+const CONTRACTS_EVENTS: pallet_contracts::CollectEvents =
+	pallet_contracts::CollectEvents::UnsafeCollect;
+
 /// Constant values used within the runtime.
 pub const MICROUNIT: Balance = 1_000_000_000_000;
 pub const MILLIUNIT: Balance = 1_000 * MICROUNIT;
 pub const UNIT: Balance = 1_000 * MILLIUNIT;
+pub const EXISTENTIAL_DEPOSIT: Balance = MILLIUNIT;
 
 pub const STORAGE_BYTE_FEE: Balance = 100 * MICROUNIT;
 
@@ -261,6 +263,10 @@ impl pallet_timestamp::Config for Runtime {
 	type WeightInfo = ();
 }
 
+parameter_types! {
+	pub const MaxLocks: u32 = 50;
+}
+
 impl pallet_balances::Config for Runtime {
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ();
@@ -270,9 +276,13 @@ impl pallet_balances::Config for Runtime {
 	/// The ubiquitous event type.
 	type RuntimeEvent = RuntimeEvent;
 	type DustRemoval = ();
-	type ExistentialDeposit = ConstU128<500>;
+	type ExistentialDeposit = ConstU128<EXISTENTIAL_DEPOSIT>;
 	type AccountStore = System;
 	type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
+	type FreezeIdentifier = ();
+	type MaxFreezes = ();
+	type HoldIdentifier = ();
+	type MaxHolds = ();
 }
 
 parameter_types! {
@@ -320,12 +330,14 @@ impl pallet_transaction_payment::Config for Runtime {
 impl pallet_sudo::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
+	type WeightInfo = pallet_sudo::weights::SubstrateWeight<Runtime>;
 }
 
 // contracts stuffs.
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
 	pub const DepositPerByte: Balance = deposit(0, 1);
+	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
 	pub const MaxValueSize: u32 = 16 * 1024;
 	// The lazy deletion runs inside on_initialize.
 	pub DeletionWeightLimit: Weight = AVERAGE_ON_INITIALIZE_RATIO *
@@ -350,14 +362,13 @@ impl pallet_contracts::Config for Runtime {
 	type DepositPerByte = DepositPerByte;
 	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
-	type ChainExtension =
-		(DappsStakingExtension<Self>, AssetsExtension<Self, SubstrateWeight<Self>>);
-	type DeletionQueueDepth = ConstU32<128>;
-	type DeletionWeightLimit = DeletionWeightLimit;
+	type ChainExtension = AssetsExtension<Self>;
 	type Schedule = Schedule;
 	type CallStack = [pallet_contracts::Frame<Self>; 5];
 	type AddressGenerator = pallet_contracts::DefaultAddressGenerator;
 	type MaxCodeLen = ConstU32<{ 123 * 1024 }>;
+	type DefaultDepositLimit = DefaultDepositLimit;
+
 	type MaxStorageKeyLen = ConstU32<128>;
 	type UnsafeUnstableInterface = ConstBool<true>;
 	type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
@@ -390,6 +401,8 @@ impl pallet_dapps_staking::Config for Runtime {
 	type MinimumRemainingAmount = MinimumRemainingAmount;
 	type MaxEraStakeValues = MaxEraStakeValues;
 	type UnregisteredDappRewardRetention = ConstU32<10>;
+	type ForcePalletDisabled = ConstBool<false>; // This will be set to `true` when needed
+	type DelegateClaimFee = ConstU128<1>;
 }
 
 parameter_types! {
@@ -470,10 +483,11 @@ pub struct BondStakeInput<AccountId, Balance> {
 
 // Create the runtime by composing the FRAME pallets that were previously configured.
 construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime
+	where
 		Block = Block,
 		NodeBlock = opaque::Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system,
 		RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip,
@@ -518,6 +532,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
+	pallet_contracts::Migration<Runtime>,
 >;
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -534,6 +549,11 @@ mod benches {
 	);
 }
 
+type EventRecord = frame_system::EventRecord<
+	<Runtime as frame_system::Config>::RuntimeEvent,
+	<Runtime as frame_system::Config>::Hash,
+>;
+
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -553,6 +573,14 @@ impl_runtime_apis! {
 		fn metadata() -> OpaqueMetadata {
 			OpaqueMetadata::new(Runtime::metadata().into())
 		}
+
+		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
+			Runtime::metadata_at_version(version)
+		}
+
+		fn metadata_versions() -> sp_std::vec::Vec<u32> {
+			Runtime::metadata_versions()
+		}
 	}
 
 	impl sp_block_builder::BlockBuilder<Block> for Runtime {
@@ -644,7 +672,9 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash> for Runtime {
+	impl pallet_contracts::ContractsApi<Block, AccountId, Balance, BlockNumber, Hash, EventRecord>
+		for Runtime
+	{
 		fn call(
 			origin: AccountId,
 			dest: AccountId,
@@ -652,9 +682,19 @@ impl_runtime_apis! {
 			gas_limit: Option<Weight>,
 			storage_deposit_limit: Option<Balance>,
 			input_data: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractExecResult<Balance> {
+		) -> pallet_contracts_primitives::ContractExecResult<Balance, EventRecord> {
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
-			Contracts::bare_call(origin, dest, value, gas_limit, storage_deposit_limit, input_data, true, pallet_contracts::Determinism::Deterministic)
+			Contracts::bare_call(
+				origin,
+				dest,
+				value,
+				gas_limit,
+				storage_deposit_limit,
+				input_data,
+				CONTRACTS_DEBUG_OUTPUT,
+				CONTRACTS_EVENTS,
+				pallet_contracts::Determinism::Enforced,
+			)
 		}
 
 		fn instantiate(
@@ -665,10 +705,20 @@ impl_runtime_apis! {
 			code: pallet_contracts_primitives::Code<Hash>,
 			data: Vec<u8>,
 			salt: Vec<u8>,
-		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance>
+		) -> pallet_contracts_primitives::ContractInstantiateResult<AccountId, Balance, EventRecord>
 		{
 			let gas_limit = gas_limit.unwrap_or(RuntimeBlockWeights::get().max_block);
-			Contracts::bare_instantiate(origin, value, gas_limit, storage_deposit_limit, code, data, salt, true)
+			Contracts::bare_instantiate(
+				origin,
+				value,
+				gas_limit,
+				storage_deposit_limit,
+				code,
+				data,
+				salt,
+				CONTRACTS_DEBUG_OUTPUT,
+				CONTRACTS_EVENTS,
+			)
 		}
 
 		fn upload_code(
@@ -742,18 +792,19 @@ impl_runtime_apis! {
 
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade() -> (Weight, Weight) {
+		fn on_runtime_upgrade(checks: frame_support::traits::UpgradeCheckSelect) -> (Weight, Weight) {
 			// NOTE: intentional unwrap: we don't want to propagate the error backwards, and want to
 			// have a backtrace here. If any of the pre/post migration checks fail, we shall stop
 			// right here and right now.
-			let weight = Executive::try_runtime_upgrade().unwrap();
+			let weight = Executive::try_runtime_upgrade(checks).unwrap();
 			(weight, RuntimeBlockWeights::get().max_block)
 		}
 
 		fn execute_block(
 			block: Block,
 			state_root_check: bool,
-			select: frame_try_runtime::TryStateSelect
+			signature_check: bool,
+			select: frame_try_runtime::TryStateSelect,
 		) -> Weight {
 			log::info!(
 				"try-runtime: executing block #{} ({:?}) / root checks: {:?} / sanity-checks: {:?}",
@@ -762,7 +813,7 @@ impl_runtime_apis! {
 				state_root_check,
 				select,
 			);
-			Executive::try_execute_block(block, state_root_check, select).expect("execute-block failed")
+			Executive::try_execute_block(block, state_root_check, signature_check, select).expect("execute-block failed")
 			}
 	}
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 688ea77..1c8d1c8 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-01-10"
+channel = "1.69.0"
 components = [ "rustfmt", "clippy" ]
 targets = [ "wasm32-unknown-unknown"]
-profile = "minimal"
+profile = "minimal"
\ No newline at end of file