diff --git a/Cargo.lock b/Cargo.lock
index ebbfe1cea1..90361d7a0b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,46 +14,27 @@ 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 0.27.3",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli 0.28.1",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.3.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "generic-array 0.14.7",
+ "gimli 0.31.1",
 ]
 
 [[package]]
-name = "aead"
-version = "0.4.3"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array 0.14.7",
- "rand_core 0.6.4",
-]
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -67,93 +48,36 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561"
-dependencies = [
- "aes-soft",
- "aesni",
- "cipher 0.2.5",
-]
-
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.4.4",
+ "cfg-if",
+ "cipher",
  "cpufeatures",
 ]
 
-[[package]]
-name = "aes-gcm"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
-dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.8.0",
- "ghash 0.4.4",
- "subtle",
-]
-
 [[package]]
 name = "aes-gcm"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
- "aead 0.5.2",
- "aes 0.8.3",
- "cipher 0.4.4",
- "ctr 0.9.2",
- "ghash 0.5.0",
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
  "subtle",
 ]
 
-[[package]]
-name = "aes-soft"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072"
-dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.0",
-]
-
-[[package]]
-name = "aesni"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce"
-dependencies = [
- "cipher 0.2.5",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
@@ -164,8 +88,8 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
- "getrandom 0.2.11",
+ "cfg-if",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -173,13 +97,19 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -206,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -221,43 +151,43 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "approx"
@@ -269,22 +199,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "arc-swap"
-version = "1.6.0"
+name = "aquamarine"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760"
+dependencies = [
+ "include_dir",
+ "itertools",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
 
 [[package]]
 name = "array-bytes"
-version = "4.2.0"
+version = "6.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
@@ -294,25 +232,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
-
-[[package]]
-name = "asn1-rs"
-version = "0.3.1"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33"
-dependencies = [
- "asn1-rs-derive 0.1.0",
- "asn1-rs-impl",
- "displaydoc",
- "nom",
- "num-traits",
- "rusticata-macros",
- "thiserror",
- "time",
-]
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "asn1-rs"
@@ -320,28 +242,16 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 dependencies = [
- "asn1-rs-derive 0.4.0",
+ "asn1-rs-derive",
  "asn1-rs-impl",
  "displaydoc",
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
-[[package]]
-name = "asn1-rs-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "synstructure",
-]
-
 [[package]]
 name = "asn1-rs-derive"
 version = "0.4.0"
@@ -351,7 +261,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
@@ -365,60 +275,65 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "asn1_der"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "155a5a185e42c6b77ac7b88a15143d930a9e9727a5b7b77eed417404ab15c247"
-
 [[package]]
 name = "asset-metadata"
 version = "0.1.0"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
 ]
 
+[[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 2.5.3",
+ "futures-core",
+]
+
 [[package]]
 name = "async-io"
-version = "2.2.2"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock",
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite",
  "parking",
  "polling",
- "rustix 0.38.28",
+ "rustix 0.38.42",
  "slab",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.2.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener",
+ "event-listener 5.3.1",
  "event-listener-strategy",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -431,15 +346,9 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "memchr",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "atty"
 version = "0.2.14"
@@ -453,23 +362,23 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
- "addr2line 0.21.0",
- "cc",
- "cfg-if 1.0.0",
+ "addr2line 0.24.2",
+ "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.32.1",
+ "object 0.36.7",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -480,15 +389,9 @@ checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
 [[package]]
 name = "base16ct"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
-
-[[package]]
-name = "base58"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
 [[package]]
 name = "base64"
@@ -498,9 +401,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64ct"
@@ -528,9 +437,9 @@ 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 1.3.2",
  "cexpr",
@@ -538,12 +447,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
+ "prettyplease 0.2.25",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -554,19 +464,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
-
-[[package]]
-name = "bitvec"
-version = "0.17.4"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c"
-dependencies = [
- "either",
- "radium 0.3.0",
-]
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitvec"
@@ -575,7 +475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
- "radium 0.7.0",
+ "radium",
  "tap",
  "wyz",
 ]
@@ -596,7 +496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "constant_time_eq",
 ]
 
@@ -607,20 +507,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "constant_time_eq",
 ]
 
 [[package]]
 name = "blake3"
-version = "1.5.0"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "constant_time_eq",
 ]
 
@@ -630,7 +530,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
 dependencies = [
- "block-padding 0.1.5",
+ "block-padding",
  "byte-tools",
  "byteorder",
  "generic-array 0.12.4",
@@ -654,16 +554,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "block-modes"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0"
-dependencies = [
- "block-padding 0.2.1",
- "cipher 0.2.5",
-]
-
 [[package]]
 name = "block-padding"
 version = "0.1.5"
@@ -673,12 +563,6 @@ dependencies = [
  "byte-tools",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
-
 [[package]]
 name = "bounded-collections"
 version = "0.1.9"
@@ -686,7 +570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
 dependencies = [
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
 ]
@@ -697,11 +581,20 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
 
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "bstr"
-version = "1.8.0"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
+checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0"
 dependencies = [
  "memchr",
  "serde",
@@ -718,15 +611,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
-[[package]]
-name = "byte-slice-cast"
-version = "0.3.5"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
@@ -742,9 +629,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
@@ -754,9 +641,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "bzip2-sys"
@@ -771,18 +658,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
 dependencies = [
  "serde",
 ]
@@ -795,31 +682,21 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.20",
+ "semver 1.0.24",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
-]
-
-[[package]]
-name = "ccm"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7"
-dependencies = [
- "aead 0.3.2",
- "cipher 0.2.5",
- "subtle",
+ "shlex",
 ]
 
 [[package]]
@@ -833,19 +710,13 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.10.3"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -864,8 +735,8 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.4.4",
+ "cfg-if",
+ "cipher",
  "cpufeatures",
 ]
 
@@ -875,54 +746,36 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "chacha20",
- "cipher 0.4.4",
+ "cipher",
  "poly1305",
  "zeroize",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "cid"
-version = "0.8.6"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2"
+checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
 dependencies = [
  "core2",
  "multibase",
- "multihash 0.16.3",
+ "multihash 0.17.0",
  "serde",
- "unsigned-varint",
-]
-
-[[package]]
-name = "cipher"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
-dependencies = [
- "generic-array 0.14.7",
-]
-
-[[package]]
-name = "cipher"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
-dependencies = [
- "generic-array 0.14.7",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
@@ -938,9 +791,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.6.1"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -949,9 +802,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -959,9 +812,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -971,21 +824,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "codespan-reporting"
@@ -994,46 +847,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
  "termcolor",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "comfy-table"
-version = "6.2.0"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba"
+checksum = "24f165e7b643266ea80cb858aed492ad9280e3e05ce24d4a99d7d7b889b6a4d9"
 dependencies = [
- "strum",
- "strum_macros",
- "unicode-width",
+ "strum 0.26.3",
+ "strum_macros 0.26.4",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "const-oid"
-version = "0.9.5"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.15",
+ "once_cell",
+ "tiny-keccak",
+]
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "convert_case"
@@ -1053,9 +926,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -1072,42 +945,41 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc42ba2e232e5b20ff7dc299a812d53337dadce9a7e39a238e6a5cb82d2e57b"
+checksum = "1277fbfa94bc82c8ec4af2ded3e639d49ca5f7f3c7eeab2c66accd135ece4e70"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "253531aca9b6f56103c9420369db3263e784df39aa1c90685a1f69cfbba0623e"
+checksum = "c6e8c31ad3b2270e9aeec38723888fe1b0ace3bea2b06b3f749ccf46661d3220"
 dependencies = [
- "arrayvec 0.7.4",
  "bumpalo",
  "cranelift-bforest",
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
  "cranelift-isle",
- "gimli 0.26.2",
- "hashbrown 0.12.3",
+ "gimli 0.27.3",
+ "hashbrown 0.13.2",
  "log",
  "regalloc2",
  "smallvec",
@@ -1116,33 +988,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f2154365e2bff1b1b8537a7181591fdff50d8e27fa6e40d5c69c3bad0ca7c8"
+checksum = "c8ac5ac30d62b2d66f12651f6b606dbdfd9c2cfd0908de6b387560a277c5c9da"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687e14e3f5775248930e0d5a84195abef8b829958e9794bf8d525104993612b4"
+checksum = "dd82b8b376247834b59ed9bdc0ddeb50f517452827d4a11bccf5937b213748b8"
 
 [[package]]
 name = "cranelift-entity"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f42ea692c7b450ad18b8c9889661505d51c09ec4380cf1c2d278dbb2da22cae1"
+checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8483c2db6f45fe9ace984e5adc5d058102227e4c62e5aa2054e16b0275fd3a6e"
+checksum = "64a25d9d0a0ae3079c463c34115ec59507b4707175454f0eee0891e83e30e82d"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1152,15 +1024,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9793158837678902446c411741d87b43f57dadfb944f2440db4287cda8cbd59"
+checksum = "80de6a7d0486e4acbd5f9f87ec49912bf4c8fb6aea00087b989685460d4469ba"
 
 [[package]]
 name = "cranelift-native"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72668c7755f2b880665cb422c8ad2d56db58a88b9bebfef0b73edc2277c13c49"
+checksum = "bb6b03e0e03801c4b3fd8ce0758a94750c07a44e7944cc0ffbf0d3f2e7c79b00"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1169,9 +1041,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.93.2"
+version = "0.95.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852ce4b088b44ac4e29459573943009a70d1b192c8d77ef949b4e814f656fc1"
+checksum = "ff3220489a3d928ad91e59dd7aeaa8b3de18afb554a6211213673a71c90737ac"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1179,66 +1051,43 @@ dependencies = [
  "itertools",
  "log",
  "smallvec",
- "wasmparser",
+ "wasmparser 0.102.0",
  "wasmtime-types",
 ]
 
-[[package]]
-name = "crc"
-version = "3.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
  "crossbeam-utils",
- "memoffset 0.9.0",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if 1.0.0",
-]
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crunchy"
@@ -1248,9 +1097,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.4.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
@@ -1313,16 +1162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.40",
-]
-
-[[package]]
-name = "ctr"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
-dependencies = [
- "cipher 0.3.0",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -1331,7 +1171,7 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher 0.4.4",
+ "cipher",
 ]
 
 [[package]]
@@ -1366,12 +1206,12 @@ version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "subtle",
  "zeroize",
 ]
@@ -1384,99 +1224,79 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.110"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8"
+checksum = "ad7c7515609502d316ab9a24f67dc045132d93bfd3f00713389e90d9898bf30d"
 dependencies = [
  "cc",
+ "cxxbridge-cmd",
  "cxxbridge-flags",
  "cxxbridge-macro",
+ "foldhash",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
-version = "1.0.110"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5"
+checksum = "8bfd16fca6fd420aebbd80d643c201ee4692114a0de208b790b9cd02ceae65fb"
 dependencies = [
  "cc",
  "codespan-reporting",
- "once_cell",
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
-name = "cxxbridge-flags"
-version = "1.0.110"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.110"
+name = "cxxbridge-cmd"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f"
+checksum = "6c33fd49f5d956a1b7ee5f7a9768d58580c6752838d92e39d0d56439efdedc35"
 dependencies = [
+ "clap",
+ "codespan-reporting",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
-name = "darling"
-version = "0.14.4"
+name = "cxxbridge-flags"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
+checksum = "be0f1077278fac36299cce8446effd19fe93a95eedb10d39265f3bf67b3036c9"
 
 [[package]]
-name = "darling_core"
-version = "0.14.4"
+name = "cxxbridge-macro"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+checksum = "3da7e4d6e74af6b79031d264b2f13c3ea70af1978083741c41ffce9308f1f24f"
 dependencies = [
- "fnv",
- "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core",
- "quote",
- "syn 1.0.109",
+ "rustversion",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e"
+checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -1484,9 +1304,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3"
+checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f"
 dependencies = [
  "data-encoding",
  "syn 1.0.109",
@@ -1494,46 +1314,21 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "der"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "zeroize",
 ]
 
-[[package]]
-name = "der-parser"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82"
-dependencies = [
- "asn1-rs 0.3.1",
- "displaydoc",
- "nom",
- "num-bigint",
- "num-traits",
- "rusticata-macros",
-]
-
 [[package]]
 name = "der-parser"
 version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -1543,9 +1338,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
 ]
@@ -1562,47 +1357,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "derive_builder"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.11.2"
+name = "derive_more"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
- "darling",
+ "convert_case",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "rustc_version 0.4.1",
+ "syn 2.0.94",
 ]
 
 [[package]]
-name = "derive_builder_macro"
-version = "0.11.2"
+name = "derive_more"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
- "derive_builder_core",
- "syn 1.0.109",
+ "derive_more-impl",
 ]
 
 [[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "derive_more-impl"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
 dependencies = [
- "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -1636,6 +1420,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer 0.10.4",
+ "const-oid",
  "crypto-common",
  "subtle",
 ]
@@ -1655,7 +1440,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -1683,13 +1468,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -1700,9 +1485,9 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dtoa"
@@ -1712,9 +1497,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
 dependencies = [
  "dtoa",
 ]
@@ -1742,20 +1527,22 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
-version = "0.14.8"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.6.1",
+ "der",
+ "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature 1.6.4",
+ "signature 2.2.0",
+ "spki",
 ]
 
 [[package]]
@@ -1773,7 +1560,7 @@ version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
- "pkcs8 0.10.2",
+ "pkcs8",
  "signature 2.2.0",
 ]
 
@@ -1793,9 +1580,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek 4.1.3",
  "ed25519 2.2.3",
@@ -1822,32 +1609,29 @@ dependencies = [
 
 [[package]]
 name = "ego-tree"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591"
+checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
-version = "0.12.3"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct",
  "crypto-bigint",
- "der 0.6.1",
  "digest 0.10.7",
  "ff",
  "generic-array 0.14.7",
  "group",
- "hkdf",
- "pem-rfc7468",
- "pkcs8 0.9.0",
+ "pkcs8",
  "rand_core 0.6.4",
  "sec1",
  "subtle",
@@ -1860,12 +1644,24 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.7.1"
@@ -1881,9 +1677,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
 dependencies = [
  "humantime 2.1.0",
  "is-terminal",
@@ -1906,33 +1702,39 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "event-listener"
-version = "4.0.0"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
- "event-listener",
- "pin-project-lite 0.2.13",
+ "event-listener 5.3.1",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -1944,6 +1746,21 @@ dependencies = [
  "futures",
 ]
 
+[[package]]
+name = "expander"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2"
+dependencies = [
+ "blake2",
+ "file-guard",
+ "fs-err",
+ "prettyplease 0.2.25",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "fake-simd"
 version = "0.1.2"
@@ -1958,9 +1775,9 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fdlimit"
@@ -1973,9 +1790,9 @@ dependencies = [
 
 [[package]]
 name = "ff"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
  "subtle",
@@ -1983,9 +1800,19 @@ dependencies = [
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.5"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+
+[[package]]
+name = "file-guard"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c"
+dependencies = [
+ "libc",
+ "winapi",
+]
 
 [[package]]
 name = "file-per-thread-logger"
@@ -1993,20 +1820,20 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.1",
+ "env_logger 0.10.2",
  "log",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2020,8 +1847,8 @@ dependencies = [
  "futures-timer",
  "log",
  "num-traits",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "scale-info",
 ]
 
@@ -2043,17 +1870,6 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
-[[package]]
-name = "flate2"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
-dependencies = [
- "crc32fast",
- "libz-sys",
- "miniz_oxide",
-]
-
 [[package]]
 name = "float-cmp"
 version = "0.9.0"
@@ -2069,12 +1885,18 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -2095,14 +1917,14 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
  "frame-system",
  "linregress",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "paste",
  "scale-info",
  "serde",
@@ -2120,7 +1942,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2136,7 +1958,7 @@ dependencies = [
  "lazy_static",
  "linked-hash-map",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "rand 0.8.5",
  "rand_pcg 0.3.1",
  "sc-block-builder",
@@ -2154,36 +1976,37 @@ dependencies = [
  "sp-database",
  "sp-externalities",
  "sp-inherents",
+ "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
  "sp-storage",
  "sp-trie",
- "thiserror",
+ "sp-wasm-interface",
+ "thiserror 1.0.69",
  "thousands",
 ]
 
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
@@ -2195,11 +2018,12 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "frame-try-runtime",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -2210,12 +2034,12 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "15.1.0"
+version = "16.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
+checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
 dependencies = [
- "cfg-if 1.0.0",
- "parity-scale-codec 3.6.9",
+ "cfg-if",
+ "parity-scale-codec",
  "scale-info",
  "serde",
 ]
@@ -2223,8 +2047,9 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
+ "aquamarine",
  "bitflags 1.3.2",
  "environmental",
  "frame-metadata",
@@ -2232,16 +2057,19 @@ dependencies = [
  "impl-trait-for-tuples",
  "k256",
  "log",
- "once_cell",
- "parity-scale-codec 3.6.9",
+ "macro_magic",
+ "parity-scale-codec",
  "paste",
  "scale-info",
  "serde",
+ "serde_json",
  "smallvec",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-core-hashing-proc-macro",
+ "sp-debug-derive",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
@@ -2256,48 +2084,52 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse",
+ "expander",
  "frame-support-procedural-tools",
  "itertools",
+ "macro_magic",
+ "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
+ "cfg-if",
  "frame-support",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
@@ -2311,12 +2143,12 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
@@ -2326,30 +2158,41 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-api",
 ]
 
 [[package]]
-name = "fs2"
-version = "0.4.3"
+name = "frame-try-runtime"
+version = "0.10.0-dev"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
+dependencies = [
+ "frame-support",
+ "parity-scale-codec",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
+name = "fs-err"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
 dependencies = [
- "libc",
- "winapi",
+ "autocfg",
 ]
 
 [[package]]
-name = "fs4"
-version = "0.6.6"
+name = "fs2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
 dependencies = [
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -2370,9 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2383,11 +2226,21 @@ dependencies = [
  "futures-util",
 ]
 
+[[package]]
+name = "futures-bounded"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0"
+dependencies = [
+ "futures-timer",
+ "futures-util",
+]
+
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -2395,15 +2248,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -2413,65 +2266,64 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.1.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "futures-rustls"
-version = "0.22.2"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
+checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
 dependencies = [
  "futures-io",
- "rustls 0.20.9",
- "webpki 0.22.4",
+ "rustls",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -2480,7 +2332,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
  "pin-utils",
  "slab",
 ]
@@ -2511,6 +2363,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
+ "zeroize",
 ]
 
 [[package]]
@@ -2529,7 +2382,7 @@ version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
 dependencies = [
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -2538,22 +2391,20 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
- "js-sys",
+ "cfg-if",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -2568,29 +2419,19 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug 0.3.0",
- "polyval 0.5.3",
-]
-
-[[package]]
-name = "ghash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
- "opaque-debug 0.3.0",
- "polyval 0.6.1",
+ "opaque-debug 0.3.1",
+ "polyval",
 ]
 
 [[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 1.9.3",
@@ -2599,34 +2440,34 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "globset"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
 name = "group"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
@@ -2645,7 +2486,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 2.1.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2663,7 +2504,7 @@ dependencies = [
  "pest_derive",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -2701,9 +2542,14 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
 
 [[package]]
 name = "heck"
@@ -2711,6 +2557,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -2722,9 +2574,15 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -2759,9 +2617,9 @@ dependencies = [
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac 0.12.1",
 ]
@@ -2808,11 +2666,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.5"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2842,13 +2700,13 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.10",
+ "itoa 1.0.14",
 ]
 
 [[package]]
@@ -2859,7 +2717,7 @@ checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
 ]
 
 [[package]]
@@ -2870,9 +2728,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2897,9 +2755,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -2910,9 +2768,9 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.10",
- "pin-project-lite 0.2.13",
- "socket2 0.4.10",
+ "itoa 1.0.14",
+ "pin-project-lite",
+ "socket2 0.5.8",
  "tokio",
  "tower-service",
  "tracing",
@@ -2921,14 +2779,15 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
+ "futures-util",
  "http",
  "hyper",
  "log",
- "rustls 0.20.9",
+ "rustls",
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
@@ -2936,16 +2795,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.58"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -2958,47 +2817,180 @@ dependencies = [
 ]
 
 [[package]]
-name = "ident_case"
-version = "1.0.1"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
 
 [[package]]
-name = "idna"
-version = "0.2.3"
+name = "icu_locid"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
 dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_locid_transform"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
 ]
 
 [[package]]
-name = "if-addrs"
-version = "0.10.2"
+name = "icu_locid_transform_data"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a"
-dependencies = [
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "if-addrs"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a"
+dependencies = [
  "libc",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "if-watch"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
+checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38"
 dependencies = [
  "async-io",
  "core-foundation",
@@ -3007,6 +2999,10 @@ dependencies = [
  "if-addrs",
  "ipnet",
  "log",
+ "netlink-packet-core",
+ "netlink-packet-route",
+ "netlink-proto",
+ "netlink-sys",
  "rtnetlink",
  "system-configuration",
  "tokio",
@@ -3019,7 +3015,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
 ]
 
 [[package]]
@@ -3033,13 +3029,32 @@ dependencies = [
 
 [[package]]
 name = "impl-trait-for-tuples"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "include_dir"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -3055,12 +3070,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -3069,25 +3084,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590"
 
-[[package]]
-name = "ink_prelude"
-version = "2.1.0"
-source = "git+https://github.com/paritytech/ink?tag=v2.1.0#cca31543d338dcd69c7ac922988b91ebf170edb2"
-dependencies = [
- "cfg-if 0.1.10",
-]
-
-[[package]]
-name = "ink_primitives"
-version = "2.1.0"
-source = "git+https://github.com/paritytech/ink?tag=v2.1.0#cca31543d338dcd69c7ac922988b91ebf170edb2"
-dependencies = [
- "ink_prelude",
- "parity-scale-codec 1.3.7",
- "tiny-keccak",
- "type-metadata",
-]
-
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -3099,11 +3095,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -3116,23 +3112,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "interceptor"
-version = "0.8.2"
+name = "intx"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b"
-dependencies = [
- "async-trait",
- "bytes",
- "log",
- "rand 0.8.5",
- "rtcp",
- "rtp",
- "thiserror",
- "tokio",
- "waitgroup",
- "webrtc-srtp",
- "webrtc-util",
-]
+checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75"
 
 [[package]]
 name = "io-lifetimes"
@@ -3140,7 +3123,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -3157,7 +3140,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.5",
+ "socket2 0.5.8",
  "widestring",
  "windows-sys 0.48.0",
  "winreg",
@@ -3165,19 +3148,19 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi 0.3.3",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3203,25 +3186,26 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
-version = "0.1.27"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.66"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -3245,7 +3229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "async-trait",
  "beef",
  "futures-channel",
@@ -3253,13 +3237,13 @@ dependencies = [
  "globset",
  "hyper",
  "jsonrpsee-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "rustc-hash",
  "serde",
  "serde_json",
- "soketto",
- "thiserror",
+ "soketto 0.7.1",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
 ]
@@ -3270,7 +3254,7 @@ version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
@@ -3291,7 +3275,7 @@ dependencies = [
  "jsonrpsee-types",
  "serde",
  "serde_json",
- "soketto",
+ "soketto 0.7.1",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -3309,27 +3293,28 @@ dependencies = [
  "beef",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
 ]
 
 [[package]]
 name = "k256"
-version = "0.11.6"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "ecdsa",
  "elliptic-curve",
+ "once_cell",
  "sha2 0.10.8",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -3350,18 +3335,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[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",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "regex",
  "rocksdb",
  "smallvec",
@@ -3369,9 +3354,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -3387,44 +3372,46 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
- "cfg-if 1.0.0",
- "winapi",
+ "cfg-if",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libp2p"
-version = "0.50.1"
+version = "0.52.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7b0104790be871edcf97db9bd2356604984e623a08d825c3f27852290266b8"
+checksum = "32d07d1502a027366d55afe187621c2d7895dc111a3df13b35fed698049681d7"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
- "getrandom 0.2.11",
+ "getrandom 0.2.15",
  "instant",
- "libp2p-core 0.38.0",
+ "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",
@@ -3432,54 +3419,41 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-tcp",
  "libp2p-wasm-ext",
- "libp2p-webrtc",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.16.0",
- "parking_lot 0.12.1",
+ "multiaddr",
  "pin-project",
- "smallvec",
 ]
 
 [[package]]
-name = "libp2p-core"
-version = "0.38.0"
+name = "libp2p-allow-block-list"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f"
+checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311"
 dependencies = [
- "asn1_der",
- "bs58",
- "ed25519-dalek 1.0.1",
- "either",
- "fnv",
- "futures",
- "futures-timer",
- "instant",
- "log",
- "multiaddr 0.16.0",
- "multihash 0.16.3",
- "multistream-select",
- "once_cell",
- "parking_lot 0.12.1",
- "pin-project",
- "prost",
- "prost-build",
- "rand 0.8.5",
- "rw-stream-sink",
- "sec1",
- "sha2 0.10.8",
- "smallvec",
- "thiserror",
- "unsigned-varint",
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
+ "void",
+]
+
+[[package]]
+name = "libp2p-connection-limits"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58"
+dependencies = [
+ "libp2p-core",
+ "libp2p-identity",
+ "libp2p-swarm",
  "void",
- "zeroize",
 ]
 
 [[package]]
 name = "libp2p-core"
-version = "0.39.2"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2"
+checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713"
 dependencies = [
  "either",
  "fnv",
@@ -3488,81 +3462,85 @@ dependencies = [
  "instant",
  "libp2p-identity",
  "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "multiaddr",
+ "multihash 0.19.3",
  "multistream-select",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
  "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
- "thiserror",
- "unsigned-varint",
+ "thiserror 1.0.69",
+ "unsigned-varint 0.7.2",
  "void",
 ]
 
 [[package]]
 name = "libp2p-dns"
-version = "0.38.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5"
+checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b"
 dependencies = [
+ "async-trait",
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "smallvec",
  "trust-dns-resolver",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.41.1"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf"
+checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd"
 dependencies = [
  "asynchronous-codec",
+ "either",
  "futures",
+ "futures-bounded",
  "futures-timer",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "lru",
- "prost",
- "prost-build",
- "prost-codec",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "void",
 ]
 
 [[package]]
 name = "libp2p-identity"
-version = "0.1.3"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
+checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d"
 dependencies = [
- "bs58",
- "ed25519-dalek 2.1.0",
- "log",
- "multiaddr 0.17.1",
- "multihash 0.17.0",
+ "bs58 0.5.1",
+ "ed25519-dalek 2.1.1",
+ "hkdf",
+ "multihash 0.19.3",
  "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.69",
+ "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-kad"
-version = "0.42.1"
+version = "0.44.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2"
+checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "asynchronous-codec",
  "bytes",
  "either",
@@ -3570,105 +3548,96 @@ dependencies = [
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
- "prost",
- "prost-build",
+ "quick-protobuf",
+ "quick-protobuf-codec",
  "rand 0.8.5",
  "sha2 0.10.8",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "uint",
- "unsigned-varint",
+ "unsigned-varint 0.7.2",
  "void",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.42.0"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b"
+checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a"
 dependencies = [
  "data-encoding",
  "futures",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "smallvec",
- "socket2 0.4.10",
+ "socket2 0.5.8",
  "tokio",
- "trust-dns-proto",
+ "trust-dns-proto 0.22.0",
  "void",
 ]
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.11.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55"
+checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620"
 dependencies = [
- "libp2p-core 0.38.0",
+ "instant",
+ "libp2p-core",
  "libp2p-identify",
+ "libp2p-identity",
  "libp2p-kad",
  "libp2p-ping",
  "libp2p-swarm",
+ "once_cell",
  "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 0.38.0",
- "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.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e"
+checksum = "71ce70757f2c0d82e9a3ef738fb10ea0723d16cec37f078f719e2c247704c1bb"
 dependencies = [
  "bytes",
- "curve25519-dalek 3.2.0",
+ "curve25519-dalek 4.1.3",
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
+ "multiaddr",
+ "multihash 0.19.3",
  "once_cell",
- "prost",
- "prost-build",
+ "quick-protobuf",
  "rand 0.8.5",
  "sha2 0.10.8",
  "snow",
  "static_assertions",
- "thiserror",
+ "thiserror 1.0.69",
  "x25519-dalek 1.1.1",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-ping"
-version = "0.41.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f"
+checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3"
 dependencies = [
+ "either",
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
@@ -3677,205 +3646,182 @@ dependencies = [
 
 [[package]]
 name = "libp2p-quic"
-version = "0.7.0-alpha"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59"
+checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927"
 dependencies = [
  "bytes",
  "futures",
  "futures-timer",
  "if-watch",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-tls",
  "log",
- "parking_lot 0.12.1",
- "quinn-proto",
+ "parking_lot 0.12.3",
+ "quinn",
  "rand 0.8.5",
- "rustls 0.20.9",
- "thiserror",
+ "ring 0.16.20",
+ "rustls",
+ "socket2 0.5.8",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.23.0"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884"
+checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4"
 dependencies = [
  "async-trait",
- "bytes",
  "futures",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm",
  "log",
  "rand 0.8.5",
  "smallvec",
- "unsigned-varint",
+ "void",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.41.1"
+version = "0.43.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0"
+checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141"
 dependencies = [
  "either",
  "fnv",
  "futures",
  "futures-timer",
  "instant",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "pin-project",
+ "multistream-select",
+ "once_cell",
  "rand 0.8.5",
  "smallvec",
- "thiserror",
  "tokio",
  "void",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.31.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400"
+checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74"
 dependencies = [
- "heck",
+ "heck 0.4.1",
+ "proc-macro-warning",
+ "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.38.0"
+version = "0.40.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d"
+checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508"
 dependencies = [
  "futures",
  "futures-timer",
  "if-watch",
  "libc",
- "libp2p-core 0.38.0",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
- "socket2 0.4.10",
+ "socket2 0.5.8",
  "tokio",
 ]
 
 [[package]]
 name = "libp2p-tls"
-version = "0.1.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781"
+checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61"
 dependencies = [
  "futures",
  "futures-rustls",
- "libp2p-core 0.39.2",
+ "libp2p-core",
  "libp2p-identity",
- "rcgen 0.10.0",
+ "rcgen",
  "ring 0.16.20",
- "rustls 0.20.9",
- "thiserror",
- "webpki 0.22.4",
- "x509-parser 0.14.0",
+ "rustls",
+ "rustls-webpki",
+ "thiserror 1.0.69",
+ "x509-parser",
  "yasna",
 ]
 
 [[package]]
 name = "libp2p-wasm-ext"
-version = "0.38.0"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069"
+checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c"
 dependencies = [
  "futures",
  "js-sys",
- "libp2p-core 0.38.0",
- "parity-send-wrapper",
+ "libp2p-core",
+ "send_wrapper",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
 
 [[package]]
-name = "libp2p-webrtc"
-version = "0.4.0-alpha"
+name = "libp2p-websocket"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a"
+checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538"
 dependencies = [
- "async-trait",
- "asynchronous-codec",
- "bytes",
+ "either",
  "futures",
- "futures-timer",
- "hex",
- "if-watch",
- "libp2p-core 0.38.0",
- "libp2p-noise",
+ "futures-rustls",
+ "libp2p-core",
+ "libp2p-identity",
  "log",
- "multihash 0.16.3",
- "prost",
- "prost-build",
- "prost-codec",
- "rand 0.8.5",
- "rcgen 0.9.3",
- "serde",
- "stun",
- "thiserror",
- "tinytemplate",
- "tokio",
- "tokio-util",
- "webrtc",
-]
-
-[[package]]
-name = "libp2p-websocket"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54"
-dependencies = [
- "either",
- "futures",
- "futures-rustls",
- "libp2p-core 0.38.0",
- "log",
- "parking_lot 0.12.1",
- "quicksink",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
  "rw-stream-sink",
- "soketto",
+ "soketto 0.8.1",
+ "thiserror 1.0.69",
  "url",
  "webpki-roots",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.42.0"
+version = "0.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29"
+checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85"
 dependencies = [
  "futures",
- "libp2p-core 0.38.0",
+ "libp2p-core",
  "log",
- "parking_lot 0.12.1",
- "thiserror",
+ "thiserror 1.0.69",
  "yamux",
 ]
 
 [[package]]
 name = "libredox"
-version = "0.0.1"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.8",
 ]
 
 [[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",
@@ -3936,9 +3882,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.12"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3962,18 +3908,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linked_hash_set"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47186c6da4d81ca383c7c47c1bfc80f4b95f4720514d860a5407aaf4233f9588"
+checksum = "bae85b5be22d9843c80e5fc80e9b64c8a3b1f98f867c709956eca3efff4e92e2"
 dependencies = [
  "linked-hash-map",
 ]
 
 [[package]]
 name = "linregress"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de04dcecc58d366391f9920245b85ffa684558a5ef6e7736e754347c3aea9c2"
+checksum = "a9eda9dcf4f2a99787827661f312ac3219292549c2ee992bf9a6248ffb066bf7"
 dependencies = [
  "nalgebra",
 ]
@@ -3986,15 +3932,21 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -4002,17 +3954,17 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.8.1"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.15.2",
 ]
 
 [[package]]
@@ -4026,19 +3978,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -4059,6 +4010,54 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "macro_magic"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
+dependencies = [
+ "macro_magic_core",
+ "macro_magic_macros",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "macro_magic_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
+dependencies = [
+ "const-random",
+ "derive-syn-parse",
+ "macro_magic_core_macros",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "macro_magic_core_macros"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "macro_magic_macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
+dependencies = [
+ "macro_magic_core",
+ "quote",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "markup5ever"
 version = "0.10.1"
@@ -4096,29 +4095,19 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
 dependencies = [
  "autocfg",
  "rawpointer",
 ]
 
-[[package]]
-name = "md-5"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
-dependencies = [
- "cfg-if 1.0.0",
- "digest 0.10.7",
-]
-
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memfd"
@@ -4126,7 +4115,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
 dependencies = [
- "rustix 0.38.28",
+ "rustix 0.38.42",
 ]
 
 [[package]]
@@ -4140,18 +4129,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
  "autocfg",
 ]
@@ -4165,12 +4145,6 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
 [[package]]
 name = "merlin"
 version = "2.0.1"
@@ -4203,22 +4177,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4227,7 +4201,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "downcast",
  "fragile",
  "lazy_static",
@@ -4242,7 +4216,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -4250,38 +4224,20 @@ dependencies = [
 
 [[package]]
 name = "multiaddr"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aebdb21e90f81d13ed01dc84123320838e53963c2ca94b60b305d3fa64f31e"
-dependencies = [
- "arrayref",
- "byteorder",
- "data-encoding",
- "multibase",
- "multihash 0.16.3",
- "percent-encoding",
- "serde",
- "static_assertions",
- "unsigned-varint",
- "url",
-]
-
-[[package]]
-name = "multiaddr"
-version = "0.17.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
+checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
 dependencies = [
  "arrayref",
  "byteorder",
  "data-encoding",
- "log",
+ "libp2p-identity",
  "multibase",
- "multihash 0.17.0",
+ "multihash 0.19.3",
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint",
+ "unsigned-varint 0.8.0",
  "url",
 ]
 
@@ -4298,30 +4254,48 @@ dependencies = [
 
 [[package]]
 name = "multihash"
-version = "0.16.3"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c346cf9999c631f002d8f977c4eaeaa0e6386f16007202308d0b3757522c2cc"
+checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
 dependencies = [
  "blake2b_simd",
  "blake2s_simd",
  "blake3",
  "core2",
  "digest 0.10.7",
- "multihash-derive",
+ "multihash-derive 0.8.1",
  "sha2 0.10.8",
  "sha3",
- "unsigned-varint",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
 name = "multihash"
-version = "0.17.0"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40"
+checksum = "6b430e7953c29dd6a09afc29ff0bb69c6e306329ee6794700aee27b76a1aea8d"
+dependencies = [
+ "core2",
+ "unsigned-varint 0.8.0",
+]
+
+[[package]]
+name = "multihash-codetable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935"
 dependencies = [
+ "blake2b_simd",
+ "blake2s_simd",
+ "blake3",
  "core2",
- "multihash-derive",
- "unsigned-varint",
+ "digest 0.10.7",
+ "multihash-derive 0.9.1",
+ "ripemd",
+ "sha1",
+ "sha2 0.10.8",
+ "sha3",
+ "strobe-rs",
 ]
 
 [[package]]
@@ -4335,7 +4309,31 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f1b7edab35d920890b88643a765fc9bd295cf0201f4154dda231bef9b8404eb"
+dependencies = [
+ "core2",
+ "multihash 0.19.3",
+ "multihash-derive-impl",
+]
+
+[[package]]
+name = "multihash-derive-impl"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3dc7141bd06405929948754f0628d247f5ca1865be745099205e5086da957cb"
+dependencies = [
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -4346,27 +4344,26 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "multistream-select"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a"
+checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19"
 dependencies = [
  "bytes",
  "futures",
  "log",
  "pin-project",
  "smallvec",
- "unsigned-varint",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
 name = "nalgebra"
-version = "0.32.3"
+version = "0.33.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa"
+checksum = "26aecdf64b707efd1310e3544d709c5c0ac61c13756046aaaba41be5c4f66a3b"
 dependencies = [
  "approx",
  "matrixmultiply",
- "nalgebra-macros",
  "num-complex",
  "num-rational",
  "num-traits",
@@ -4374,17 +4371,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "names"
 version = "0.13.0"
@@ -4396,21 +4382,20 @@ dependencies = [
 
 [[package]]
 name = "netlink-packet-core"
-version = "0.4.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297"
+checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4"
 dependencies = [
  "anyhow",
  "byteorder",
- "libc",
  "netlink-packet-utils",
 ]
 
 [[package]]
 name = "netlink-packet-route"
-version = "0.12.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab"
+checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66"
 dependencies = [
  "anyhow",
  "bitflags 1.3.2",
@@ -4429,29 +4414,29 @@ dependencies = [
  "anyhow",
  "byteorder",
  "paste",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "netlink-proto"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6"
+checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21"
 dependencies = [
  "bytes",
  "futures",
  "log",
  "netlink-packet-core",
  "netlink-sys",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
 [[package]]
 name = "netlink-sys"
-version = "0.8.5"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411"
+checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23"
 dependencies = [
  "bytes",
  "futures",
@@ -4462,20 +4447,19 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "memoffset 0.6.5",
 ]
 
 [[package]]
@@ -4491,7 +4475,7 @@ dependencies = [
  "pallet-pips",
  "pallet-portfolio",
  "pallet-transaction-payment",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "serde",
  "sp-api",
@@ -4514,7 +4498,7 @@ dependencies = [
  "pallet-pips",
  "pallet-portfolio",
  "pallet-transaction-payment",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "serde",
  "serde_json",
@@ -4554,51 +4538,54 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
 dependencies = [
- "arrayvec 0.7.4",
- "itoa 1.0.10",
+ "arrayvec 0.7.6",
+ "itoa 1.0.14",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -4606,9 +4593,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -4619,54 +4606,45 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[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",
+ "hashbrown 0.13.2",
  "indexmap 1.9.3",
  "memchr",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "oid-registry"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a"
-dependencies = [
- "asn1-rs 0.3.1",
-]
-
 [[package]]
 name = "oid-registry"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "opaque-debug"
@@ -4676,9 +4654,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl-probe"
@@ -4686,33 +4664,11 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[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.8",
-]
-
-[[package]]
-name = "p384"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "sha2 0.10.8",
-]
-
 [[package]]
 name = "pallet-asset"
 version = "0.1.0"
 dependencies = [
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -4725,7 +4681,7 @@ dependencies = [
  "pallet-portfolio",
  "pallet-statistics",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "polymesh-primitives-derive",
@@ -4747,12 +4703,12 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-session",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
  "sp-authority-discovery",
@@ -4763,12 +4719,12 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-runtime",
  "sp-std",
@@ -4777,7 +4733,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4786,11 +4742,11 @@ dependencies = [
  "pallet-authorship",
  "pallet-session",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
  "sp-consensus-babe",
- "sp-consensus-vrf",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-session",
@@ -4809,7 +4765,7 @@ dependencies = [
  "pallet-identity",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -4826,13 +4782,13 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-runtime",
  "sp-std",
@@ -4844,7 +4800,7 @@ version = "0.1.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -4870,7 +4826,7 @@ dependencies = [
  "pallet-identity",
  "pallet-multisig",
  "pallet-scheduler",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -4889,7 +4845,7 @@ dependencies = [
  "pallet-identity",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -4916,7 +4872,7 @@ dependencies = [
  "pallet-identity",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "scale-info",
@@ -4933,9 +4889,10 @@ dependencies = [
 [[package]]
 name = "pallet-contracts"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "bitflags 1.3.2",
+ "environmental",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -4943,7 +4900,7 @@ dependencies = [
  "log",
  "pallet-contracts-primitives",
  "pallet-contracts-proc-macro",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "rand 0.8.5",
  "rand_pcg 0.3.1",
  "scale-info",
@@ -4955,17 +4912,16 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "wasm-instrument 0.4.0",
- "wasmi 0.20.0",
- "wasmparser-nostd",
+ "wasmi",
 ]
 
 [[package]]
 name = "pallet-contracts-primitives"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "24.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "bitflags 1.3.2",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-runtime",
  "sp-std",
@@ -4975,11 +4931,11 @@ dependencies = [
 [[package]]
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -4997,7 +4953,7 @@ dependencies = [
  "pallet-identity",
  "pallet-portfolio",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "polymesh-primitives-derive",
@@ -5016,7 +4972,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5024,7 +4980,7 @@ dependencies = [
  "frame-system",
  "log",
  "pallet-election-provider-support-benchmarking",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
@@ -5033,18 +4989,18 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-std",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
 ]
@@ -5060,7 +5016,7 @@ dependencies = [
  "pallet-base",
  "pallet-identity",
  "pallet-permissions",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "polymesh-primitives-derive",
  "scale-info",
@@ -5073,7 +5029,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5081,7 +5037,7 @@ dependencies = [
  "log",
  "pallet-authorship",
  "pallet-session",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
  "sp-consensus-grandpa",
@@ -5103,7 +5059,7 @@ dependencies = [
  "pallet-identity",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5125,7 +5081,7 @@ dependencies = [
  "jsonrpsee",
  "node-rpc",
  "pallet-group-rpc-runtime-api",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "serde",
  "sp-api",
@@ -5140,8 +5096,9 @@ dependencies = [
 name = "pallet-group-rpc-runtime-api"
 version = "2.0.0"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
+ "scale-info",
  "serde",
  "sp-api",
  "sp-std",
@@ -5161,7 +5118,7 @@ dependencies = [
  "pallet-base",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "scale-info",
@@ -5179,14 +5136,14 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
  "pallet-authorship",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-application-crypto",
  "sp-core",
@@ -5199,12 +5156,12 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -5216,11 +5173,11 @@ dependencies = [
 [[package]]
 name = "pallet-insecure-randomness-collective-flip"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "safe-mix",
  "scale-info",
  "sp-runtime",
@@ -5238,7 +5195,7 @@ dependencies = [
  "pallet-identity",
  "pallet-permissions",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5261,7 +5218,7 @@ dependencies = [
  "pallet-external-agents",
  "pallet-identity",
  "pallet-portfolio",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "sp-runtime",
@@ -5271,13 +5228,13 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
  "log",
  "pallet-balances 4.0.0-dev",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-runtime",
@@ -5292,7 +5249,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5316,7 +5273,7 @@ dependencies = [
  "pallet-permissions",
  "pallet-timestamp",
  "pallet-treasury",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "polymesh-primitives-derive",
@@ -5345,7 +5302,7 @@ dependencies = [
  "pallet-base",
  "pallet-identity",
  "pallet-permissions",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5357,13 +5314,13 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -5379,7 +5336,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-identity",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "scale-info",
@@ -5399,7 +5356,7 @@ dependencies = [
  "jsonrpsee",
  "node-rpc",
  "pallet-protocol-fee-rpc-runtime-api",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "serde",
@@ -5415,9 +5372,10 @@ dependencies = [
 name = "pallet-protocol-fee-rpc-runtime-api"
 version = "0.1.0"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
+ "scale-info",
  "serde",
  "sp-api",
  "sp-runtime",
@@ -5431,7 +5389,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-identity",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "sp-runtime",
@@ -5441,13 +5399,13 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-io",
  "sp-runtime",
@@ -5458,14 +5416,14 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "log",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -5495,7 +5453,7 @@ dependencies = [
  "pallet-permissions",
  "pallet-scheduler",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "polymesh-primitives-derive",
  "scale-info",
@@ -5523,7 +5481,7 @@ dependencies = [
  "pallet-identity",
  "pallet-session",
  "pallet-staking-reward-curve",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "rand_chacha 0.2.2",
  "scale-info",
@@ -5542,12 +5500,12 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -5559,7 +5517,7 @@ dependencies = [
  "jsonrpsee",
  "node-rpc",
  "pallet-staking-rpc-runtime-api",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -5590,7 +5548,7 @@ dependencies = [
  "pallet-external-agents",
  "pallet-identity",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5621,7 +5579,7 @@ dependencies = [
  "pallet-portfolio",
  "pallet-settlement",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "polymesh-primitives-derive",
  "scale-info",
@@ -5641,7 +5599,7 @@ version = "2.0.0"
 dependencies = [
  "frame-support",
  "frame-system",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-io",
@@ -5652,13 +5610,13 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-inherents",
  "sp-io",
@@ -5674,7 +5632,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "pallet-timestamp",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5695,7 +5653,7 @@ dependencies = [
  "pallet-balances 0.1.0",
  "pallet-identity",
  "pallet-permissions",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -5718,7 +5676,7 @@ dependencies = [
  "pallet-balances 0.1.0",
  "pallet-identity",
  "pallet-permissions",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "scale-info",
@@ -5730,9 +5688,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
+checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e"
 dependencies = [
  "blake2",
  "crc32fast",
@@ -5742,70 +5700,40 @@ dependencies = [
  "log",
  "lz4",
  "memmap2",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "siphasher",
  "snap",
+ "winapi",
 ]
 
 [[package]]
 name = "parity-scale-codec"
-version = "1.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d"
-dependencies = [
- "arrayvec 0.5.2",
- "bitvec 0.17.4",
- "byte-slice-cast 0.3.5",
- "parity-scale-codec-derive 1.2.3",
- "serde",
-]
-
-[[package]]
-name = "parity-scale-codec"
-version = "3.6.9"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
- "arrayvec 0.7.4",
- "bitvec 1.0.1",
- "byte-slice-cast 1.2.2",
+ "arrayvec 0.7.6",
+ "bitvec",
+ "byte-slice-cast",
  "bytes",
  "impl-trait-for-tuples",
- "parity-scale-codec-derive 3.6.9",
+ "parity-scale-codec-derive",
  "serde",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41512944b1faff334a5f1b9447611bf4ef40638ccb6328173dacefb338e878c"
-dependencies = [
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "parity-scale-codec-derive"
-version = "3.6.9"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parity-send-wrapper"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
-
 [[package]]
 name = "parity-wasm"
 version = "0.45.0"
@@ -5814,9 +5742,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -5831,12 +5759,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -5845,7 +5773,7 @@ version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "instant",
  "libc",
  "redox_syscall 0.2.16",
@@ -5855,22 +5783,28 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.8",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
+[[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.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbkdf2"
@@ -5905,15 +5839,6 @@ dependencies = [
  "base64 0.13.1",
 ]
 
-[[package]]
-name = "pem-rfc7468"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
-dependencies = [
- "base64ct",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -5931,20 +5856,20 @@ dependencies = [
 
 [[package]]
 name = "pest"
-version = "2.7.5"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5"
+checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc"
 dependencies = [
  "memchr",
- "thiserror",
+ "thiserror 2.0.9",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.7.5"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2"
+checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5952,22 +5877,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.5"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227"
+checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.5"
+version = "2.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6"
+checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea"
 dependencies = [
  "once_cell",
  "pest",
@@ -5976,12 +5901,12 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.1.0",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
@@ -6059,35 +5984,29 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -6095,50 +6014,35 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "pkcs8"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
-dependencies = [
- "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.8",
- "spki 0.7.3",
+ "der",
+ "spki",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-
-[[package]]
-name = "platforms"
-version = "2.0.0"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
-version = "3.3.1"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
- "pin-project-lite 0.2.13",
- "rustix 0.38.28",
+ "hermit-abi 0.4.0",
+ "pin-project-lite",
+ "rustix 0.38.42",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6148,8 +6052,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash 0.5.1",
+ "opaque-debug 0.3.1",
+ "universal-hash",
 ]
 
 [[package]]
@@ -6191,7 +6095,7 @@ dependencies = [
  "pallet-staking-rpc-runtime-api",
  "pallet-sudo",
  "pallet-transaction-payment",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-contracts",
  "polymesh-node-rpc",
@@ -6214,11 +6118,14 @@ dependencies = [
  "sc-executor",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
+ "sc-offchain",
  "sc-rpc",
  "sc-service",
  "sc-sync-state-rpc",
  "sc-telemetry",
  "sc-transaction-pool",
+ "sc-transaction-pool-api",
  "serde",
  "serde_json",
  "sp-api",
@@ -6253,7 +6160,7 @@ name = "polymesh-common-utilities"
 version = "0.1.0"
 dependencies = [
  "frame-support",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -6274,7 +6181,7 @@ dependencies = [
  "pallet-contracts-primitives",
  "pallet-identity",
  "pallet-permissions",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives",
  "scale-info",
  "serde",
@@ -6308,7 +6215,6 @@ dependencies = [
  "sc-client-api",
  "sc-consensus-babe",
  "sc-consensus-babe-rpc",
- "sc-consensus-epochs",
  "sc-consensus-grandpa",
  "sc-consensus-grandpa-rpc",
  "sc-rpc",
@@ -6337,7 +6243,7 @@ dependencies = [
  "hex",
  "libsecp256k1",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-primitives-derive",
  "rand 0.8.5",
  "rand_core 0.6.4",
@@ -6350,6 +6256,7 @@ dependencies = [
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-core",
+ "sp-debug-derive",
  "sp-io",
  "sp-runtime",
  "sp-runtime-interface",
@@ -6381,7 +6288,7 @@ dependencies = [
  "pallet-identity",
  "pallet-multisig",
  "pallet-relayer",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-common-utilities",
  "polymesh-primitives",
  "smallvec",
@@ -6401,7 +6308,6 @@ dependencies = [
  "frame-system",
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
- "getrandom 0.2.11",
  "hex-literal 0.3.4",
  "log",
  "node-rpc-runtime-api",
@@ -6449,7 +6355,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-utility",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-build-tool",
  "polymesh-common-utilities",
  "polymesh-contracts",
@@ -6485,7 +6391,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "lazy_static",
  "log",
  "node-rpc-runtime-api",
  "pallet-asset",
@@ -6532,7 +6437,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-utility",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-build-tool",
  "polymesh-common-utilities",
  "polymesh-contracts",
@@ -6570,7 +6475,6 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "lazy_static",
  "log",
  "node-rpc-runtime-api",
  "pallet-asset",
@@ -6617,7 +6521,7 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-utility",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "polymesh-build-tool",
  "polymesh-common-utilities",
  "polymesh-contracts",
@@ -6658,10 +6562,7 @@ dependencies = [
  "frame-support",
  "frame-system",
  "frame-system-rpc-runtime-api",
- "hex-literal 0.3.4",
- "ink_primitives",
  "lazy_static",
- "libsecp256k1",
  "log",
  "node-rpc-runtime-api",
  "pallet-asset",
@@ -6708,8 +6609,8 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-utility",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "polymesh-common-utilities",
  "polymesh-contracts",
  "polymesh-exec-macro",
@@ -6787,26 +6688,14 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash 0.4.1",
-]
-
-[[package]]
-name = "polyval"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
- "opaque-debug 0.3.0",
- "universal-hash 0.5.1",
+ "opaque-debug 0.3.1",
+ "universal-hash",
 ]
 
 [[package]]
@@ -6817,9 +6706,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "precomputed-hash"
@@ -6843,15 +6735,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -6867,6 +6759,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -6880,33 +6782,23 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
- "thiserror",
- "toml",
+ "thiserror 1.0.69",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_datetime",
- "toml_edit",
+ "toml_edit 0.22.22",
 ]
 
 [[package]]
@@ -6939,50 +6831,61 @@ version = "0.5.20+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
+[[package]]
+name = "proc-macro-warning"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.1",
- "thiserror",
+ "parking_lot 0.12.3",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "prometheus-client"
-version = "0.18.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c"
+checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2"
 dependencies = [
  "dtoa",
- "itoa 1.0.10",
- "parking_lot 0.12.1",
- "prometheus-client-derive-text-encode",
+ "itoa 1.0.14",
+ "parking_lot 0.12.3",
+ "prometheus-client-derive-encode",
 ]
 
 [[package]]
-name = "prometheus-client-derive-text-encode"
-version = "0.3.0"
+name = "prometheus-client-derive-encode"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd"
+checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -7002,13 +6905,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes",
- "heck",
+ "heck 0.4.1",
  "itertools",
  "lazy_static",
  "log",
  "multimap",
  "petgraph",
- "prettyplease",
+ "prettyplease 0.1.25",
  "prost",
  "prost-types",
  "regex",
@@ -7017,19 +6920,6 @@ dependencies = [
  "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.9"
@@ -7054,9 +6944,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
@@ -7077,48 +6967,74 @@ dependencies = [
 ]
 
 [[package]]
-name = "quicksink"
-version = "0.1.2"
+name = "quick-protobuf-codec"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858"
+checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98"
 dependencies = [
- "futures-core",
- "futures-sink",
- "pin-project-lite 0.1.12",
+ "asynchronous-codec",
+ "bytes",
+ "quick-protobuf",
+ "thiserror 1.0.69",
+ "unsigned-varint 0.7.2",
+]
+
+[[package]]
+name = "quinn"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
+dependencies = [
+ "bytes",
+ "futures-io",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.9.6"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
+checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
 dependencies = [
  "bytes",
  "rand 0.8.5",
  "ring 0.16.20",
  "rustc-hash",
- "rustls 0.20.9",
+ "rustls",
  "slab",
- "thiserror",
+ "thiserror 1.0.69",
  "tinyvec",
  "tracing",
- "webpki 0.22.4",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.33"
+name = "quinn-udp"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
 dependencies = [
- "proc-macro2",
+ "bytes",
+ "libc",
+ "socket2 0.5.8",
+ "tracing",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
-name = "radium"
-version = "0.3.0"
+name = "quote"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+dependencies = [
+ "proc-macro2",
+]
 
 [[package]]
 name = "radium"
@@ -7186,7 +7102,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -7224,9 +7140,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -7234,27 +7150,14 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
-dependencies = [
- "pem",
- "ring 0.16.20",
- "time",
- "x509-parser 0.13.2",
- "yasna",
-]
-
 [[package]]
 name = "rcgen"
 version = "0.10.0"
@@ -7278,49 +7181,49 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom 0.2.15",
  "libredox",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.20"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[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",
@@ -7330,14 +7233,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -7351,13 +7254,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -7368,21 +7271,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "region"
-version = "3.0.0"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "mach",
- "winapi",
-]
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "resolv-conf"
@@ -7396,13 +7287,12 @@ dependencies = [
 
 [[package]]
 name = "rfc6979"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
- "crypto-bigint",
  "hmac 0.12.1",
- "zeroize",
+ "subtle",
 ]
 
 [[package]]
@@ -7422,23 +7312,33 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "cfg-if",
+ "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
 ]
 
 [[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",
@@ -7455,29 +7355,21 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rtcp"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691"
-dependencies = [
- "bytes",
- "thiserror",
- "webrtc-util",
-]
-
 [[package]]
 name = "rtnetlink"
-version = "0.10.1"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0"
+checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0"
 dependencies = [
  "futures",
  "log",
+ "netlink-packet-core",
  "netlink-packet-route",
+ "netlink-packet-utils",
  "netlink-proto",
+ "netlink-sys",
  "nix",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
@@ -7491,25 +7383,11 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rtp"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80"
-dependencies = [
- "async-trait",
- "bytes",
- "rand 0.8.5",
- "serde",
- "thiserror",
- "webrtc-util",
-]
-
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -7534,11 +7412,11 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.20",
+ "semver 1.0.24",
 ]
 
 [[package]]
@@ -7566,40 +7444,27 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring 0.16.20",
- "sct 0.6.1",
- "webpki 0.21.4",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.9"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.16.20",
- "sct 0.7.1",
- "webpki 0.22.4",
+ "ring 0.17.8",
+ "rustls-webpki",
+ "sct",
 ]
 
 [[package]]
@@ -7620,20 +7485,30 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
 
 [[package]]
 name = "rw-stream-sink"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04"
+checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1"
 dependencies = [
  "futures",
  "pin-project",
@@ -7642,9 +7517,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safe-mix"
@@ -7657,9 +7532,9 @@ dependencies = [
 
 [[package]]
 name = "safe_arch"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"
 dependencies = [
  "bytemuck",
 ]
@@ -7676,18 +7551,18 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "log",
  "sp-core",
  "sp-wasm-interface",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
@@ -7695,12 +7570,13 @@ dependencies = [
  "ip_network",
  "libp2p",
  "log",
- "parity-scale-codec 3.6.9",
+ "multihash-codetable",
+ "parity-scale-codec",
  "prost",
  "prost-build",
  "rand 0.8.5",
  "sc-client-api",
- "sc-network-common",
+ "sc-network",
  "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
@@ -7708,18 +7584,18 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "futures-timer",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-block-builder",
  "sc-client-api",
  "sc-proposer-metrics",
@@ -7737,9 +7613,9 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-client-api",
  "sp-api",
  "sp-block-builder",
@@ -7752,13 +7628,13 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "memmap2",
  "sc-chain-spec-derive",
  "sc-client-api",
  "sc-executor",
- "sc-network-common",
+ "sc-network",
  "sc-telemetry",
  "serde",
  "serde_json",
@@ -7771,28 +7647,28 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
  "chrono",
  "clap",
  "fdlimit",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "names",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "rand 0.8.5",
  "regex",
  "rpassword",
@@ -7800,7 +7676,6 @@ dependencies = [
  "sc-client-db",
  "sc-keystore",
  "sc-network",
- "sc-network-common",
  "sc-service",
  "sc-telemetry",
  "sc-tracing",
@@ -7814,7 +7689,7 @@ dependencies = [
  "sp-panic-handler",
  "sp-runtime",
  "sp-version",
- "thiserror",
+ "thiserror 1.0.69",
  "tiny-bip39",
  "tokio",
 ]
@@ -7822,13 +7697,13 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "fnv",
  "futures",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -7838,9 +7713,9 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-externalities",
- "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
+ "sp-statement-store",
  "sp-storage",
  "substrate-prometheus-endpoint",
 ]
@@ -7848,7 +7723,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -7857,8 +7732,8 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-db",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-state-db",
  "schnellru",
@@ -7874,15 +7749,15 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "log",
  "mockall",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-utils",
  "serde",
@@ -7893,32 +7768,30 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "fork-tree",
  "futures",
  "log",
- "merlin 2.0.1",
  "num-bigint",
  "num-rational",
  "num-traits",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
- "sc-keystore",
  "sc-telemetry",
+ "sc-transaction-pool-api",
  "scale-info",
- "schnorrkel 0.9.1",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -7926,19 +7799,18 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-babe",
  "sp-consensus-slots",
- "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -7954,16 +7826,16 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-runtime",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "fork-tree",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
  "sp-blockchain",
@@ -7973,7 +7845,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ahash 0.8.11",
  "array-bytes",
@@ -7984,8 +7856,8 @@ dependencies = [
  "futures",
  "futures-timer",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "sc-block-builder",
  "sc-chain-spec",
@@ -7995,6 +7867,7 @@ dependencies = [
  "sc-network-common",
  "sc-network-gossip",
  "sc-telemetry",
+ "sc-transaction-pool-api",
  "sc-utils",
  "serde_json",
  "sp-api",
@@ -8007,19 +7880,19 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "finality-grandpa",
  "futures",
  "jsonrpsee",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-consensus-grandpa",
  "sc-rpc",
@@ -8027,19 +7900,19 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-client-api",
  "sc-consensus",
  "sc-telemetry",
@@ -8056,14 +7929,13 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "lru",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-executor-common",
- "sc-executor-wasmi",
  "sc-executor-wasmtime",
+ "schnellru",
  "sp-api",
  "sp-core",
  "sp-externalities",
@@ -8074,45 +7946,29 @@ 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/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-instrument 0.3.0",
- "wasmi 0.13.2",
-]
-
-[[package]]
-name = "sc-executor-wasmi"
-version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
-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/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "anyhow",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "log",
- "once_cell",
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
@@ -8124,13 +7980,14 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ansi_term",
  "futures",
  "futures-timer",
  "log",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
  "sp-blockchain",
  "sp-runtime",
@@ -8139,27 +7996,26 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
- "async-trait",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde_json",
  "sp-application-crypto",
  "sp-core",
  "sp-keystore",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
+ "async-channel",
  "async-trait",
  "asynchronous-codec",
- "backtrace",
  "bytes",
  "either",
  "fnv",
@@ -8167,91 +8023,84 @@ dependencies = [
  "futures-timer",
  "ip_network",
  "libp2p",
+ "libp2p-kad",
+ "linked_hash_set",
  "log",
- "lru",
  "mockall",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "partial_sort",
  "pin-project",
  "rand 0.8.5",
- "sc-block-builder",
  "sc-client-api",
- "sc-consensus",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
  "serde",
  "serde_json",
  "smallvec",
  "sp-arithmetic",
  "sp-blockchain",
- "sp-consensus",
  "sp-core",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror",
- "unsigned-varint",
+ "thiserror 1.0.69",
+ "unsigned-varint 0.7.2",
+ "void",
+ "wasm-timer",
  "zeroize",
 ]
 
 [[package]]
 name = "sc-network-bitswap"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
+ "async-channel",
  "cid",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
  "prost",
  "prost-build",
  "sc-client-api",
- "sc-network-common",
+ "sc-network",
  "sp-blockchain",
  "sp-runtime",
- "thiserror",
- "unsigned-varint",
+ "thiserror 1.0.69",
+ "unsigned-varint 0.7.2",
 ]
 
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
- "bytes",
  "futures",
- "futures-timer",
- "libp2p",
- "linked_hash_set",
- "parity-scale-codec 3.6.9",
+ "libp2p-identity",
+ "parity-scale-codec",
  "prost-build",
  "sc-consensus",
- "sc-peerset",
- "serde",
- "smallvec",
- "sp-blockchain",
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-runtime",
- "substrate-prometheus-endpoint",
- "thiserror",
 ]
 
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ahash 0.8.11",
  "futures",
  "futures-timer",
- "libp2p",
+ "libp2p-identity",
  "log",
- "lru",
+ "multiaddr",
+ "sc-network",
  "sc-network-common",
- "sc-peerset",
+ "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "tracing",
@@ -8260,45 +8109,47 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
+ "async-channel",
  "futures",
- "libp2p",
+ "libp2p-identity",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "prost",
  "prost-build",
  "sc-client-api",
- "sc-network-common",
- "sc-peerset",
+ "sc-network",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
+ "async-channel",
  "async-trait",
  "fork-tree",
  "futures",
+ "futures-timer",
  "libp2p",
  "log",
- "lru",
  "mockall",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "prost",
  "prost-build",
  "sc-client-api",
  "sc-consensus",
+ "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
+ "schnellru",
  "smallvec",
  "sp-arithmetic",
  "sp-blockchain",
@@ -8307,22 +8158,21 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-network-transactions"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
  "futures",
  "libp2p",
  "log",
- "parity-scale-codec 3.6.9",
- "pin-project",
+ "parity-scale-codec",
+ "sc-network",
  "sc-network-common",
- "sc-peerset",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -8332,7 +8182,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
  "bytes",
@@ -8342,40 +8192,31 @@ dependencies = [
  "hyper",
  "hyper-rustls",
  "libp2p",
+ "log",
  "num_cpus",
  "once_cell",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "sc-client-api",
+ "sc-network",
  "sc-network-common",
- "sc-peerset",
+ "sc-transaction-pool-api",
  "sc-utils",
  "sp-api",
  "sp-core",
+ "sp-externalities",
+ "sp-keystore",
  "sp-offchain",
  "sp-runtime",
  "threadpool",
  "tracing",
 ]
 
-[[package]]
-name = "sc-peerset"
-version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
-dependencies = [
- "futures",
- "libp2p",
- "log",
- "sc-utils",
- "serde_json",
- "wasm-timer",
-]
-
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -8384,13 +8225,13 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "jsonrpsee",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -8407,6 +8248,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-session",
+ "sp-statement-store",
  "sp-version",
  "tokio",
 ]
@@ -8414,10 +8256,10 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "jsonrpsee",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-chain-spec",
  "sc-transaction-pool-api",
  "scale-info",
@@ -8427,13 +8269,13 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-version",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "http",
  "jsonrpsee",
@@ -8448,7 +8290,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
  "futures",
@@ -8456,8 +8298,8 @@ dependencies = [
  "hex",
  "jsonrpsee",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-chain-spec",
  "sc-client-api",
  "sc-transaction-pool-api",
@@ -8467,14 +8309,14 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-version",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio-stream",
 ]
 
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "directories",
@@ -8483,8 +8325,8 @@ dependencies = [
  "futures-timer",
  "jsonrpsee",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "sc-block-builder",
@@ -8501,11 +8343,9 @@ dependencies = [
  "sc-network-light",
  "sc-network-sync",
  "sc-network-transactions",
- "sc-offchain",
  "sc-rpc",
  "sc-rpc-server",
  "sc-rpc-spec-v2",
- "sc-storage-monitor",
  "sc-sysinfo",
  "sc-telemetry",
  "sc-tracing",
@@ -8531,7 +8371,7 @@ dependencies = [
  "static_init",
  "substrate-prometheus-endpoint",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
  "tracing-futures",
@@ -8540,37 +8380,21 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
-dependencies = [
- "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
- "sp-core",
-]
-
-[[package]]
-name = "sc-storage-monitor"
-version = "0.1.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "clap",
- "fs4",
- "futures",
  "log",
- "sc-client-db",
- "sc-utils",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sp-core",
- "thiserror",
- "tokio",
 ]
 
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "jsonrpsee",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
  "sc-consensus-babe",
@@ -8580,13 +8404,13 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-runtime",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "libc",
@@ -8605,26 +8429,26 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "chrono",
  "futures",
  "libp2p",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
  "rand 0.8.5",
  "sc-utils",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ansi_term",
  "atty",
@@ -8632,12 +8456,10 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "regex",
  "rustc-hash",
  "sc-client-api",
- "sc-rpc-server",
  "sc-tracing-proc-macro",
  "serde",
  "sp-api",
@@ -8646,7 +8468,7 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-tracing",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "tracing-log",
  "tracing-subscriber",
@@ -8655,27 +8477,26 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "linked-hash-map",
  "log",
- "num-traits",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -8687,80 +8508,83 @@ dependencies = [
  "sp-tracing",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
  "log",
+ "parity-scale-codec",
  "serde",
  "sp-blockchain",
+ "sp-core",
  "sp-runtime",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "backtrace",
+ "async-channel",
  "futures",
  "futures-timer",
  "lazy_static",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
+ "sp-arithmetic",
 ]
 
 [[package]]
 name = "scale-info"
-version = "2.10.0"
+version = "2.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
+checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b"
 dependencies = [
- "bitvec 1.0.1",
- "cfg-if 1.0.0",
- "derive_more",
- "parity-scale-codec 3.6.9",
+ "bitvec",
+ "cfg-if",
+ "derive_more 1.0.0",
+ "parity-scale-codec",
  "scale-info-derive",
  "serde",
 ]
 
 [[package]]
 name = "scale-info-derive"
-version = "2.10.0"
+version = "2.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
+checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf"
 dependencies = [
- "proc-macro-crate 1.1.3",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "schnellru"
-version = "0.2.1"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
+checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649"
 dependencies = [
  "ahash 0.8.11",
- "cfg-if 1.0.0",
+ "cfg-if",
  "hashbrown 0.13.2",
 ]
 
@@ -8788,9 +8612,9 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "arrayref",
- "arrayvec 0.7.4",
+ "arrayvec 0.7.6",
  "curve25519-dalek 4.1.3",
  "getrandom_or_panic",
  "merlin 3.0.0",
@@ -8829,48 +8653,26 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.17.7",
+ "ring 0.17.8",
  "untrusted 0.9.0",
 ]
 
-[[package]]
-name = "sdp"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13"
-dependencies = [
- "rand 0.8.5",
- "substring",
- "thiserror",
- "url",
-]
-
 [[package]]
 name = "sec1"
-version = "0.3.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct",
- "der 0.6.1",
+ "der",
  "generic-array 0.14.7",
- "pkcs8 0.9.0",
+ "pkcs8",
  "subtle",
  "zeroize",
 ]
@@ -8904,11 +8706,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -8917,9 +8719,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -8933,7 +8735,7 @@ checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe"
 dependencies = [
  "bitflags 1.3.2",
  "cssparser",
- "derive_more",
+ "derive_more 0.99.18",
  "fxhash",
  "log",
  "matches",
@@ -8965,9 +8767,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
  "serde",
 ]
@@ -8978,46 +8780,62 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
- "itoa 1.0.10",
+ "itoa 1.0.14",
+ "memchr",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "servo_arc"
 version = "0.1.1"
@@ -9035,10 +8853,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
 ]
 
 [[package]]
@@ -9047,7 +8865,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -9071,10 +8889,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
- "opaque-debug 0.3.0",
+ "opaque-debug 0.3.1",
 ]
 
 [[package]]
@@ -9083,7 +8901,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -9115,9 +8933,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -9127,10 +8945,6 @@ name = "signature"
 version = "1.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
-dependencies = [
- "digest 0.10.7",
- "rand_core 0.6.4",
-]
 
 [[package]]
 name = "signature"
@@ -9138,14 +8952,15 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
+ "digest 0.10.7",
  "rand_core 0.6.4",
 ]
 
 [[package]]
 name = "simba"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
+checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
 dependencies = [
  "approx",
  "num-complex",
@@ -9177,9 +8992,9 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snap"
@@ -9193,13 +9008,13 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
- "aes-gcm 0.10.3",
+ "aes-gcm",
  "blake2",
  "chacha20poly1305",
  "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
- "ring 0.17.7",
- "rustc_version 0.4.0",
+ "ring 0.17.8",
+ "rustc_version 0.4.1",
  "sha2 0.10.8",
  "subtle",
 ]
@@ -9216,12 +9031,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -9232,7 +9047,6 @@ checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
 dependencies = [
  "base64 0.13.1",
  "bytes",
- "flate2",
  "futures",
  "http",
  "httparse",
@@ -9241,42 +9055,62 @@ dependencies = [
  "sha-1",
 ]
 
+[[package]]
+name = "soketto"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e859df029d160cb88608f5d7df7fb4753fd20fdfb4de5644f3d8b8440841721"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+]
+
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
+ "scale-info",
  "sp-api-proc-macro",
  "sp-core",
+ "sp-externalities",
+ "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
  "sp-std",
  "sp-trie",
  "sp-version",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
+ "Inflector",
  "blake2",
+ "expander",
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sp-application-crypto"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "23.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
@@ -9286,12 +9120,12 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "6.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "16.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "integer-sqrt",
  "num-traits",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-std",
@@ -9301,9 +9135,9 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
@@ -9314,9 +9148,8 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
  "sp-api",
  "sp-inherents",
  "sp-runtime",
@@ -9326,57 +9159,50 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "log",
- "lru",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "schnellru",
  "sp-api",
  "sp-consensus",
  "sp-database",
  "sp-runtime",
  "sp-state-machine",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "futures",
  "log",
- "parity-scale-codec 3.6.9",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
- "sp-version",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
- "merlin 2.0.1",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
- "sp-consensus",
  "sp-consensus-slots",
- "sp-consensus-vrf",
  "sp-core",
  "sp-inherents",
- "sp-keystore",
  "sp-runtime",
  "sp-std",
  "sp-timestamp",
@@ -9385,11 +9211,11 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "finality-grandpa",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-api",
@@ -9403,38 +9229,25 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-std",
  "sp-timestamp",
 ]
 
-[[package]]
-name = "sp-consensus-vrf"
-version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
-dependencies = [
- "parity-scale-codec 3.6.9",
- "scale-info",
- "schnorrkel 0.9.1",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "sp-core"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "21.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "array-bytes",
- "base58",
  "bitflags 1.3.2",
  "blake2",
  "bounded-collections",
+ "bs58 0.4.0",
  "dyn-clonable",
  "ed25519-zebra",
  "futures",
@@ -9445,8 +9258,9 @@ dependencies = [
  "libsecp256k1",
  "log",
  "merlin 2.0.1",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "paste",
  "primitive-types",
  "rand 0.8.5",
  "regex",
@@ -9463,93 +9277,102 @@ dependencies = [
  "sp-storage",
  "ss58-registry",
  "substrate-bip39",
- "thiserror",
+ "thiserror 1.0.69",
  "tiny-bip39",
+ "tracing",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-core-hashing"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "9.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "blake2",
+ "blake2b_simd",
  "byteorder",
  "digest 0.10.7",
  "sha2 0.10.8",
  "sha3",
- "sp-std",
  "twox-hash",
 ]
 
 [[package]]
 name = "sp-core-hashing-proc-macro"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "9.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "proc-macro2",
  "quote",
  "sp-core-hashing",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
 name = "sp-debug-derive"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "8.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.13.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "0.19.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "environmental",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-std",
  "sp-storage",
 ]
 
+[[package]]
+name = "sp-genesis-builder"
+version = "0.1.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
+dependencies = [
+ "serde_json",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-runtime",
  "sp-std",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-io"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "23.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "bytes",
  "ed25519 1.5.3",
  "ed25519-dalek 1.0.1",
- "futures",
  "libsecp256k1",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
+ "rustversion",
  "secp256k1",
  "sp-core",
  "sp-externalities",
@@ -9565,47 +9388,53 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "24.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "lazy_static",
  "sp-core",
  "sp-runtime",
- "strum",
+ "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-keystore"
-version = "0.13.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "0.27.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "async-trait",
- "futures",
- "merlin 2.0.1",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
- "schnorrkel 0.9.1",
- "serde",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "sp-core",
  "sp-externalities",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
+dependencies = [
+ "thiserror 1.0.69",
+ "zstd 0.12.4",
+]
+
+[[package]]
+name = "sp-metadata-ir"
+version = "0.1.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "thiserror",
- "zstd",
+ "frame-metadata",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-std",
 ]
 
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-arithmetic",
@@ -9617,7 +9446,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9626,8 +9455,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "8.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -9637,7 +9466,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -9646,14 +9475,14 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "24.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "paste",
  "rand 0.8.5",
  "scale-info",
@@ -9668,12 +9497,12 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "17.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "primitive-types",
  "sp-externalities",
  "sp-runtime-interface-proc-macro",
@@ -9686,25 +9515,26 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "11.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "Inflector",
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
+ "sp-keystore",
  "sp-runtime",
  "sp-staking",
  "sp-std",
@@ -9713,10 +9543,12 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
  "scale-info",
+ "serde",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -9724,13 +9556,13 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.13.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "0.28.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "hash-db",
  "log",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "smallvec",
  "sp-core",
@@ -9738,22 +9570,47 @@ dependencies = [
  "sp-panic-handler",
  "sp-std",
  "sp-trie",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
+ "trie-db",
+]
+
+[[package]]
+name = "sp-statement-store"
+version = "4.0.0-dev"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
+dependencies = [
+ "aes-gcm",
+ "curve25519-dalek 3.2.0",
+ "ed25519-dalek 1.0.1",
+ "hkdf",
+ "parity-scale-codec",
+ "rand 0.8.5",
+ "scale-info",
+ "sha2 0.10.8",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-externalities",
+ "sp-runtime",
+ "sp-runtime-interface",
+ "sp-std",
+ "thiserror 1.0.69",
+ "x25519-dalek 2.0.0-pre.1",
 ]
 
 [[package]]
 name = "sp-std"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "8.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 
 [[package]]
 name = "sp-storage"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "13.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "ref-cast",
  "serde",
  "sp-debug-derive",
@@ -9763,24 +9620,22 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
- "futures-timer",
- "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
  "sp-std",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "6.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "10.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-std",
  "tracing",
  "tracing-core",
@@ -9790,7 +9645,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9799,11 +9654,10 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "async-trait",
- "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-inherents",
@@ -9814,22 +9668,22 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "22.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
- "hashbrown 0.12.3",
+ "hashbrown 0.13.2",
  "lazy_static",
  "memory-db",
  "nohash-hasher",
- "parity-scale-codec 3.6.9",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "scale-info",
  "schnellru",
  "sp-core",
  "sp-std",
- "thiserror",
+ "thiserror 1.0.69",
  "tracing",
  "trie-db",
  "trie-root",
@@ -9837,11 +9691,11 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "5.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "22.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "impl-serde",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "parity-wasm",
  "scale-info",
  "serde",
@@ -9849,40 +9703,39 @@ dependencies = [
  "sp-runtime",
  "sp-std",
  "sp-version-proc-macro",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "8.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "7.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "14.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sp-std",
- "wasmi 0.13.2",
  "wasmtime",
 ]
 
 [[package]]
 name = "sp-weights"
-version = "4.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+version = "20.0.0"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "scale-info",
  "serde",
  "smallvec",
@@ -9904,16 +9757,6 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
-[[package]]
-name = "spki"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
-dependencies = [
- "base64ct",
- "der 0.6.1",
-]
-
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -9921,14 +9764,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.8",
+ "der",
 ]
 
 [[package]]
 name = "ss58-registry"
-version = "1.44.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35935738370302d5e33963665b77541e4b990a3e919ec904c837a56cfc891de1"
+checksum = "19409f13998e55816d1c728395af0b52ec066206341d939e22e7766df9b494b8"
 dependencies = [
  "Inflector",
  "num-format",
@@ -9968,9 +9811,9 @@ dependencies = [
 
 [[package]]
 name = "static_init_macro"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf"
+checksum = "1389c88ddd739ec6d3f8f83343764a0e944cd23cfbf126a9796a714b0b6edd6f"
 dependencies = [
  "cfg_aliases",
  "memchr",
@@ -9987,7 +9830,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
  "new_debug_unreachable",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
@@ -10005,11 +9848,24 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "strobe-rs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "keccak",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "strum"
@@ -10017,16 +9873,22 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.24.3",
 ]
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+
 [[package]]
 name = "strum_macros"
 version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -10034,33 +9896,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "stun"
-version = "0.4.4"
+name = "strum_macros"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "base64 0.13.1",
- "crc",
- "lazy_static",
- "md-5",
- "rand 0.8.5",
- "ring 0.16.20",
- "subtle",
- "thiserror",
- "tokio",
- "url",
- "webrtc-util",
-]
-
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "substrate-bip39"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328"
+checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f"
 dependencies = [
  "hmac 0.11.0",
  "pbkdf2 0.8.0",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "sha2 0.9.9",
  "zeroize",
 ]
@@ -10068,21 +9924,18 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
-dependencies = [
- "platforms",
-]
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
  "jsonrpsee",
  "log",
- "parity-scale-codec 3.6.9",
+ "parity-scale-codec",
  "sc-rpc-api",
  "sc-transaction-pool-api",
  "sp-api",
@@ -10095,19 +9948,19 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "hyper",
  "log",
  "prometheus",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
 ]
 
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -10117,40 +9970,32 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-03#74ef745933703849d756dc16d41d938157d6943a"
+source = "git+https://github.com/PolymeshAssociation/polkadot-sdk?branch=polymesh-v6-monthly-2023-08#ad2de07d0757e4f237665f55b4c039174127d04e"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "filetime",
+ "parity-wasm",
  "sp-maybe-compressed-blob",
- "strum",
+ "strum 0.24.1",
  "tempfile",
- "toml",
+ "toml 0.7.8",
  "walkdir",
  "wasm-opt",
 ]
 
-[[package]]
-name = "substring"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -10170,9 +10015,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.40"
+version = "2.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e"
+checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10191,22 +10036,33 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
 [[package]]
 name = "system-configuration"
-version = "0.5.1"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "system-configuration-sys",
 ]
 
 [[package]]
 name = "system-configuration-sys"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -10220,21 +10076,22 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
- "redox_syscall 0.4.1",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "getrandom 0.2.15",
+ "once_cell",
+ "rustix 0.38.42",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10250,18 +10107,18 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "termtree"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
+checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
 
 [[package]]
 name = "thin-slice"
@@ -10271,22 +10128,42 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
+dependencies = [
+ "thiserror-impl 2.0.9",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
- "thiserror-impl",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "2.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -10297,11 +10174,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -10326,12 +10203,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
- "itoa 1.0.10",
+ "itoa 1.0.14",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -10346,10 +10224,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -10366,7 +10245,7 @@ dependencies = [
  "rand 0.8.5",
  "rustc-hash",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.69",
  "unicode-normalization",
  "wasm-bindgen",
  "zeroize",
@@ -10382,20 +10261,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinytemplate"
-version = "1.2.1"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "serde",
- "serde_json",
+ "displaydoc",
+ "zerovec",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -10408,70 +10287,67 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
- "parking_lot 0.12.1",
- "pin-project-lite 0.2.13",
+ "parking_lot 0.12.3",
+ "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.8",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.23.4"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.20.9",
+ "rustls",
  "tokio",
- "webpki 0.22.4",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
  "tokio",
  "tokio-util",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -10483,21 +10359,49 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.19.15",
+]
+
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.7.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.7.0",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.22",
 ]
 
 [[package]]
@@ -10513,62 +10417,62 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "bytes",
  "futures-core",
  "futures-util",
  "http",
  "http-body",
  "http-range-header",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
- "pin-project-lite 0.2.13",
+ "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -10657,9 +10561,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
 dependencies = [
  "async-trait",
- "cfg-if 1.0.0",
+ "cfg-if",
  "data-encoding",
- "enum-as-inner",
+ "enum-as-inner 0.5.1",
  "futures-channel",
  "futures-io",
  "futures-util",
@@ -10669,7 +10573,32 @@ dependencies = [
  "rand 0.8.5",
  "smallvec",
  "socket2 0.4.10",
- "thiserror",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner 0.6.1",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.4.0",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "smallvec",
+ "thiserror 1.0.69",
  "tinyvec",
  "tokio",
  "tracing",
@@ -10678,22 +10607,23 @@ dependencies = [
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.22.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
+checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "futures-util",
  "ipconfig",
- "lazy_static",
  "lru-cache",
- "parking_lot 0.12.1",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "resolv-conf",
  "smallvec",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tracing",
- "trust-dns-proto",
+ "trust-dns-proto 0.23.2",
 ]
 
 [[package]]
@@ -10708,57 +10638,18 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
 
-[[package]]
-name = "turn"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8"
-dependencies = [
- "async-trait",
- "base64 0.13.1",
- "futures",
- "log",
- "md-5",
- "rand 0.8.5",
- "ring 0.16.20",
- "stun",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "digest 0.10.7",
  "rand 0.8.5",
  "static_assertions",
 ]
 
-[[package]]
-name = "type-metadata"
-version = "0.1.0"
-source = "git+https://github.com/type-metadata/type-metadata.git?rev=02eae9f35c40c943b56af5b60616219f2b72b47d#02eae9f35c40c943b56af5b60616219f2b72b47d"
-dependencies = [
- "derive_more",
- "serde",
- "type-metadata-derive",
-]
-
-[[package]]
-name = "type-metadata-derive"
-version = "0.1.0"
-source = "git+https://github.com/type-metadata/type-metadata.git?rev=02eae9f35c40c943b56af5b60616219f2b72b47d#02eae9f35c40c943b56af5b60616219f2b72b47d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -10767,9 +10658,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uint"
@@ -10785,46 +10676,42 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.4"
+name = "unicode-width"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
-name = "universal-hash"
-version = "0.4.1"
+name = "unicode-xid"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
-dependencies = [
- "generic-array 0.14.7",
- "subtle",
-]
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -10848,6 +10735,12 @@ dependencies = [
  "futures-util",
 ]
 
+[[package]]
+name = "unsigned-varint"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -10862,12 +10755,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.3",
  "percent-encoding",
 ]
 
@@ -10878,19 +10771,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
-name = "utf8parse"
-version = "0.2.1"
+name = "utf16_iter"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
 
 [[package]]
-name = "uuid"
-version = "1.6.1"
+name = "utf8_iter"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
-dependencies = [
- "getrandom 0.2.11",
-]
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
@@ -10906,9 +10802,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "void"
@@ -10916,20 +10812,11 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
-[[package]]
-name = "waitgroup"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292"
-dependencies = [
- "atomic-waker",
-]
-
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -10958,46 +10845,47 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.89"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.89"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.39"
+version = "0.4.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12"
+checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.89"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -11005,30 +10893,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.89"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.89"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "wasm-encoder"
-version = "0.38.1"
+version = "0.222.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f"
+checksum = "3432682105d7e994565ef928ccf5856cf6af4ba3dddebedb737f61caed70f956"
 dependencies = [
  "leb128",
+ "wasmparser 0.222.0",
 ]
 
 [[package]]
@@ -11051,25 +10940,25 @@ 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",
- "strum",
- "strum_macros",
+ "strum 0.24.1",
+ "strum_macros 0.24.3",
  "tempfile",
- "thiserror",
+ "thiserror 1.0.69",
  "wasm-opt-cxx-sys",
  "wasm-opt-sys",
 ]
 
 [[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",
@@ -11079,15 +10968,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]]
@@ -11107,131 +10995,111 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422"
-dependencies = [
- "parity-wasm",
- "wasmi-validation",
- "wasmi_core 0.2.1",
-]
-
-[[package]]
-name = "wasmi"
-version = "0.20.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01bf50edb2ea9d922aa75a7bf3c15e26a6c9e2d18c56e862b49737a582901729"
+checksum = "e51fb5c61993e71158abf5bb863df2674ca3ec39ed6471c64f07aeaf751d67b4"
 dependencies = [
+ "intx",
+ "smallvec",
  "spin 0.9.8",
  "wasmi_arena",
- "wasmi_core 0.5.0",
+ "wasmi_core",
  "wasmparser-nostd",
 ]
 
-[[package]]
-name = "wasmi-validation"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b"
-dependencies = [
- "parity-wasm",
-]
-
 [[package]]
 name = "wasmi_arena"
-version = "0.1.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ea379cbb0b41f3a9f0bf7b47036d036aae7f43383d8cc487d4deccf40dee0a"
+checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
 
 [[package]]
 name = "wasmi_core"
-version = "0.2.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7"
+checksum = "624e6333e861ef49095d2d678b76ebf30b06bf37effca845be7e5b87c90071b7"
 dependencies = [
  "downcast-rs",
  "libm",
- "memory_units",
- "num-rational",
  "num-traits",
- "region",
+ "paste",
 ]
 
 [[package]]
-name = "wasmi_core"
-version = "0.5.0"
+name = "wasmparser"
+version = "0.102.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5bf998ab792be85e20e771fe14182b4295571ad1d4f89d3da521c1bef5f597a"
+checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b"
 dependencies = [
- "downcast-rs",
- "libm",
- "num-traits",
+ "indexmap 1.9.3",
+ "url",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.100.0"
+version = "0.222.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b20236ab624147dfbb62cf12a19aaf66af0e41b8398838b66e997d07d269d4"
+checksum = "4adf50fde1b1a49c1add6a80d47aea500c88db70551805853aa8b88f3ea27ab5"
 dependencies = [
- "indexmap 1.9.3",
- "url",
+ "bitflags 2.6.0",
+ "indexmap 2.7.0",
+ "semver 1.0.24",
 ]
 
 [[package]]
 name = "wasmparser-nostd"
-version = "0.91.0"
+version = "0.100.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c37f310b5a62bfd5ae7c0f1d8e6f98af16a5d6d84ba764e9c36439ec14e318b"
+checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa"
 dependencies = [
  "indexmap-nostd",
 ]
 
 [[package]]
 name = "wasmtime"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a222f5fa1e14b2cefc286f1b68494d7a965f4bf57ec04c59bb62673d639af6"
+checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9"
 dependencies = [
  "anyhow",
  "bincode",
- "cfg-if 1.0.0",
+ "cfg-if",
  "indexmap 1.9.3",
  "libc",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
  "paste",
  "psm",
  "rayon",
  "serde",
  "target-lexicon",
- "wasmparser",
+ "wasmparser 0.102.0",
  "wasmtime-cache",
  "wasmtime-cranelift",
  "wasmtime-environ",
  "wasmtime-jit",
  "wasmtime-runtime",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4407a7246e7d2f3d8fb1cf0c72fda8dbafdb6dd34d555ae8bea0e5ae031089cc"
+checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ceb3adf61d654be0be67fffdce42447b0880481348785be5fe40b5dd7663a4c"
+checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213"
 dependencies = [
  "anyhow",
- "base64 0.13.1",
+ "base64 0.21.7",
  "bincode",
  "directories-next",
  "file-per-thread-logger",
@@ -11239,16 +11107,16 @@ dependencies = [
  "rustix 0.36.17",
  "serde",
  "sha2 0.10.8",
- "toml",
- "windows-sys 0.42.0",
- "zstd",
+ "toml 0.5.11",
+ "windows-sys 0.45.0",
+ "zstd 0.11.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c366bb8647e01fd08cb5589976284b00abfded5529b33d7e7f3f086c68304a4"
+checksum = "b1cefde0cce8cb700b1b21b6298a3837dba46521affd7b8c38a9ee2c869eee04"
 dependencies = [
  "anyhow",
  "cranelift-codegen",
@@ -11256,48 +11124,64 @@ dependencies = [
  "cranelift-frontend",
  "cranelift-native",
  "cranelift-wasm",
- "gimli 0.26.2",
+ "gimli 0.27.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
+ "target-lexicon",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
+ "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 0.27.3",
+ "object 0.30.4",
  "target-lexicon",
- "thiserror",
- "wasmparser",
  "wasmtime-environ",
 ]
 
 [[package]]
 name = "wasmtime-environ"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b8b50962eae38ee319f7b24900b7cf371f03eebdc17400c1dc8575fc10c9a7"
+checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949"
 dependencies = [
  "anyhow",
  "cranelift-entity",
- "gimli 0.26.2",
+ "gimli 0.27.3",
  "indexmap 1.9.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "serde",
  "target-lexicon",
- "thiserror",
- "wasmparser",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
  "wasmtime-types",
 ]
 
 [[package]]
 name = "wasmtime-jit"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffaed4f9a234ba5225d8e64eac7b4a5d13b994aeb37353cde2cbeb3febda9eaa"
+checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244"
 dependencies = [
- "addr2line 0.17.0",
+ "addr2line 0.19.0",
  "anyhow",
  "bincode",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpp_demangle",
- "gimli 0.26.2",
+ "gimli 0.27.3",
  "log",
- "object 0.29.0",
+ "object 0.30.4",
  "rustc-demangle",
  "serde",
  "target-lexicon",
@@ -11305,352 +11189,122 @@ 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.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed41cbcbf74ce3ff6f1d07d1b707888166dc408d1a880f651268f4f7c9194b2"
+checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
 dependencies = [
- "object 0.29.0",
+ "object 0.30.4",
  "once_cell",
  "rustix 0.36.17",
 ]
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a28ae1e648461bfdbb79db3efdaee1bca5b940872e4175390f465593a2e54c"
+checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "wasmtime-runtime"
-version = "6.0.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e704b126e4252788ccfc3526d4d4511d4b23c521bf123e447ac726c14545217b"
+checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441"
 dependencies = [
  "anyhow",
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "indexmap 1.9.3",
  "libc",
  "log",
  "mach",
  "memfd",
- "memoffset 0.6.5",
+ "memoffset",
  "paste",
  "rand 0.8.5",
  "rustix 0.36.17",
  "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.2"
+version = "8.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e5572c5727c1ee7e8f28717aaa8400e4d22dcbd714ea5457d85b5005206568"
+checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f"
 dependencies = [
  "cranelift-entity",
  "serde",
- "thiserror",
- "wasmparser",
+ "thiserror 1.0.69",
+ "wasmparser 0.102.0",
 ]
 
 [[package]]
 name = "wast"
-version = "69.0.1"
+version = "222.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a"
+checksum = "5ce7191f4b7da0dd300cc32476abae6457154e4625d9b1bc26890828a9a26f6e"
 dependencies = [
+ "bumpalo",
  "leb128",
  "memchr",
- "unicode-width",
+ "unicode-width 0.2.0",
  "wasm-encoder",
 ]
 
 [[package]]
 name = "wat"
-version = "1.0.82"
+version = "1.222.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c"
+checksum = "8fde61b4b52f9a84ae31b5e8902a2cd3162ea45d8bf564c729c3288fe52f4334"
 dependencies = [
  "wast",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.66"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "webpki"
-version = "0.21.4"
+name = "webpki-roots"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
-name = "webpki"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-dependencies = [
- "ring 0.17.7",
- "untrusted 0.9.0",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki 0.22.4",
-]
-
-[[package]]
-name = "webrtc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb"
-dependencies = [
- "arc-swap",
- "async-trait",
- "bytes",
- "hex",
- "interceptor",
- "lazy_static",
- "log",
- "rand 0.8.5",
- "rcgen 0.9.3",
- "regex",
- "ring 0.16.20",
- "rtcp",
- "rtp",
- "rustls 0.19.1",
- "sdp",
- "serde",
- "serde_json",
- "sha2 0.10.8",
- "stun",
- "thiserror",
- "time",
- "tokio",
- "turn",
- "url",
- "waitgroup",
- "webrtc-data",
- "webrtc-dtls",
- "webrtc-ice",
- "webrtc-mdns",
- "webrtc-media",
- "webrtc-sctp",
- "webrtc-srtp",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-data"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100"
-dependencies = [
- "bytes",
- "derive_builder",
- "log",
- "thiserror",
- "tokio",
- "webrtc-sctp",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-dtls"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267"
-dependencies = [
- "aes 0.6.0",
- "aes-gcm 0.10.3",
- "async-trait",
- "bincode",
- "block-modes",
- "byteorder",
- "ccm",
- "curve25519-dalek 3.2.0",
- "der-parser 8.2.0",
- "elliptic-curve",
- "hkdf",
- "hmac 0.12.1",
- "log",
- "p256",
- "p384",
- "rand 0.8.5",
- "rand_core 0.6.4",
- "rcgen 0.10.0",
- "ring 0.16.20",
- "rustls 0.19.1",
- "sec1",
- "serde",
- "sha1",
- "sha2 0.10.8",
- "signature 1.6.4",
- "subtle",
- "thiserror",
- "tokio",
- "webpki 0.21.4",
- "webrtc-util",
- "x25519-dalek 2.0.0",
- "x509-parser 0.13.2",
-]
-
-[[package]]
-name = "webrtc-ice"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80"
-dependencies = [
- "arc-swap",
- "async-trait",
- "crc",
- "log",
- "rand 0.8.5",
- "serde",
- "serde_json",
- "stun",
- "thiserror",
- "tokio",
- "turn",
- "url",
- "uuid",
- "waitgroup",
- "webrtc-mdns",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-mdns"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106"
-dependencies = [
- "log",
- "socket2 0.4.10",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-media"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991"
-dependencies = [
- "byteorder",
- "bytes",
- "rand 0.8.5",
- "rtp",
- "thiserror",
-]
-
-[[package]]
-name = "webrtc-sctp"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0"
-dependencies = [
- "arc-swap",
- "async-trait",
- "bytes",
- "crc",
- "log",
- "rand 0.8.5",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-srtp"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5"
-dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "aes-gcm 0.9.4",
- "async-trait",
- "byteorder",
- "bytes",
- "ctr 0.8.0",
- "hmac 0.11.0",
- "log",
- "rtcp",
- "rtp",
- "sha-1",
- "subtle",
- "thiserror",
- "tokio",
- "webrtc-util",
-]
-
-[[package]]
-name = "webrtc-util"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87"
-dependencies = [
- "async-trait",
- "bitflags 1.3.2",
- "bytes",
- "cc",
- "ipnet",
- "lazy_static",
- "libc",
- "log",
- "nix",
- "rand 0.8.5",
- "thiserror",
- "tokio",
- "winapi",
-]
-
-[[package]]
-name = "which"
-version = "4.4.2"
+name = "which"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.28",
+ "rustix 0.38.42",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.13"
+version = "0.7.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242"
+checksum = "58e6db2670d2be78525979e9a5f9c69d296fd7d670549fe9ebf70f8708cb5019"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -11658,9 +11312,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -11680,11 +11334,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -11695,36 +11349,40 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.51.1"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538"
 dependencies = [
- "windows-core",
- "windows-targets 0.48.5",
+ "windows-core 0.53.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.51.1"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-core"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd"
 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",
+ "windows-result",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -11751,7 +11409,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -11786,17 +11453,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -11813,9 +11481,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -11831,9 +11499,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -11849,9 +11517,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -11867,9 +11541,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -11885,9 +11559,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -11903,9 +11577,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -11921,15 +11595,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "winnow"
-version = "0.5.27"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb877ca3232bec99a6472ed63f7241de2a250165260908b2d24c09d867907a85"
+checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980"
 dependencies = [
  "memchr",
 ]
@@ -11940,10 +11623,22 @@ version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -11966,63 +11661,43 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0"
+version = "2.0.0-pre.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
+checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df"
 dependencies = [
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek 3.2.0",
  "rand_core 0.6.4",
- "serde",
  "zeroize",
 ]
 
 [[package]]
 name = "x509-parser"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c"
-dependencies = [
- "asn1-rs 0.3.1",
- "base64 0.13.1",
- "data-encoding",
- "der-parser 7.0.0",
- "lazy_static",
- "nom",
- "oid-registry 0.4.0",
- "ring 0.16.20",
- "rusticata-macros",
- "thiserror",
- "time",
-]
-
-[[package]]
-name = "x509-parser"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
+checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
 dependencies = [
- "asn1-rs 0.5.2",
- "base64 0.13.1",
+ "asn1-rs",
  "data-encoding",
- "der-parser 8.2.0",
+ "der-parser",
  "lazy_static",
  "nom",
- "oid-registry 0.6.1",
+ "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
 [[package]]
 name = "yamux"
-version = "0.10.2"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5"
+checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776"
 dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+ "pin-project",
  "rand 0.8.5",
  "static_assertions",
 ]
@@ -12036,31 +11711,77 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -12073,7 +11794,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.40",
+ "syn 2.0.94",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.94",
 ]
 
 [[package]]
@@ -12082,7 +11825,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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
+dependencies = [
+ "zstd-safe 6.0.6",
 ]
 
 [[package]]
@@ -12095,11 +11847,21 @@ dependencies = [
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "6.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 31489f7101..a2f69b0ccb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,97 +9,100 @@ edition = "2021"
 name = "polymesh"
 path = "src/main.rs"
 
-# Path build to use our Substrate version from github, `branch = "polymesh-v6-monthly-2023-03"`.
+# Path build to use our Substrate version from github, `branch = "polymesh-v6-monthly-2023-08"`.
 [patch.crates-io]
-frame-benchmarking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-benchmarking-cli = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-executive = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-support = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-election-provider-support = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-system = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-system-benchmarking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-frame-system-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-authorship = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-balances = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-contracts = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-contracts-primitives = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-election-provider-multi-phase = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-im-online = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-indices = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-offences = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-preimage = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-scheduler = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-session = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-staking-reward-curve = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-pallet-timestamp = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-basic-authorship = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-block-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-chain-spec = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-cli = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-client-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-client-db = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-babe-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-epochs = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-slots = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-executor = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-consensus-grandpa-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-keystore = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-network = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-network-common = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-rpc-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-rpc-spec-v2 = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-service = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-telemetry = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-transaction-pool = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-transaction-pool-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sc-sync-state-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-application-crypto = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-arithmetic = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-block-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-blockchain = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-consensus = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-consensus-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-consensus-slots = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-core = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-externalities = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-consensus-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-inherents = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-io = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-keystore = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-keyring = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-npos-elections = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-offchain = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-runtime = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-weights = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-runtime-interface = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-session = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-staking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-state-machine = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-std = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-storage = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-timestamp = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-tracing = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-transaction-pool = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-transaction-storage-proof = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-trie = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-sp-version = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-substrate-frame-rpc-system = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-substrate-prometheus-endpoint = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-substrate-build-script-utils = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-substrate-wasm-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
-substrate-test-utils = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-03" }
+frame-benchmarking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-benchmarking-cli = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-executive = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-support = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-election-provider-support = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-system = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-system-benchmarking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+frame-system-rpc-runtime-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-authorship = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-balances = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-contracts = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-contracts-primitives = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-election-provider-multi-phase = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-im-online = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-indices = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-offences = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-preimage = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-scheduler = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-session = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-staking-reward-curve = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+pallet-timestamp = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-basic-authorship = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-block-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-chain-spec = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-cli = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-client-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-client-db = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-babe-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-epochs = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-slots = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-executor = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-consensus-grandpa-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-keystore = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-network = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-network-common = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-network-sync = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-rpc-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-rpc-spec-v2 = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-service = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-telemetry = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-transaction-pool = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-transaction-pool-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-sync-state-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sc-offchain = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-api = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-application-crypto = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-arithmetic = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-authority-discovery = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-block-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-blockchain = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-consensus = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-consensus-babe = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-consensus-slots = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-core = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-debug-derive = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-externalities = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-consensus-grandpa = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-inherents = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-io = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-keystore = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-keyring = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-npos-elections = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-offchain = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-rpc = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-runtime = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-weights = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-runtime-interface = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-session = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-staking = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-state-machine = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-std = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-storage = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-timestamp = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-tracing = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-transaction-pool = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-transaction-storage-proof = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-trie = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+sp-version = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+substrate-frame-rpc-system = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+substrate-prometheus-endpoint = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+substrate-build-script-utils = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+substrate-wasm-builder = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
+substrate-test-utils = { git = "https://github.com/PolymeshAssociation/polkadot-sdk", branch = "polymesh-v6-monthly-2023-08" }
 
 [workspace]
 members = [
@@ -197,6 +200,7 @@ pallet-group-rpc = { path = "pallets/group/rpc", default-features = false }
 pallet-group-rpc-runtime-api = { path = "pallets/group/rpc/runtime-api", default-features = false }
 pallet-protocol-fee-rpc = { path = "pallets/protocol-fee/rpc", default-features = false }
 pallet-protocol-fee-rpc-runtime-api = { path = "pallets/protocol-fee/rpc/runtime-api", default-features = false }
+pallet-staking-rpc = { path = "pallets/staking/rpc", default-features = false }
 pallet-staking-rpc-runtime-api = { path = "pallets/staking/rpc/runtime-api", default-features = false }
 polymesh-node-rpc = { path = "node-rpc", default-features = false }
 
@@ -212,14 +216,18 @@ polymesh-build-tool = { path = "pallets/runtime/build_tool", default-features =
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "max-encoded-len"] }
 frame-support = { version = "4.0.0-dev", default-features = false }
 frame-system = { version = "4.0.0-dev", default-features = false }
+frame-system-benchmarking = { version = "4.0.0-dev", default-features = false }
 frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false }
+frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false }
+frame-benchmarking-cli = { version = "4.0.0-dev", default-features = false }
+frame-executive = { version = "4.0.0-dev", default-features = false }
 pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
 pallet-authorship = { version = "4.0.0-dev", default-features = false }
 pallet-babe = { version = "4.0.0-dev", default-features = false }
 pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false}
+pallet-contracts-primitives = { version = "24.0.0", default-features = false}
 pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-pallet-executive = { package = "frame-executive", version = "4.0.0-dev", default-features = false }
 pallet-grandpa = { version = "4.0.0-dev", default-features = false }
 pallet-im-online = { version = "4.0.0-dev", default-features = false }
 pallet-indices = { version = "4.0.0-dev", default-features = false }
@@ -230,30 +238,68 @@ pallet-scheduler = { version = "4.0.0-dev", default-features = false }
 pallet-session = { version = "4.0.0-dev", default-features = false }
 pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
 pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
 sp-api = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
+sp-application-crypto = { version = "23.0.0", default-features = false }
+sp-arithmetic = { version = "16.0.0", default-features = false }
 sp-authority-discovery = { version = "4.0.0-dev", default-features = false }
 sp-block-builder = { version = "4.0.0-dev", default-features = false }
 sp-blockchain = { version = "4.0.0-dev", default-features = false }
 sp-consensus = { version = "0.10.0-dev", default-features = false }
 sp-consensus-babe = { version = "0.10.0-dev", default-features = false }
-sp-consensus-slots = { version = "0.10.0-dev", default-features = false }
 sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false }
-sp-keyring = { version = "7.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
+sp-consensus-slots = { version = "0.10.0-dev", default-features = false }
+sp-core = { version = "21.0.0", default-features = false }
+sp-debug-derive = { version = "8.0.0", default-features = false }
 sp-inherents = { version = "4.0.0-dev", default-features = false }
-sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
+sp-io = { version = "23.0.0", default-features = false }
+sp-keyring = { version = "24.0.0", default-features = false }
+sp-keystore = { version = "0.27.0", default-features = false }
+sp-npos-elections = { version = "4.0.0-dev", default-features = false }
 sp-offchain = { version = "4.0.0-dev", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-runtime-interface = { version = "7.0.0", default-features = false }
-sp-timestamp = { version = "4.0.0-dev", default-features = false }
+sp-rpc = { version = "6.0.0", default-features = false }
+sp-runtime = { version = "24.0.0", default-features = false }
+sp-runtime-interface = { version = "17.0.0", default-features = false }
 sp-session = { version = "4.0.0-dev", default-features = false }
 sp-staking = { version = "4.0.0-dev", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+sp-std = { version = "8.0.0", default-features = false }
+sp-timestamp = { version = "4.0.0-dev", default-features = false }
+sp-tracing = { version = "10.0.0", default-features = false }
+sp-transaction-storage-proof = { version = "4.0.0-dev", default-features = false }
 sp-transaction-pool = { version = "4.0.0-dev", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
+sp-weights = { version = "20.0.0", default-features = false }
+sp-version = { version = "22.0.0", default-features = false }
+substrate-test-utils = { version = "4.0.0-dev", default-features = false }
+substrate-wasm-builder = { version = "5.0.0-dev", default-features = false }
+substrate-frame-rpc-system = { version = "4.0.0-dev", default-features = false }
+
+# Substrate client deps.
+sc-authority-discovery = "0.10.0-dev"
+sc-basic-authorship = "0.10.0-dev"
+sc-chain-spec = "4.0.0-dev"
+sc-cli = { version = "0.10.0-dev" }
+sc-client-api = "4.0.0-dev"
+sc-client-db = { version = "0.10.0-dev", default-features = false }
+sc-consensus = "0.10.0-dev"
+sc-consensus-babe = "0.10.0-dev"
+sc-consensus-babe-rpc = "0.10.0-dev"
+sc-consensus-epochs = { version = "0.10.0-dev" }
+sc-consensus-grandpa = "0.10.0-dev"
+sc-consensus-grandpa-rpc = "0.10.0-dev"
+sc-consensus-slots = "0.10.0-dev"
+sc-executor = { version = "0.10.0-dev" }
+sc-network = "0.10.0-dev"
+sc-network-common = { version = "0.10.0-dev" }
+sc-network-sync = { version = "0.10.0-dev" }
+sc-rpc = "4.0.0-dev"
+sc-rpc-api = { version = "0.10.0-dev" }
+sc-rpc-spec-v2 = { version = "0.10.0-dev" }
+sc-service = { version = "0.10.0-dev" }
+sc-telemetry = "4.0.0-dev"
+sc-transaction-pool = "4.0.0-dev"
+sc-transaction-pool-api = { version = "4.0.0-dev" }
+sc-sync-state-rpc = { version = "0.10.0-dev" }
+sc-offchain = { version = "4.0.0-dev" }
 
 # Crypto
 rand = { version = "0.8", default-features = false }
@@ -300,29 +346,32 @@ polymesh-runtime-testnet = { workspace = true }
 futures = "0.3.21"
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 log = "0.4"
-serde = { version = "1.0.136", default-features = false }
+serde = { version = "1.0.136", default-features = false, features = ["alloc", "derive"] }
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 clap = { version = "4.0.9", features = ["derive"] }
 rustc-hex = "2.1.0"
 
 # Substrate client deps.
-sc-authority-discovery = "0.10.0-dev"
-sc-basic-authorship = "0.10.0-dev"
-sc-chain-spec = "4.0.0-dev"
-sc-cli = { version = "0.10.0-dev" }
-sc-client-api = "4.0.0-dev"
-sc-client-db = { version = "0.10.0-dev", default-features = false }
-sc-consensus = "0.10.0-dev"
-sc-consensus-babe = "0.10.0-dev"
-sc-consensus-slots = "0.10.0-dev"
-sc-executor = { version = "0.10.0-dev" }
-sc-network = "0.10.0-dev"
-sc-network-common = { version = "0.10.0-dev" }
-sc-rpc = "4.0.0-dev"
-sc-service = { version = "0.10.0-dev" }
-sc-telemetry = "4.0.0-dev"
-sc-transaction-pool = "4.0.0-dev"
-sc-sync-state-rpc = { version = "0.10.0-dev" }
+sc-authority-discovery = { workspace = true }
+sc-basic-authorship = { workspace = true }
+sc-chain-spec = { workspace = true }
+sc-cli = { workspace = true }
+sc-client-api = { workspace = true }
+sc-client-db = { workspace = true, default-features = false }
+sc-consensus = { workspace = true }
+sc-consensus-babe = { workspace = true }
+sc-consensus-slots = { workspace = true }
+sc-executor = { workspace = true }
+sc-network = { workspace = true }
+sc-network-common = { workspace = true }
+sc-network-sync = { workspace = true }
+sc-rpc = { workspace = true }
+sc-service = { workspace = true }
+sc-telemetry = { workspace = true }
+sc-transaction-pool = { workspace = true }
+sc-transaction-pool-api = { workspace = true }
+sc-sync-state-rpc = { workspace = true }
+sc-offchain = { workspace = true }
 grandpa = { package = "sc-consensus-grandpa", version = "0.10.0-dev" }
 
 # Substrate
@@ -353,8 +402,8 @@ sp-session = { workspace = true }
 sp-transaction-pool = { workspace = true }
 
 # These dependencies are used for runtime benchmarking
-frame-benchmarking = "4.0.0-dev"
-frame-benchmarking-cli = "4.0.0-dev"
+frame-benchmarking = { workspace = true }
+frame-benchmarking-cli = { workspace = true }
 
 [build-dependencies]
 substrate-build-script-utils = { version = "3.0.0" }
diff --git a/integration/Cargo.lock b/integration/Cargo.lock
index 3d5cb3ad51..225c054cd5 100644
--- a/integration/Cargo.lock
+++ b/integration/Cargo.lock
@@ -3245,9 +3245,9 @@ dependencies = [
 
 [[package]]
 name = "polymesh-api"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "975666bf3077ef7540833649adec88c58eddc6e68ee51d8e9eed75cbb0bd4e2a"
+checksum = "1e926bea634faf849381f66064f6ef6843542c13a8d36aac90214c2b480b507d"
 dependencies = [
  "async-trait",
  "ink",
@@ -3260,6 +3260,7 @@ dependencies = [
  "serde",
  "serde-big-array",
  "sp-arithmetic",
+ "sp-runtime",
 ]
 
 [[package]]
@@ -3311,9 +3312,9 @@ dependencies = [
 
 [[package]]
 name = "polymesh-api-codegen"
-version = "3.6.2"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c561c4e41c52bc822ae3fbb8fcdeadad3dfb9ee1c95e180b9fa893c66ebdd6e5"
+checksum = "24ec054112258eea6fc91ae2ed428c9ff5e9bef958231942b9dae63b578d9f5d"
 dependencies = [
  "frame-metadata 15.1.0",
  "heck 0.4.1",
@@ -3331,9 +3332,9 @@ dependencies = [
 
 [[package]]
 name = "polymesh-api-codegen-macro"
-version = "3.6.2"
+version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f29d6e08ff01c399678ff599abf0a0348028e2df2c06077ec4f610d9fff96a"
+checksum = "14b12e55121c22d6795ea14017fa779fafda975749dd877ebd41e8c9ac5ba852"
 dependencies = [
  "darling 0.14.4",
  "parity-scale-codec",
diff --git a/integration/tests/contract_permissions.rs b/integration/tests/contract_permissions.rs
index c1b5cd7e1e..04b36c4c5e 100644
--- a/integration/tests/contract_permissions.rs
+++ b/integration/tests/contract_permissions.rs
@@ -49,7 +49,7 @@ async fn contract_as_secondary_key_change_identity() -> Result<()> {
         .polymesh_contracts()
         .instantiate_with_code_perms(
             0,
-            Weight::from_parts(10_000_000_000, 0),
+            Weight::from_parts(10_000_000_000, 20_000),
             None,
             call_runtime_bytes.to_vec(),
             vec![0x9b, 0xae, 0x9d, 0x5e], // Selector for `new` constructor.
@@ -134,7 +134,7 @@ async fn contract_as_secondary_key_change_identity() -> Result<()> {
         .call(
             contract.into(),
             0,
-            Weight::from_parts(10_000_000_000, 0),
+            Weight::from_parts(19_000_000_000, 40_000),
             None,
             encoded_call,
         )?
diff --git a/node-rpc/Cargo.toml b/node-rpc/Cargo.toml
index 48cf175997..aa824b0535 100644
--- a/node-rpc/Cargo.toml
+++ b/node-rpc/Cargo.toml
@@ -12,29 +12,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 jsonrpsee = { version = "0.16.2", features = ["server"] }
 
-polymesh-primitives = { path = "../primitives", default-features = false }
-pallet-group-rpc = { path = "../pallets/group/rpc" }
-pallet-staking-rpc = { path = "../pallets/staking/rpc" }
-pallet-protocol-fee-rpc = {  path = "../pallets/protocol-fee/rpc" }
-node-rpc = { path = "../rpc" }
+polymesh-primitives = { workspace = true, default-features = false }
+pallet-group-rpc = { workspace = true }
+pallet-staking-rpc = { workspace = true }
+pallet-protocol-fee-rpc = {  workspace = true }
+node-rpc = { workspace = true }
 
-sc-chain-spec = { version = "4.0.0-dev" }
-sc-client-api = { version = "4.0.0-dev" }
-sc-consensus-babe = { version = "0.10.0-dev" }
-sc-consensus-babe-rpc = { version = "0.10.0-dev" }
-sc-consensus-epochs = { version = "0.10.0-dev" }
-sc-consensus-grandpa = { version = "0.10.0-dev" }
-sc-consensus-grandpa-rpc = { version = "0.10.0-dev" }
-sc-rpc = { version = "4.0.0-dev" }
-sc-rpc-api = { version = "0.10.0-dev" }
-sc-rpc-spec-v2 = { version = "0.10.0-dev" }
-sc-sync-state-rpc = { version = "0.10.0-dev" }
-sc-transaction-pool-api = { version = "4.0.0-dev" }
-sp-api = { version = "4.0.0-dev" }
-sp-block-builder = { version = "4.0.0-dev" }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-consensus = { version = "0.10.0-dev" }
-sp-consensus-babe = { version = "0.10.0-dev" }
-sp-keystore = { version = "0.13.0" }
-sp-runtime = { version = "7.0.0" }
-substrate-frame-rpc-system = { version = "4.0.0-dev" }
+sc-chain-spec = { workspace = true }
+sc-client-api = { workspace = true }
+sc-consensus-babe = { workspace = true }
+sc-consensus-babe-rpc = { workspace = true }
+sc-consensus-grandpa = { workspace = true }
+sc-consensus-grandpa-rpc = { workspace = true }
+sc-rpc = { workspace = true }
+sc-rpc-api = { workspace = true }
+sc-rpc-spec-v2 = { workspace = true }
+sc-sync-state-rpc = { workspace = true }
+sc-transaction-pool-api = { workspace = true }
+sp-api = { workspace = true }
+sp-block-builder = { workspace = true }
+sp-blockchain = { workspace = true }
+sp-consensus = { workspace = true }
+sp-consensus-babe = { workspace = true }
+sp-keystore = { workspace = true }
+sp-runtime = { workspace = true }
+substrate-frame-rpc-system = { workspace = true }
diff --git a/node-rpc/src/lib.rs b/node-rpc/src/lib.rs
index 41bc76f2c1..828bbc8a6f 100644
--- a/node-rpc/src/lib.rs
+++ b/node-rpc/src/lib.rs
@@ -33,10 +33,9 @@
 use std::sync::Arc;
 
 use jsonrpsee::RpcModule;
-use polymesh_primitives::{AccountId, Block, BlockNumber, Hash, IdentityId, Index, Moment, Ticker};
+use polymesh_primitives::{AccountId, Block, BlockNumber, Hash, IdentityId, Moment, Nonce, Ticker};
 use sc_client_api::AuxStore;
-use sc_consensus_babe::{BabeConfiguration, Epoch};
-use sc_consensus_epochs::SharedEpochChanges;
+use sc_consensus_babe::BabeWorkerHandle;
 use sc_consensus_grandpa::{
     FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,
 };
@@ -48,16 +47,14 @@ use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 use sp_consensus::SelectChain;
 use sp_consensus_babe::BabeApi;
-use sp_keystore::SyncCryptoStorePtr;
+use sp_keystore::KeystorePtr;
 
 /// Extra dependencies for BABE.
 pub struct BabeDeps {
-    /// BABE protocol config.
-    pub babe_config: BabeConfiguration,
-    /// BABE pending epoch changes.
-    pub shared_epoch_changes: SharedEpochChanges<Block, Epoch>,
+    /// A handle to the BABE worker for issuing requests.
+    pub babe_worker_handle: BabeWorkerHandle<Block>,
     /// The keystore that manages the keys of the node.
-    pub keystore: SyncCryptoStorePtr,
+    pub keystore: KeystorePtr,
 }
 
 /// Extra dependencies for GRANDPA
@@ -90,12 +87,22 @@ pub struct FullDeps<C, P, SC, B> {
     pub babe: BabeDeps,
     /// GRANDPA specific dependencies.
     pub grandpa: GrandpaDeps<B>,
+    /// The backend used by the node.
+    pub backend: Arc<B>,
 }
 
 /// Instantiate all Full RPC extensions.
 pub fn create_full<C, P, SC, B>(
-    deps: FullDeps<C, P, SC, B>,
-    _backend: Arc<B>,
+    FullDeps {
+        client,
+        pool,
+        select_chain,
+        chain_spec,
+        deny_unsafe,
+        babe,
+        grandpa,
+        backend: _,
+    }: FullDeps<C, P, SC, B>,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
     C: ProvideRuntimeApi<Block>
@@ -106,7 +113,7 @@ where
         + Sync
         + Send
         + 'static,
-    C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,
+    C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Nonce>,
     C::Api: node_rpc::transaction_payment::TransactionPaymentRuntimeApi<Block>,
     C::Api: pallet_staking_rpc::StakingRuntimeApi<Block>,
     C::Api: node_rpc::pips::PipsRuntimeApi<Block, AccountId>,
@@ -121,7 +128,7 @@ where
     P: TransactionPool + 'static,
     SC: SelectChain<Block> + 'static,
     B: sc_client_api::Backend<Block> + Send + Sync + 'static,
-    B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
+    B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashingFor<Block>>,
 {
     use node_rpc::{
         asset::{Asset, AssetApiServer},
@@ -142,20 +149,10 @@ where
     use substrate_frame_rpc_system::{System, SystemApiServer};
 
     let mut io = RpcModule::new(());
-    let FullDeps {
-        client,
-        pool,
-        select_chain,
-        chain_spec,
-        deny_unsafe,
-        babe,
-        grandpa,
-    } = deps;
 
     let BabeDeps {
         keystore,
-        babe_config,
-        shared_epoch_changes,
+        babe_worker_handle,
     } = babe;
     let GrandpaDeps {
         shared_voter_state,
@@ -179,9 +176,8 @@ where
     io.merge(
         Babe::new(
             client.clone(),
-            shared_epoch_changes.clone(),
+            babe_worker_handle.clone(),
             keystore,
-            babe_config,
             select_chain,
             deny_unsafe,
         )
@@ -203,7 +199,7 @@ where
             chain_spec,
             client.clone(),
             shared_authority_set,
-            shared_epoch_changes,
+            babe_worker_handle,
         )?
         .into_rpc(),
     )?;
diff --git a/pallets/asset/Cargo.toml b/pallets/asset/Cargo.toml
index 83edd21c38..b7e0aea9c0 100644
--- a/pallets/asset/Cargo.toml
+++ b/pallets/asset/Cargo.toml
@@ -22,7 +22,7 @@ polymesh-runtime-common = { workspace = true, default-features = false }
 # Other
 serde = { version = "1.0.104", default-features = false }
 serde_derive = { version = "1.0.104", optional = true, default-features = false }
-serde_json = "1.0.48"
+serde_json = { version = "1.0.48", default-features = false }
 rustc-hex = { version = "2.1.0", default-features = false }
 hex-literal = "0.2.1"
 arrayvec = { version = "0.7.1", default-features = false }
@@ -30,20 +30,20 @@ log = "0.4"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/asset/src/checkpoint/mod.rs b/pallets/asset/src/checkpoint/mod.rs
index 1aa398a6cf..dbdebc2d82 100644
--- a/pallets/asset/src/checkpoint/mod.rs
+++ b/pallets/asset/src/checkpoint/mod.rs
@@ -259,13 +259,15 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
         pub schedules_max_complexity: u64,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(2));
 
diff --git a/pallets/asset/src/lib.rs b/pallets/asset/src/lib.rs
index 48ac26d0a7..2761d73a23 100644
--- a/pallets/asset/src/lib.rs
+++ b/pallets/asset/src/lib.rs
@@ -95,6 +95,7 @@ use frame_support::traits::{Currency, Get, UnixTime};
 use frame_support::weights::Weight;
 use frame_support::BoundedBTreeSet;
 use frame_system::ensure_root;
+use frame_system::pallet_prelude::*;
 use sp_io::hashing::blake2_128;
 use sp_runtime::traits::Zero;
 use sp_std::collections::btree_set::BTreeSet;
@@ -149,7 +150,6 @@ pub use pallet::*;
 pub mod pallet {
     use super::*;
     use frame_support::pallet_prelude::*;
-    use frame_system::pallet_prelude::*;
 
     #[pallet::config]
     pub trait Config:
@@ -571,15 +571,17 @@ pub mod pallet {
 
     #[pallet::genesis_config]
     #[derive(frame_support::DefaultNoBound)]
-    pub struct GenesisConfig {
+    pub struct GenesisConfig<T> {
         // TODO: Why is serde required here?
         pub ticker_registration_config: TickerRegistrationConfig<polymesh_primitives::Moment>,
         pub reserved_country_currency_codes: Vec<Ticker>,
         pub asset_metadata: Vec<(AssetMetadataName, AssetMetadataSpec)>,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T>
     where
         T: AssetConfig,
     {
@@ -3101,7 +3103,7 @@ impl<T: AssetConfig> Pallet<T> {
     }
 
     pub fn generate_asset_id(caller_acc: T::AccountId, update: bool) -> AssetId {
-        let genesis_hash = frame_system::Pallet::<T>::block_hash(T::BlockNumber::zero());
+        let genesis_hash = frame_system::Pallet::<T>::block_hash(BlockNumberFor::<T>::zero());
         let nonce = Self::get_nonce(&caller_acc, update);
         blake2_128(&(b"modlpy/pallet_asset", genesis_hash, caller_acc, nonce).encode()).into()
     }
diff --git a/pallets/asset/src/types.rs b/pallets/asset/src/types.rs
index 44534a3eee..d785a74592 100644
--- a/pallets/asset/src/types.rs
+++ b/pallets/asset/src/types.rs
@@ -1,8 +1,6 @@
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
-
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 
 use polymesh_primitives::asset::AssetType;
 use polymesh_primitives::{Balance, IdentityId};
@@ -64,7 +62,7 @@ pub struct TickerRegistration<T> {
 }
 
 /// struct to store the ticker registration config.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Clone,
     Debug,
diff --git a/pallets/balances/Cargo.toml b/pallets/balances/Cargo.toml
index 2bd4a7fa41..39d37e5d20 100644
--- a/pallets/balances/Cargo.toml
+++ b/pallets/balances/Cargo.toml
@@ -15,21 +15,21 @@ serde = { version = "1.0.104", default-features = false }
 serde_derive = { version = "1.0.104", optional = true, default-features = false}
 
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = {  version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = {  workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 # Benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
@@ -49,6 +49,7 @@ std = [
 	"sp-arithmetic/std",
 	"frame-system/std",
 	"frame-support/std",
+	"frame-benchmarking?/std",
 	"pallet-timestamp/std",
 	"polymesh-primitives/std",
 	"pallet-permissions/std",
diff --git a/pallets/balances/src/lib.rs b/pallets/balances/src/lib.rs
index 922f6b33ee..01703a49b3 100644
--- a/pallets/balances/src/lib.rs
+++ b/pallets/balances/src/lib.rs
@@ -127,7 +127,7 @@
 //! use frame_support::traits::{WithdrawReasons, LockableCurrency};
 //! use sp_runtime::traits::Bounded;
 //! pub trait Trait: frame_system::Config {
-//! type Currency: LockableCurrency<Self::AccountId, Moment=Self::BlockNumber>;
+//! type Currency: LockableCurrency<Self::AccountId, Moment=frame_system::pallet_prelude::BlockNumberFor<Self>>;
 //! }
 //! # struct StakingLedger<T: Trait> {
 //!     # stash: <T as frame_system::Config>::AccountId,
@@ -172,18 +172,25 @@ use frame_support::{
     dispatch::{DispatchError, DispatchResult},
     ensure,
     traits::{
-        tokens::{fungible, BalanceStatus as Status, DepositConsequence, WithdrawConsequence},
+        tokens::{
+            fungible, BalanceStatus as Status, DepositConsequence,
+            Fortitude::{self, Polite},
+            Preservation::{self, Expendable, Preserve, Protect},
+            Provenance::{self, Minted},
+            WithdrawConsequence,
+        },
         Currency, ExistenceRequirement, Get, Imbalance, LockIdentifier, LockableCurrency,
         OnUnbalanced, ReservableCurrency, SignedImbalance, StoredMap, WithdrawReasons,
     },
     weights::Weight,
 };
+use frame_system::pallet_prelude::*;
 use frame_system::{self as system, ensure_root, ensure_signed};
 use polymesh_primitives::traits::{BlockRewardsReserveCurrency, CheckCdd, IdentityFnTrait};
 use polymesh_primitives::{Balance, IdentityId, Memo, SystematicIssuers, GC_DID};
 use scale_info::TypeInfo;
 use sp_runtime::{
-    traits::{AccountIdConversion, StaticLookup, Zero},
+    traits::{AccountIdConversion, Saturating, StaticLookup, Zero},
     RuntimeDebug,
 };
 use sp_std::ops::BitOr;
@@ -286,11 +293,12 @@ impl BitOr for Reasons {
 
 pub use pallet::*;
 
+const LOG_TARGET: &str = "runtime::balances";
+
 #[frame_support::pallet]
 pub mod pallet {
     use super::*;
     use frame_support::pallet_prelude::*;
-    use frame_system::pallet_prelude::*;
 
     #[pallet::event]
     #[pallet::generate_deposit(pub(super) fn deposit_event)]
@@ -427,21 +435,22 @@ pub mod pallet {
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             let f = |u: Balance, &v| u + v;
             let total: Balance = self.balances.iter().map(|(_, v)| v).fold(Zero::zero(), f);
             TotalIssuance::<T>::put(total);
 
-            for (who, free) in &self.balances {
-                T::AccountStore::insert(
+            for &(ref who, free) in &self.balances {
+                frame_system::Pallet::<T>::inc_providers(who);
+                assert!(T::AccountStore::insert(
                     who,
                     AccountData {
-                        free: *free,
+                        free,
                         ..Default::default()
                     },
                 )
-                .unwrap();
+                .is_ok());
             }
         }
     }
@@ -572,7 +581,7 @@ pub mod pallet {
                 account.reserved = new_reserved;
 
                 (account.free, account.reserved)
-            });
+            })?;
             Self::deposit_event(Event::BalanceSet(caller_id, who, free, reserved));
             Ok(())
         }
@@ -627,7 +636,9 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
-    // PRIVATE MUTABLES
+    fn ed() -> Balance {
+        T::ExistentialDeposit::get()
+    }
 
     /// Get the free balance of an account.
     pub fn free_balance(who: impl sp_std::borrow::Borrow<T::AccountId>) -> Balance {
@@ -662,28 +673,17 @@ impl<T: Config> Pallet<T> {
         T::AccountStore::get(&who)
     }
 
-    /// Places the `free` and `reserved` parts of `new` into `account`. Also does 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 the final free balance, iff the account was previously of total balance zero, known
-    /// as its "endowment".
-    fn post_mutation(_who: &T::AccountId, new: AccountData) -> Option<AccountData> {
-        // Polymesh modified code. Removed Existential Deposit logic
-        Some(new)
-    }
-
     fn deposit_consequence(
         _who: &T::AccountId,
         amount: Balance,
         account: &AccountData,
-        mint: bool,
+        provence: Provenance,
     ) -> DepositConsequence {
         if amount.is_zero() {
             return DepositConsequence::Success;
         }
 
-        if mint && TotalIssuance::<T>::get().checked_add(amount).is_none() {
+        if provence == Minted && TotalIssuance::<T>::get().checked_add(amount).is_none() {
             return DepositConsequence::Overflow;
         }
 
@@ -717,7 +717,7 @@ impl<T: Config> Pallet<T> {
 
         let new_total_balance = match account.total().checked_sub(amount) {
             Some(x) => x,
-            None => return WithdrawConsequence::NoFunds,
+            None => return WithdrawConsequence::BalanceLow,
         };
 
         // Provider restriction - total account balance cannot be reduced to zero if it cannot
@@ -738,7 +738,7 @@ impl<T: Config> Pallet<T> {
         // 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,
+            None => return WithdrawConsequence::BalanceLow,
         };
 
         // Eventual free funds must be no less than the frozen balance.
@@ -757,39 +757,72 @@ impl<T: Config> Pallet<T> {
     ///
     /// 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) -> R) -> R {
+    pub fn mutate_account<R>(
+        who: &T::AccountId,
+        f: impl FnOnce(&mut AccountData) -> R,
+    ) -> Result<R, DispatchError> {
         Self::try_mutate_account(who, |a, _| -> Result<R, DispatchError> { Ok(f(a)) })
-            .expect("Error is infallible; qed")
     }
 
-    /// Mutate an account to some new value, or delete it entirely with `None`.
-    /// This will do nothing if the result of `f` is an `Err`.
+    /// 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.
-    fn try_mutate_account<R, E: From<DispatchError>>(
+    pub(crate) fn try_mutate_account<R, E: From<DispatchError>>(
         who: &T::AccountId,
         f: impl FnOnce(&mut AccountData, bool) -> Result<R, E>,
     ) -> Result<R, E> {
-        T::AccountStore::try_mutate_exists(who, |maybe_account| {
+        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 };
-                // `post_mutation` always return the same account store
-                *maybe_account = Self::post_mutation(who, account);
-                (maybe_endowed, result)
-            })
-        })
-        .map(|(maybe_endowed, result)| {
+            let did_provide = frame_system::Pallet::<T>::providers(who) > 0;
+            let did_consume =
+                !is_new && (!account.reserved.is_zero() || !account.frozen(Reasons::All).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(Reasons::All).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)?;
+            }
+            // POLYMESH: We don't reap accounts, so we don't need to dec_providers.
+            // A account's provider count is increased when the account is created and
+            // the account is never removed, so the provider count will never decrease.
+            //if did_provide && !does_provide {
+            //    frame_system::Pallet::<T>::dec_providers(who);
+            //}
+
+            let maybe_endowed = if is_new { Some(account.free) } else { None };
+
+            // Polymesh-note: Removed dust code.
+            *maybe_account = Some(account);
+            Ok((maybe_endowed, result))
+        });
+        result.map(|(maybe_endowed, result)| {
             if let Some(endowed) = maybe_endowed {
-                // Polymesh-note: Modified the code in the favour of Polymesh code base
+                // Polymesh-note: Add DID to event.
                 let who_id = T::IdentityFn::get_identity(who);
                 Self::deposit_event(Event::Endowed(who_id, who.clone(), endowed));
             }
+            // Polymesh-note: Removed dust code.
             result
         })
     }
@@ -803,7 +836,7 @@ impl<T: Config> Pallet<T> {
             );
         }
 
-        Self::mutate_account(who, |b| {
+        let res = Self::mutate_account(who, |b| {
             b.misc_frozen = Zero::zero();
             b.fee_frozen = Zero::zero();
             for l in locks.iter() {
@@ -815,6 +848,7 @@ impl<T: Config> Pallet<T> {
                 }
             }
         });
+        debug_assert!(res.is_ok());
 
         let existed = Locks::<T>::contains_key(who);
         if locks.is_empty() {
@@ -826,8 +860,15 @@ impl<T: Config> Pallet<T> {
             }
         } else {
             Locks::<T>::insert(who, locks);
-            if !existed {
-                let _ = system::Pallet::<T>::inc_consumers(who);
+            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."
+                );
             }
         }
     }
@@ -1098,22 +1139,18 @@ impl<T: Config> Currency<T::AccountId> for Pallet<T> {
             return (NegativeImbalance::zero(), value);
         }
 
-        Self::mutate_account(who, |account| {
-            let free_slash = cmp::min(account.free, value);
-            account.free -= free_slash;
-
-            let remaining_slash = value - free_slash;
-            if !remaining_slash.is_zero() {
-                let reserved_slash = cmp::min(account.reserved, remaining_slash);
-                account.reserved -= reserved_slash;
-                (
-                    NegativeImbalance::new(free_slash + reserved_slash),
-                    remaining_slash - reserved_slash,
-                )
-            } else {
-                (NegativeImbalance::new(value), Zero::zero())
-            }
-        })
+        let result =
+            match Self::try_mutate_account(who, |account, _is_new| -> Result<_, DispatchError> {
+                let actual = cmp::min(account.free, value);
+                account.free.saturating_reduce(actual);
+
+                let remaining = value.saturating_sub(actual);
+                Ok((NegativeImbalance::new(value), remaining))
+            }) {
+                Ok(x) => x,
+                Err(_) => (NegativeImbalance::zero(), value),
+            };
+        result
     }
 
     /// Deposit some `value` into the free balance of an existing target account `who`.
@@ -1279,14 +1316,22 @@ impl<T: Config> ReservableCurrency<T::AccountId> for Pallet<T> {
             return value;
         }
 
-        let actual = Self::mutate_account(who, |account| {
+        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.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.clone(), actual));
         value - actual
@@ -1307,12 +1352,15 @@ impl<T: Config> ReservableCurrency<T::AccountId> for Pallet<T> {
             return (NegativeImbalance::zero(), value);
         }
 
-        Self::mutate_account(who, |account| {
+        match Self::mutate_account(who, |account| {
             // underflow should never happen, but it if does, there's nothing to be done here.
             let actual = cmp::min(account.reserved, value);
             account.reserved -= actual;
             (NegativeImbalance::new(actual), value - actual)
-        })
+        }) {
+            Ok(x) => x,
+            Err(_) => (NegativeImbalance::zero(), value),
+        }
     }
 
     /// Move the reserved balance of one account into the balance of another, according to `status`.
@@ -1378,7 +1426,7 @@ impl<T: Config> ReservableCurrency<T::AccountId> for Pallet<T> {
 }
 
 impl<T: Config> LockableCurrency<T::AccountId> for Pallet<T> {
-    type Moment = T::BlockNumber;
+    type Moment = BlockNumberFor<T>;
 
     type MaxLocks = T::MaxLocks;
 
@@ -1503,25 +1551,45 @@ impl<T: Config> fungible::Inspect<T::AccountId> for Pallet<T> {
     fn minimum_balance() -> Self::Balance {
         T::ExistentialDeposit::get()
     }
-    fn balance(who: &T::AccountId) -> Self::Balance {
+    fn total_balance(who: &T::AccountId) -> Self::Balance {
         Self::account(who).total()
     }
-    fn reducible_balance(who: &T::AccountId, keep_alive: bool) -> Self::Balance {
+    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);
-        // 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)
+        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(Reasons::All).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, mint: bool) -> DepositConsequence {
-        Self::deposit_consequence(who, amount, &Self::account(who), mint)
+    fn can_deposit(
+        who: &T::AccountId,
+        amount: Self::Balance,
+        provence: Provenance,
+    ) -> DepositConsequence {
+        Self::deposit_consequence(who, amount, &Self::account(who), provence)
     }
     fn can_withdraw(
         who: &T::AccountId,
diff --git a/pallets/bridge/Cargo.toml b/pallets/bridge/Cargo.toml
index f25ba0689b..399f25a745 100644
--- a/pallets/bridge/Cargo.toml
+++ b/pallets/bridge/Cargo.toml
@@ -14,27 +14,28 @@ pallet-multisig = { workspace = true, default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
 
-frame-benchmarking = { version = "4.0.0-dev", optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 # Other
 serde = { version = "1.0.104", default-features = false }
 log = "0.4.8"
 
 [features]
+default = ["std", "equalize"]
+
 equalize = []
 only-staking = []
-default = ["std", "equalize"]
 no_std = []
 std = [
-    "frame-benchmarking/std",
+    "frame-benchmarking?/std",
     "frame-support/std",
     "frame-system/std",
     "pallet-base/std",
diff --git a/pallets/bridge/src/lib.rs b/pallets/bridge/src/lib.rs
index 6251bcda40..719caa881d 100644
--- a/pallets/bridge/src/lib.rs
+++ b/pallets/bridge/src/lib.rs
@@ -19,6 +19,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
+use frame_system::pallet_prelude::*;
 use polymesh_primitives::{storage_migration_ver, Balance, IdentityId};
 use scale_info::TypeInfo;
 use sp_core::H256;
@@ -29,7 +30,7 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
     use super::*;
-    use frame_support::pallet_prelude::{ValueQuery, *};
+    use frame_support::pallet_prelude::*;
 
     #[pallet::config]
     pub trait Config: frame_system::Config {}
@@ -109,7 +110,7 @@ pub mod pallet {
         T::AccountId,
         Blake2_128Concat,
         u32,
-        BridgeTxDetail<T::BlockNumber>,
+        BridgeTxDetail<BlockNumberFor<T>>,
         ValueQuery,
     >;
 
@@ -129,18 +130,19 @@ pub mod pallet {
     /// The bridge transaction timelock period, in blocks, since the acceptance of the
     /// transaction proposal during which the admin key can freeze the transaction.
     #[pallet::storage]
-    pub(super) type Timelock<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+    pub(super) type Timelock<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
     /// The maximum number of bridged POLYX per identity within a set interval of
     /// blocks. Fields: POLYX amount and the block interval duration.
     #[pallet::storage]
-    pub(super) type BridgeLimit<T: Config> = StorageValue<_, (Balance, T::BlockNumber), ValueQuery>;
+    pub(super) type BridgeLimit<T: Config> =
+        StorageValue<_, (Balance, BlockNumberFor<T>), ValueQuery>;
 
     /// Amount of POLYX bridged by the identity in last block interval. Fields: the bridged
     /// amount and the last interval number.
     #[pallet::storage]
     pub(super) type PolyxBridged<T: Config> =
-        StorageMap<_, Identity, IdentityId, (Balance, T::BlockNumber), ValueQuery>;
+        StorageMap<_, Identity, IdentityId, (Balance, BlockNumberFor<T>), ValueQuery>;
 
     /// Identities not constrained by the bridge limit.
     #[pallet::storage]
@@ -152,11 +154,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {}
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(0));
         }
diff --git a/pallets/committee/Cargo.toml b/pallets/committee/Cargo.toml
index 1ef7fa995b..08c85c573f 100644
--- a/pallets/committee/Cargo.toml
+++ b/pallets/committee/Cargo.toml
@@ -15,19 +15,19 @@ serde_derive = { version = "1.0.104", optional = true, default-features = false
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
 
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/committee/src/lib.rs b/pallets/committee/src/lib.rs
index fd56299bec..45dfd313f2 100644
--- a/pallets/committee/src/lib.rs
+++ b/pallets/committee/src/lib.rs
@@ -184,7 +184,7 @@ pub mod pallet {
     #[pallet::storage]
     #[pallet::unbounded]
     pub type Voting<T: Config<I>, I: 'static = ()> =
-        StorageMap<_, Identity, T::Hash, PolymeshVotes<T::BlockNumber>, OptionQuery>;
+        StorageMap<_, Identity, T::Hash, PolymeshVotes<BlockNumberFor<T>>, OptionQuery>;
 
     /// Proposals so far.
     #[pallet::storage]
@@ -207,7 +207,7 @@ pub mod pallet {
     /// Time after which a proposal will expire.
     #[pallet::storage]
     pub type ExpiresAfter<T: Config<I>, I: 'static = ()> =
-        StorageValue<_, MaybeBlock<T::BlockNumber>, ValueQuery>;
+        StorageValue<_, MaybeBlock<BlockNumberFor<T>>, ValueQuery>;
 
     #[pallet::genesis_config]
     #[derive(frame_support::DefaultNoBound)]
@@ -215,13 +215,13 @@ pub mod pallet {
         pub members: Vec<IdentityId>,
         pub vote_threshold: (u32, u32),
         pub release_coordinator: IdentityId,
-        pub expires_after: MaybeBlock<T::BlockNumber>,
+        pub expires_after: MaybeBlock<BlockNumberFor<T>>,
         #[serde(skip)]
         pub phantom: PhantomData<(T, I)>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+    impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
         fn build(&self) {
             Members::<T, I>::put(self.members.clone());
             VoteThreshold::<T, I>::put(self.vote_threshold);
@@ -307,10 +307,7 @@ pub mod pallet {
         ReleaseCoordinatorUpdated(Option<IdentityId>),
         /// Proposal expiry time has been updated.
         /// Parameters: caller DID, new expiry time (if any).
-        ExpiresAfterUpdated(
-            IdentityId,
-            MaybeBlock<<T as frame_system::Config>::BlockNumber>,
-        ),
+        ExpiresAfterUpdated(IdentityId, MaybeBlock<BlockNumberFor<T>>),
         /// Voting threshold has been updated
         /// Parameters: caller DID, numerator, denominator
         VoteThresholdUpdated(IdentityId, u32, u32),
@@ -385,7 +382,7 @@ pub mod pallet {
         #[pallet::call_index(2)]
         pub fn set_expires_after(
             origin: OriginFor<T>,
-            expiry: MaybeBlock<T::BlockNumber>,
+            expiry: MaybeBlock<BlockNumberFor<T>>,
         ) -> DispatchResult {
             T::CommitteeOrigin::ensure_origin(origin)?;
             <ExpiresAfter<T, I>>::put(expiry);
@@ -489,7 +486,7 @@ pub mod pallet {
         fn ensure_proposal(
             hash: &T::Hash,
             idx: ProposalIndex,
-        ) -> Result<PolymeshVotes<T::BlockNumber>, DispatchError> {
+        ) -> Result<PolymeshVotes<BlockNumberFor<T>>, DispatchError> {
             let voting = Voting::<T, I>::get(&hash).ok_or(Error::<T, I>::NoSuchProposal)?;
             ensure!(voting.index == idx, Error::<T, I>::MismatchedVotingIndex);
             Ok(voting)
@@ -623,7 +620,7 @@ pub mod pallet {
         /// As a side-effect, on error, any existing proposal data is pruned.
         fn ensure_not_expired(
             proposal: &T::Hash,
-            expiry: MaybeBlock<T::BlockNumber>,
+            expiry: MaybeBlock<BlockNumberFor<T>>,
         ) -> Result<(), Error<T, I>> {
             match expiry {
                 MaybeBlock::Some(e) if e <= frame_system::Pallet::<T>::block_number() => {
diff --git a/pallets/common/Cargo.toml b/pallets/common/Cargo.toml
index f78a935d4b..f3e67bc751 100644
--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.104", optional = true, default-features = false, features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 
 polymesh-primitives = { workspace = true, default-features = false }
 
@@ -19,7 +19,7 @@ sp-std = {  workspace = true, default-features = false }
 default = ["std"]
 
 std = [
-	"serde",
+	"serde/std",
 	"codec/std",
 	"frame-support/std",
 	"polymesh-primitives/std",
diff --git a/pallets/common/src/protocol_fee.rs b/pallets/common/src/protocol_fee.rs
index 03308f76e4..a57e9f1c23 100644
--- a/pallets/common/src/protocol_fee.rs
+++ b/pallets/common/src/protocol_fee.rs
@@ -16,13 +16,12 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::dispatch::DispatchResult;
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 /// Protocol fee operations.
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum ProtocolOp {
     /// Fee charged when registering a new ticker.
     AssetRegisterTicker,
diff --git a/pallets/compliance-manager/Cargo.toml b/pallets/compliance-manager/Cargo.toml
index b4098e3831..59bf62dbe4 100644
--- a/pallets/compliance-manager/Cargo.toml
+++ b/pallets/compliance-manager/Cargo.toml
@@ -23,19 +23,19 @@ log = "0.4"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
 
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 [features]
 equalize = []
diff --git a/pallets/compliance-manager/src/lib.rs b/pallets/compliance-manager/src/lib.rs
index fd8286b1db..71761f854b 100644
--- a/pallets/compliance-manager/src/lib.rs
+++ b/pallets/compliance-manager/src/lib.rs
@@ -233,11 +233,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
         }
diff --git a/pallets/contracts/Cargo.toml b/pallets/contracts/Cargo.toml
index 26179cd207..9f235876fb 100644
--- a/pallets/contracts/Cargo.toml
+++ b/pallets/contracts/Cargo.toml
@@ -10,15 +10,15 @@ log = "0.4.8"
 
 wasm-instrument = { version = "0.3", default-features = false, optional = true }
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-contracts-primitives = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # Polymesh specific
 pallet-base = { workspace = true, default-features = false }
@@ -26,7 +26,7 @@ pallet-identity = { workspace = true, default-features = false }
 pallet-permissions = { workspace = true, default-features = false }
 polymesh-primitives = { workspace = true, default-features = false }
 
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/contracts/src/chain_extension.rs b/pallets/contracts/src/chain_extension.rs
index 42b1aee7cf..94d26f9c59 100644
--- a/pallets/contracts/src/chain_extension.rs
+++ b/pallets/contracts/src/chain_extension.rs
@@ -1,6 +1,3 @@
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
-
 use codec::{Decode, DecodeLimit, Encode};
 use frame_support::dispatch::{DispatchError, Dispatchable, GetDispatchInfo};
 use frame_support::ensure;
@@ -11,6 +8,7 @@ use frame_system::RawOrigin;
 use scale_info::prelude::format;
 use scale_info::prelude::string::String;
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_core::crypto::UncheckedFrom;
 
 use pallet_contracts::chain_extension as ce;
@@ -27,7 +25,7 @@ const MAX_DECODE_DEPTH: u32 = 10;
 
 /// ExtrinsicId
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct ExtrinsicId(u8, u8);
 
diff --git a/pallets/contracts/src/lib.rs b/pallets/contracts/src/lib.rs
index 84409b5d19..f286042239 100644
--- a/pallets/contracts/src/lib.rs
+++ b/pallets/contracts/src/lib.rs
@@ -65,7 +65,6 @@ use frame_support::traits::Get;
 use frame_support::weights::Weight;
 use frame_system::ensure_root;
 use frame_system::ensure_signed;
-#[cfg(feature = "std")]
 use pallet_contracts::Determinism;
 use scale_info::TypeInfo;
 use sp_core::crypto::UncheckedFrom;
@@ -409,7 +408,7 @@ pub mod pallet {
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
 
@@ -422,10 +421,10 @@ pub mod pallet {
                     owner.clone(),
                     self.upgradable_code.clone(),
                     None,
-                    Determinism::Deterministic,
+                    Determinism::Enforced,
                 )
                 .unwrap();
-                log::info!("Uploaded upgradeable code: {}", code_result.code_hash);
+                log::info!("Uploaded upgradeable code: {:?}", code_result.code_hash);
                 let api_code_hash = ApiCodeHash::new(code_result.code_hash);
                 let api = Api::new(self.upgradable_description, self.upgradable_major);
                 CurrentApiHash::<T>::insert(&api, &api_code_hash);
diff --git a/pallets/corporate-actions/Cargo.toml b/pallets/corporate-actions/Cargo.toml
index 56536e7013..97a5130594 100644
--- a/pallets/corporate-actions/Cargo.toml
+++ b/pallets/corporate-actions/Cargo.toml
@@ -24,18 +24,18 @@ log = "0.4"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
+pallet-timestamp = { workspace = true, default-features = false }
 
 pallet-compliance-manager = { workspace = true, default-features = false, optional = true }
 
diff --git a/pallets/corporate-actions/src/ballot/mod.rs b/pallets/corporate-actions/src/ballot/mod.rs
index dea3a8411f..9da22ce407 100644
--- a/pallets/corporate-actions/src/ballot/mod.rs
+++ b/pallets/corporate-actions/src/ballot/mod.rs
@@ -94,9 +94,8 @@ use polymesh_common_utilities::protocol_fee::{ChargeProtocolFee, ProtocolOp};
 use polymesh_primitives::{storage_migration_ver, Balance, EventDid, IdentityId, Moment};
 use polymesh_primitives_derive::VecU8StrongTyped;
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_runtime::traits::Zero;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
 type Checkpoint<T> = checkpoint::Pallet<T>;
@@ -104,25 +103,25 @@ type CA<T> = ca::Pallet<T>;
 type ExternalAgents<T> = pallet_external_agents::Pallet<T>;
 
 /// A wrapper for a motion title.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, PartialEq, Eq, Hash, Default, Debug)]
 pub struct MotionTitle(pub Vec<u8>);
 
 /// A wrapper for a motion info link.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, PartialEq, Eq, Hash, Default, Debug)]
 pub struct MotionInfoLink(pub Vec<u8>);
 
 /// A wrapper for a choice's title.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, PartialEq, Eq, Hash, Default, Debug)]
 pub struct ChoiceTitle(pub Vec<u8>);
 
 /// Details about motions
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Clone, PartialEq, Eq, Default, Debug, Encode, Decode, TypeInfo)]
 pub struct Motion {
     /// Title of the motion
@@ -137,7 +136,7 @@ pub struct Motion {
 }
 
 /// A wrapper for a ballot's title.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, PartialEq, Eq, Hash, Debug, Default)]
 pub struct BallotTitle(pub Vec<u8>);
@@ -149,7 +148,7 @@ pub struct BallotTitle(pub Vec<u8>);
 /// When the metadata has been committed to chain,
 /// the needed numbers aforementioned are cached away,
 /// and the metadata is not read on-chain again.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Clone, PartialEq, Eq, Debug, Encode, TypeInfo, Decode, Default)]
 pub struct BallotMeta {
     /// The ballot's title.
@@ -168,7 +167,7 @@ impl BallotMeta {
 }
 
 /// Timestamp range details about vote start / end.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Copy,
     Clone,
@@ -190,7 +189,7 @@ pub struct BallotTimeRange {
 }
 
 /// A vote cast on some choice in some motion in a ballot.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Copy,
     Clone,
@@ -352,11 +351,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
         }
diff --git a/pallets/corporate-actions/src/distribution/mod.rs b/pallets/corporate-actions/src/distribution/mod.rs
index 51d689ec3a..b9f92cd205 100644
--- a/pallets/corporate-actions/src/distribution/mod.rs
+++ b/pallets/corporate-actions/src/distribution/mod.rs
@@ -81,9 +81,8 @@ use polymesh_primitives::{
     EventDid, IdentityId, Moment, PortfolioId, PortfolioNumber, SecondaryKey, WeightMeter,
 };
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_runtime::traits::Zero;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
 storage_migration_ver!(1);
@@ -101,7 +100,7 @@ pub const PER_SHARE_PRECISION: Balance = 1_000_000;
 /// A capital distribution's various details.
 ///
 /// All information contained is used by on-chain logic.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Copy,
     Clone,
@@ -185,11 +184,14 @@ pub mod pallet {
     pub(crate) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
         }
diff --git a/pallets/corporate-actions/src/lib.rs b/pallets/corporate-actions/src/lib.rs
index a93098b34b..aaf7033321 100644
--- a/pallets/corporate-actions/src/lib.rs
+++ b/pallets/corporate-actions/src/lib.rs
@@ -519,13 +519,15 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
         pub max_details_length: u32,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
             MaxDetailsLength::<T>::put(self.max_details_length);
diff --git a/pallets/external-agents/Cargo.toml b/pallets/external-agents/Cargo.toml
index 7e8bd23bf0..081140ca7d 100644
--- a/pallets/external-agents/Cargo.toml
+++ b/pallets/external-agents/Cargo.toml
@@ -21,14 +21,14 @@ log = "0.4"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/external-agents/src/lib.rs b/pallets/external-agents/src/lib.rs
index 59fa3d7783..885ce532c3 100644
--- a/pallets/external-agents/src/lib.rs
+++ b/pallets/external-agents/src/lib.rs
@@ -138,11 +138,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
         }
diff --git a/pallets/group/Cargo.toml b/pallets/group/Cargo.toml
index 02b3c416bd..351ed0a9ba 100644
--- a/pallets/group/Cargo.toml
+++ b/pallets/group/Cargo.toml
@@ -15,20 +15,20 @@ serde_derive = { version = "1.0.104", optional = true, default-features = false
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
 # Only for benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/group/rpc/Cargo.toml b/pallets/group/rpc/Cargo.toml
index efdc9cc897..cdf29dc3b3 100644
--- a/pallets/group/rpc/Cargo.toml
+++ b/pallets/group/rpc/Cargo.toml
@@ -10,24 +10,24 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = false, features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-core = { version = "7.0.0", default-features = false }
-sp-rpc = { version = "6.0.0" }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = {version = "5.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-blockchain = { workspace = true }
+sp-core = { workspace = true, default-features = false }
+sp-rpc = { workspace = true }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
 # Common
 node-rpc = { workspace = true }
 polymesh-primitives = { workspace = true, default-features = false}
 
 # RPC
-pallet-group-rpc-runtime-api = { version = "2.0.0", path = "./runtime-api" }
+pallet-group-rpc-runtime-api = { workspace = true, default-features = false }
 
 # Others
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["derive"] }
 
 [features]
 default = ["std"]
diff --git a/pallets/group/rpc/runtime-api/Cargo.toml b/pallets/group/rpc/runtime-api/Cargo.toml
index aed64f03e0..e861fd2d2f 100644
--- a/pallets/group/rpc/runtime-api/Cargo.toml
+++ b/pallets/group/rpc/runtime-api/Cargo.toml
@@ -9,20 +9,21 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # Common
-polymesh-primitives = { workspace = true, default-features = false}
+polymesh-primitives = { workspace = true, default-features = false }
 
 # Others
-serde = { version = "1.0.104", optional = true, features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive", "decode"] }
 
 [features]
 default = ["std"]
 std = [
-	"serde",
+	"serde/std",
 	"sp-api/std",
 	"codec/std",
 	"sp-std/std",
diff --git a/pallets/group/rpc/runtime-api/src/lib.rs b/pallets/group/rpc/runtime-api/src/lib.rs
index 7c61143b45..15a0cf4bce 100644
--- a/pallets/group/rpc/runtime-api/src/lib.rs
+++ b/pallets/group/rpc/runtime-api/src/lib.rs
@@ -5,13 +5,14 @@ use polymesh_primitives::traits::group::InactiveMember;
 use polymesh_primitives::{IdentityId, Moment};
 
 use codec::{Decode, Encode};
-#[cfg(feature = "std")]
+use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_std::{prelude::*, vec::Vec};
 
-#[derive(Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct Member {
     pub id: IdentityId,
     pub expiry_at: Option<Moment>,
diff --git a/pallets/group/src/lib.rs b/pallets/group/src/lib.rs
index 838343ddb1..ab6e6603b3 100644
--- a/pallets/group/src/lib.rs
+++ b/pallets/group/src/lib.rs
@@ -200,25 +200,16 @@ pub mod pallet {
     pub type ActiveMembersLimit<T: Config<I>, I: 'static = ()> = StorageValue<_, u32, ValueQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
         pub active_members_limit: u32,
         pub active_members: Vec<IdentityId>,
+        #[serde(skip)]
         pub phantom: PhantomData<(T, I)>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config<I>, I: 'static> Default for GenesisConfig<T, I> {
-        fn default() -> Self {
-            Self {
-                active_members_limit: 0,
-                active_members: vec![],
-                phantom: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
-    impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+    impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
         fn build(&self) {
             use frame_support::traits::InitializeMembers;
 
diff --git a/pallets/identity/Cargo.toml b/pallets/identity/Cargo.toml
index 0b8f850972..cce2903793 100644
--- a/pallets/identity/Cargo.toml
+++ b/pallets/identity/Cargo.toml
@@ -23,7 +23,7 @@ schnorrkel = { version = "0.11", default-features = false, optional = true }
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
 frame-support = { workspace = true, default-features = false }
-scale-info = { version = "2.0", default-features = false, features = [
+scale-info = { workspace = true, default-features = false, features = [
     "derive",
 ] }
 frame-system = { workspace = true, default-features = false }
@@ -36,7 +36,7 @@ sp-std = { workspace = true, default-features = false }
 sp-version = { workspace = true, default-features = false }
 
 # Only Benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 hex = { version = "^0.4.0", default-features = false, features = [
     "alloc",
 ], optional = true }
diff --git a/pallets/identity/src/keys.rs b/pallets/identity/src/keys.rs
index 811c985d02..0bff77dda1 100644
--- a/pallets/identity/src/keys.rs
+++ b/pallets/identity/src/keys.rs
@@ -854,15 +854,11 @@ impl<T: Config> Pallet<T> {
     }
 
     /// Registers the systematic issuer with its DID.
-    #[allow(dead_code)]
-    pub(crate) fn register_systematic_id(issuer: SystematicIssuers)
-    where
-        T::AccountId: core::fmt::Display,
-    {
+    pub(crate) fn register_systematic_id(issuer: SystematicIssuers) {
         let acc = issuer.as_pallet_id().into_account_truncating();
         let id = issuer.as_id();
         log::info!(
-            "Register Systematic id {} with account {} as {}",
+            "Register Systematic id {} with account {:?} as {}",
             issuer,
             acc,
             id
@@ -872,7 +868,6 @@ impl<T: Config> Pallet<T> {
     }
 
     /// Registers `primary_key` as `id` identity.
-    #[allow(dead_code)]
     pub(crate) fn do_register_id(
         primary_key: T::AccountId,
         id: IdentityId,
diff --git a/pallets/identity/src/lib.rs b/pallets/identity/src/lib.rs
index 750ad19f9f..30a1dd4b1b 100644
--- a/pallets/identity/src/lib.rs
+++ b/pallets/identity/src/lib.rs
@@ -548,7 +548,7 @@ pub mod pallet {
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             MultiPurposeNonce::<T>::put(1);
             StorageVersion::<T>::put(Version::new(7));
diff --git a/pallets/identity/src/types.rs b/pallets/identity/src/types.rs
index 5d34e0334b..b7548a4211 100644
--- a/pallets/identity/src/types.rs
+++ b/pallets/identity/src/types.rs
@@ -3,10 +3,8 @@
 use codec::{Decode, Encode, MaxEncodedLen};
 use polymesh_primitives::{ClaimType, IdentityId, Permissions, Scope, SecondaryKey};
 use scale_info::TypeInfo;
-use sp_std::{prelude::*, vec::Vec};
-
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sp_std::{prelude::*, vec::Vec};
 
 pub type Error = Vec<u8>;
 pub type CddStatus = Result<IdentityId, Error>;
@@ -17,9 +15,10 @@ pub fn zero_account_id<AccountId: Decode>() -> AccountId {
 }
 
 /// A result of execution of get_votes.
-#[derive(Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub enum RpcDidRecords<AccountId> {
     /// Id was found and has the following primary key and secondary keys.
     Success {
@@ -30,8 +29,9 @@ pub enum RpcDidRecords<AccountId> {
     IdNotFound,
 }
 
-#[derive(Encode, Decode, MaxEncodedLen, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[derive(Encode, Decode, TypeInfo, MaxEncodedLen, PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 pub enum DidStatus {
     Unknown,
     Exists,
@@ -39,8 +39,8 @@ pub enum DidStatus {
 }
 
 /// Aggregate information about an `AccountId` in relation to an `IdentityId`.
-#[derive(Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[derive(Serialize, Deserialize)]
 pub struct KeyIdentityData<IdentityId> {
     /// The identity of the provided `AccountId`.
     pub identity: IdentityId,
diff --git a/pallets/multisig/Cargo.toml b/pallets/multisig/Cargo.toml
index be097a2484..6f5f171051 100644
--- a/pallets/multisig/Cargo.toml
+++ b/pallets/multisig/Cargo.toml
@@ -17,17 +17,17 @@ serde = { version = "1.0.104", default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
 
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 [features]
 equalize = []
diff --git a/pallets/multisig/src/lib.rs b/pallets/multisig/src/lib.rs
index e5cce5e4b5..0146e36e1c 100644
--- a/pallets/multisig/src/lib.rs
+++ b/pallets/multisig/src/lib.rs
@@ -839,11 +839,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {}
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             MultiSigNonce::<T>::put(1);
             TransactionVersion::<T>::put(0);
diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml
index 8582f303e0..73fe9ff338 100644
--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -15,16 +15,16 @@ polymesh-primitives = { workspace = true, default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 # Other crates
 log = "0.4.8"
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/nft/src/lib.rs b/pallets/nft/src/lib.rs
index 27c647af7f..8a8c69c800 100644
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -149,11 +149,14 @@ pub mod pallet {
     pub type CurrentCollectionId<T: Config> = StorageValue<_, NFTCollectionId, OptionQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {}
     }
 
diff --git a/pallets/permissions/Cargo.toml b/pallets/permissions/Cargo.toml
index c60e9b832b..d9027447c1 100644
--- a/pallets/permissions/Cargo.toml
+++ b/pallets/permissions/Cargo.toml
@@ -13,14 +13,14 @@ serde = { version = "1.0.104", default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # Only for benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/pips/Cargo.toml b/pallets/pips/Cargo.toml
index f7b9cd2b3f..9ecbca393d 100644
--- a/pallets/pips/Cargo.toml
+++ b/pallets/pips/Cargo.toml
@@ -24,21 +24,21 @@ log = "0.4.8"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
 
-frame-system = { package = "frame-system", version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 # Benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 rand = { version = "0.8.2", default-features = false, optional = true }
 rand_chacha = { version = "0.3.0", default-features = false, optional = true }
 pallet-committee = { workspace = true, default-features = false, optional = true }
diff --git a/pallets/pips/src/lib.rs b/pallets/pips/src/lib.rs
index dc0fc19824..46b3a25baa 100644
--- a/pallets/pips/src/lib.rs
+++ b/pallets/pips/src/lib.rs
@@ -80,7 +80,7 @@ use frame_support::pallet_prelude::*;
 use frame_support::storage::types::StorageValue;
 use frame_support::traits::schedule::{DispatchTime, Named};
 use frame_support::traits::{Currency, EnsureOrigin, Get, WithdrawReasons};
-use frame_system::pallet_prelude::{BlockNumberFor, OriginFor};
+use frame_system::pallet_prelude::*;
 use frame_system::{ensure_root, ensure_signed, RawOrigin};
 use sp_runtime::traits::{BlakeTwo256, Dispatchable, Hash, One, Saturating, Zero};
 use sp_runtime::DispatchError;
@@ -214,7 +214,7 @@ pub mod pallet {
             Balance,
             Option<Url>,
             Option<PipDescription>,
-            MaybeBlock<T::BlockNumber>,
+            MaybeBlock<BlockNumberFor<T>>,
             ProposalData,
         ),
         /// The state of a proposal was updated.
@@ -245,15 +245,15 @@ pub mod pallet {
         /// Parameters:
         /// - `IdentityId`: The DID of the caller.
         /// - `PipId`: The ID of the PIP.
-        /// - `T::BlockNumber`: The block number at which the PIP is scheduled for execution.
-        ExecutionScheduled(IdentityId, PipId, T::BlockNumber),
+        /// - `BlockNumber`: The block number at which the PIP is scheduled for execution.
+        ExecutionScheduled(IdentityId, PipId, BlockNumberFor<T>),
         /// The default enactment period was changed.
         ///
         /// Parameters:
         /// - `IdentityId`: The DID of the caller.
-        /// - `T::BlockNumber`: The old enactment period.
-        /// - `T::BlockNumber`: The new enactment period.
-        DefaultEnactmentPeriodChanged(IdentityId, T::BlockNumber, T::BlockNumber),
+        /// - `BlockNumber`: The old enactment period.
+        /// - `BlockNumber`: The new enactment period.
+        DefaultEnactmentPeriodChanged(IdentityId, BlockNumberFor<T>, BlockNumberFor<T>),
         /// The minimum deposit amount for proposals was changed.
         ///
         /// Parameters:
@@ -269,8 +269,8 @@ pub mod pallet {
         /// - `MaybeBlock<T::BlockNumber>`: The new expiry time.
         PendingPipExpiryChanged(
             IdentityId,
-            MaybeBlock<T::BlockNumber>,
-            MaybeBlock<T::BlockNumber>,
+            MaybeBlock<BlockNumberFor<T>>,
+            MaybeBlock<BlockNumberFor<T>>,
         ),
         /// The maximum number of times a PIP can be skipped was changed.
         ///
@@ -333,22 +333,22 @@ pub mod pallet {
         /// Parameters:
         /// - `IdentityId`: The DID of the caller.
         /// - `PipId`: The ID of the PIP.
-        /// - `T::BlockNumber`: The block number at which the PIP was scheduled for execution.
-        ExecutionSchedulingFailed(IdentityId, PipId, T::BlockNumber),
+        /// - `BlockNumber`: The block number at which the PIP was scheduled for execution.
+        ExecutionSchedulingFailed(IdentityId, PipId, BlockNumberFor<T>),
         /// The PIP has been scheduled for expiry.
         ///
         /// Parameters:
         /// - `IdentityId`: The DID of the caller.
         /// - `PipId`: The ID of the PIP.
-        /// - `T::BlockNumber`: The block number at which the PIP is scheduled for expiry.
-        ExpiryScheduled(IdentityId, PipId, T::BlockNumber),
+        /// - `BlockNumber`: The block number at which the PIP is scheduled for expiry.
+        ExpiryScheduled(IdentityId, PipId, BlockNumberFor<T>),
         /// Scheduling of the PIP for expiry failed in the scheduler pallet.
         ///
         /// Parameters:
         /// - `IdentityId`: The DID of the caller.
         /// - `PipId`: The ID of the PIP.
-        /// - `T::BlockNumber`: The block number at which the PIP was scheduled for expiry.
-        ExpirySchedulingFailed(IdentityId, PipId, T::BlockNumber),
+        /// - `BlockNumber`: The block number at which the PIP was scheduled for expiry.
+        ExpirySchedulingFailed(IdentityId, PipId, BlockNumberFor<T>),
         /// Cancelling the PIP execution failed in the scheduler pallet.
         ///
         /// Parameters:
@@ -361,7 +361,7 @@ pub mod pallet {
         frame_system::Config + pallet_timestamp::Config + IdentityConfig + pallet_base::Config
     {
         /// Currency type for this module.
-        type Currency: LockableCurrencyExt<Self::AccountId, Moment = Self::BlockNumber>;
+        type Currency: LockableCurrencyExt<Self::AccountId, Moment = BlockNumberFor<Self>>;
         /// Origin type for enacting results for PIPs (e.g., reject, approve, skip).
         type VotingMajorityOrigin: EnsureOrigin<Self::RuntimeOrigin>;
         /// Governance committee responsible for overseeing the PIPs.
@@ -377,7 +377,7 @@ pub mod pallet {
         /// Scheduler for executed or expired proposals. The scheduler module does not have instances,
         /// so the names of scheduled tasks must be unique within this pallet. Names cannot be just PIP
         /// IDs because names of executed and expired PIPs should be different.
-        type Scheduler: Named<Self::BlockNumber, Self::SchedulerCall, Self::SchedulerOrigin>;
+        type Scheduler: Named<BlockNumberFor<Self>, Self::SchedulerCall, Self::SchedulerOrigin>;
         /// A call type used by the scheduler.
         type SchedulerCall: From<Call<Self>> + Into<<Self as IdentityConfig>::Proposal>;
         /// The maximum number of votes that can be pruned at once.
@@ -395,12 +395,13 @@ pub mod pallet {
 
     /// Default enactment period that will be use after a proposal is accepted by GC.
     #[pallet::storage]
-    pub type DefaultEnactmentPeriod<T: Config> = StorageValue<_, T::BlockNumber, ValueQuery>;
+    pub type DefaultEnactmentPeriod<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
     /// Number of blocks it will take, after a `Pending` PIP expires, assuming it has not transitioned to another `ProposalState`.
     #[pallet::storage]
     #[pallet::unbounded]
-    pub type PendingPipExpiry<T: Config> = StorageValue<_, MaybeBlock<T::BlockNumber>, ValueQuery>;
+    pub type PendingPipExpiry<T: Config> =
+        StorageValue<_, MaybeBlock<BlockNumberFor<T>>, ValueQuery>;
 
     /// Maximum times a PIP can be skipped before triggering `CannotSkipPip` in `enact_snapshot_results`.
     #[pallet::storage]
@@ -426,7 +427,7 @@ pub mod pallet {
     #[pallet::storage]
     #[pallet::unbounded]
     pub type ProposalMetadata<T: Config> =
-        StorageMap<_, Twox64Concat, PipId, PipsMetadata<T::BlockNumber>, OptionQuery>;
+        StorageMap<_, Twox64Concat, PipId, PipsMetadata<BlockNumberFor<T>>, OptionQuery>;
 
     /// All locked [`DepositInfo`] per [`PipId`] for each account.
     #[pallet::storage]
@@ -459,7 +460,7 @@ pub mod pallet {
     /// Maps PIPs to the block at which they will be executed.
     #[pallet::storage]
     pub type PipToSchedule<T: Config> =
-        StorageMap<_, Twox64Concat, PipId, T::BlockNumber, OptionQuery>;
+        StorageMap<_, Twox64Concat, PipId, BlockNumberFor<T>, OptionQuery>;
 
     /// A live priority queue (lowest priority at index 0)
     /// of pending PIPs up to the active limit.
@@ -483,7 +484,7 @@ pub mod pallet {
     /// The [`SnapshotMetadata`].
     #[pallet::storage]
     pub type SnapshotMeta<T: Config> =
-        StorageValue<_, SnapshotMetadata<T::BlockNumber, T::AccountId>, OptionQuery>;
+        StorageValue<_, SnapshotMetadata<BlockNumberFor<T>, T::AccountId>, OptionQuery>;
 
     /// The number of times a certain PIP has been skipped.
     /// Once a (configurable) threshhold is exceeded, a PIP cannot be skipped again.
@@ -513,19 +514,19 @@ pub mod pallet {
     #[pallet::storage]
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
-    #[derive(frame_support::DefaultNoBound)]
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub prune_historical_pips: bool,
         pub min_proposal_deposit: Balance,
-        pub default_enactment_period: T::BlockNumber,
-        pub pending_pip_expiry: MaybeBlock<T::BlockNumber>,
+        pub default_enactment_period: BlockNumberFor<T>,
+        pub pending_pip_expiry: MaybeBlock<BlockNumberFor<T>>,
         pub max_pip_skip_count: u8,
         pub active_pip_limit: u32,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             PruneHistoricalPips::<T>::put(self.prune_historical_pips);
             MinimumProposalDeposit::<T>::put(self.min_proposal_deposit);
@@ -605,7 +606,7 @@ pub mod pallet {
         #[pallet::weight((<T as Config>::WeightInfo::set_default_enactment_period(), Operational))]
         pub fn set_default_enactment_period(
             origin: OriginFor<T>,
-            duration: T::BlockNumber,
+            duration: BlockNumberFor<T>,
         ) -> DispatchResult {
             ensure_root(origin)?;
             let old_value = DefaultEnactmentPeriod::<T>::get();
@@ -631,7 +632,7 @@ pub mod pallet {
         #[pallet::weight((<T as Config>::WeightInfo::set_pending_pip_expiry(), Operational))]
         pub fn set_pending_pip_expiry(
             origin: OriginFor<T>,
-            expiry: MaybeBlock<T::BlockNumber>,
+            expiry: MaybeBlock<BlockNumberFor<T>>,
         ) -> DispatchResult {
             ensure_root(origin)?;
             let old_value = PendingPipExpiry::<T>::get();
@@ -1019,7 +1020,7 @@ pub mod pallet {
         pub fn reschedule_execution(
             origin: OriginFor<T>,
             id: PipId,
-            until: Option<T::BlockNumber>,
+            until: Option<BlockNumberFor<T>>,
         ) -> DispatchResult {
             let did = pallet_identity::Pallet::<T>::ensure_perms(origin)?;
 
@@ -1356,7 +1357,7 @@ impl<T: Config> Pallet<T> {
     }
 
     /// Adds a PIP expiry call to the PIP expiry schedule.
-    fn schedule_pip_for_expiry(id: PipId, at: T::BlockNumber) {
+    fn schedule_pip_for_expiry(id: PipId, at: BlockNumberFor<T>) {
         let did = GC_DID;
         let call = Call::<T>::expire_scheduled_pip { did, id }.into();
         let event = match T::Scheduler::schedule_named(
@@ -1505,7 +1506,7 @@ impl<T: Config> Pallet<T> {
     }
 
     /// Emit event based on a `result` from scheduling a PIP for execution.
-    fn handle_exec_scheduling_result<A, B>(id: PipId, at: T::BlockNumber, result: Result<A, B>) {
+    fn handle_exec_scheduling_result<A, B>(id: PipId, at: BlockNumberFor<T>, result: Result<A, B>) {
         Self::deposit_event(match result {
             Err(_) => Event::ExecutionSchedulingFailed(GC_DID, id, at),
             Ok(_) => Event::ExecutionScheduled(GC_DID, id, at),
diff --git a/pallets/pips/src/types.rs b/pallets/pips/src/types.rs
index 0275dc1ac3..2f155f1c06 100644
--- a/pallets/pips/src/types.rs
+++ b/pallets/pips/src/types.rs
@@ -13,14 +13,12 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "std")]
-use serde::{Deserialize, Serialize};
-
 use codec::{Decode, Encode, MaxEncodedLen};
 use core::cmp::Ordering;
 use frame_support::traits::schedule::{Priority, HARD_DEADLINE};
 use frame_support::traits::LockIdentifier;
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_core::H256;
 use sp_std::convert::From;
 use sp_std::vec::Vec;
@@ -48,7 +46,7 @@ pub(crate) const PIPS_LOCK_ID: LockIdentifier = *b"pips    ";
 pub struct PipDescription(pub Vec<u8>);
 
 /// The global and unique identitifer of a Polymesh Improvement Proposal (PIP).
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Default, Debug)]
 pub struct PipId(pub u32);
@@ -81,8 +79,9 @@ pub struct Pip<Proposal, AccountId> {
 
 /// A result of execution of get_votes.
 
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[derive(Decode, Encode, Eq, PartialEq)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
+#[derive(Decode, Encode, TypeInfo, MaxEncodedLen, Eq, PartialEq)]
 pub enum VoteCount {
     /// Proposal was found and has the following votes.
     ProposalFound {
@@ -167,7 +166,8 @@ pub struct VotingResult {
 }
 
 /// A "vote" or "signal" on a PIP to move it up or down the review queue.
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Eq, PartialEq)]
 pub struct Vote(
@@ -177,7 +177,8 @@ pub struct Vote(
     pub Balance,
 );
 
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Clone, Decode, Encode, Eq, PartialEq)]
 pub struct VoteByPip<VoteType> {
     pub pip: PipId,
@@ -215,7 +216,7 @@ pub struct DepositInfo<AccountId> {
 }
 
 /// ID of the taken snapshot in a sequence.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Default, Eq, Ord, PartialEq, PartialOrd)]
 pub struct SnapshotId(pub u32);
diff --git a/pallets/portfolio/Cargo.toml b/pallets/portfolio/Cargo.toml
index 0e40021a8b..f99364c90a 100644
--- a/pallets/portfolio/Cargo.toml
+++ b/pallets/portfolio/Cargo.toml
@@ -19,15 +19,15 @@ log = "0.4.8"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-runtime = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/portfolio/src/lib.rs b/pallets/portfolio/src/lib.rs
index 41592bd673..31ecca9e82 100644
--- a/pallets/portfolio/src/lib.rs
+++ b/pallets/portfolio/src/lib.rs
@@ -330,11 +330,14 @@ pub mod pallet {
     storage_migration_ver!(3);
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(3));
         }
diff --git a/pallets/protocol-fee/Cargo.toml b/pallets/protocol-fee/Cargo.toml
index 7d7f46128d..1f8698d520 100644
--- a/pallets/protocol-fee/Cargo.toml
+++ b/pallets/protocol-fee/Cargo.toml
@@ -16,16 +16,16 @@ serde = { version = "1.0.104", default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # benchmark-only
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/protocol-fee/rpc/Cargo.toml b/pallets/protocol-fee/rpc/Cargo.toml
index 630e99f3eb..d1314702b9 100644
--- a/pallets/protocol-fee/rpc/Cargo.toml
+++ b/pallets/protocol-fee/rpc/Cargo.toml
@@ -10,14 +10,14 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = false, features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-core = { version = "7.0.0", default-features = false }
-sp-rpc = { version = "6.0.0" }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = {version = "5.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-blockchain = { workspace = true }
+sp-core = { workspace = true, default-features = false }
+sp-rpc = { workspace = true }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
 node-rpc = { workspace = true }
 polymesh-common-utilities = { workspace = true, default-features = false }
@@ -25,4 +25,4 @@ polymesh-primitives = { workspace = true, default-features = false }
 pallet-protocol-fee-rpc-runtime-api = { workspace = true }
 
 # General
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["derive"] }
diff --git a/pallets/protocol-fee/rpc/runtime-api/Cargo.toml b/pallets/protocol-fee/rpc/runtime-api/Cargo.toml
index 9ad78d3d44..9e0e93f7c9 100644
--- a/pallets/protocol-fee/rpc/runtime-api/Cargo.toml
+++ b/pallets/protocol-fee/rpc/runtime-api/Cargo.toml
@@ -12,17 +12,18 @@ polymesh-common-utilities = { workspace = true, default-features = false }
 polymesh-primitives = { workspace = true, default-features = false }
 
 # General
-serde = { version = "1.0.104", optional = true, features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-sp-api = { version = "4.0.0-dev", default-features = false}
-sp-runtime = { version = "7.0.0", default-features = false}
+sp-api = { workspace = true, default-features = false}
+sp-runtime = { workspace = true, default-features = false}
+scale-info = { workspace = true, default-features = false, features = ["derive", "decode"] }
 
 [features]
 default = ["std"]
 std = [
-    "serde",
+    "serde/std",
     "sp-api/std",
     "codec/std",
     "sp-runtime/std",
diff --git a/pallets/protocol-fee/rpc/runtime-api/src/lib.rs b/pallets/protocol-fee/rpc/runtime-api/src/lib.rs
index 894ee16ecd..dbbe1ce6ce 100644
--- a/pallets/protocol-fee/rpc/runtime-api/src/lib.rs
+++ b/pallets/protocol-fee/rpc/runtime-api/src/lib.rs
@@ -19,15 +19,16 @@
 
 use codec::{Decode, Encode};
 use polymesh_common_utilities::protocol_fee::ProtocolOp;
-#[cfg(feature = "std")]
+use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_runtime::traits::{SaturatedConversion, UniqueSaturatedInto};
 
 /// A capped version of `Balance` which is normally a `u128`, fit into `u64` which is a serializable
 /// type unlike `u128`. There are no fees that would not fit into `u64`.
-#[derive(Eq, PartialEq, Encode, Decode)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-#[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct CappedFee(pub u64);
 
 impl<T: UniqueSaturatedInto<u64>> From<T> for CappedFee {
diff --git a/pallets/protocol-fee/src/lib.rs b/pallets/protocol-fee/src/lib.rs
index 81c0d18111..406f11c9b5 100644
--- a/pallets/protocol-fee/src/lib.rs
+++ b/pallets/protocol-fee/src/lib.rs
@@ -51,7 +51,7 @@ use polymesh_primitives::{
     Balance, IdentityId, PosRatio, GC_DID,
 };
 use sp_runtime::{traits::Zero, Perbill};
-use sp_std::vec;
+use sp_std::vec::Vec;
 
 type NegativeImbalanceOf<T> = <<T as Config>::Currency as Currency<
     <T as frame_system::Config>::AccountId,
@@ -108,14 +108,16 @@ pub mod pallet {
     pub type Coefficient<T: Config> = StorageValue<_, PosRatio, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig {
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
         pub base_fees: Vec<(ProtocolOp, Balance)>,
         pub coefficient: PosRatio,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             // Set initial base fees
             for (op, fee) in &self.base_fees {
diff --git a/pallets/relayer/Cargo.toml b/pallets/relayer/Cargo.toml
index 6f7ea37e64..ea51043321 100644
--- a/pallets/relayer/Cargo.toml
+++ b/pallets/relayer/Cargo.toml
@@ -10,14 +10,14 @@ polymesh-primitives = { workspace = true, default-features = false}
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-sp-runtime = { version = "7.0.0", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-std = { version = "5.0.0", default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-std = { workspace = true, default-features = false }
 
 # Only Benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/runtime/build_tool/Cargo.toml b/pallets/runtime/build_tool/Cargo.toml
index 4f89505a81..f3f88d59fe 100644
--- a/pallets/runtime/build_tool/Cargo.toml
+++ b/pallets/runtime/build_tool/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-substrate-wasm-builder = { version = "5.0.0-dev", default-features = false}
+substrate-wasm-builder = { workspace = true, default-features = false}
 
 [features]
 default = ["std"]
diff --git a/pallets/runtime/build_tool/src/lib.rs b/pallets/runtime/build_tool/src/lib.rs
index d7f7855247..86a7e29c23 100644
--- a/pallets/runtime/build_tool/src/lib.rs
+++ b/pallets/runtime/build_tool/src/lib.rs
@@ -3,7 +3,7 @@ pub fn build() {
     {
         substrate_wasm_builder::WasmBuilder::new()
             .with_current_project()
-            //.with_wasm_builder_from_git(BUILDER_REPO, BUILDER_REV)
+            .disable_runtime_version_section_check()
             .export_heap_base()
             .import_memory()
             .build()
diff --git a/pallets/runtime/common/Cargo.toml b/pallets/runtime/common/Cargo.toml
index 4261b155b1..b3c32d51b5 100644
--- a/pallets/runtime/common/Cargo.toml
+++ b/pallets/runtime/common/Cargo.toml
@@ -22,14 +22,14 @@ smallvec = "1.4.0"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-election-provider-multi-phase = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
 
 [features]
 equalize = []
diff --git a/pallets/runtime/common/src/lib.rs b/pallets/runtime/common/src/lib.rs
index 3888d1f6f3..200c13dcfc 100644
--- a/pallets/runtime/common/src/lib.rs
+++ b/pallets/runtime/common/src/lib.rs
@@ -15,7 +15,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+#![recursion_limit = "1024"]
 
 pub mod cdd_check;
 pub mod fee_details;
@@ -61,7 +61,7 @@ pub const AVERAGE_ON_INITIALIZE_RATIO: Perbill = Perbill::from_percent(10);
 const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 /// We allow for 2 seconds of compute with a 6 second average block time.
 const MAXIMUM_BLOCK_WEIGHT: Weight =
-    Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2)).set_proof_size(u64::MAX);
+    Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2), u64::MAX);
 
 /// Maximum number of iterations for balancing that will be executed in the embedded OCW
 /// miner of election provider multi phase.
@@ -81,9 +81,9 @@ parameter_types! {
     /// Blocks can be of upto 10 MB in size.
     pub const MaximumBlockLength: u32 = 10 * 1024 * 1024;
     /// 20 ms is needed to create a block.
-    pub const BlockExecutionWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_MILLIS.saturating_mul(20));
+    pub const BlockExecutionWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_MILLIS.saturating_mul(20), 0);
     /// 0.65 ms is needed to process an empty extrinsic.
-    pub const ExtrinsicBaseWeight: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_MICROS.saturating_mul(650));
+    pub const ExtrinsicBaseWeight: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_MICROS.saturating_mul(650), 0);
     /// When the read/writes are cached/buffered, they take 25/100 microseconds on NVMe disks.
     /// When they are uncached, they take 250/450 microseconds on NVMe disks.
     /// Most read will be cached and writes will be buffered in production.
@@ -102,11 +102,15 @@ parameter_types! {
     /// Number of block delay an extrinsic claim surcharge has.
     pub const SignedClaimHandicap: u32 = 2;
     /// The balance every contract needs to deposit to stay alive indefinitely.
-    pub const DepositPerContract: u128 = 10 * CENTS;
+    pub const DepositPerContract: Balance = 10 * CENTS;
     /// The balance a contract needs to deposit per storage item to stay alive indefinitely.
-    pub const DepositPerItem: u128 = deposit(1, 0);
+    pub const DepositPerItem: Balance = deposit(1, 0);
     /// The balance a contract needs to deposit per storage byte to stay alive indefinitely.
-    pub const DepositPerByte: u128 = deposit(0, 1);
+    pub const DepositPerByte: Balance = deposit(0, 1);
+    /// The code hash lookup deposit.
+    pub CodeHashLockupDepositPercent: Perbill = Perbill::from_percent(30);
+    /// The default deposit limit.
+    pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
     /// The maximum nesting level of a call/instantiate stack.
     pub const ContractsMaxDepth: u32 = 32;
     /// The maximum size of a storage value and event payload in bytes.
diff --git a/pallets/runtime/common/src/runtime.rs b/pallets/runtime/common/src/runtime.rs
index b0fa944067..ce351cd39a 100644
--- a/pallets/runtime/common/src/runtime.rs
+++ b/pallets/runtime/common/src/runtime.rs
@@ -61,17 +61,14 @@ macro_rules! misc_pallet_impls {
             type RuntimeCall = RuntimeCall;
             /// The lookup mechanism to get account ID from whatever is passed in dispatchers.
             type Lookup = Indices;
-            /// The index type for storing how many extrinsics an account has signed.
-            type Index = polymesh_primitives::Index;
-            /// The index type for blocks.
-            type BlockNumber = polymesh_primitives::BlockNumber;
+            /// The nonce type for storing how many extrinsics an account has signed.
+            type Nonce = polymesh_primitives::Nonce;
             /// The type for hashing blocks and tries.
             type Hash = polymesh_primitives::Hash;
             /// The hashing algorithm used.
             type Hashing = sp_runtime::traits::BlakeTwo256;
-            /// The header type.
-            type Header =
-                sp_runtime::generic::Header<polymesh_primitives::BlockNumber, BlakeTwo256>;
+            /// The block type.
+            type Block = Block;
             /// The ubiquitous event type.
             type RuntimeEvent = RuntimeEvent;
             /// The ubiquitous origin type.
@@ -109,24 +106,12 @@ macro_rules! misc_pallet_impls {
             type EpochChangeTrigger = pallet_babe::ExternalTrigger;
             type DisabledValidators = Session;
 
-            type KeyOwnerProofSystem = Historical;
-
-            type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-                sp_core::crypto::KeyTypeId,
-                pallet_babe::AuthorityId,
-            )>>::Proof;
-
-            type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-                sp_core::crypto::KeyTypeId,
-                pallet_babe::AuthorityId,
-            )>>::IdentificationTuple;
-
-            type HandleEquivocation = pallet_babe::EquivocationHandler<
-                Self::KeyOwnerIdentification,
-                Offences,
-                ReportLongevity,
-            >;
             type MaxAuthorities = MaxAuthorities;
+            type MaxNominators = MaxNominatorRewardedPerValidator;
+            type KeyOwnerProof =
+              <Historical as KeyOwnerProofSystem<(sp_core::crypto::KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
+            type EquivocationReportSystem =
+              pallet_babe::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
         }
 
         impl pallet_indices::Config for Runtime {
@@ -245,7 +230,7 @@ macro_rules! misc_pallet_impls {
             type Currency = Balances;
             type CurrencyBalance = Balance;
             type UnixTime = Timestamp;
-            type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
+            type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote;
             type ElectionProvider = ElectionProviderMultiPhase;
             type GenesisElectionProvider = Self::ElectionProvider;
             type MaxNominations = polymesh_runtime_common::MaxNominations;
@@ -266,7 +251,7 @@ macro_rules! misc_pallet_impls {
             type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
             type TargetList = pallet_staking::UseValidatorsMap<Self>;
             type MaxUnlockingChunks = polymesh_runtime_common::MaxUnlockingChunks;
-            type OnStakerSlash = pallet_staking::OnStakerSlashMock<Self>;
+            type EventListeners = pallet_staking::NominatorsOnStakingUpdate<Self>;
             type BenchmarkingConfig = pallet_staking::SampleBenchmarkingConfig;
             type WeightInfo = polymesh_weights::pallet_staking::SubstrateWeight;
             type MaxValidatorPerIdentity = polymesh_runtime_common::MaxValidatorPerIdentity;
@@ -407,13 +392,12 @@ macro_rules! misc_pallet_impls {
             type CallFilter = frame_support::traits::Nothing;
             type DepositPerItem = polymesh_runtime_common::DepositPerItem;
             type DepositPerByte = polymesh_runtime_common::DepositPerByte;
+            type DefaultDepositLimit = polymesh_runtime_common::DefaultDepositLimit;
             type CallStack = [pallet_contracts::Frame<Self>; 5];
             type WeightPrice = pallet_transaction_payment::Pallet<Self>;
             type WeightInfo = polymesh_weights::pallet_contracts::SubstrateWeight;
             type ChainExtension = polymesh_contracts::PolymeshExtension;
             type Schedule = Schedule;
-            type DeletionQueueDepth = DeletionQueueDepth;
-            type DeletionWeightLimit = DeletionWeightLimit;
             type AddressGenerator = pallet_contracts::DefaultAddressGenerator;
             #[cfg(not(feature = "runtime-benchmarks"))]
             type PolymeshHooks = polymesh_contracts::ContractPolymeshHooks;
@@ -423,6 +407,18 @@ macro_rules! misc_pallet_impls {
             type MaxStorageKeyLen = frame_support::traits::ConstU32<128>;
             type UnsafeUnstableInterface = frame_support::traits::ConstBool<false>;
             type MaxDebugBufferLen = frame_support::traits::ConstU32<{ 2 * 1024 * 1024 }>;
+            #[cfg(not(feature = "runtime-benchmarks"))]
+            type Migrations = (
+                // Migration v9 -> v10 has already been run.
+                pallet_contracts::migration::NoopMigration<10>,
+                pallet_contracts::migration::v11::Migration<Runtime>,
+                pallet_contracts::migration::v12::Migration<Runtime>,
+                pallet_contracts::migration::v13::Migration<Runtime>,
+            );
+            #[cfg(feature = "runtime-benchmarks")]
+            type Migrations = pallet_contracts::migration::codegen::BenchMigrations;
+            type MaxDelegateDependencies = frame_support::traits::ConstU32<32>;
+            type CodeHashLockupDepositPercent = polymesh_runtime_common::CodeHashLockupDepositPercent;
         }
 
         impl pallet_compliance_manager::Config for Runtime {
@@ -496,8 +492,6 @@ macro_rules! misc_pallet_impls {
             type OnOffenceHandler = Staking;
         }
 
-        type GrandpaKey = (sp_core::crypto::KeyTypeId, pallet_grandpa::AuthorityId);
-
         impl pallet_im_online::Config for Runtime {
             type AuthorityId = pallet_im_online::sr25519::AuthorityId;
             type RuntimeEvent = RuntimeEvent;
@@ -508,29 +502,18 @@ macro_rules! misc_pallet_impls {
             type WeightInfo = polymesh_weights::pallet_im_online::SubstrateWeight;
             type MaxKeys = MaxKeys;
             type MaxPeerInHeartbeats = MaxPeerInHeartbeats;
-            type MaxPeerDataEncodingSize = MaxPeerDataEncodingSize;
         }
 
         impl pallet_grandpa::Config for Runtime {
             type RuntimeEvent = RuntimeEvent;
 
-            type KeyOwnerProofSystem = Historical;
-
-            type KeyOwnerProof =
-                <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<GrandpaKey>>::Proof;
-
-            type KeyOwnerIdentification =
-                <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<GrandpaKey>>::IdentificationTuple;
-
-            type HandleEquivocation = pallet_grandpa::EquivocationHandler<
-                Self::KeyOwnerIdentification,
-                Offences,
-                ReportLongevity,
-            >;
-
             type WeightInfo = ();
             type MaxAuthorities = MaxAuthorities;
+            type MaxNominators = MaxNominatorRewardedPerValidator;
             type MaxSetIdSessionEntries = MaxSetIdSessionEntries;
+            type KeyOwnerProof = <Historical as KeyOwnerProofSystem<(sp_core::crypto::KeyTypeId, pallet_grandpa::AuthorityId)>>::Proof;
+            type EquivocationReportSystem =
+              pallet_grandpa::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
         }
 
         impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
@@ -575,7 +558,7 @@ macro_rules! misc_pallet_impls {
                 call: RuntimeCall,
                 public: <polymesh_primitives::Signature as Verify>::Signer,
                 account: polymesh_primitives::AccountId,
-                nonce: polymesh_primitives::Index,
+                nonce: polymesh_primitives::Nonce,
             ) -> Option<(
                 RuntimeCall,
                 <UncheckedExtrinsic as Extrinsic>::SignaturePayload,
@@ -705,21 +688,22 @@ macro_rules! misc_pallet_impls {
 
         impl pallet_election_provider_multi_phase::MinerConfig for Runtime {
             type AccountId = polymesh_primitives::AccountId;
-	        type MaxLength = polymesh_runtime_common::MinerMaxLength;
-	        type MaxWeight = polymesh_runtime_common::MinerMaxWeight;
-	        type Solution = polymesh_runtime_common::NposSolution16;
-	        type MaxVotesPerVoter =
-	            <<Self as pallet_election_provider_multi_phase::Config>::DataProvider as frame_election_provider_support::ElectionDataProvider>::MaxVotesPerVoter;
-
-	        // The unsigned submissions have to respect the weight of the submit_unsigned call, thus their
-	        // weight estimate function is wired to this call's weight.
-	        fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight {
-	        	<
-	        		<Self as pallet_election_provider_multi_phase::Config>::WeightInfo
-	        		as
-	        		pallet_election_provider_multi_phase::WeightInfo
-	        	>::submit_unsigned(v, t, a, d)
-	        }
+	          type MaxLength = polymesh_runtime_common::MinerMaxLength;
+	          type MaxWeight = polymesh_runtime_common::MinerMaxWeight;
+	          type Solution = polymesh_runtime_common::NposSolution16;
+	          type MaxVotesPerVoter =
+	              <<Self as pallet_election_provider_multi_phase::Config>::DataProvider as frame_election_provider_support::ElectionDataProvider>::MaxVotesPerVoter;
+            type MaxWinners = polymesh_runtime_common::MaxActiveValidators;
+
+	          // The unsigned submissions have to respect the weight of the submit_unsigned call, thus their
+	          // weight estimate function is wired to this call's weight.
+	          fn solution_weight(v: u32, t: u32, a: u32, d: u32) -> Weight {
+	          	<
+	          		<Self as pallet_election_provider_multi_phase::Config>::WeightInfo
+	          		as
+	          		pallet_election_provider_multi_phase::WeightInfo
+	          	>::submit_unsigned(v, t, a, d)
+	          }
         }
     };
 }
@@ -741,7 +725,7 @@ macro_rules! runtime_apis {
         use polymesh_primitives::transfer_compliance::TransferCondition;
         use polymesh_primitives::compliance_manager::{AssetComplianceResult, ComplianceReport};
         use polymesh_primitives::{
-            asset::CheckpointId, IdentityId, Index, NFTs,PortfolioId, Signatory, Ticker,
+            asset::CheckpointId, IdentityId, Nonce, NFTs,PortfolioId, Signatory, Ticker,
             WeightMeter, IdentityClaim
         };
 
@@ -773,7 +757,7 @@ macro_rules! runtime_apis {
         /// Extrinsic type that has already been checked.
         pub type CheckedExtrinsic = generic::CheckedExtrinsic<polymesh_primitives::AccountId, RuntimeCall, SignedExtra>;
         /// Executive: handles dispatch to the various modules.
-        pub type Executive = pallet_executive::Executive<
+        pub type Executive = frame_executive::Executive<
             Runtime,
             Block,
             frame_system::ChainContext<Runtime>,
@@ -785,6 +769,11 @@ macro_rules! runtime_apis {
             )
         >;
 
+        type EventRecord = frame_system::EventRecord<
+            <Runtime as frame_system::Config>::RuntimeEvent,
+            <Runtime as frame_system::Config>::Hash,
+        >;
+
         sp_api::impl_runtime_apis! {
             impl sp_api::Core<Block> for Runtime {
                 fn version() -> RuntimeVersion {
@@ -804,6 +793,14 @@ macro_rules! runtime_apis {
                 fn metadata() -> sp_core::OpaqueMetadata {
                     sp_core::OpaqueMetadata::new(Runtime::metadata().into())
                 }
+
+                fn metadata_at_version(version: u32) -> Option<sp_core::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 {
@@ -931,8 +928,8 @@ macro_rules! runtime_apis {
                 }
             }
 
-            impl frame_system_rpc_runtime_api::AccountNonceApi<Block, polymesh_primitives::AccountId, Index> for Runtime {
-                fn account_nonce(account: polymesh_primitives::AccountId) -> Index {
+            impl frame_system_rpc_runtime_api::AccountNonceApi<Block, polymesh_primitives::AccountId, Nonce> for Runtime {
+                fn account_nonce(account: polymesh_primitives::AccountId) -> Nonce {
                     System::account_nonce(account)
                 }
             }
@@ -943,6 +940,7 @@ macro_rules! runtime_apis {
                 Balance,
                 BlockNumber,
                 polymesh_primitives::Hash,
+                EventRecord,
             > for Runtime {
                 fn call(
                     origin: polymesh_primitives::AccountId,
@@ -951,9 +949,19 @@ macro_rules! 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(polymesh_runtime_common::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,
+                        pallet_contracts::DebugInfo::UnsafeDebug,
+                        pallet_contracts::CollectEvents::UnsafeCollect,
+                        pallet_contracts::Determinism::Enforced,
+                    )
                 }
 
                 fn instantiate(
@@ -964,9 +972,19 @@ macro_rules! runtime_apis {
                     code: pallet_contracts_primitives::Code<polymesh_primitives::Hash>,
                     data: Vec<u8>,
                     salt: Vec<u8>,
-                ) -> pallet_contracts_primitives::ContractInstantiateResult<polymesh_primitives::AccountId, Balance> {
+                ) -> pallet_contracts_primitives::ContractInstantiateResult<polymesh_primitives::AccountId, Balance, EventRecord> {
                     let gas_limit = gas_limit.unwrap_or(polymesh_runtime_common::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,
+                        pallet_contracts::DebugInfo::UnsafeDebug,
+                        pallet_contracts::CollectEvents::UnsafeCollect,
+                    )
                 }
 
                 fn upload_code(
diff --git a/pallets/runtime/develop/Cargo.toml b/pallets/runtime/develop/Cargo.toml
index d492edd5d4..1ae95f9878 100644
--- a/pallets/runtime/develop/Cargo.toml
+++ b/pallets/runtime/develop/Cargo.toml
@@ -35,7 +35,7 @@ pallet-relayer = { workspace = true, default-features = false }
 pallet-sto = { workspace = true, default-features = false }
 pallet-settlement = { workspace = true, default-features = false }
 pallet-staking = { workspace = true, default-features = false }
-pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
+pallet-staking-reward-curve = { workspace = true, default-features = false }
 pallet-statistics = { workspace = true, default-features = false }
 pallet-transaction-payment = { workspace = true, default-features = false }
 pallet-treasury = { workspace = true, default-features = false }
@@ -49,60 +49,57 @@ log = "0.4.8"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-inherents = { version = "4.0.0-dev", default-features = false }
-sp-offchain = { version = "4.0.0-dev", default-features = false }
-sp-staking = { version = "4.0.0-dev", default-features = false }
-sp-consensus-babe = { version = "0.10.0-dev", default-features = false }
-sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false }
-sp-session = { version = "4.0.0-dev", default-features = false }
-sp-authority-discovery = { version = "4.0.0-dev", default-features = false }
-sp-transaction-pool = { version = "4.0.0-dev", default-features = false }
-sp-block-builder = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-inherents = { workspace = true, default-features = false }
+sp-offchain = { workspace = true, default-features = false }
+sp-staking = { workspace = true, default-features = false }
+sp-consensus-babe = { workspace = true, default-features = false }
+sp-consensus-grandpa = { workspace = true, default-features = false }
+sp-session = { workspace = true, default-features = false }
+sp-authority-discovery = { workspace = true, default-features = false }
+sp-transaction-pool = { workspace = true, default-features = false }
+sp-block-builder = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
 #
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false }
-pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-pallet-executive = { package = "frame-executive", version = "4.0.0-dev", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", default-features = false }
-pallet-im-online = { version = "4.0.0-dev", default-features = false }
-pallet-indices = { version = "4.0.0-dev", default-features = false }
-pallet-offences = { version = "4.0.0-dev", default-features = false }
-pallet-preimage = { version = "4.0.0-dev", default-features = false }
-pallet-session = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
-pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
-pallet-insecure-randomness-collective-flip = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-contracts-primitives = { workspace = true, default-features = false }
+pallet-election-provider-multi-phase = { workspace = true, default-features = false }
+pallet-grandpa = { workspace = true, default-features = false }
+pallet-im-online = { workspace = true, default-features = false }
+pallet-indices = { workspace = true, default-features = false }
+pallet-offences = { workspace = true, default-features = false }
+pallet-preimage = { workspace = true, default-features = false }
+pallet-session = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
+pallet-authority-discovery = { workspace = true, default-features = false }
+pallet-insecure-randomness-collective-flip = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
 
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+frame-executive = { workspace = true, default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
 # RPC
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false }
+frame-system-rpc-runtime-api = { workspace = true, default-features = false }
 pallet-group-rpc-runtime-api = { workspace = true, default-features = false }
 pallet-protocol-fee-rpc-runtime-api = { workspace = true, default-features = false }
 pallet-staking-rpc-runtime-api = { workspace = true, default-features = false }
 node-rpc-runtime-api = { workspace = true, default-features = false }
 
 # Used for runtime benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
-frame-system-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
+frame-system-benchmarking = { workspace = true, default-features = false, optional = true }
 hex-literal = { version = "0.3.1", optional = true }
 
-# Import 'getrandom' here to enable feature `getrandom/js` for wasm builds.
-getrandom = { version = "0.2.6", default-features = false, optional = true }
-
 [build-dependencies]
 polymesh-build-tool = { workspace = true, default-features = false }
 
@@ -122,7 +119,7 @@ no_std = [
 ]
 
 std = [
-	"polymesh-build-tool/std",
+    "polymesh-build-tool/std",
     "u64_backend",
     "codec/std",
     "frame-benchmarking?/std",
@@ -145,7 +142,7 @@ std = [
     "pallet-contracts/std",
     "pallet-corporate-actions/std",
     "pallet-election-provider-multi-phase/std",
-    "pallet-executive/std",
+    "frame-executive/std",
     "pallet-external-agents/std",
     "pallet-grandpa/std",
     "pallet-group-rpc-runtime-api/std",
@@ -199,7 +196,6 @@ std = [
     "polymesh-contracts/std",
 ]
 runtime-benchmarks = [
-	"getrandom/js",
     "frame-benchmarking/runtime-benchmarks",
     "frame-support/runtime-benchmarks",
     "frame-system-benchmarking/runtime-benchmarks",
diff --git a/pallets/runtime/develop/src/benchmarks/pallet_session.rs b/pallets/runtime/develop/src/benchmarks/pallet_session.rs
index 7a4cfa13b5..d8241f4a0a 100644
--- a/pallets/runtime/develop/src/benchmarks/pallet_session.rs
+++ b/pallets/runtime/develop/src/benchmarks/pallet_session.rs
@@ -25,6 +25,7 @@ use codec::Decode;
 use core::convert::TryInto;
 use frame_benchmarking::benchmarks;
 use frame_support::traits::{Currency, Get, OnInitialize};
+use frame_system::pallet_prelude::BlockNumberFor;
 use frame_system::RawOrigin;
 use pallet_session::{Call, Pallet as Session};
 use pallet_staking::benchmarking::create_validator_with_nominators;
@@ -41,8 +42,8 @@ pub trait Config:
 {
 }
 
-impl<T: Config> OnInitialize<T::BlockNumber> for Pallet<T> {
-    fn on_initialize(n: T::BlockNumber) -> frame_support::weights::Weight {
+impl<T: Config> OnInitialize<BlockNumberFor<T>> for Pallet<T> {
+    fn on_initialize(n: BlockNumberFor<T>) -> frame_support::weights::Weight {
         Session::<T>::on_initialize(n)
     }
 }
diff --git a/pallets/runtime/develop/src/lib.rs b/pallets/runtime/develop/src/lib.rs
index ce50ba6285..301fcd5056 100644
--- a/pallets/runtime/develop/src/lib.rs
+++ b/pallets/runtime/develop/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+#![recursion_limit = "1024"]
 
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]
diff --git a/pallets/runtime/develop/src/runtime.rs b/pallets/runtime/develop/src/runtime.rs
index 9d6ef6dced..dab60fc9cb 100644
--- a/pallets/runtime/develop/src/runtime.rs
+++ b/pallets/runtime/develop/src/runtime.rs
@@ -49,6 +49,7 @@ pub use pallet_timestamp::Call as TimestampCall;
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 /// Runtime version.
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("polymesh_dev"),
     impl_name: create_runtime_str!("polymesh_dev"),
@@ -105,7 +106,6 @@ parameter_types! {
     pub const MaxAuthorities: u32 = 100_000;
     pub const MaxKeys: u32 = 10_000;
     pub const MaxPeerInHeartbeats: u32 = 10_000;
-    pub const MaxPeerDataEncodingSize: u32 = 1_000;
 
     // Assets:
     pub const AssetNameMaxLength: u32 = 128;
@@ -136,8 +136,6 @@ parameter_types! {
 
     // Contracts:
     pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
-    pub DeletionWeightLimit: Weight = Weight::from_ref_time(500_000_000_000);
-    pub DeletionQueueDepth: u32 = 1024;
     pub MaxInLen: u32 = 8 * 1024;
     pub MaxOutLen: u32 = 8 * 1024;
 
@@ -343,13 +341,9 @@ mod benches {
 }
 
 construct_runtime!(
-    pub enum Runtime where
-        Block = Block,
-        NodeBlock = polymesh_primitives::Block,
-        UncheckedExtrinsic = UncheckedExtrinsic
-    {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-        Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+    pub struct Runtime {
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
+        Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
         Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
         Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
         Authorship: pallet_authorship = 4,
@@ -383,7 +377,7 @@ construct_runtime!(
         // UpgradeCommitteeMembership: Genesis config deps: UpgradeCommittee, Identity
         UpgradeCommitteeMembership: pallet_group::<Instance4>::{Pallet, Call, Storage, Event<T>, Config<T>} = 14,
 
-        MultiSig: pallet_multisig::{Pallet, Call, Config, Storage, Event<T>} = 15,
+        MultiSig: pallet_multisig::{Pallet, Call, Config<T>, Storage, Event<T>} = 15,
 
         Bridge: pallet_bridge::{Pallet, Storage} = 16,
 
@@ -394,8 +388,8 @@ construct_runtime!(
 
         // Session: Genesis config deps: System.
         Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 19,
-        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 20,
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 21,
+        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 20,
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event} = 21,
         Historical: pallet_session_historical::{Pallet} = 22,
         ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 23,
         RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 24,
@@ -404,19 +398,19 @@ construct_runtime!(
         Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 25,
 
         // Asset: Genesis config deps: Timestamp,
-        Asset: pallet_asset::{Pallet, Call, Storage, Config, Event<T>} = 26,
-        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config} = 27,
-        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config} = 28,
+        Asset: pallet_asset::{Pallet, Call, Storage, Config<T>, Event<T>} = 26,
+        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config<T>} = 27,
+        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config<T>} = 28,
         ComplianceManager: pallet_compliance_manager::{Pallet, Call, Storage, Event<T>} = 29,
-        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config} = 30,
-        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config} = 31,
+        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config<T>} = 30,
+        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config<T>} = 31,
         Permissions: pallet_permissions::{Pallet} = 32,
         Pips: pallet_pips::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
-        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config} = 34,
-        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config} = 35,
+        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config<T>} = 34,
+        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 36,
-        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config} = 37,
-        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config} = 38,
+        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config<T>} = 37,
+        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config<T>} = 38,
         Sto: pallet_sto::{Pallet, Call, Storage, Event<T>} = 39,
         Treasury: pallet_treasury::{Pallet, Call, Event<T>} = 40,
         Utility: pallet_utility::{Pallet, Call, Storage, Event<T>} = 41,
diff --git a/pallets/runtime/mainnet/Cargo.toml b/pallets/runtime/mainnet/Cargo.toml
index f68e8a6852..bc477c9075 100644
--- a/pallets/runtime/mainnet/Cargo.toml
+++ b/pallets/runtime/mainnet/Cargo.toml
@@ -50,51 +50,50 @@ pallet-protocol-fee-rpc-runtime-api = { workspace = true, default-features = fal
 
 # Others
 log = "0.4.8"
-lazy_static = { version = "1.4.0", default-features = false }
 serde = { version = "1.0.104", default-features = false }
 serde_derive = { version = "1.0.104", optional = true }
 smallvec = "1.4.0"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false }
-pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false}
-pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-pallet-executive = { package = "frame-executive", version = "4.0.0-dev", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", default-features = false }
-pallet-im-online = { version = "4.0.0-dev", default-features = false }
-pallet-indices = { version = "4.0.0-dev", default-features = false }
-pallet-offences = { version = "4.0.0-dev", default-features = false }
-pallet-preimage = { version = "4.0.0-dev", default-features = false }
-pallet-insecure-randomness-collective-flip = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
-pallet-session = { version = "4.0.0-dev", default-features = false }
-pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-authority-discovery = { version = "4.0.0-dev", default-features = false }
-sp-block-builder = { version = "4.0.0-dev", default-features = false }
-sp-consensus-babe = { version = "0.10.0-dev", default-features = false }
-sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-inherents = { version = "4.0.0-dev", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-offchain = { version = "4.0.0-dev", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-session = { version = "4.0.0-dev", default-features = false }
-sp-staking = { version = "4.0.0-dev", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-transaction-pool = { version = "4.0.0-dev", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-executive = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-system-rpc-runtime-api = { workspace = true, default-features = false }
+pallet-authority-discovery = { workspace = true, default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-contracts-primitives = { workspace = true, default-features = false}
+pallet-election-provider-multi-phase = { workspace = true, default-features = false }
+pallet-grandpa = { workspace = true, default-features = false }
+pallet-im-online = { workspace = true, default-features = false }
+pallet-indices = { workspace = true, default-features = false }
+pallet-offences = { workspace = true, default-features = false }
+pallet-preimage = { workspace = true, default-features = false }
+pallet-insecure-randomness-collective-flip = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
+pallet-session = { workspace = true, default-features = false }
+pallet-staking-reward-curve = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-api = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-authority-discovery = { workspace = true, default-features = false }
+sp-block-builder = { workspace = true, default-features = false }
+sp-consensus-babe = { workspace = true, default-features = false }
+sp-consensus-grandpa = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-inherents = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-offchain = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-session = { workspace = true, default-features = false }
+sp-staking = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-transaction-pool = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
 
 [build-dependencies]
 polymesh-build-tool = { workspace = true, default-features = false }
@@ -132,7 +131,7 @@ std = [
     "pallet-compliance-manager/std",
     "pallet-contracts/std",
     "pallet-election-provider-multi-phase/std",
-    "pallet-executive/std",
+    "frame-executive/std",
     "pallet-external-agents/std",
     "pallet-grandpa/std",
     "pallet-group-rpc-runtime-api/std",
diff --git a/pallets/runtime/mainnet/src/lib.rs b/pallets/runtime/mainnet/src/lib.rs
index 4909e0202e..242ca986b8 100644
--- a/pallets/runtime/mainnet/src/lib.rs
+++ b/pallets/runtime/mainnet/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+#![recursion_limit = "1024"]
 
 pub mod constants;
 pub mod runtime;
diff --git a/pallets/runtime/mainnet/src/runtime.rs b/pallets/runtime/mainnet/src/runtime.rs
index 3c335a8be4..c6f6d434b5 100644
--- a/pallets/runtime/mainnet/src/runtime.rs
+++ b/pallets/runtime/mainnet/src/runtime.rs
@@ -47,6 +47,7 @@ use crate::constants::time::*;
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 /// Runtime version.
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("polymesh_mainnet"),
     impl_name: create_runtime_str!("polymesh_mainnet"),
@@ -103,7 +104,6 @@ parameter_types! {
     pub const MaxAuthorities: u32 = 100_000;
     pub const MaxKeys: u32 = 10_000;
     pub const MaxPeerInHeartbeats: u32 = 10_000;
-    pub const MaxPeerDataEncodingSize: u32 = 1_000;
 
     // Assets:
     pub const AssetNameMaxLength: u32 = 128;
@@ -133,8 +133,6 @@ parameter_types! {
 
     // Contracts:
     pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
-    pub DeletionWeightLimit: Weight = Weight::from_ref_time(500_000_000_000);
-    pub DeletionQueueDepth: u32 = 1024;
     pub MaxInLen: u32 = 8 * 1024;
     pub MaxOutLen: u32 = 8 * 1024;
 
@@ -293,13 +291,9 @@ impl pallet_group::Config<pallet_group::Instance2> for Runtime {
 }
 
 construct_runtime!(
-    pub enum Runtime where
-        Block = Block,
-        NodeBlock = polymesh_primitives::Block,
-        UncheckedExtrinsic = UncheckedExtrinsic
-    {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-        Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+    pub struct Runtime {
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
+        Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
         Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
         Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
         Authorship: pallet_authorship = 4,
@@ -333,7 +327,7 @@ construct_runtime!(
         // UpgradeCommitteeMembership: Genesis config deps: UpgradeCommittee, Identity
         UpgradeCommitteeMembership: pallet_group::<Instance4>::{Pallet, Call, Storage, Event<T>, Config<T>} = 14,
 
-        MultiSig: pallet_multisig::{Pallet, Call, Config, Storage, Event<T>} = 15,
+        MultiSig: pallet_multisig::{Pallet, Call, Config<T>, Storage, Event<T>} = 15,
 
         Bridge: pallet_bridge::{Pallet, Storage} = 16,
 
@@ -344,8 +338,8 @@ construct_runtime!(
 
         // Session: Genesis config deps: System.
         Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 19,
-        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 20,
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 21,
+        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 20,
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event} = 21,
         Historical: pallet_session_historical::{Pallet} = 22,
         ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 23,
         RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 24,
@@ -354,19 +348,19 @@ construct_runtime!(
         // Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 25,
 
         // Asset: Genesis config deps: Timestamp,
-        Asset: pallet_asset::{Pallet, Call, Storage, Config, Event<T>} = 26,
-        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config} = 27,
-        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config} = 28,
+        Asset: pallet_asset::{Pallet, Call, Storage, Config<T>, Event<T>} = 26,
+        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config<T>} = 27,
+        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config<T>} = 28,
         ComplianceManager: pallet_compliance_manager::{Pallet, Call, Storage, Event<T>} = 29,
-        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config} = 30,
-        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config} = 31,
+        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config<T>} = 30,
+        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config<T>} = 31,
         Permissions: pallet_permissions::{Pallet} = 32,
         Pips: pallet_pips::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
-        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config} = 34,
-        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config} = 35,
+        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config<T>} = 34,
+        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 36,
-        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config} = 37,
-        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config} = 38,
+        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config<T>} = 37,
+        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config<T>} = 38,
         Sto: pallet_sto::{Pallet, Call, Storage, Event<T>} = 39,
         Treasury: pallet_treasury::{Pallet, Call, Event<T>} = 40,
         Utility: pallet_utility::{Pallet, Call, Storage, Event<T>} = 41,
diff --git a/pallets/runtime/testnet/Cargo.toml b/pallets/runtime/testnet/Cargo.toml
index d46d6ab8cf..89d9b25e82 100644
--- a/pallets/runtime/testnet/Cargo.toml
+++ b/pallets/runtime/testnet/Cargo.toml
@@ -49,54 +49,53 @@ pallet-staking-rpc-runtime-api = { workspace = true, default-features = false }
 pallet-protocol-fee-rpc-runtime-api = { workspace = true, default-features = false }
 
 # Others
-lazy_static = { version = "1.4.0", default-features = false }
 log = "0.4.8"
 serde = { version = "1.0.104", default-features = false }
 serde_derive = { version = "1.0.104", optional = true }
+smallvec = "1.4.0"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-inherents = { version = "4.0.0-dev", default-features = false }
-sp-offchain = { version = "4.0.0-dev", default-features = false }
-sp-staking = { version = "4.0.0-dev", default-features = false }
-sp-consensus-babe = { version = "0.10.0-dev", default-features = false }
-sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false }
-sp-session = { version = "4.0.0-dev", default-features = false }
-sp-authority-discovery = { version = "4.0.0-dev", default-features = false }
-sp-transaction-pool = { version = "4.0.0-dev", default-features = false }
-sp-block-builder = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-inherents = { workspace = true, default-features = false }
+sp-offchain = { workspace = true, default-features = false }
+sp-staking = { workspace = true, default-features = false }
+sp-consensus-babe = { workspace = true, default-features = false }
+sp-consensus-grandpa = { workspace = true, default-features = false }
+sp-session = { workspace = true, default-features = false }
+sp-authority-discovery = { workspace = true, default-features = false }
+sp-transaction-pool = { workspace = true, default-features = false }
+sp-block-builder = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
 
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false}
-pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-pallet-executive = { package = "frame-executive", version = "4.0.0-dev", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", default-features = false }
-pallet-im-online = { version = "4.0.0-dev", default-features = false }
-pallet-indices = { version = "4.0.0-dev", default-features = false }
-pallet-offences = { version = "4.0.0-dev", default-features = false }
-pallet-preimage = { version = "4.0.0-dev", default-features = false }
-pallet-session = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
-pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
-pallet-insecure-randomness-collective-flip = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
-pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-contracts-primitives = { workspace = true, default-features = false}
+pallet-election-provider-multi-phase = { workspace = true, default-features = false }
+pallet-grandpa = { workspace = true, default-features = false }
+pallet-im-online = { workspace = true, default-features = false }
+pallet-indices = { workspace = true, default-features = false }
+pallet-offences = { workspace = true, default-features = false }
+pallet-preimage = { workspace = true, default-features = false }
+pallet-session = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
+pallet-authority-discovery = { workspace = true, default-features = false }
+pallet-insecure-randomness-collective-flip = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
+pallet-staking-reward-curve = { workspace = true, default-features = false }
 
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false }
-smallvec = "1.4.0"
+frame-executive = { workspace = true, default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system-rpc-runtime-api = { workspace = true, default-features = false }
 
 [build-dependencies]
 polymesh-build-tool = { workspace = true, default-features = false }
@@ -135,7 +134,7 @@ std = [
     "pallet-compliance-manager/std",
     "pallet-contracts/std",
     "pallet-election-provider-multi-phase/std",
-    "pallet-executive/std",
+    "frame-executive/std",
     "pallet-external-agents/std",
     "pallet-grandpa/std",
     "pallet-group-rpc-runtime-api/std",
diff --git a/pallets/runtime/testnet/src/lib.rs b/pallets/runtime/testnet/src/lib.rs
index e7b27f0a0f..e53a4055d6 100644
--- a/pallets/runtime/testnet/src/lib.rs
+++ b/pallets/runtime/testnet/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
-#![recursion_limit = "256"]
+#![recursion_limit = "1024"]
 
 pub mod constants;
 pub mod runtime;
diff --git a/pallets/runtime/testnet/src/runtime.rs b/pallets/runtime/testnet/src/runtime.rs
index e351598d26..9f2677b718 100644
--- a/pallets/runtime/testnet/src/runtime.rs
+++ b/pallets/runtime/testnet/src/runtime.rs
@@ -49,6 +49,7 @@ use crate::constants::time::*;
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 /// Runtime version.
+#[sp_version::runtime_version]
 pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("polymesh_testnet"),
     impl_name: create_runtime_str!("polymesh_testnet"),
@@ -106,7 +107,6 @@ parameter_types! {
     pub const MaxAuthorities: u32 = 100_000;
     pub const MaxKeys: u32 = 10_000;
     pub const MaxPeerInHeartbeats: u32 = 10_000;
-    pub const MaxPeerDataEncodingSize: u32 = 1_000;
 
     // Assets:
     pub const AssetNameMaxLength: u32 = 128;
@@ -136,8 +136,6 @@ parameter_types! {
 
     // Contracts:
     pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
-    pub DeletionWeightLimit: Weight = Weight::from_ref_time(500_000_000_000);
-    pub DeletionQueueDepth: u32 = 1024;
     pub MaxInLen: u32 = 8 * 1024;
     pub MaxOutLen: u32 = 8 * 1024;
 
@@ -298,14 +296,9 @@ impl pallet_group::Config<pallet_group::Instance2> for Runtime {
 pub type AllModulesExported = AllPalletsWithSystem;
 
 construct_runtime!(
-    pub enum Runtime where
-        Block = Block,
-        NodeBlock = polymesh_primitives::Block,
-        UncheckedExtrinsic = UncheckedExtrinsic
-    {
-
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-        Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+    pub struct Runtime {
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
+        Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
         Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
         Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
         Authorship: pallet_authorship = 4,
@@ -339,7 +332,7 @@ construct_runtime!(
         // UpgradeCommitteeMembership: Genesis config deps: UpgradeCommittee, Identity
         UpgradeCommitteeMembership: pallet_group::<Instance4>::{Pallet, Call, Storage, Event<T>, Config<T>} = 14,
 
-        MultiSig: pallet_multisig::{Pallet, Call, Config, Storage, Event<T>} = 15,
+        MultiSig: pallet_multisig::{Pallet, Call, Config<T>, Storage, Event<T>} = 15,
 
         Bridge: pallet_bridge::{Pallet, Storage} = 16,
 
@@ -350,8 +343,8 @@ construct_runtime!(
 
         // Session: Genesis config deps: System.
         Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 19,
-        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 20,
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 21,
+        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 20,
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event} = 21,
         Historical: pallet_session_historical::{Pallet} = 22,
         ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 23,
         RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 24,
@@ -360,19 +353,19 @@ construct_runtime!(
         // Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 25,
 
         // Asset: Genesis config deps: Timestamp,
-        Asset: pallet_asset::{Pallet, Call, Storage, Config, Event<T>} = 26,
-        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config} = 27,
-        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config} = 28,
+        Asset: pallet_asset::{Pallet, Call, Storage, Config<T>, Event<T>} = 26,
+        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config<T>} = 27,
+        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config<T>} = 28,
         ComplianceManager: pallet_compliance_manager::{Pallet, Call, Storage, Event<T>} = 29,
-        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config} = 30,
-        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config} = 31,
+        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config<T>} = 30,
+        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config<T>} = 31,
         Permissions: pallet_permissions::{Pallet} = 32,
         Pips: pallet_pips::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
-        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config} = 34,
-        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config} = 35,
+        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config<T>} = 34,
+        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 36,
-        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config} = 37,
-        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config} = 38,
+        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config<T>} = 37,
+        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config<T>} = 38,
         Sto: pallet_sto::{Pallet, Call, Storage, Event<T>} = 39,
         Treasury: pallet_treasury::{Pallet, Call, Event<T>} = 40,
         Utility: pallet_utility::{Pallet, Call, Storage, Event<T>} = 41,
diff --git a/pallets/runtime/tests/Cargo.toml b/pallets/runtime/tests/Cargo.toml
index 6e43826d0d..52b06d66ca 100644
--- a/pallets/runtime/tests/Cargo.toml
+++ b/pallets/runtime/tests/Cargo.toml
@@ -46,64 +46,61 @@ polymesh-exec-macro = { path = "exec_macro" }
 serde = { version = "1.0.104", default-features = false }
 rand = { version = "0.7.3", default-features = false }
 chrono = { version = "0.4", default-features = false }
-hex-literal = "0.3.0"
 smallvec = "1.4.1"
 lazy_static = "1.4.0"
 parking_lot = "0.12.0"
 env_logger = "0.7"
-serde_json = '1.0.48'
+serde_json = { version = "1.0.48", default-features = false }
 log = "0.4.8"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "4.0.0-dev", optional = true }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false }
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-ink_primitives = { git = "https://github.com/paritytech/ink", tag = "v2.1.0", default-features = false }
-pallet-authority-discovery = { version = "4.0.0-dev", default-features = false }
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-contracts-primitives = { version = "7.0.0", default-features = false }
-pallet-election-provider-multi-phase = { version = "4.0.0-dev", default-features = false }
-pallet-executive = { package = "frame-executive", version = "4.0.0-dev", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", default-features = false }
-pallet-im-online = { version = "4.0.0-dev", default-features = false }
-pallet-indices = { version = "4.0.0-dev", default-features = false }
-pallet-offences = { version = "4.0.0-dev", default-features = false }
-pallet-preimage = { version = "4.0.0-dev", default-features = false }
-pallet-insecure-randomness-collective-flip = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
-pallet-session = { version = "4.0.0-dev", default-features = false, features = ["historical"] }
-pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-authority-discovery = { version = "4.0.0-dev", default-features = false }
-sp-block-builder = { version = "4.0.0-dev", default-features = false }
-sp-consensus-babe = { version = "0.10.0-dev", default-features = false }
-sp-consensus-grandpa = { version = "4.0.0-dev", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-inherents = { version = "4.0.0-dev", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-npos-elections = { version = "4.0.0-dev", default-features = false }
-sp-offchain = { version = "4.0.0-dev", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-session = { version = "4.0.0-dev", default-features = false }
-sp-staking = { version = "4.0.0-dev", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-transaction-pool = { version = "4.0.0-dev", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-keyring = { version = "7.0.0" }
-substrate-test-utils = { version = "4.0.0-dev", default-features = false }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
+frame-support = { workspace = true, default-features = false }
+frame-executive = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-system-rpc-runtime-api = { workspace = true, default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+pallet-authority-discovery = { workspace = true, default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-contracts-primitives = { workspace = true, default-features = false }
+pallet-election-provider-multi-phase = { workspace = true, default-features = false }
+pallet-grandpa = { workspace = true, default-features = false }
+pallet-im-online = { workspace = true, default-features = false }
+pallet-indices = { workspace = true, default-features = false }
+pallet-offences = { workspace = true, default-features = false }
+pallet-preimage = { workspace = true, default-features = false }
+pallet-insecure-randomness-collective-flip = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
+pallet-session = { workspace = true, default-features = false, features = ["historical"] }
+pallet-staking-reward-curve = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-api = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-authority-discovery = { workspace = true, default-features = false }
+sp-block-builder = { workspace = true, default-features = false }
+sp-consensus-babe = { workspace = true, default-features = false }
+sp-consensus-grandpa = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-inherents = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-npos-elections = { workspace = true, default-features = false }
+sp-offchain = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-session = { workspace = true, default-features = false }
+sp-staking = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-transaction-pool = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-keyring = { workspace = true }
+substrate-test-utils = { workspace = true, default-features = false }
 
 [dev-dependencies]
-libsecp256k1 = { version = "0.7", default-features = false }
 wat = "1.0"
-sp-tracing = { version = "6.0.0", default-features = false, features = ["std"] }
+sp-tracing = { workspace = true, default-features = false, features = ["std"] }
 
 [features]
 default = ["std", "testing", "equalize"]
@@ -123,8 +120,8 @@ std = [
     "u64_backend",
     "frame-support/std",
     "frame-system/std",
+    "frame-benchmarking?/std",
     "frame-election-provider-support/std",
-    "ink_primitives/std",
     "pallet-asset/std",
     "pallet-authorship/std",
     "pallet-base/std",
diff --git a/pallets/runtime/tests/src/asset_test.rs b/pallets/runtime/tests/src/asset_test.rs
index 544abfab31..9e22194d7e 100644
--- a/pallets/runtime/tests/src/asset_test.rs
+++ b/pallets/runtime/tests/src/asset_test.rs
@@ -1,8 +1,6 @@
 use chrono::prelude::Utc;
 use frame_support::dispatch::{DispatchError, DispatchResult};
 use frame_support::{assert_noop, assert_ok};
-use hex_literal::hex;
-use ink_primitives::hash as FunctionSelectorHasher;
 use rand::Rng;
 use sp_consensus_babe::Slot;
 use sp_runtime::AnySignature;
@@ -75,7 +73,7 @@ type OffChainSignature = AnySignature;
 type Origin = <TestStorage as frame_system::Config>::RuntimeOrigin;
 type DidRecords = pallet_identity::DidRecords<TestStorage>;
 type Statistics = pallet_statistics::Pallet<TestStorage>;
-type AssetGenesis = pallet_asset::GenesisConfig;
+type AssetGenesis = pallet_asset::GenesisConfig<TestStorage>;
 type System = frame_system::Pallet<TestStorage>;
 type ExternalAgents = pallet_external_agents::Pallet<TestStorage>;
 type EAError = pallet_external_agents::Error<TestStorage>;
@@ -205,19 +203,6 @@ pub fn check_schedules(asset_id: AssetId, schedules: &[(ScheduleId, ScheduleChec
     }
 }
 
-#[test]
-fn check_the_test_hex() {
-    ExtBuilder::default().build().execute_with(|| {
-        let selector: [u8; 4] = (FunctionSelectorHasher::keccak256("verify_transfer".as_bytes())
-            [0..4])
-            .try_into()
-            .unwrap();
-        println!("{:#X}", u32::from_be_bytes(selector));
-        let data = hex!("D9386E41");
-        println!("{:?}", data);
-    });
-}
-
 #[test]
 fn issuers_can_create_and_rename_tokens() {
     ExtBuilder::default().build().execute_with(|| {
diff --git a/pallets/runtime/tests/src/balances_test.rs b/pallets/runtime/tests/src/balances_test.rs
index 3ad412ff9f..d1ecc5fd6f 100644
--- a/pallets/runtime/tests/src/balances_test.rs
+++ b/pallets/runtime/tests/src/balances_test.rs
@@ -26,7 +26,7 @@ type Error = balances::Error<TestStorage>;
 /// create a transaction info struct from weight. Handy to avoid building the whole struct.
 pub fn info_from_weight(w: u64) -> DispatchInfo {
     DispatchInfo {
-        weight: Weight::from_ref_time(w),
+        weight: Weight::from_parts(w, 0),
         ..Default::default()
     }
 }
diff --git a/pallets/runtime/tests/src/contracts_test.rs b/pallets/runtime/tests/src/contracts_test.rs
index 508eb70e11..bc33624445 100644
--- a/pallets/runtime/tests/src/contracts_test.rs
+++ b/pallets/runtime/tests/src/contracts_test.rs
@@ -23,7 +23,7 @@ use crate::storage::{root, TestStorage, User};
 // and instead focus on the particulars of our contracts pallet.
 // This includes testing CDD, permissions, and what the chain extension does.
 
-const GAS_LIMIT: Gas = Weight::from_ref_time(100_000_000_000).set_proof_size(3 * 1024 * 1024);
+const GAS_LIMIT: Gas = Weight::from_parts(100_000_000_000, 3 * 1024 * 1024);
 
 type Asset = pallet_asset::Pallet<TestStorage>;
 type FrameContracts = pallet_contracts::Pallet<TestStorage>;
diff --git a/pallets/runtime/tests/src/ext_builder.rs b/pallets/runtime/tests/src/ext_builder.rs
index f7183da544..cf2be72bce 100644
--- a/pallets/runtime/tests/src/ext_builder.rs
+++ b/pallets/runtime/tests/src/ext_builder.rs
@@ -1,6 +1,5 @@
 use crate::TestStorage;
 use frame_support::dispatch::Weight;
-use frame_support::pallet_prelude::GenesisBuild;
 use pallet_asset::{self as asset, TickerRegistrationConfig};
 use pallet_balances as balances;
 use pallet_committee as committee;
@@ -14,7 +13,7 @@ use polymesh_primitives::{
 };
 use sp_io::TestExternalities;
 use sp_keyring::AccountKeyring;
-use sp_runtime::Storage;
+use sp_runtime::{BuildStorage, Storage};
 use sp_std::prelude::Vec;
 use sp_std::{cell::RefCell, convert::From, iter};
 
@@ -124,7 +123,7 @@ thread_local! {
 impl ExtBuilder {
     /// Sets the minimum weight for the extrinsic (see also `weight_fee`).
     pub fn base_weight(mut self, extrinsic_base_weight: u64) -> Self {
-        self.extrinsic_base_weight = Weight::from_ref_time(extrinsic_base_weight);
+        self.extrinsic_base_weight = Weight::from_parts(extrinsic_base_weight, 0);
         self
     }
 
@@ -326,12 +325,14 @@ impl ExtBuilder {
             max_ticker_length: 8,
             registration_length: Some(10000),
         };
-        let genesis = asset::GenesisConfig {
+        asset::GenesisConfig::<TestStorage> {
             ticker_registration_config,
             reserved_country_currency_codes: vec![],
             asset_metadata: vec![],
-        };
-        GenesisBuild::<TestStorage>::assimilate_storage(&genesis, storage).unwrap();
+            ..Default::default()
+        }
+        .assimilate_storage(storage)
+        .unwrap();
     }
 
     /// For each `cdd_providers`:
@@ -392,11 +393,13 @@ impl ExtBuilder {
     }
 
     fn build_protocol_fee_genesis(&self, storage: &mut Storage) {
-        let genesis = pallet_protocol_fee::GenesisConfig {
+        pallet_protocol_fee::GenesisConfig::<TestStorage> {
             base_fees: self.protocol_base_fees.0.clone(),
             coefficient: self.protocol_coefficient,
-        };
-        GenesisBuild::<TestStorage>::assimilate_storage(&genesis, storage).unwrap();
+            ..Default::default()
+        }
+        .assimilate_storage(storage)
+        .unwrap();
     }
 
     fn build_pips_genesis(&self, storage: &mut Storage) {
@@ -476,8 +479,8 @@ impl ExtBuilder {
             .collect();
 
         // Create storage and assimilate each genesis.
-        let mut storage = frame_system::GenesisConfig::default()
-            .build_storage::<TestStorage>()
+        let mut storage = frame_system::GenesisConfig::<TestStorage>::default()
+            .build_storage()
             .expect("TestStorage cannot build its own storage");
 
         self.build_identity_genesis(&mut storage, identities);
diff --git a/pallets/runtime/tests/src/lib.rs b/pallets/runtime/tests/src/lib.rs
index 0c7b8ae822..9fcb365f31 100644
--- a/pallets/runtime/tests/src/lib.rs
+++ b/pallets/runtime/tests/src/lib.rs
@@ -1,5 +1,7 @@
 #![allow(dead_code)]
 #![cfg(test)]
+// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256.
+#![recursion_limit = "1024"]
 
 pub mod storage;
 pub use storage::{
diff --git a/pallets/runtime/tests/src/relayer_test.rs b/pallets/runtime/tests/src/relayer_test.rs
index cda868c066..f7395c2fdf 100644
--- a/pallets/runtime/tests/src/relayer_test.rs
+++ b/pallets/runtime/tests/src/relayer_test.rs
@@ -70,14 +70,14 @@ fn call_relayer_remove_paying_key(user_key: AccountId, paying_key: AccountId) ->
 /// create a transaction info struct from weight. Handy to avoid building the whole struct.
 pub fn info_from_weight(w: u64) -> DispatchInfo {
     DispatchInfo {
-        weight: Weight::from_ref_time(w),
+        weight: Weight::from_parts(w, 0),
         ..Default::default()
     }
 }
 
 fn post_info_from_weight(w: u64) -> PostDispatchInfo {
     PostDispatchInfo {
-        actual_weight: Some(Weight::from_ref_time(w)),
+        actual_weight: Some(Weight::from_parts(w, 0)),
         pays_fee: Pays::Yes,
     }
 }
diff --git a/pallets/runtime/tests/src/settlement_test.rs b/pallets/runtime/tests/src/settlement_test.rs
index 54211ae1e6..2d2a546e0d 100644
--- a/pallets/runtime/tests/src/settlement_test.rs
+++ b/pallets/runtime/tests/src/settlement_test.rs
@@ -8,6 +8,7 @@ use frame_support::{
     assert_err_ignore_postinfo, assert_noop, assert_ok, assert_storage_noop, traits::TryCollect,
     BoundedBTreeSet,
 };
+use frame_system::pallet_prelude::BlockNumberFor;
 use rand::{prelude::*, thread_rng};
 use sp_runtime::{AccountId32, AnySignature};
 use sp_std::collections::btree_set::BTreeSet;
@@ -64,7 +65,7 @@ type AssetError = pallet_asset::Error<TestStorage>;
 type OffChainSignature = AnySignature;
 type Origin = <TestStorage as frame_system::Config>::RuntimeOrigin;
 type Moment = <TestStorage as pallet_timestamp::Config>::Moment;
-type BlockNumber = <TestStorage as frame_system::Config>::BlockNumber;
+type BlockNumber = BlockNumberFor<TestStorage>;
 type Settlement = pallet_settlement::Pallet<TestStorage>;
 type System = frame_system::Pallet<TestStorage>;
 type Error = pallet_settlement::Error<TestStorage>;
diff --git a/pallets/runtime/tests/src/signed_extra.rs b/pallets/runtime/tests/src/signed_extra.rs
index 999941861c..ff41af8cad 100644
--- a/pallets/runtime/tests/src/signed_extra.rs
+++ b/pallets/runtime/tests/src/signed_extra.rs
@@ -1,21 +1,19 @@
 use pallet_group as group;
 use pallet_identity as identity;
-use polymesh_primitives::{identity_id::GenesisIdentityRecord, AccountId, IdentityId, Index};
+use polymesh_primitives::{identity_id::GenesisIdentityRecord, AccountId, IdentityId, Nonce};
 use polymesh_runtime_develop::{
     runtime::{RuntimeCall, SignedExtra},
     Runtime,
 };
 
 use frame_support::dispatch::{DispatchClass, DispatchInfo, Weight};
-use frame_support::pallet_prelude::*;
 use frame_system::{
     CheckEra, CheckGenesis, CheckNonce, CheckSpecVersion, CheckTxVersion, CheckWeight,
 };
 use sp_io::TestExternalities;
-use sp_runtime::{generic, traits::SignedExtension};
-use sp_std::convert::From;
-
 use sp_keyring::AccountKeyring;
+use sp_runtime::{generic, traits::SignedExtension, BuildStorage};
+use sp_std::convert::From;
 
 pub fn make_call() -> (<Runtime as frame_system::Config>::RuntimeCall, usize) {
     (
@@ -29,7 +27,7 @@ pub fn make_call() -> (<Runtime as frame_system::Config>::RuntimeCall, usize) {
 ///     - Transaction `priority` == `tip`.
 ///     - Only `Operational` transactions could have `tip` != 0.
 ///     - `Normal` transactions have `priority` == 0, as `tip` == 0.
-fn make_signed_extra(current_block: u64, period: u64, nonce: Index, tip: u128) -> SignedExtra {
+fn make_signed_extra(current_block: u64, period: u64, nonce: Nonce, tip: u128) -> SignedExtra {
     (
         CheckSpecVersion::<Runtime>::new(),
         CheckTxVersion::<Runtime>::new(),
@@ -75,7 +73,7 @@ fn make_min_storage() -> Result<TestExternalities, String> {
         .map(|gen_id| gen_id.did)
         .collect::<Vec<_>>();
 
-    let mut storage = frame_system::GenesisConfig::default().build_storage::<Runtime>()?;
+    let mut storage = frame_system::GenesisConfig::<Runtime>::default().build_storage()?;
 
     // Balances
     pallet_balances::GenesisConfig::<Runtime> {
@@ -122,7 +120,7 @@ fn normal_tx() -> Result<(), String> {
     let user = AccountKeyring::Alice.to_account_id();
     let (call, len) = make_call();
     let info = DispatchInfo {
-        weight: Weight::from_ref_time(100),
+        weight: Weight::from_parts(100, 0),
         ..Default::default()
     };
 
@@ -152,7 +150,7 @@ fn operational_tx() -> Result<(), String> {
     let user: AccountId = AccountKeyring::Alice.public().into();
     let (call, len) = make_call();
     let info = DispatchInfo {
-        weight: Weight::from_ref_time(100),
+        weight: Weight::from_parts(100, 0),
         class: DispatchClass::Operational,
         ..Default::default()
     };
diff --git a/pallets/runtime/tests/src/staking/mock.rs b/pallets/runtime/tests/src/staking/mock.rs
index 879199a78c..a6c31f1418 100644
--- a/pallets/runtime/tests/src/staking/mock.rs
+++ b/pallets/runtime/tests/src/staking/mock.rs
@@ -22,17 +22,18 @@ use std::collections::BTreeMap;
 use frame_election_provider_support::{onchain, SequentialPhragmen};
 use frame_support::dispatch::{DispatchResult, Weight};
 use frame_support::traits::{
-    ConstU32, Currency, EitherOfDiverse, FindAuthor, GenesisBuild, Get, Hooks, Imbalance,
-    KeyOwnerProofSystem, OnUnbalanced, OneSessionHandler,
+    ConstU32, Currency, EitherOfDiverse, FindAuthor, Get, Hooks, Imbalance, KeyOwnerProofSystem,
+    OnUnbalanced, OneSessionHandler,
 };
 use frame_support::weights::constants::RocksDbWeight;
 use frame_support::{assert_ok, ord_parameter_types, parameter_types};
 use frame_system::{EnsureRoot, EnsureSignedBy};
 use sp_core::H256;
 use sp_runtime::curve::PiecewiseLinear;
-use sp_runtime::testing::{Header, TestXt, UintAuthorityId};
+use sp_runtime::testing::{TestXt, UintAuthorityId};
 use sp_runtime::traits::{IdentityLookup, Zero};
 use sp_runtime::transaction_validity::InvalidTransaction;
+use sp_runtime::BuildStorage;
 use sp_runtime::{KeyTypeId, Perbill};
 use sp_staking::offence::{DisableStrategy, OffenceDetails, OnOffenceHandler};
 use sp_staking::{EraIndex, SessionIndex};
@@ -58,7 +59,7 @@ pub const BLOCK_TIME: u64 = 1_000;
 
 /// The AccountId alias in this test module.
 pub(crate) type AccountId = u64;
-pub(crate) type AccountIndex = u64;
+pub(crate) type Nonce = u64;
 pub(crate) type BlockNumber = u64;
 pub(crate) type Balance = u128;
 
@@ -98,18 +99,14 @@ pub fn is_disabled(controller: AccountId) -> bool {
     Session::disabled_validators().contains(&validator_index)
 }
 
-type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
 pub type Call = RuntimeCall;
 
 frame_support::construct_runtime!(
-    pub enum Test where
-        Block = Block,
-        NodeBlock = Block,
-        UncheckedExtrinsic = UncheckedExtrinsic,
+    pub enum Test
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-        Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
+        Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned},
         Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
         Authorship: pallet_authorship,
         Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
@@ -118,7 +115,7 @@ frame_support::construct_runtime!(
         Historical: pallet_session::historical::{Pallet},
         Identity: pallet_identity::{Pallet, Call, Storage, Event<T>, Config<T>},
         CddServiceProviders: pallet_group::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
-        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config},
+        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config<T>},
         Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
         Treasury: pallet_treasury::{Pallet, Call, Event<T>},
@@ -149,10 +146,10 @@ parameter_types! {
     pub const MaxLen: u32 = 256;
     pub const MaxLocks: u32 = 1024;
     pub const BlockHashCount: u64 = 250;
-    pub const MaximumBlockWeight: Weight = Weight::from_ref_time(1024);
+    pub const MaximumBlockWeight: Weight = Weight::from_parts(1024, 0);
     pub BlockWeights: frame_system::limits::BlockWeights =
         frame_system::limits::BlockWeights::simple_max(
-            Weight::from_ref_time(frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND * 2)
+            Weight::from_parts(frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND * 2, 0)
         );
 }
 
@@ -162,14 +159,13 @@ impl frame_system::Config for Test {
     type BlockLength = ();
     type DbWeight = RocksDbWeight;
     type RuntimeOrigin = RuntimeOrigin;
-    type Index = AccountIndex;
-    type BlockNumber = BlockNumber;
+    type Nonce = Nonce;
     type RuntimeCall = RuntimeCall;
     type Hash = H256;
     type Hashing = ::sp_runtime::traits::BlakeTwo256;
     type AccountId = AccountId;
     type Lookup = IdentityLookup<Self::AccountId>;
-    type Header = Header;
+    type Block = Block;
     type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = BlockHashCount;
     type Version = ();
@@ -488,19 +484,11 @@ impl pallet_babe::Config for Test {
     type EpochChangeTrigger = pallet_babe::ExternalTrigger;
     type DisabledValidators = Session;
 
-    type KeyOwnerProofSystem = ();
-    type KeyOwnerProof = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-        KeyTypeId,
-        pallet_babe::AuthorityId,
-    )>>::Proof;
-    type KeyOwnerIdentification = <Self::KeyOwnerProofSystem as KeyOwnerProofSystem<(
-        KeyTypeId,
-        pallet_babe::AuthorityId,
-    )>>::IdentificationTuple;
-    type HandleEquivocation =
-        pallet_babe::EquivocationHandler<Self::KeyOwnerIdentification, (), ()>;
-
     type MaxAuthorities = MaxAuthorities;
+    type MaxNominators = MaxNominatorRewardedPerValidator;
+    type KeyOwnerProof =
+        <Historical as KeyOwnerProofSystem<(KeyTypeId, pallet_babe::AuthorityId)>>::Proof;
+    type EquivocationReportSystem = pallet_babe::EquivocationReportSystem<Self, (), Historical, ()>;
 }
 
 pallet_staking_reward_curve::build! {
@@ -547,7 +535,6 @@ parameter_types! {
     pub static HistoryDepth: u32 = 80;
     pub static MaxUnlockingChunks: u32 = 32;
     pub static RewardOnUnbalanceWasCalled: bool = false;
-    pub static LedgerSlashPerEra: (BalanceOf<Test>, BTreeMap<EraIndex, BalanceOf<Test>>) = (Zero::zero(), BTreeMap::new());
     pub static MaxWinners: u32 = 100;
 }
 
@@ -570,8 +557,14 @@ impl OnUnbalanced<PositiveImbalanceOf<Test>> for MockReward {
     }
 }
 
-pub struct OnStakerSlashMock<T: Config>(core::marker::PhantomData<T>);
-impl<T: Config> sp_staking::OnStakerSlash<AccountId, Balance> for OnStakerSlashMock<T> {
+parameter_types! {
+  pub static LedgerSlashPerEra:
+    (BalanceOf<Test>, BTreeMap<EraIndex, BalanceOf<Test>>) =
+    (Zero::zero(), BTreeMap::new());
+}
+
+pub struct EventListenerMock;
+impl sp_staking::OnStakingUpdate<AccountId, Balance> for EventListenerMock {
     fn on_slash(
         _pool_account: &AccountId,
         slashed_bonded: Balance,
@@ -585,7 +578,7 @@ impl pallet_staking::Config for Test {
     type Currency = Balances;
     type CurrencyBalance = Balance;
     type UnixTime = Timestamp;
-    type CurrencyToVote = frame_support::traits::U128CurrencyToVote;
+    type CurrencyToVote = sp_staking::currency_to_vote::U128CurrencyToVote;
     type ElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
     type GenesisElectionProvider = Self::ElectionProvider;
     type MaxNominations = MaxNominations;
@@ -606,7 +599,7 @@ impl pallet_staking::Config for Test {
     type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
     type TargetList = pallet_staking::UseValidatorsMap<Self>;
     type MaxUnlockingChunks = MaxUnlockingChunks;
-    type OnStakerSlash = OnStakerSlashMock<Self>;
+    type EventListeners = EventListenerMock;
     type BenchmarkingConfig = pallet_staking::SampleBenchmarkingConfig;
     type WeightInfo = polymesh_weights::pallet_staking::SubstrateWeight;
     type MaxValidatorPerIdentity = polymesh_runtime_common::MaxValidatorPerIdentity;
@@ -750,8 +743,8 @@ impl ExtBuilder {
     }
     fn build(self) -> sp_io::TestExternalities {
         sp_tracing::try_init_simple();
-        let mut storage = frame_system::GenesisConfig::default()
-            .build_storage::<Test>()
+        let mut storage = frame_system::GenesisConfig::<Test>::default()
+            .build_storage()
             .unwrap();
 
         let _ = pallet_balances::GenesisConfig::<Test> {
diff --git a/pallets/runtime/tests/src/staking/mod.rs b/pallets/runtime/tests/src/staking/mod.rs
index f95780fb26..74991b5c72 100644
--- a/pallets/runtime/tests/src/staking/mod.rs
+++ b/pallets/runtime/tests/src/staking/mod.rs
@@ -2022,27 +2022,26 @@ fn reap_stash_works() {
             // Polymesh change
             // -----------------------------------------------------------------
             // controller or any other account is not reapable
-            // assert_noop!(
-            //     Staking::reap_stash(RuntimeOrigin::signed(20), 10, 0),
-            //     Error::<Test>::NotStash
-            // );
+            assert_noop!(
+                Staking::reap_stash(RuntimeOrigin::signed(20), 10, 0),
+                Error::<Test>::NotStash
+            );
             // -----------------------------------------------------------------
 
             // no easy way to cause an account to go below ED, we tweak their staking ledger
             // instead.
 
-            //Ledger::<Test>::insert(
-            //    10,
-            //    StakingLedger {
-            //        stash: 11,
-            //        total: 5,
-            //        active: 5,
-            //        unlocking: Default::default(),
-            //        claimed_rewards: bounded_vec![],
-            //    },
-            //);
+            Ledger::<Test>::insert(
+                10,
+                StakingLedger {
+                    stash: 11,
+                    total: 0,
+                    active: 0,
+                    unlocking: Default::default(),
+                    claimed_rewards: bounded_vec![],
+                },
+            );
 
-            let _ = Balances::slash(&11, Balance::max_value());
             // reap-able
             assert_ok!(Staking::reap_stash(RuntimeOrigin::signed(20), 11, 0));
 
@@ -6106,7 +6105,7 @@ fn proportional_ledger_slash_works() {
     ledger.active = unit;
     ledger.total = unit * 4 + value;
     // When
-    assert_eq!(ledger.slash(slash, 0, 0), slash - 5);
+    assert_eq!(ledger.slash(slash, 0, 0), slash);
     // Then
     // The amount slashed out of `unit`
     let affected_balance = value + unit * 4;
@@ -6122,12 +6121,12 @@ fn proportional_ledger_slash_works() {
         value - value_slash
     };
     assert_eq!(ledger.active, unit_slashed);
-    assert_eq!(ledger.unlocking, vec![c(5, value_slashed)]);
-    assert_eq!(ledger.total, value_slashed);
+    assert_eq!(ledger.unlocking, vec![c(5, value_slashed), c(7, 32)]);
+    assert_eq!(ledger.total, value_slashed + 32);
     assert_eq!(LedgerSlashPerEra::get().0, 0);
     assert_eq!(
         LedgerSlashPerEra::get().1,
-        BTreeMap::from([(4, 0), (5, value_slashed), (6, 0), (7, 0)])
+        BTreeMap::from([(4, 0), (5, value_slashed), (6, 0), (7, 32)])
     );
 }
 
diff --git a/pallets/runtime/tests/src/storage.rs b/pallets/runtime/tests/src/storage.rs
index b14389c5fb..25ba3e1a34 100644
--- a/pallets/runtime/tests/src/storage.rs
+++ b/pallets/runtime/tests/src/storage.rs
@@ -127,7 +127,7 @@ impl From<UintAuthorityId> for MockSessionKeys {
 type Runtime = TestStorage;
 
 // example module to test behaviors.
-#[frame_support::pallet]
+#[frame_support::pallet(dev_mode)]
 pub mod example {
     use frame_support::{dispatch::WithPostDispatchInfo, pallet_prelude::*};
     use frame_system::pallet_prelude::*;
@@ -223,7 +223,6 @@ parameter_types! {
     pub const MaxAuthorities: u32 = 100_000;
     pub const MaxKeys: u32 = 10_000;
     pub const MaxPeerInHeartbeats: u32 = 10_000;
-    pub const MaxPeerDataEncodingSize: u32 = 1_000;
     pub const ReportLongevity: u64 =
         BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get();
     pub const MaxNumberOfCollectionKeys: u8 = u8::MAX;
@@ -244,13 +243,9 @@ parameter_types! {
 }
 
 frame_support::construct_runtime!(
-    pub enum TestStorage where
-    Block = Block,
-    NodeBlock = polymesh_primitives::Block,
-    UncheckedExtrinsic = UncheckedExtrinsic,
-{
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-        Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned} = 1,
+    pub struct TestStorage {
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
+        Babe: pallet_babe::{Pallet, Call, Storage, Config<T>, ValidateUnsigned} = 1,
         Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
         Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>} = 3,
         // Authorship: pallet_authorship = 4,
@@ -284,7 +279,7 @@ frame_support::construct_runtime!(
         // UpgradeCommitteeMembership: Genesis config deps: UpgradeCommittee
         UpgradeCommitteeMembership: pallet_group::<Instance4>::{Pallet, Call, Storage, Event<T>, Config<T>} = 14,
 
-        MultiSig: pallet_multisig::{Pallet, Call, Config, Storage, Event<T>} = 15,
+        MultiSig: pallet_multisig::{Pallet, Call, Config<T>, Storage, Event<T>} = 15,
 
         // Staking: Genesis config deps: Balances, Indices, Identity, Babe, Timestamp, CddServiceProviders.
         Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>} = 17,
@@ -292,8 +287,8 @@ frame_support::construct_runtime!(
 
         // Session: Genesis config deps: System.
         Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 19,
-        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config} = 20,
-        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event} = 21,
+        AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config<T>} = 20,
+        Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config<T>, Event} = 21,
         Historical: pallet_session_historical::{Pallet} = 22,
         ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>} = 23,
         RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip::{Pallet, Storage} = 24,
@@ -302,19 +297,19 @@ frame_support::construct_runtime!(
         Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 25,
 
         // Asset: Genesis config deps: Timestamp,
-        Asset: pallet_asset::{Pallet, Call, Storage, Config, Event<T>} = 26,
-        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config} = 27,
-        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config} = 28,
+        Asset: pallet_asset::{Pallet, Call, Storage, Config<T>, Event<T>} = 26,
+        CapitalDistribution: pallet_capital_distribution::{Pallet, Call, Storage, Event<T>, Config<T>} = 27,
+        Checkpoint: pallet_checkpoint::{Pallet, Call, Storage, Event<T>, Config<T>} = 28,
         ComplianceManager: pallet_compliance_manager::{Pallet, Call, Storage, Event<T>} = 29,
-        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config} = 30,
-        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config} = 31,
+        CorporateAction: pallet_corporate_actions::{Pallet, Call, Storage, Event<T>, Config<T>} = 30,
+        CorporateBallot: pallet_corporate_ballot::{Pallet, Call, Storage, Event<T>, Config<T>} = 31,
         Permissions: pallet_permissions::{Pallet, Storage} = 32,
         Pips: pallet_pips::{Pallet, Call, Storage, Event<T>, Config<T>} = 33,
-        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config} = 34,
-        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config} = 35,
+        Portfolio: pallet_portfolio::{Pallet, Call, Storage, Event<T>, Config<T>} = 34,
+        ProtocolFee: pallet_protocol_fee::{Pallet, Call, Storage, Event<T>, Config<T>} = 35,
         Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 36,
-        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config} = 37,
-        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config} = 38,
+        Settlement: pallet_settlement::{Pallet, Call, Storage, Event<T>, Config<T>} = 37,
+        Statistics: pallet_statistics::{Pallet, Call, Storage, Event<T>, Config<T>} = 38,
         Sto: pallet_sto::{Pallet, Call, Storage, Event<T>} = 39,
         Treasury: pallet_treasury::{Pallet, Call, Event<T>} = 40,
         Utility: pallet_utility::{Pallet, Call, Storage, Event<T>} = 41,
@@ -428,7 +423,7 @@ pub(crate) type Balance = u128;
 parameter_types! {
     pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()
         .saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();
-    pub const BlockExecutionWeight: Weight = Weight::from_ref_time(10);
+    pub const BlockExecutionWeight: Weight = Weight::from_parts(10, 0);
     pub TransactionByteFee: Balance = TRANSACTION_BYTE_FEE.with(|v| *v.borrow());
     pub ExtrinsicBaseWeight: Weight = EXTRINSIC_BASE_WEIGHT.with(|v| *v.borrow());
     pub const DbWeight: RuntimeDbWeight = RuntimeDbWeight {
@@ -483,8 +478,6 @@ parameter_types! {
     pub const MaxValueSize: u32 = 16_384;
 
     pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
-    pub DeletionWeightLimit: Weight = Weight::from_ref_time(500_000_000_000);
-    pub DeletionQueueDepth: u32 = 1024;
     pub MaxInLen: u32 = 8 * 1024;
     pub MaxOutLen: u32 = 8 * 1024;
 }
@@ -1027,7 +1020,7 @@ fn sign(xt: CheckedExtrinsic) -> UncheckedExtrinsic {
 }
 
 /// Returns transaction extra.
-fn signed_extra(nonce: Index) -> SignedExtra {
+fn signed_extra(nonce: Nonce) -> SignedExtra {
     (
         frame_system::CheckSpecVersion::new(),
         frame_system::CheckTxVersion::new(),
diff --git a/pallets/runtime/tests/src/transaction_payment_test.rs b/pallets/runtime/tests/src/transaction_payment_test.rs
index 0f01e1ecb7..38c78fa23f 100644
--- a/pallets/runtime/tests/src/transaction_payment_test.rs
+++ b/pallets/runtime/tests/src/transaction_payment_test.rs
@@ -36,7 +36,7 @@ type TransactionPayment = pallet_transaction_payment::Pallet<TestStorage>;
 pub fn info_from_weight(w: u64) -> DispatchInfo {
     // pays_fee: Pays::Yes -- class: DispatchClass::Normal
     DispatchInfo {
-        weight: Weight::from_ref_time(w),
+        weight: Weight::from_parts(w, 0),
         ..Default::default()
     }
 }
@@ -47,7 +47,7 @@ fn weight_to_fee(weight: Weight) -> u128 {
 
 fn operational_info_from_weight(w: u64) -> DispatchInfo {
     DispatchInfo {
-        weight: Weight::from_ref_time(w),
+        weight: Weight::from_parts(w, 0),
         class: DispatchClass::Operational,
         ..Default::default()
     }
@@ -55,7 +55,7 @@ fn operational_info_from_weight(w: u64) -> DispatchInfo {
 
 fn post_info_from_weight(w: u64) -> PostDispatchInfo {
     PostDispatchInfo {
-        actual_weight: Some(Weight::from_ref_time(w)),
+        actual_weight: Some(Weight::from_parts(w, 0)),
         pays_fee: Pays::Yes,
     }
 }
@@ -186,7 +186,7 @@ fn signed_extension_allows_free_transactions() {
 
             // This is a completely free (and thus wholly insecure/DoS-ridden) transaction.
             let operational_transaction = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::No,
             };
@@ -196,7 +196,7 @@ fn signed_extension_allows_free_transactions() {
 
             // like a InsecureFreeNormal
             let free_transaction = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Normal,
                 pays_fee: Pays::Yes,
             };
@@ -264,14 +264,14 @@ fn compute_fee_works_without_multiplier() {
 
             // Tip only, no fees works
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::No,
             };
             assert_eq!(TransactionPayment::compute_fee(0, &dispatch_info, 10), 10);
             // No tip, only base fee works
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -288,7 +288,7 @@ fn compute_fee_works_without_multiplier() {
             );
             // Weight fee + base fee works
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(1000),
+                weight: Weight::from_parts(1000, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -307,7 +307,7 @@ fn compute_fee_works_with_multiplier() {
             TransactionPayment::put_next_fee_multiplier(Multiplier::saturating_from_rational(3, 2));
             // Base fee is unaffected by multiplier
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -315,7 +315,7 @@ fn compute_fee_works_with_multiplier() {
 
             // Everything works together :)
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(123),
+                weight: Weight::from_parts(123, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -339,7 +339,7 @@ fn compute_fee_works_with_negative_multiplier() {
 
             // Base fee is unaffected by multiplier.
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(0),
+                weight: Weight::from_parts(0, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -347,7 +347,7 @@ fn compute_fee_works_with_negative_multiplier() {
 
             // Everything works together.
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(123),
+                weight: Weight::from_parts(123, 0),
                 class: DispatchClass::Operational,
                 pays_fee: Pays::Yes,
             };
@@ -420,7 +420,7 @@ fn zero_transfer_on_free_transaction() {
             System::set_block_number(10);
             let len = 10;
             let dispatch_info = DispatchInfo {
-                weight: Weight::from_ref_time(100),
+                weight: Weight::from_parts(100, 0),
                 pays_fee: Pays::No,
                 class: DispatchClass::Normal,
             };
diff --git a/pallets/runtime/tests/src/utility_test.rs b/pallets/runtime/tests/src/utility_test.rs
index d901df6b0f..4a1e5c0bc7 100644
--- a/pallets/runtime/tests/src/utility_test.rs
+++ b/pallets/runtime/tests/src/utility_test.rs
@@ -496,8 +496,8 @@ fn sub_batch_with_signed_filters() {
 fn sub_batch_handles_weight_refund() {
     new_test_ext().execute_with(|| {
         let charlie = User::new(AccountKeyring::Charlie);
-        let start_weight = Weight::from_ref_time(100);
-        let end_weight = Weight::from_ref_time(75);
+        let start_weight = Weight::from_parts(100, 0);
+        let end_weight = Weight::from_parts(75, 0);
         let diff = start_weight - end_weight;
         let batch_len = 4;
 
@@ -639,8 +639,8 @@ fn sub_batch_all_revert() {
 fn sub_batch_all_handles_weight_refund() {
     new_test_ext().execute_with(|| {
         let charlie = User::new(AccountKeyring::Charlie).balance(10);
-        let start_weight = Weight::from_ref_time(100);
-        let end_weight = Weight::from_ref_time(75);
+        let start_weight = Weight::from_parts(100, 0);
+        let end_weight = Weight::from_parts(75, 0);
         let diff = start_weight - end_weight;
         let batch_len = 4;
 
@@ -786,7 +786,7 @@ fn sub_force_batch_works() {
             charlie.origin(),
             vec![
                 transfer(ferdie.acc(), 5),
-                call_foobar(true, Weight::from_ref_time(75), None),
+                call_foobar(true, Weight::from_parts(75, 0), None),
                 transfer(ferdie.acc(), 10),
                 transfer(ferdie.acc(), 5),
             ]
@@ -986,15 +986,9 @@ fn batch_all_works_with_committee_origin() {
 #[test]
 fn sub_with_weight_works() {
     new_test_ext().execute_with(|| {
-        let weights = <TestStorage as frame_system::Config>::BlockWeights::get();
         let upgrade_code_call = Box::new(RuntimeCall::System(
             frame_system::Call::set_code_without_checks { code: vec![] },
         ));
-        // Weight before is max.
-        assert_eq!(
-            upgrade_code_call.get_dispatch_info().weight,
-            weights.max_block
-        );
         assert_eq!(
             upgrade_code_call.get_dispatch_info().class,
             frame_support::dispatch::DispatchClass::Operational
diff --git a/pallets/settlement/Cargo.toml b/pallets/settlement/Cargo.toml
index 8a7dda8987..c8d60a00e0 100644
--- a/pallets/settlement/Cargo.toml
+++ b/pallets/settlement/Cargo.toml
@@ -22,20 +22,20 @@ hex-literal = "0.2.1"
 hex = { version = "0.4.2", optional = true }
 log = "0.4.8"
 
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/settlement/src/benchmarking.rs b/pallets/settlement/src/benchmarking.rs
index 8e29b35c08..224adfa99c 100644
--- a/pallets/settlement/src/benchmarking.rs
+++ b/pallets/settlement/src/benchmarking.rs
@@ -200,7 +200,7 @@ where
 fn setup_execute_instruction<T>(
     sender: &User<T>,
     receiver: &User<T>,
-    settlement_type: SettlementType<T::BlockNumber>,
+    settlement_type: SettlementType<BlockNumberFor<T>>,
     venue_id: VenueId,
     f: u32,
     n: u32,
diff --git a/pallets/settlement/src/lib.rs b/pallets/settlement/src/lib.rs
index 6b1fc1e34b..1c29ded526 100644
--- a/pallets/settlement/src/lib.rs
+++ b/pallets/settlement/src/lib.rs
@@ -155,7 +155,7 @@ pub mod pallet {
             IdentityId,
             Option<VenueId>,
             InstructionId,
-            SettlementType<T::BlockNumber>,
+            SettlementType<BlockNumberFor<T>>,
             Option<T::Moment>,
             Option<T::Moment>,
             Vec<Leg>,
@@ -416,7 +416,11 @@ pub mod pallet {
         type Proposal: From<Call<Self>> + Into<<Self as pallet_identity::Config>::Proposal>;
 
         /// Scheduler of settlement instructions.
-        type Scheduler: Named<Self::BlockNumber, <Self as Config>::Proposal, Self::SchedulerOrigin>;
+        type Scheduler: Named<
+            BlockNumberFor<Self>,
+            <Self as Config>::Proposal,
+            Self::SchedulerOrigin,
+        >;
 
         /// Portfolio module.
         type Portfolio: PortfolioSubTrait<Self::AccountId>;
@@ -587,7 +591,7 @@ pub mod pallet {
         _,
         Twox64Concat,
         InstructionId,
-        Instruction<T::Moment, T::BlockNumber>,
+        Instruction<T::Moment, BlockNumberFor<T>>,
         ValueQuery,
     >;
 
@@ -664,8 +668,13 @@ pub mod pallet {
 
     /// Instruction statuses. instruction_id -> InstructionStatus
     #[pallet::storage]
-    pub type InstructionStatuses<T: Config> =
-        StorageMap<_, Twox64Concat, InstructionId, InstructionStatus<T::BlockNumber>, ValueQuery>;
+    pub type InstructionStatuses<T: Config> = StorageMap<
+        _,
+        Twox64Concat,
+        InstructionId,
+        InstructionStatus<BlockNumberFor<T>>,
+        ValueQuery,
+    >;
 
     /// Legs under an instruction. (instruction_id, leg_id) -> Leg
     #[pallet::storage]
@@ -707,11 +716,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             VenueCounter::<T>::put(VenueId(1));
             InstructionCounter::<T>::put(InstructionId(1));
@@ -979,7 +991,7 @@ pub mod pallet {
         pub fn add_instruction(
             origin: OriginFor<T>,
             venue_id: Option<VenueId>,
-            settlement_type: SettlementType<T::BlockNumber>,
+            settlement_type: SettlementType<BlockNumberFor<T>>,
             trade_date: Option<T::Moment>,
             value_date: Option<T::Moment>,
             legs: Vec<Leg>,
@@ -1017,7 +1029,7 @@ pub mod pallet {
         pub fn add_and_affirm_instruction(
             origin: OriginFor<T>,
             venue_id: Option<VenueId>,
-            settlement_type: SettlementType<T::BlockNumber>,
+            settlement_type: SettlementType<BlockNumberFor<T>>,
             trade_date: Option<T::Moment>,
             value_date: Option<T::Moment>,
             legs: Vec<Leg>,
@@ -1242,7 +1254,7 @@ pub mod pallet {
         pub fn add_instruction_with_mediators(
             origin: OriginFor<T>,
             venue_id: Option<VenueId>,
-            settlement_type: SettlementType<T::BlockNumber>,
+            settlement_type: SettlementType<BlockNumberFor<T>>,
             trade_date: Option<T::Moment>,
             value_date: Option<T::Moment>,
             legs: Vec<Leg>,
@@ -1282,7 +1294,7 @@ pub mod pallet {
         pub fn add_and_affirm_with_mediators(
             origin: OriginFor<T>,
             venue_id: Option<VenueId>,
-            settlement_type: SettlementType<T::BlockNumber>,
+            settlement_type: SettlementType<BlockNumberFor<T>>,
             trade_date: Option<T::Moment>,
             value_date: Option<T::Moment>,
             legs: Vec<Leg>,
@@ -1404,7 +1416,7 @@ impl<T: Config> Pallet<T> {
         origin: OriginFor<T>,
         id: InstructionId,
         is_execute: bool,
-    ) -> EnsureValidInstructionResult<T::AccountId, T::Moment, T::BlockNumber> {
+    ) -> EnsureValidInstructionResult<T::AccountId, T::Moment, BlockNumberFor<T>> {
         let origin_data = pallet_identity::Pallet::<T>::ensure_origin_call_permissions(origin)?;
         Ok((
             origin_data.primary_did,
@@ -1424,7 +1436,7 @@ impl<T: Config> Pallet<T> {
     pub fn base_add_instruction(
         did: IdentityId,
         venue_id: Option<VenueId>,
-        settlement_type: SettlementType<T::BlockNumber>,
+        settlement_type: SettlementType<BlockNumberFor<T>>,
         trade_date: Option<T::Moment>,
         value_date: Option<T::Moment>,
         legs: Vec<Leg>,
@@ -1671,7 +1683,7 @@ impl<T: Config> Pallet<T> {
     fn ensure_instruction_validity(
         id: InstructionId,
         is_execute: bool,
-    ) -> Result<Instruction<T::Moment, T::BlockNumber>, DispatchError> {
+    ) -> Result<Instruction<T::Moment, BlockNumberFor<T>>, DispatchError> {
         let details = InstructionDetails::<T>::get(id);
         ensure!(
             InstructionStatuses::<T>::get(id) != InstructionStatus::Unknown,
@@ -2071,7 +2083,7 @@ impl<T: Config> Pallet<T> {
     /// for the given block so there are chances where the instruction execution block no. may drift.
     pub(crate) fn schedule_instruction(
         id: InstructionId,
-        execution_at: T::BlockNumber,
+        execution_at: BlockNumberFor<T>,
         weight_limit: Weight,
     ) {
         let call = Call::<T>::execute_scheduled_instruction { id, weight_limit }.into();
@@ -2278,7 +2290,7 @@ impl<T: Config> Pallet<T> {
     fn execute_settle_on_affirmation_instruction(
         id: InstructionId,
         affirms_pending: u64,
-        settlement_type: SettlementType<T::BlockNumber>,
+        settlement_type: SettlementType<BlockNumberFor<T>>,
         caller_did: IdentityId,
         weight_meter: &mut WeightMeter,
     ) -> DispatchResult {
diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml
index d081526f64..8cc66663fc 100644
--- a/pallets/staking/Cargo.toml
+++ b/pallets/staking/Cargo.toml
@@ -10,41 +10,42 @@ pallet-identity = { workspace = true, default-features = false}
 
 # General
 static_assertions = "1.1.0"
-serde = { version = "1.0.104", optional = true }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 log = "0.4.8"
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false}
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-staking = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-election-provider-support = { version = "4.0.0-dev", default-features = false }
-sp-npos-elections = { version = "4.0.0-dev", default-features = false}
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false}
+sp-runtime = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-staking = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-election-provider-support = { workspace = true, default-features = false }
+sp-npos-elections = { workspace = true, default-features = false}
 
-pallet-session = { features = ["historical"], version = "4.0.0-dev", default-features = false }
-pallet-authorship = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
+pallet-session = { features = ["historical"], workspace = true, default-features = false }
+pallet-authorship = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
 
 # Optional imports for benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 rand_chacha = { version = "0.2", default-features = false, optional = true }
 
 [dev-dependencies]
-pallet-staking-reward-curve = { version = "4.0.0-dev", default-features = false }
-sp-tracing = "6.0.0"
+pallet-staking-reward-curve = { workspace = true, default-features = false }
+sp-tracing = { workspace = true }
 
 [features]
 default = ["std"]
 no_std = []
 std = [
+  "frame-benchmarking?/std",
 	"polymesh-primitives/std",
-	"serde",
+	"serde/std",
 	"codec/std",
 	"sp-std/std",
 	"sp-npos-elections/std",
@@ -60,10 +61,13 @@ std = [
 	"pallet-babe/std",
 	"sp-arithmetic/std",
 	"rand_chacha",
-	"frame-benchmarking",
 ]
 runtime-benchmarks = [
-	"frame-benchmarking",
+	"frame-benchmarking/runtime-benchmarks",
+  "frame-election-provider-support/runtime-benchmarks",
 	"rand_chacha",
+  "sp-staking/runtime-benchmarks",
+	"polymesh-primitives/runtime-benchmarks",
+  "pallet-identity/runtime-benchmarks",
 ]
 try-runtime = []
diff --git a/pallets/staking/rpc/Cargo.toml b/pallets/staking/rpc/Cargo.toml
index cca6e62550..96c8099ff7 100644
--- a/pallets/staking/rpc/Cargo.toml
+++ b/pallets/staking/rpc/Cargo.toml
@@ -10,17 +10,17 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = false, features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-core = { version = "7.0.0", default-features = false }
-sp-rpc = { version = "6.0.0" }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = {version = "5.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-blockchain = { workspace = true }
+sp-core = { workspace = true, default-features = false }
+sp-rpc = { workspace = true }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
 # General
-serde = { version = "1.0.104", features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["derive"] }
 
 node-rpc = { workspace = true }
-pallet-staking-rpc-runtime-api = { version = "2.0.0", path = "./runtime-api" }
+pallet-staking-rpc-runtime-api = { workspace = true, default-features = false }
diff --git a/pallets/staking/rpc/runtime-api/Cargo.toml b/pallets/staking/rpc/runtime-api/Cargo.toml
index 7e601e397a..9f3e95be73 100644
--- a/pallets/staking/rpc/runtime-api/Cargo.toml
+++ b/pallets/staking/rpc/runtime-api/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "4.0.0-dev", default-features = false}
-sp-runtime = { version = "7.0.0", default-features = false}
-frame-support = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false}
+sp-runtime = { workspace = true, default-features = false}
+frame-support = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]
diff --git a/pallets/staking/src/lib.rs b/pallets/staking/src/lib.rs
index 99ffdcdeb4..f7f80d6ee5 100644
--- a/pallets/staking/src/lib.rs
+++ b/pallets/staking/src/lib.rs
@@ -300,14 +300,16 @@ use frame_support::{
     BoundedVec, CloneNoBound, EqNoBound, PartialEqNoBound, RuntimeDebugNoBound,
 };
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_runtime::{
     curve::PiecewiseLinear,
     traits::{AtLeast32BitUnsigned, Convert, Saturating, StaticLookup, Zero},
     Perbill, Perquintill, Rounding, RuntimeDebug,
 };
+pub use sp_staking::StakerStatus;
 use sp_staking::{
     offence::{Offence, OffenceError, ReportOffence},
-    EraIndex, SessionIndex,
+    EraIndex, OnStakingUpdate, SessionIndex,
 };
 use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 pub use weights::WeightInfo;
@@ -378,18 +380,6 @@ impl<AccountId: Ord> Default for EraRewardPoints<AccountId> {
     }
 }
 
-/// Indicates the initial status of the staker.
-#[derive(RuntimeDebug, TypeInfo)]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize, Clone))]
-pub enum StakerStatus<AccountId> {
-    /// Chilling.
-    Idle,
-    /// Declared desire in validating or already participating in it.
-    Validator,
-    /// Nominating for a group of other stakers.
-    Nominator(Vec<AccountId>),
-}
-
 /// A destination account for payment.
 #[derive(
     PartialEq,
@@ -586,7 +576,7 @@ impl<T: Config> StakingLedger<T> {
     ///
     /// `slash_era` is the era in which the slash (which is being enacted now) actually happened.
     ///
-    /// This calls `Config::OnStakerSlash::on_slash` with information as to how the slash was
+    /// This calls `Config::OnStakingUpdate::on_slash` with information as to how the slash was
     /// applied.
     pub fn slash(
         &mut self,
@@ -599,7 +589,6 @@ impl<T: Config> StakingLedger<T> {
         }
 
         use sp_runtime::PerThing as _;
-        use sp_staking::OnStakerSlash as _;
         let mut remaining_slash = slash_amount;
         let pre_slash_total = self.total;
 
@@ -710,7 +699,7 @@ impl<T: Config> StakingLedger<T> {
         // clean unlocking chunks that are set to zero.
         self.unlocking.retain(|c| !c.value.is_zero());
 
-        T::OnStakerSlash::on_slash(&self.stash, self.active, &slashed_unlocking);
+        T::EventListeners::on_slash(&self.stash, self.active, &slashed_unlocking);
         pre_slash_total.saturating_sub(self.total)
     }
 }
@@ -943,7 +932,7 @@ impl<Balance: AtLeast32BitUnsigned + Clone, T: Get<&'static PiecewiseLinear<'sta
     TypeInfo,
     MaxEncodedLen
 )]
-#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum Forcing {
     /// Not forcing anything - just let whatever happen.
     NotForcing,
@@ -1025,19 +1014,6 @@ where
     }
 }
 
-pub struct OnStakerSlashMock<T: Config>(core::marker::PhantomData<T>);
-
-impl<T: Config> sp_staking::OnStakerSlash<T::AccountId, T::CurrencyBalance>
-    for OnStakerSlashMock<T>
-{
-    fn on_slash(
-        _pool_account: &T::AccountId,
-        _slashed_bonded: T::CurrencyBalance,
-        _slashed_chunks: &BTreeMap<EraIndex, T::CurrencyBalance>,
-    ) {
-    }
-}
-
 /// Configurations of the benchmarking of the pallet.
 pub trait BenchmarkingConfig {
     /// The maximum number of validators to use.
diff --git a/pallets/staking/src/pallet/impls.rs b/pallets/staking/src/pallet/impls.rs
index cdcea46854..851c058ef2 100644
--- a/pallets/staking/src/pallet/impls.rs
+++ b/pallets/staking/src/pallet/impls.rs
@@ -22,11 +22,12 @@ use frame_election_provider_support::{
     SortedListProvider, VoteWeight, VoterOf,
 };
 use frame_support::{
+    defensive,
     dispatch::WithPostDispatchInfo,
     pallet_prelude::*,
     traits::{
-        Currency, CurrencyToVote, Defensive, DefensiveResult, EstimateNextNewSession, Get,
-        Imbalance, LockableCurrency, OnUnbalanced, TryCollect, UnixTime, WithdrawReasons,
+        Currency, Defensive, DefensiveResult, EstimateNextNewSession, Get, Imbalance,
+        LockableCurrency, OnUnbalanced, TryCollect, UnixTime, WithdrawReasons,
     },
     weights::Weight,
 };
@@ -37,10 +38,11 @@ use sp_runtime::{
     Perbill,
 };
 use sp_staking::{
+    currency_to_vote::CurrencyToVote,
     offence::{DisableStrategy, OffenceDetails, OnOffenceHandler},
     EraIndex, SessionIndex, Stake, StakingInterface,
 };
-use sp_std::prelude::*;
+use sp_std::{collections::btree_map::BTreeMap, prelude::*};
 
 use crate::{
     log, slashing, weights::WeightInfo, ActiveEraInfo, BalanceOf, EraPayout, Exposure, ExposureOf,
@@ -510,7 +512,7 @@ impl<T: Config> Pallet<T> {
             let next_block_number = <frame_system::Pallet<T>>::block_number() + 1u32.into();
             for (index, validator_id) in T::SessionInterface::validators().into_iter().enumerate() {
                 let schedule_block_number =
-                    next_block_number + index.saturated_into::<T::BlockNumber>();
+                    next_block_number + index.saturated_into::<BlockNumberFor<T>>();
                 match T::RewardScheduler::schedule(
                     DispatchTime::At(schedule_block_number),
                     None,
@@ -786,7 +788,7 @@ impl<T: Config> Pallet<T> {
 
     /// Apply previously-unapplied slashes on the beginning of a new era, after a delay.
     fn apply_unapplied_slashes(active_era: EraIndex) {
-        let era_slashes = <Self as Store>::UnappliedSlashes::take(&active_era);
+        let era_slashes = UnappliedSlashes::<T>::take(&active_era);
         log!(
             debug,
             "found {} slashes scheduled to be executed in era {:?}",
@@ -1298,7 +1300,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
         Ok(Self::get_npos_targets(None))
     }
 
-    fn next_election_prediction(now: T::BlockNumber) -> T::BlockNumber {
+    fn next_election_prediction(now: BlockNumberFor<T>) -> BlockNumberFor<T> {
         let current_era = Self::current_era().unwrap_or(0);
         let current_session = Self::current_planned_session();
         let current_era_start_session_index =
@@ -1315,7 +1317,7 @@ impl<T: Config> ElectionDataProvider for Pallet<T> {
 
         let session_length = T::NextNewSession::average_session_length();
 
-        let sessions_left: T::BlockNumber = match ForceEra::<T>::get() {
+        let sessions_left: BlockNumberFor<T> = match ForceEra::<T>::get() {
             Forcing::ForceNone => Bounded::max_value(),
             Forcing::ForceNew | Forcing::ForceAlways => Zero::zero(),
             Forcing::NotForcing if era_progress >= T::SessionsPerEra::get() => Zero::zero(),
@@ -1531,7 +1533,7 @@ impl<T: Config> historical::SessionManager<T::AccountId, Exposure<T::AccountId,
 
 /// Add reward points to block authors:
 /// * 20 points to the block producer for producing a (non-uncle) block in the relay chain,
-impl<T> pallet_authorship::EventHandler<T::AccountId, T::BlockNumber> for Pallet<T>
+impl<T> pallet_authorship::EventHandler<T::AccountId, BlockNumberFor<T>> for Pallet<T>
 where
     T: Config + pallet_authorship::Config + pallet_session::Config,
 {
@@ -1577,7 +1579,7 @@ where
         // -----------------------------------------------------------------
 
         let reward_proportion = SlashRewardFraction::<T>::get();
-        let mut consumed_weight = Weight::from_ref_time(0);
+        let mut consumed_weight = Weight::from_parts(0, 0);
         let mut add_db_reads_writes = |reads, writes| {
             consumed_weight += T::DbWeight::get().reads_writes(reads, writes);
         };
@@ -1685,7 +1687,7 @@ where
                         active_era,
                         slash_era + slash_defer_duration + 1,
                     );
-                    <Self as Store>::UnappliedSlashes::mutate(
+                    UnappliedSlashes::<T>::mutate(
                         slash_era
                             .saturating_add(slash_defer_duration)
                             .saturating_add(One::one()),
@@ -1884,10 +1886,23 @@ impl<T: Config> SortedListProvider<T::AccountId> for UseNominatorsAndValidatorsM
     }
 }
 
-// NOTE: in this entire impl block, the assumption is that `who` is a stash account.
+pub struct NominatorsOnStakingUpdate<T: Config>(core::marker::PhantomData<T>);
+impl<T: Config> sp_staking::OnStakingUpdate<T::AccountId, T::CurrencyBalance>
+    for NominatorsOnStakingUpdate<T>
+{
+    fn on_slash(
+        _pool_account: &T::AccountId,
+        _slashed_bonded: T::CurrencyBalance,
+        _slashed_chunks: &BTreeMap<EraIndex, T::CurrencyBalance>,
+    ) {
+        // TODO:
+    }
+}
+
 impl<T: Config> StakingInterface for Pallet<T> {
     type AccountId = T::AccountId;
     type Balance = BalanceOf<T>;
+    type CurrencyToVote = T::CurrencyToVote;
 
     fn minimum_nominator_bond() -> Self::Balance {
         MinNominatorBond::<T>::get()
@@ -1930,11 +1945,10 @@ impl<T: Config> StakingInterface for Pallet<T> {
         Self::current_era().unwrap_or(Zero::zero())
     }
 
-    fn stake(who: &Self::AccountId) -> Result<Stake<Self>, DispatchError> {
+    fn stake(who: &Self::AccountId) -> Result<Stake<BalanceOf<T>>, DispatchError> {
         Self::bonded(who)
             .and_then(|c| Self::ledger(c))
             .map(|l| Stake {
-                stash: l.stash,
                 total: l.total,
                 active: l.active,
             })
@@ -1991,8 +2005,36 @@ impl<T: Config> StakingInterface for Pallet<T> {
         Self::nominate(RawOrigin::Signed(ctrl).into(), targets)
     }
 
+    fn status(
+        who: &Self::AccountId,
+    ) -> Result<sp_staking::StakerStatus<Self::AccountId>, DispatchError> {
+        let is_bonded = Self::bonded(who).is_some();
+        if !is_bonded {
+            return Err(Error::<T>::NotStash.into());
+        }
+
+        let is_validator = Validators::<T>::contains_key(&who);
+        let is_nominator = Nominators::<T>::get(&who);
+
+        use sp_staking::StakerStatus;
+        match (is_validator, is_nominator.is_some()) {
+            (false, false) => Ok(StakerStatus::Idle),
+            (true, false) => Ok(StakerStatus::Validator),
+            (false, true) => Ok(StakerStatus::Nominator(
+                is_nominator
+                    .expect("is checked above; qed")
+                    .targets
+                    .into_inner(),
+            )),
+            (true, true) => {
+                defensive!("cannot be both validators and nominator");
+                Err(Error::<T>::BadState.into())
+            }
+        }
+    }
+
     sp_staking::runtime_benchmarks_enabled! {
-        fn nominations(who: Self::AccountId) -> Option<Vec<T::AccountId>> {
+        fn nominations(who: &Self::AccountId) -> Option<Vec<T::AccountId>> {
             Nominators::<T>::get(who).map(|n| n.targets.into_inner())
         }
 
diff --git a/pallets/staking/src/pallet/mod.rs b/pallets/staking/src/pallet/mod.rs
index 5cdc9e1ade..1a34c112ea 100644
--- a/pallets/staking/src/pallet/mod.rs
+++ b/pallets/staking/src/pallet/mod.rs
@@ -24,8 +24,8 @@ use frame_support::{
     dispatch::Codec,
     pallet_prelude::*,
     traits::{
-        Currency, CurrencyToVote, Defensive, DefensiveResult, EnsureOrigin, EstimateNextNewSession,
-        Get, LockIdentifier, LockableCurrency, OnUnbalanced, TryCollect, UnixTime,
+        Currency, Defensive, DefensiveResult, EnsureOrigin, EstimateNextNewSession, Get,
+        LockIdentifier, LockableCurrency, OnUnbalanced, TryCollect, UnixTime,
     },
     weights::Weight,
     BoundedVec,
@@ -81,7 +81,6 @@ pub mod pallet {
     use super::*;
 
     #[pallet::pallet]
-    #[pallet::generate_store(pub(crate) trait Store)]
     pub struct Pallet<T>(_);
 
     /// Possible operations on the configuration values of this pallet.
@@ -105,7 +104,7 @@ pub mod pallet {
         /// The staking balance.
         type Currency: LockableCurrency<
             Self::AccountId,
-            Moment = Self::BlockNumber,
+            Moment = BlockNumberFor<Self>,
             Balance = Self::CurrencyBalance,
         >;
         /// Just the `Currency::Balance` type; we have this item to allow us to constrain it to
@@ -131,19 +130,19 @@ pub mod pallet {
         /// in 128.
         /// Consequently, the backward convert is used convert the u128s from sp-elections back to a
         /// [`BalanceOf`].
-        type CurrencyToVote: CurrencyToVote<BalanceOf<Self>>;
+        type CurrencyToVote: sp_staking::currency_to_vote::CurrencyToVote<BalanceOf<Self>>;
 
         /// Something that provides the election functionality.
         type ElectionProvider: ElectionProvider<
             AccountId = Self::AccountId,
-            BlockNumber = Self::BlockNumber,
+            BlockNumber = BlockNumberFor<Self>,
             // we only accept an election provider that has staking as data provider.
             DataProvider = Pallet<Self>,
         >;
         /// Something that provides the election functionality at genesis.
         type GenesisElectionProvider: ElectionProvider<
             AccountId = Self::AccountId,
-            BlockNumber = Self::BlockNumber,
+            BlockNumber = BlockNumberFor<Self>,
             DataProvider = Pallet<Self>,
         >;
 
@@ -218,7 +217,7 @@ pub mod pallet {
 
         /// Something that can estimate the next session change, accurately or as a best effort
         /// guess.
-        type NextNewSession: EstimateNextNewSession<Self::BlockNumber>;
+        type NextNewSession: EstimateNextNewSession<BlockNumberFor<Self>>;
 
         /// The maximum number of nominators rewarded for each validator.
         ///
@@ -279,9 +278,11 @@ pub mod pallet {
         #[pallet::constant]
         type MaxUnlockingChunks: Get<u32>;
 
-        /// A hook called when any staker is slashed. Mostly likely this can be a no-op unless
-        /// other pallets exist that are affected by slashing per-staker.
-        type OnStakerSlash: sp_staking::OnStakerSlash<Self::AccountId, BalanceOf<Self>>;
+        /// Something that listens to staking updates and performs actions based on the data it
+        /// receives.
+        ///
+        /// WARNING: this only reports slashing events for the time being.
+        type EventListeners: sp_staking::OnStakingUpdate<Self::AccountId, BalanceOf<Self>>;
 
         /// Some parameters of the benchmarking.
         type BenchmarkingConfig: BenchmarkingConfig;
@@ -312,7 +313,11 @@ pub mod pallet {
         type PalletsOrigin: From<frame_system::RawOrigin<Self::AccountId>>;
 
         /// To schedule the rewards for the stakers after the end of era.
-        type RewardScheduler: Anon<Self::BlockNumber, <Self as Config>::Call, Self::PalletsOrigin>;
+        type RewardScheduler: Anon<
+            BlockNumberFor<Self>,
+            <Self as Config>::Call,
+            Self::PalletsOrigin,
+        >;
 
         // -----------------------------------------------------------------
     }
@@ -649,6 +654,7 @@ pub mod pallet {
     // -----------------------------------------------------------------
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         pub validator_count: u32,
         pub minimum_validator_count: u32,
@@ -671,29 +677,8 @@ pub mod pallet {
         pub validator_commission_cap: Perbill,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            GenesisConfig {
-                validator_count: Default::default(),
-                minimum_validator_count: Default::default(),
-                invulnerables: Default::default(),
-                force_era: Default::default(),
-                slash_reward_fraction: Default::default(),
-                canceled_payout: Default::default(),
-                stakers: Default::default(),
-                min_nominator_bond: Default::default(),
-                min_validator_bond: Default::default(),
-                max_validator_count: None,
-                max_nominator_count: None,
-                slashing_allowed_for: Default::default(),
-                validator_commission_cap: Default::default(),
-            }
-        }
-    }
-
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             ValidatorCount::<T>::put(self.validator_count);
             MinimumValidatorCount::<T>::put(self.minimum_validator_count);
@@ -1705,7 +1690,7 @@ pub mod pallet {
                 Error::<T>::NotSortedAndUnique
             );
 
-            let mut unapplied = <Self as Store>::UnappliedSlashes::get(&era);
+            let mut unapplied = UnappliedSlashes::<T>::get(&era);
             let last_item = slash_indices[slash_indices.len() - 1];
             ensure!(
                 (last_item as usize) < unapplied.len(),
@@ -1717,7 +1702,7 @@ pub mod pallet {
                 unapplied.remove(index);
             }
 
-            <Self as Store>::UnappliedSlashes::insert(&era, &unapplied);
+            UnappliedSlashes::<T>::insert(&era, &unapplied);
             Ok(())
         }
 
@@ -1815,7 +1800,7 @@ pub mod pallet {
                 || Self::ledger(Self::bonded(stash.clone()).ok_or(Error::<T>::NotStash)?)
                     .map(|l| l.total)
                     .unwrap_or_default()
-                    < ed;
+                    <= ed;
             ensure!(reapable, Error::<T>::FundedTarget);
 
             Self::kill_stash(&stash, num_slashing_spans)?;
diff --git a/pallets/staking/src/slashing.rs b/pallets/staking/src/slashing.rs
index 5314bb97a2..7471f2ecd0 100644
--- a/pallets/staking/src/slashing.rs
+++ b/pallets/staking/src/slashing.rs
@@ -50,8 +50,9 @@
 //! Based on research at <https://research.web3.foundation/en/latest/polkadot/slashing/npos.html>
 
 use crate::{
-    types::SlashingSwitch, BalanceOf, Config, Error, Exposure, NegativeImbalanceOf, Pallet,
-    Perbill, SessionInterface, SlashingAllowedFor, Store, UnappliedSlash,
+    types::SlashingSwitch, BalanceOf, Config, Error, Exposure, NegativeImbalanceOf,
+    NominatorSlashInEra, OffendingValidators, Pallet, Perbill, SessionInterface,
+    SlashingAllowedFor, SpanSlash, UnappliedSlash, ValidatorSlashInEra,
 };
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
@@ -249,16 +250,15 @@ pub(crate) fn compute_slash<T: Config>(
         return None;
     }
 
-    let prior_slash_p =
-        <Pallet<T> as Store>::ValidatorSlashInEra::get(&params.slash_era, params.stash)
-            .map_or(Zero::zero(), |(prior_slash_proportion, _)| {
-                prior_slash_proportion
-            });
+    let prior_slash_p = ValidatorSlashInEra::<T>::get(&params.slash_era, params.stash)
+        .map_or(Zero::zero(), |(prior_slash_proportion, _)| {
+            prior_slash_proportion
+        });
 
     // compare slash proportions rather than slash values to avoid issues due to rounding
     // error.
     if params.slash.deconstruct() > prior_slash_p.deconstruct() {
-        <Pallet<T> as Store>::ValidatorSlashInEra::insert(
+        ValidatorSlashInEra::<T>::insert(
             &params.slash_era,
             params.stash,
             &(params.slash, own_slash),
@@ -345,7 +345,7 @@ fn kick_out_if_recent<T: Config>(params: SlashParams<T>) {
 /// If after adding the validator `OffendingValidatorsThreshold` is reached
 /// a new era will be forced.
 fn add_offending_validator<T: Config>(stash: &T::AccountId, disable: bool) {
-    <Pallet<T> as Store>::OffendingValidators::mutate(|offending| {
+    OffendingValidators::<T>::mutate(|offending| {
         let validators = T::SessionInterface::validators();
         let validator_index = match validators.iter().position(|i| i == stash) {
             Some(index) => index,
@@ -406,10 +406,9 @@ fn slash_nominators<T: Config>(
             let own_slash_difference = own_slash_by_validator.saturating_sub(own_slash_prior);
 
             let mut era_slash =
-                <Pallet<T> as Store>::NominatorSlashInEra::get(&params.slash_era, stash)
-                    .unwrap_or_else(Zero::zero);
+                NominatorSlashInEra::<T>::get(&params.slash_era, stash).unwrap_or_else(Zero::zero);
             era_slash += own_slash_difference;
-            <Pallet<T> as Store>::NominatorSlashInEra::insert(&params.slash_era, stash, &era_slash);
+            NominatorSlashInEra::<T>::insert(&params.slash_era, stash, &era_slash);
 
             era_slash
         };
@@ -463,9 +462,9 @@ fn fetch_spans<'a, T: Config + 'a>(
     slash_of: &'a mut BalanceOf<T>,
     reward_proportion: Perbill,
 ) -> InspectingSpans<'a, T> {
-    let spans = <Pallet<T> as Store>::SlashingSpans::get(stash).unwrap_or_else(|| {
+    let spans = crate::SlashingSpans::<T>::get(stash).unwrap_or_else(|| {
         let spans = SlashingSpans::new(window_start);
-        <Pallet<T> as Store>::SlashingSpans::insert(stash, &spans);
+        crate::SlashingSpans::<T>::insert(stash, &spans);
         spans
     });
 
@@ -514,7 +513,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
     ) -> Option<SpanIndex> {
         let target_span = self.era_span(slash_era)?;
         let span_slash_key = (self.stash.clone(), target_span.index);
-        let mut span_record = <Pallet<T> as Store>::SpanSlash::get(&span_slash_key);
+        let mut span_record = SpanSlash::<T>::get(&span_slash_key);
         let mut changed = false;
 
         let reward = if span_record.slashed < slash {
@@ -545,7 +544,7 @@ impl<'a, T: 'a + Config> InspectingSpans<'a, T> {
 
         if changed {
             self.dirty = true;
-            <Pallet<T> as Store>::SpanSlash::insert(&span_slash_key, &span_record);
+            SpanSlash::<T>::insert(&span_slash_key, &span_record);
         }
 
         Some(target_span.index)
@@ -561,20 +560,20 @@ impl<'a, T: 'a + Config> Drop for InspectingSpans<'a, T> {
 
         if let Some((start, end)) = self.spans.prune(self.window_start) {
             for span_index in start..end {
-                <Pallet<T> as Store>::SpanSlash::remove(&(self.stash.clone(), span_index));
+                SpanSlash::<T>::remove(&(self.stash.clone(), span_index));
             }
         }
 
-        <Pallet<T> as Store>::SlashingSpans::insert(self.stash, &self.spans);
+        crate::SlashingSpans::<T>::insert(self.stash, &self.spans);
     }
 }
 
 /// Clear slashing metadata for an obsolete era.
 pub(crate) fn clear_era_metadata<T: Config>(obsolete_era: EraIndex) {
     #[allow(deprecated)]
-    <Pallet<T> as Store>::ValidatorSlashInEra::remove_prefix(&obsolete_era, None);
+    ValidatorSlashInEra::<T>::remove_prefix(&obsolete_era, None);
     #[allow(deprecated)]
-    <Pallet<T> as Store>::NominatorSlashInEra::remove_prefix(&obsolete_era, None);
+    NominatorSlashInEra::<T>::remove_prefix(&obsolete_era, None);
 }
 
 /// Clear slashing metadata for a dead account.
@@ -582,7 +581,7 @@ pub(crate) fn clear_stash_metadata<T: Config>(
     stash: &T::AccountId,
     num_slashing_spans: u32,
 ) -> DispatchResult {
-    let spans = match <Pallet<T> as Store>::SlashingSpans::get(stash) {
+    let spans = match crate::SlashingSpans::<T>::get(stash) {
         None => return Ok(()),
         Some(s) => s,
     };
@@ -592,7 +591,7 @@ pub(crate) fn clear_stash_metadata<T: Config>(
         Error::<T>::IncorrectSlashingSpans
     );
 
-    <Pallet<T> as Store>::SlashingSpans::remove(stash);
+    crate::SlashingSpans::<T>::remove(stash);
 
     // kill slashing-span metadata for account.
     //
@@ -600,7 +599,7 @@ pub(crate) fn clear_stash_metadata<T: Config>(
     // in that case, they may re-bond, but it would count again as span 0. Further ancient
     // slashes would slash into this new bond, since metadata has now been cleared.
     for span in spans.iter() {
-        <Pallet<T> as Store>::SpanSlash::remove(&(stash.clone(), span.index));
+        SpanSlash::<T>::remove(&(stash.clone(), span.index));
     }
 
     Ok(())
diff --git a/pallets/staking/src/types.rs b/pallets/staking/src/types.rs
index 2377d56c79..acf9bfdda8 100644
--- a/pallets/staking/src/types.rs
+++ b/pallets/staking/src/types.rs
@@ -1,8 +1,6 @@
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
-
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
 use sp_runtime::RuntimeDebug;
 
 /// Preference of an identity regarding validation.
@@ -42,7 +40,7 @@ impl PermissionedIdentityPrefs {
 /// validators, both validators and nominators, or no-one.
 #[derive(Decode, Encode, MaxEncodedLen, RuntimeDebug, TypeInfo)]
 #[derive(Clone, Copy, Default, Eq, PartialEq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum SlashingSwitch {
     /// Allow validators but not nominators to get slashed.
     Validator,
diff --git a/pallets/statistics/Cargo.toml b/pallets/statistics/Cargo.toml
index e740db9215..d6f73f8b09 100644
--- a/pallets/statistics/Cargo.toml
+++ b/pallets/statistics/Cargo.toml
@@ -16,20 +16,20 @@ serde_derive = { version = "1.0.112", optional = true, default-features = false}
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 # Only in Benchmarks
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [dev-dependencies]
 lazy_static = "1.4.0"
diff --git a/pallets/statistics/src/lib.rs b/pallets/statistics/src/lib.rs
index ed6097f6dc..d3293a516a 100644
--- a/pallets/statistics/src/lib.rs
+++ b/pallets/statistics/src/lib.rs
@@ -185,11 +185,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(3));
         }
diff --git a/pallets/sto/Cargo.toml b/pallets/sto/Cargo.toml
index 86c59dd273..d150b79314 100644
--- a/pallets/sto/Cargo.toml
+++ b/pallets/sto/Cargo.toml
@@ -22,20 +22,20 @@ serde_derive = { version = "1.0.104", optional = true, default-features = false
 log = "0.4.8"
 
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
 # Only in STD
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/sto/src/lib.rs b/pallets/sto/src/lib.rs
index 954c2571b4..e6b3278640 100644
--- a/pallets/sto/src/lib.rs
+++ b/pallets/sto/src/lib.rs
@@ -303,11 +303,14 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Version, ValueQuery>;
 
     #[pallet::genesis_config]
-    #[derive(Default)]
-    pub struct GenesisConfig;
+    #[derive(frame_support::DefaultNoBound)]
+    pub struct GenesisConfig<T> {
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
+    }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Version::new(1));
         }
diff --git a/pallets/sudo/src/lib.rs b/pallets/sudo/src/lib.rs
index 40952d5ff6..d58f955aef 100644
--- a/pallets/sudo/src/lib.rs
+++ b/pallets/sudo/src/lib.rs
@@ -59,7 +59,7 @@
 //! 	use frame_system::pallet_prelude::*;
 //!
 //! 	#[pallet::pallet]
-//! 	pub struct Pallet<T>(PhantomData<T>);
+//! 	pub struct Pallet<T>(_);
 //!
 //! 	#[pallet::config]
 //! 	pub trait Config: frame_system::Config {}
@@ -124,7 +124,7 @@ pub mod pallet {
     use frame_support::pallet_prelude::*;
     use frame_system::pallet_prelude::*;
 
-    pub const MIN_WEIGHT: Weight = Weight::from_ref_time(1_000);
+    pub const MIN_WEIGHT: Weight = Weight::from_parts(1_000, 0);
 
     #[pallet::config]
     pub trait Config: frame_system::Config {
@@ -138,7 +138,7 @@ pub mod pallet {
     }
 
     #[pallet::pallet]
-    pub struct Pallet<T>(PhantomData<T>);
+    pub struct Pallet<T>(_);
 
     #[pallet::call]
     impl<T: Config> Pallet<T> {
@@ -292,20 +292,14 @@ pub mod pallet {
     pub type Key<T: Config> = StorageValue<_, T::AccountId, OptionQuery>;
 
     #[pallet::genesis_config]
+    #[derive(frame_support::DefaultNoBound)]
     pub struct GenesisConfig<T: Config> {
         /// The `AccountId` of the sudo key.
         pub key: Option<T::AccountId>,
     }
 
-    #[cfg(feature = "std")]
-    impl<T: Config> Default for GenesisConfig<T> {
-        fn default() -> Self {
-            Self { key: None }
-        }
-    }
-
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             if let Some(ref key) = self.key {
                 Key::<T>::put(key);
diff --git a/pallets/sudo/src/mock.rs b/pallets/sudo/src/mock.rs
index bf43e49636..150226e212 100644
--- a/pallets/sudo/src/mock.rs
+++ b/pallets/sudo/src/mock.rs
@@ -19,12 +19,12 @@
 
 use super::*;
 use crate as sudo;
-use frame_support::traits::{ConstU32, ConstU64, Contains, GenesisBuild};
+use frame_support::traits::{ConstU32, ConstU64, Contains};
 use sp_core::H256;
 use sp_io;
 use sp_runtime::{
-    testing::Header,
     traits::{BlakeTwo256, IdentityLookup},
+    BuildStorage,
 };
 
 // Logger module to track execution.
@@ -99,16 +99,12 @@ pub mod logger {
     pub type I32Log<T> = StorageValue<_, BoundedVec<i32, ConstU32<1_000>>, ValueQuery>;
 }
 
-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,
+    pub struct Test
     {
-        System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
         Sudo: sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
         Logger: logger::{Pallet, Call, Storage, Event<T>},
     }
@@ -128,13 +124,12 @@ impl frame_system::Config for Test {
     type DbWeight = ();
     type RuntimeOrigin = RuntimeOrigin;
     type RuntimeCall = RuntimeCall;
-    type Index = u64;
-    type BlockNumber = u64;
+    type Nonce = u64;
     type Hash = H256;
     type Hashing = BlakeTwo256;
     type AccountId = u64;
     type Lookup = IdentityLookup<Self::AccountId>;
-    type Header = Header;
+    type Block = Block;
     type RuntimeEvent = RuntimeEvent;
     type BlockHashCount = ConstU64<250>;
     type Version = ();
@@ -165,8 +160,8 @@ pub type LoggerCall = logger::Call<Test>;
 
 // Build test environment by setting the root `key` for the Genesis.
 pub fn new_test_ext(root_key: u64) -> sp_io::TestExternalities {
-    let mut t = frame_system::GenesisConfig::default()
-        .build_storage::<Test>()
+    let mut t = frame_system::GenesisConfig::<Test>::default()
+        .build_storage()
         .unwrap();
     sudo::GenesisConfig::<Test> {
         key: Some(root_key),
diff --git a/pallets/sudo/src/tests.rs b/pallets/sudo/src/tests.rs
index c11f692b38..eb7c986938 100644
--- a/pallets/sudo/src/tests.rs
+++ b/pallets/sudo/src/tests.rs
@@ -43,7 +43,7 @@ fn sudo_basics() {
         // A privileged function should work when `sudo` is passed the root `key` as `origin`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         }));
         assert_ok!(Sudo::sudo(RuntimeOrigin::signed(1), call));
         assert_eq!(I32Log::<Test>::get(), vec![42i32]);
@@ -51,7 +51,7 @@ fn sudo_basics() {
         // A privileged function should not work when `sudo` is passed a non-root `key` as `origin`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         }));
         assert_noop!(
             Sudo::sudo(RuntimeOrigin::signed(2), call),
@@ -72,7 +72,7 @@ fn sudo_emits_events_correctly() {
         // Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         assert_ok!(Sudo::sudo(RuntimeOrigin::signed(1), call));
         System::assert_has_event(TestEvent::Sudo(Event::Sudid {
@@ -87,25 +87,25 @@ fn sudo_unchecked_weight_basics() {
         // A privileged function should work when `sudo` is passed the root `key` as origin.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         }));
         assert_ok!(Sudo::sudo_unchecked_weight(
             RuntimeOrigin::signed(1),
             call,
-            Weight::from_ref_time(1_000)
+            Weight::from_parts(1_000, 0)
         ));
         assert_eq!(I32Log::<Test>::get(), vec![42i32]);
 
         // A privileged function should not work when called with a non-root `key`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         }));
         assert_noop!(
             Sudo::sudo_unchecked_weight(
                 RuntimeOrigin::signed(2),
                 call,
-                Weight::from_ref_time(1_000)
+                Weight::from_parts(1_000, 0)
             ),
             DispatchErrorWithPostInfo {
                 post_info: Some(MIN_WEIGHT).into(),
@@ -118,14 +118,14 @@ fn sudo_unchecked_weight_basics() {
         // Controls the dispatched weight.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         let sudo_unchecked_weight_call = SudoCall::sudo_unchecked_weight {
             call,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         };
         let info = sudo_unchecked_weight_call.get_dispatch_info();
-        assert_eq!(info.weight, Weight::from_ref_time(1_000));
+        assert_eq!(info.weight, Weight::from_parts(1_000, 0));
     });
 }
 
@@ -138,12 +138,12 @@ fn sudo_unchecked_weight_emits_events_correctly() {
         // Should emit event to indicate success when called with the root `key` and `call` is `Ok`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         assert_ok!(Sudo::sudo_unchecked_weight(
             RuntimeOrigin::signed(1),
             call,
-            Weight::from_ref_time(1_000)
+            Weight::from_parts(1_000, 0)
         ));
         System::assert_has_event(TestEvent::Sudo(Event::Sudid {
             sudo_result: Ok(()),
@@ -197,7 +197,7 @@ fn sudo_as_basics() {
         // A privileged function will not work when passed to `sudo_as`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::privileged_i32_log {
             i: 42,
-            weight: Weight::from_ref_time(1_000),
+            weight: Weight::from_parts(1_000, 0),
         }));
         assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call));
         assert!(I32Log::<Test>::get().is_empty());
@@ -206,7 +206,7 @@ fn sudo_as_basics() {
         // A non-privileged function should not work when called with a non-root `key`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         assert_noop!(
             Sudo::sudo_as(RuntimeOrigin::signed(3), 2, call),
@@ -219,7 +219,7 @@ fn sudo_as_basics() {
         // A non-privileged function will work when passed to `sudo_as` with the root `key`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call));
         assert_eq!(I32Log::<Test>::get(), vec![42i32]);
@@ -237,7 +237,7 @@ fn sudo_as_emits_events_correctly() {
         // A non-privileged function will work when passed to `sudo_as` with the root `key`.
         let call = Box::new(RuntimeCall::Logger(LoggerCall::non_privileged_log {
             i: 42,
-            weight: Weight::from_ref_time(1),
+            weight: Weight::from_parts(1, 0),
         }));
         assert_ok!(Sudo::sudo_as(RuntimeOrigin::signed(1), 2, call));
         System::assert_has_event(TestEvent::Sudo(Event::SudoAsDone {
diff --git a/pallets/transaction-payment/Cargo.toml b/pallets/transaction-payment/Cargo.toml
index a469be17bc..2ddaaa2505 100644
--- a/pallets/transaction-payment/Cargo.toml
+++ b/pallets/transaction-payment/Cargo.toml
@@ -13,14 +13,14 @@ serde = { version = "1.0.104", default-features = false, optional = true }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-std = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-std = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.56"
diff --git a/pallets/transaction-payment/src/lib.rs b/pallets/transaction-payment/src/lib.rs
index b71f229c80..deb12b31ff 100644
--- a/pallets/transaction-payment/src/lib.rs
+++ b/pallets/transaction-payment/src/lib.rs
@@ -386,25 +386,27 @@ pub mod pallet {
     pub(super) type StorageVersion<T: Config> = StorageValue<_, Releases, ValueQuery>;
 
     #[pallet::genesis_config]
-    pub struct GenesisConfig {
+    pub struct GenesisConfig<T> {
         pub multiplier: Multiplier,
         #[cfg(feature = "disable_fees")]
         pub disable_fees: bool,
+        #[serde(skip)]
+        pub _config: sp_std::marker::PhantomData<T>,
     }
 
-    #[cfg(feature = "std")]
-    impl Default for GenesisConfig {
+    impl<T: Config> Default for GenesisConfig<T> {
         fn default() -> Self {
             Self {
                 multiplier: MULTIPLIER_DEFAULT_VALUE,
                 #[cfg(feature = "disable_fees")]
                 disable_fees: false,
+                _config: Default::default(),
             }
         }
     }
 
     #[pallet::genesis_build]
-    impl<T: Config> GenesisBuild<T> for GenesisConfig {
+    impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
         fn build(&self) {
             StorageVersion::<T>::put(Releases::V2);
             NextFeeMultiplier::<T>::put(self.multiplier);
@@ -472,7 +474,7 @@ pub mod pallet {
     #[pallet::call]
     impl<T: Config> Pallet<T> {
         #[pallet::call_index(0)]
-        #[pallet::weight(Weight::from_ref_time(25_000_000))]
+        #[pallet::weight(Weight::from_parts(25_000_000, 0))]
         pub fn set_disable_fees(origin: OriginFor<T>, _value: bool) -> DispatchResult {
             frame_system::ensure_root(origin)?;
             #[cfg(feature = "disable_fees")]
diff --git a/pallets/transaction-payment/src/types.rs b/pallets/transaction-payment/src/types.rs
index a9dab61535..e0cc42048b 100644
--- a/pallets/transaction-payment/src/types.rs
+++ b/pallets/transaction-payment/src/types.rs
@@ -18,6 +18,7 @@
 //! Types for transaction-payment RPC.
 
 use codec::{Decode, Encode};
+use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
@@ -27,7 +28,7 @@ use sp_std::prelude::*;
 use frame_support::dispatch::DispatchClass;
 
 /// The base fee and adjusted weight and length fees constitute the _inclusion fee_.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, TypeInfo, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct InclusionFee<Balance> {
@@ -63,7 +64,7 @@ impl<Balance: AtLeast32BitUnsigned + Copy> InclusionFee<Balance> {
 ///   - (Optional) `inclusion_fee`: Only the `Pays::Yes` transaction can have the inclusion fee.
 ///   - `tip`: If included in the transaction, the tip will be added on top. Only signed
 ///     transactions can have a tip.
-#[derive(Encode, Decode, Clone, Eq, PartialEq)]
+#[derive(Encode, Decode, TypeInfo, Clone, Eq, PartialEq)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 pub struct FeeDetails<Balance> {
@@ -91,7 +92,7 @@ impl<Balance: AtLeast32BitUnsigned + Copy> FeeDetails<Balance> {
 
 /// Information related to a dispatchable's class, weight, and fee that can be queried from the
 /// runtime.
-#[derive(Eq, PartialEq, Encode, Decode, Default)]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo, Default)]
 #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 #[cfg_attr(
@@ -143,7 +144,7 @@ mod tests {
     #[test]
     fn should_serialize_and_deserialize_properly_with_string() {
         let info = RuntimeDispatchInfo {
-            weight: Weight::from_ref_time(5),
+            weight: Weight::from_parts(5, 0),
             class: DispatchClass::Normal,
             partial_fee: 1_000_000_u64,
         };
@@ -164,7 +165,7 @@ mod tests {
     #[test]
     fn should_serialize_and_deserialize_properly_large_value() {
         let info = RuntimeDispatchInfo {
-            weight: Weight::from_ref_time(5),
+            weight: Weight::from_parts(5, 0),
             class: DispatchClass::Normal,
             partial_fee: u128::max_value(),
         };
diff --git a/pallets/treasury/Cargo.toml b/pallets/treasury/Cargo.toml
index 5312526a2d..3025c88fbe 100644
--- a/pallets/treasury/Cargo.toml
+++ b/pallets/treasury/Cargo.toml
@@ -16,19 +16,19 @@ serde_derive = { version = "1.0.104", optional = true, default-features = false
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.0", default-features = false, features = ["derive"] }
-sp-core = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
-sp-api = { version = "4.0.0-dev", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+sp-core = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
+sp-api = { workspace = true, default-features = false }
 
-frame-system = { version = "4.0.0-dev", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
+frame-system = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
 
 # Benchmarking
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
 
 [features]
 equalize = []
diff --git a/pallets/utility/Cargo.toml b/pallets/utility/Cargo.toml
index 16479fe24c..f4ea2876ab 100644
--- a/pallets/utility/Cargo.toml
+++ b/pallets/utility/Cargo.toml
@@ -14,14 +14,14 @@ polymesh-primitives = { workspace = true, default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-frame-benchmarking = { version = "4.0.0-dev", default-features = false, optional = true }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive"] }
+frame-benchmarking = { workspace = true, default-features = false, optional = true }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 [features]
 default = ["std"]
diff --git a/pallets/utility/src/lib.rs b/pallets/utility/src/lib.rs
index e11dd09118..c401214804 100644
--- a/pallets/utility/src/lib.rs
+++ b/pallets/utility/src/lib.rs
@@ -105,7 +105,7 @@ pub trait WeightInfo {
 }
 
 // POLYMESH:
-pub const MIN_WEIGHT: Weight = Weight::from_ref_time(1_000_000);
+pub const MIN_WEIGHT: Weight = Weight::from_parts(1_000_000, 0);
 
 // POLYMESH: Used for permission checks.
 type CallPermissions<T> = pallet_permissions::Pallet<T>;
diff --git a/pallets/weights/Cargo.toml b/pallets/weights/Cargo.toml
index 70066c660d..52d048ce5d 100644
--- a/pallets/weights/Cargo.toml
+++ b/pallets/weights/Cargo.toml
@@ -6,18 +6,18 @@ edition = "2021"
 
 [dependencies]
 # substrate pallets
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-pallet-timestamp = { version = "4.0.0-dev", default-features = false }
-pallet-babe = { version = "4.0.0-dev", default-features = false }
-pallet-contracts = { version = "4.0.0-dev", default-features = false }
-pallet-im-online = { version = "4.0.0-dev", default-features = false }
-pallet-indices = { version = "4.0.0-dev", default-features = false }
-pallet-grandpa = { version = "4.0.0-dev", default-features = false }
-pallet-preimage = { version = "4.0.0-dev", default-features = false }
-pallet-scheduler = { version = "4.0.0-dev", default-features = false }
-pallet-session = { version = "4.0.0-dev", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+pallet-timestamp = { workspace = true, default-features = false }
+pallet-babe = { workspace = true, default-features = false }
+pallet-contracts = { workspace = true, default-features = false }
+pallet-im-online = { workspace = true, default-features = false }
+pallet-indices = { workspace = true, default-features = false }
+pallet-grandpa = { workspace = true, default-features = false }
+pallet-preimage = { workspace = true, default-features = false }
+pallet-scheduler = { workspace = true, default-features = false }
+pallet-session = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
 
 # our pallets
 pallet-asset = { workspace = true, default-features = false }
diff --git a/pallets/weights/src/frame_system.rs b/pallets/weights/src/frame_system.rs
index ec40590d77..a30b296984 100644
--- a/pallets/weights/src/frame_system.rs
+++ b/pallets/weights/src/frame_system.rs
@@ -56,16 +56,16 @@ impl frame_system::WeightInfo for SubstrateWeight {
     /// The range of component `b` is `[0, 7864320]`.
     fn remark(b: u32) -> Weight {
         // Minimum execution time: 2_322 nanoseconds.
-        Weight::from_ref_time(13_323_989)
+        Weight::from_parts(13_323_989, 0)
             // Standard Error: 0
-            .saturating_add(Weight::from_ref_time(276).saturating_mul(b.into()))
+            .saturating_add(Weight::from_parts(276, 0).saturating_mul(b.into()))
     }
     /// The range of component `b` is `[0, 7864320]`.
     fn remark_with_event(b: u32) -> Weight {
         // Minimum execution time: 7_811 nanoseconds.
-        Weight::from_ref_time(8_112_000)
+        Weight::from_parts(8_112_000, 0)
             // Standard Error: 0
-            .saturating_add(Weight::from_ref_time(1_191).saturating_mul(b.into()))
+            .saturating_add(Weight::from_parts(1_191, 0).saturating_mul(b.into()))
     }
     // Storage: System Digest (r:1 w:1)
     // Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
@@ -73,18 +73,31 @@ impl frame_system::WeightInfo for SubstrateWeight {
     // Proof Skipped: unknown `0x3a686561707061676573` (r:0 w:1)
     fn set_heap_pages() -> Weight {
         // Minimum execution time: 4_347 nanoseconds.
-        Weight::from_ref_time(4_997_000)
+        Weight::from_parts(4_997_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
+    /// Storage: System Digest (r:1 w:1)
+    /// Proof Skipped: System Digest (max_values: Some(1), max_size: None, mode: Measured)
+    /// Storage: unknown `0x3a636f6465` (r:0 w:1)
+    /// Proof Skipped: unknown `0x3a636f6465` (r:0 w:1)
+    fn set_code() -> Weight {
+        // Proof Size summary in bytes:
+        //  Measured:  `0`
+        //  Estimated: `1485`
+        // Minimum execution time: 84_000_503_000 picoseconds.
+        Weight::from_parts(87_586_619_000, 1485)
+            .saturating_add(DbWeight::get().reads(1_u64))
+            .saturating_add(DbWeight::get().writes(2_u64))
+    }
     // Storage: Skipped Metadata (r:0 w:0)
     // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
     /// The range of component `i` is `[0, 1000]`.
     fn set_storage(i: u32) -> Weight {
         // Minimum execution time: 2_755 nanoseconds.
-        Weight::from_ref_time(2_785_000)
+        Weight::from_parts(2_785_000, 0)
             // Standard Error: 1_586
-            .saturating_add(Weight::from_ref_time(975_700).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(975_700, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
     // Storage: Skipped Metadata (r:0 w:0)
@@ -92,9 +105,9 @@ impl frame_system::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 1000]`.
     fn kill_storage(i: u32) -> Weight {
         // Minimum execution time: 2_534 nanoseconds.
-        Weight::from_ref_time(2_554_000)
+        Weight::from_parts(2_554_000, 0)
             // Standard Error: 1_494
-            .saturating_add(Weight::from_ref_time(679_556).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(679_556, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
     // Storage: Skipped Metadata (r:0 w:0)
@@ -102,9 +115,9 @@ impl frame_system::WeightInfo for SubstrateWeight {
     /// The range of component `p` is `[0, 1000]`.
     fn kill_prefix(p: u32) -> Weight {
         // Minimum execution time: 4_768 nanoseconds.
-        Weight::from_ref_time(4_957_000)
+        Weight::from_parts(4_957_000, 0)
             // Standard Error: 2_359
-            .saturating_add(Weight::from_ref_time(1_254_023).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(1_254_023, 0).saturating_mul(p.into()))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(p.into())))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(p.into())))
     }
diff --git a/pallets/weights/src/pallet_asset.rs b/pallets/weights/src/pallet_asset.rs
index 02cc02c29f..03d51f8fc1 100644
--- a/pallets/weights/src/pallet_asset.rs
+++ b/pallets/weights/src/pallet_asset.rs
@@ -73,7 +73,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset TickersOwnedByUser (max_values: None, max_size: None, mode: Measured)
     fn register_unique_ticker() -> Weight {
         // Minimum execution time: 49_124 nanoseconds.
-        Weight::from_ref_time(52_329_000)
+        Weight::from_parts(52_329_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -95,7 +95,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset TickersOwnedByUser (max_values: None, max_size: None, mode: Measured)
     fn accept_ticker_transfer() -> Weight {
         // Minimum execution time: 61_791 nanoseconds.
-        Weight::from_ref_time(63_646_000)
+        Weight::from_parts(63_646_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -127,7 +127,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset SecurityTokensOwnedByUser (max_values: None, max_size: None, mode: Measured)
     fn accept_asset_ownership_transfer() -> Weight {
         // Minimum execution time: 89_264 nanoseconds.
-        Weight::from_ref_time(90_495_000)
+        Weight::from_parts(90_495_000, 0)
             .saturating_add(DbWeight::get().reads(10))
             .saturating_add(DbWeight::get().writes(9))
     }
@@ -166,12 +166,12 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `f` is `[1, 128]`.
     fn create_asset(n: u32, i: u32, f: u32) -> Weight {
         // Minimum execution time: 79_620 nanoseconds.
-        Weight::from_ref_time(84_893_228)
-            .saturating_add(Weight::from_ref_time(20_181).saturating_mul(n.into()))
+        Weight::from_parts(84_893_228, 0)
+            .saturating_add(Weight::from_parts(20_181, 0).saturating_mul(n.into()))
             // Standard Error: 2_282
-            .saturating_add(Weight::from_ref_time(66_647).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(66_647, 0).saturating_mul(i.into()))
             // Standard Error: 9_149
-            .saturating_add(Weight::from_ref_time(13_187).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(13_187, 0).saturating_mul(f.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(9))
     }
@@ -189,7 +189,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset Frozen (max_values: None, max_size: None, mode: Measured)
     fn freeze() -> Weight {
         // Minimum execution time: 40_401 nanoseconds.
-        Weight::from_ref_time(41_663_000)
+        Weight::from_parts(41_663_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -207,7 +207,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset Frozen (max_values: None, max_size: None, mode: Measured)
     fn unfreeze() -> Weight {
         // Minimum execution time: 41_673 nanoseconds.
-        Weight::from_ref_time(45_007_000)
+        Weight::from_parts(45_007_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -226,9 +226,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 128]`.
     fn rename_asset(n: u32) -> Weight {
         // Minimum execution time: 35_943 nanoseconds.
-        Weight::from_ref_time(40_348_962)
+        Weight::from_parts(40_348_962, 0)
             // Standard Error: 5_348
-            .saturating_add(Weight::from_ref_time(8_093).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(8_093, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -266,7 +266,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset IssuedInFundingRound (max_values: None, max_size: None, mode: Measured)
     fn issue() -> Weight {
         // Minimum execution time: 86_960 nanoseconds.
-        Weight::from_ref_time(97_256_000)
+        Weight::from_parts(97_256_000, 0)
             .saturating_add(DbWeight::get().reads(16))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -298,7 +298,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Statistics ActiveAssetStats (max_values: None, max_size: None, mode: Measured)
     fn redeem() -> Weight {
         // Minimum execution time: 77_997 nanoseconds.
-        Weight::from_ref_time(79_950_000)
+        Weight::from_parts(79_950_000, 0)
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -314,7 +314,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset Assets (max_values: None, max_size: None, mode: Measured)
     fn make_divisible() -> Weight {
         // Minimum execution time: 36_563 nanoseconds.
-        Weight::from_ref_time(37_907_000)
+        Weight::from_parts(37_907_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -337,9 +337,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `d` is `[1, 64]`.
     fn add_documents(d: u32) -> Weight {
         // Minimum execution time: 49_905 nanoseconds.
-        Weight::from_ref_time(44_909_679)
+        Weight::from_parts(44_909_679, 0)
             // Standard Error: 34_183
-            .saturating_add(Weight::from_ref_time(11_133_100).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(11_133_100, 0).saturating_mul(d.into()))
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(1))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(d.into())))
@@ -357,9 +357,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `d` is `[1, 64]`.
     fn remove_documents(d: u32) -> Weight {
         // Minimum execution time: 22_182 nanoseconds.
-        Weight::from_ref_time(21_595_029)
+        Weight::from_parts(21_595_029, 0)
             // Standard Error: 21_140
-            .saturating_add(Weight::from_ref_time(6_496_860).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(6_496_860, 0).saturating_mul(d.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(d.into())))
     }
@@ -376,9 +376,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `f` is `[1, 128]`.
     fn set_funding_round(f: u32) -> Weight {
         // Minimum execution time: 30_045 nanoseconds.
-        Weight::from_ref_time(34_308_258)
+        Weight::from_parts(34_308_258, 0)
             // Standard Error: 3_823
-            .saturating_add(Weight::from_ref_time(5_302).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(5_302, 0).saturating_mul(f.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -395,9 +395,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 512]`.
     fn update_identifiers(i: u32) -> Weight {
         // Minimum execution time: 31_056 nanoseconds.
-        Weight::from_ref_time(34_256_155)
+        Weight::from_parts(34_256_155, 0)
             // Standard Error: 2_248
-            .saturating_add(Weight::from_ref_time(59_751).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(59_751, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -427,7 +427,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Statistics ActiveAssetStats (max_values: None, max_size: None, mode: Measured)
     fn controller_transfer() -> Weight {
         // Minimum execution time: 94_831 nanoseconds.
-        Weight::from_ref_time(97_556_000)
+        Weight::from_parts(97_556_000, 0)
             .saturating_add(DbWeight::get().reads(14))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -442,9 +442,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 2048]`.
     fn register_custom_asset_type(n: u32) -> Weight {
         // Minimum execution time: 30_265 nanoseconds.
-        Weight::from_ref_time(32_957_363)
+        Weight::from_parts(32_957_363, 0)
             // Standard Error: 406
-            .saturating_add(Weight::from_ref_time(6_526).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(6_526, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -464,7 +464,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataValues (max_values: None, max_size: None, mode: Measured)
     fn set_asset_metadata() -> Weight {
         // Minimum execution time: 55_263 nanoseconds.
-        Weight::from_ref_time(57_176_000)
+        Weight::from_parts(57_176_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -484,7 +484,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
     fn set_asset_metadata_details() -> Weight {
         // Minimum execution time: 48_102 nanoseconds.
-        Weight::from_ref_time(52_127_000)
+        Weight::from_parts(52_127_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -510,7 +510,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataLocalSpecs (max_values: None, max_size: None, mode: Measured)
     fn register_and_set_local_asset_metadata() -> Weight {
         // Minimum execution time: 82_333 nanoseconds.
-        Weight::from_ref_time(86_209_000)
+        Weight::from_parts(86_209_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -532,7 +532,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataLocalSpecs (max_values: None, max_size: None, mode: Measured)
     fn register_asset_metadata_local_type() -> Weight {
         // Minimum execution time: 60_210 nanoseconds.
-        Weight::from_ref_time(61_893_000)
+        Weight::from_parts(61_893_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -546,7 +546,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataGlobalSpecs (max_values: None, max_size: None, mode: Measured)
     fn register_asset_metadata_global_type() -> Weight {
         // Minimum execution time: 35_473 nanoseconds.
-        Weight::from_ref_time(41_562_000)
+        Weight::from_parts(41_562_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -562,7 +562,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Permissions CurrentDispatchableName (max_values: Some(1), max_size: None, mode: Measured)
     fn update_asset_type() -> Weight {
         // Minimum execution time: 36_665 nanoseconds.
-        Weight::from_ref_time(43_065_000)
+        Weight::from_parts(43_065_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -590,7 +590,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataLocalSpecs (max_values: None, max_size: None, mode: Measured)
     fn remove_local_metadata_key() -> Weight {
         // Minimum execution time: 65_649 nanoseconds.
-        Weight::from_ref_time(66_860_000)
+        Weight::from_parts(66_860_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -610,7 +610,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataValues (max_values: None, max_size: None, mode: Measured)
     fn remove_metadata_value() -> Weight {
         // Minimum execution time: 45_568 nanoseconds.
-        Weight::from_ref_time(46_749_000)
+        Weight::from_parts(46_749_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -646,7 +646,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Statistics ActiveAssetStats (max_values: None, max_size: None, mode: Measured)
     fn base_transfer() -> Weight {
         // Minimum execution time: 164_396 nanoseconds.
-        Weight::from_ref_time(168_101_000)
+        Weight::from_parts(168_101_000, 0)
             .saturating_add(DbWeight::get().reads(21))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -654,13 +654,13 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetsExemptFromAffirmation (max_values: None, max_size: None, mode: Measured)
     fn exempt_asset_affirmation() -> Weight {
         // Minimum execution time: 13_289 nanoseconds.
-        Weight::from_ref_time(16_024_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(16_024_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Asset AssetsExemptFromAffirmation (r:0 w:1)
     // Proof Skipped: Asset AssetsExemptFromAffirmation (max_values: None, max_size: None, mode: Measured)
     fn remove_asset_affirmation_exemption() -> Weight {
         // Minimum execution time: 13_811 nanoseconds.
-        Weight::from_ref_time(14_711_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(14_711_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -668,7 +668,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset PreApprovedAsset (max_values: None, max_size: None, mode: Measured)
     fn pre_approve_asset() -> Weight {
         // Minimum execution time: 20_762 nanoseconds.
-        Weight::from_ref_time(22_614_000)
+        Weight::from_parts(22_614_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -678,7 +678,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset PreApprovedAsset (max_values: None, max_size: None, mode: Measured)
     fn remove_asset_pre_approval() -> Weight {
         // Minimum execution time: 21_572 nanoseconds.
-        Weight::from_ref_time(23_626_000)
+        Weight::from_parts(23_626_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -695,9 +695,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 4]`.
     fn add_mandatory_mediators(n: u32) -> Weight {
         // Minimum execution time: 33_950 nanoseconds.
-        Weight::from_ref_time(37_383_822)
+        Weight::from_parts(37_383_822, 0)
             // Standard Error: 148_326
-            .saturating_add(Weight::from_ref_time(584_842).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(584_842, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -714,9 +714,9 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 4]`.
     fn remove_mandatory_mediators(n: u32) -> Weight {
         // Minimum execution time: 35_053 nanoseconds.
-        Weight::from_ref_time(39_197_078)
+        Weight::from_parts(39_197_078, 0)
             // Standard Error: 113_163
-            .saturating_add(Weight::from_ref_time(169_623).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(169_623, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -738,7 +738,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetIdTicker (max_values: None, max_size: None, mode: Measured)
     fn link_ticker_to_asset_id() -> Weight {
         // Minimum execution time: 50_786 nanoseconds.
-        Weight::from_ref_time(55_283_000)
+        Weight::from_parts(55_283_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -760,7 +760,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetIdTicker (max_values: None, max_size: None, mode: Measured)
     fn unlink_ticker_from_asset_id() -> Weight {
         // Minimum execution time: 49_083 nanoseconds.
-        Weight::from_ref_time(52_949_000)
+        Weight::from_parts(52_949_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -770,7 +770,7 @@ impl pallet_asset::WeightInfo for SubstrateWeight {
     // Proof Skipped: Asset AssetMetadataGlobalSpecs (max_values: None, max_size: None, mode: Measured)
     fn update_global_metadata_spec() -> Weight {
         // Minimum execution time: 40_469 nanoseconds.
-        Weight::from_ref_time(40_786_000)
+        Weight::from_parts(40_786_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_babe.rs b/pallets/weights/src/pallet_babe.rs
index 5c43ef39f1..88bf187c80 100644
--- a/pallets/weights/src/pallet_babe.rs
+++ b/pallets/weights/src/pallet_babe.rs
@@ -1,13 +1,13 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// 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
+// 	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,
@@ -21,39 +21,34 @@
 use polymesh_runtime_common::{
     RocksDbWeight as DbWeight, Weight, WEIGHT_REF_TIME_PER_MICROS, WEIGHT_REF_TIME_PER_NANOS,
 };
-
 /// Weights for pallet_babe using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;
 impl pallet_babe::WeightInfo for SubstrateWeight {
     fn plan_config_change() -> Weight {
-        Weight::zero()
+        DbWeight::get().writes(1)
     }
 
-    // WARNING! Some components were not used: ["x"]
-    fn report_equivocation(validator_count: u32) -> Weight {
+    fn report_equivocation(validator_count: u32, max_nominators_per_validator: u32) -> Weight {
         // we take the validator set count from the membership proof to
         // calculate the weight but we set a floor of 100 validators.
         let validator_count = validator_count.max(100) as u64;
 
-        // worst case we are considering is that the given offender
-        // is backed by 200 nominators
-        const MAX_NOMINATORS: u64 = 200;
-
         // checking membership proof
-        Weight::from_ref_time(35u64 * WEIGHT_REF_TIME_PER_MICROS)
+        Weight::from_parts(35u64 * WEIGHT_REF_TIME_PER_MICROS, 0)
             .saturating_add(
-                Weight::from_ref_time(175u64 * WEIGHT_REF_TIME_PER_NANOS)
+                Weight::from_parts(175u64 * WEIGHT_REF_TIME_PER_NANOS, 0)
                     .saturating_mul(validator_count),
             )
             .saturating_add(DbWeight::get().reads(5))
             // check equivocation proof
-            .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS))
+            .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0))
             // report offence
-            .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS))
-            .saturating_add(Weight::from_ref_time(
-                25u64 * WEIGHT_REF_TIME_PER_MICROS * MAX_NOMINATORS,
+            .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0))
+            .saturating_add(Weight::from_parts(
+                25u64 * WEIGHT_REF_TIME_PER_MICROS * max_nominators_per_validator as u64,
+                0,
             ))
-            .saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS))
-            .saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS))
+            .saturating_add(DbWeight::get().reads(14 + 3 * max_nominators_per_validator as u64))
+            .saturating_add(DbWeight::get().writes(10 + 3 * max_nominators_per_validator as u64))
     }
 }
diff --git a/pallets/weights/src/pallet_balances.rs b/pallets/weights/src/pallet_balances.rs
index 5ede0629e0..36de160cf8 100644
--- a/pallets/weights/src/pallet_balances.rs
+++ b/pallets/weights/src/pallet_balances.rs
@@ -65,7 +65,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn transfer() -> Weight {
         // Minimum execution time: 67_431 nanoseconds.
-        Weight::from_ref_time(74_752_000)
+        Weight::from_parts(74_752_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -81,7 +81,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn transfer_with_memo() -> Weight {
         // Minimum execution time: 67_641 nanoseconds.
-        Weight::from_ref_time(70_816_000)
+        Weight::from_parts(70_816_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -91,7 +91,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn deposit_block_reward_reserve_balance() -> Weight {
         // Minimum execution time: 45_388 nanoseconds.
-        Weight::from_ref_time(47_752_000)
+        Weight::from_parts(47_752_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -101,7 +101,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
     fn set_balance() -> Weight {
         // Minimum execution time: 54_811 nanoseconds.
-        Weight::from_ref_time(60_891_000)
+        Weight::from_parts(60_891_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -111,7 +111,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
     fn force_transfer() -> Weight {
         // Minimum execution time: 35_873 nanoseconds.
-        Weight::from_ref_time(38_698_000)
+        Weight::from_parts(38_698_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -121,7 +121,7 @@ impl pallet_balances::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn burn_account_balance() -> Weight {
         // Minimum execution time: 29_194 nanoseconds.
-        Weight::from_ref_time(32_929_000)
+        Weight::from_parts(32_929_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_capital_distribution.rs b/pallets/weights/src/pallet_capital_distribution.rs
index 236a1f09dd..7900c9a910 100644
--- a/pallets/weights/src/pallet_capital_distribution.rs
+++ b/pallets/weights/src/pallet_capital_distribution.rs
@@ -81,7 +81,7 @@ impl pallet_corporate_actions::distribution::WeightInfo for SubstrateWeight {
     // Proof Skipped: ProtocolFee BaseFees (max_values: None, max_size: None, mode: Measured)
     fn distribute() -> Weight {
         // Minimum execution time: 81_412 nanoseconds.
-        Weight::from_ref_time(91_938_000)
+        Weight::from_parts(91_938_000, 0)
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -125,11 +125,11 @@ impl pallet_corporate_actions::distribution::WeightInfo for SubstrateWeight {
     /// The range of component `w` is `[0, 1000]`.
     fn claim(t: u32, w: u32) -> Weight {
         // Minimum execution time: 282_282 nanoseconds.
-        Weight::from_ref_time(295_677_207)
+        Weight::from_parts(295_677_207, 0)
             // Standard Error: 2_270
-            .saturating_add(Weight::from_ref_time(37_836).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(37_836, 0).saturating_mul(t.into()))
             // Standard Error: 2_270
-            .saturating_add(Weight::from_ref_time(13_878).saturating_mul(w.into()))
+            .saturating_add(Weight::from_parts(13_878, 0).saturating_mul(w.into()))
             .saturating_add(DbWeight::get().reads(24))
             .saturating_add(DbWeight::get().writes(7))
     }
@@ -179,11 +179,11 @@ impl pallet_corporate_actions::distribution::WeightInfo for SubstrateWeight {
     /// The range of component `w` is `[0, 1000]`.
     fn push_benefit(t: u32, w: u32) -> Weight {
         // Minimum execution time: 299_609 nanoseconds.
-        Weight::from_ref_time(292_208_631)
+        Weight::from_parts(292_208_631, 0)
             // Standard Error: 2_178
-            .saturating_add(Weight::from_ref_time(45_439).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(45_439, 0).saturating_mul(t.into()))
             // Standard Error: 2_178
-            .saturating_add(Weight::from_ref_time(29_985).saturating_mul(w.into()))
+            .saturating_add(Weight::from_parts(29_985, 0).saturating_mul(w.into()))
             .saturating_add(DbWeight::get().reads(27))
             .saturating_add(DbWeight::get().writes(7))
     }
@@ -205,7 +205,7 @@ impl pallet_corporate_actions::distribution::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio PortfolioLockedAssets (max_values: None, max_size: None, mode: Measured)
     fn reclaim() -> Weight {
         // Minimum execution time: 59_550 nanoseconds.
-        Weight::from_ref_time(63_365_000)
+        Weight::from_parts(63_365_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -225,7 +225,7 @@ impl pallet_corporate_actions::distribution::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio PortfolioLockedAssets (max_values: None, max_size: None, mode: Measured)
     fn remove_distribution() -> Weight {
         // Minimum execution time: 57_575 nanoseconds.
-        Weight::from_ref_time(59_079_000)
+        Weight::from_parts(59_079_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(2))
     }
diff --git a/pallets/weights/src/pallet_checkpoint.rs b/pallets/weights/src/pallet_checkpoint.rs
index 6d226b0de7..5732c300e3 100644
--- a/pallets/weights/src/pallet_checkpoint.rs
+++ b/pallets/weights/src/pallet_checkpoint.rs
@@ -57,7 +57,7 @@ impl pallet_asset::checkpoint::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint SchedulesMaxComplexity (max_values: Some(1), max_size: None, mode: Measured)
     fn set_schedules_max_complexity() -> Weight {
         // Minimum execution time: 11_066 nanoseconds.
-        Weight::from_ref_time(11_147_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(11_147_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -79,7 +79,7 @@ impl pallet_asset::checkpoint::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint Timestamps (max_values: None, max_size: None, mode: Measured)
     fn create_checkpoint() -> Weight {
         // Minimum execution time: 58_728 nanoseconds.
-        Weight::from_ref_time(64_186_000)
+        Weight::from_parts(64_186_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -109,7 +109,7 @@ impl pallet_asset::checkpoint::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint ScheduleRefCount (max_values: None, max_size: None, mode: Measured)
     fn create_schedule() -> Weight {
         // Minimum execution time: 81_152 nanoseconds.
-        Weight::from_ref_time(97_196_000)
+        Weight::from_parts(97_196_000, 0)
             .saturating_add(DbWeight::get().reads(10))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -129,7 +129,7 @@ impl pallet_asset::checkpoint::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint CachedNextCheckpoints (max_values: None, max_size: None, mode: Measured)
     fn remove_schedule() -> Weight {
         // Minimum execution time: 69_505 nanoseconds.
-        Weight::from_ref_time(72_329_000)
+        Weight::from_parts(72_329_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(3))
     }
diff --git a/pallets/weights/src/pallet_committee.rs b/pallets/weights/src/pallet_committee.rs
index 11888053d6..87d74b27f6 100644
--- a/pallets/weights/src/pallet_committee.rs
+++ b/pallets/weights/src/pallet_committee.rs
@@ -57,7 +57,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee VoteThreshold (max_values: Some(1), max_size: None, mode: Measured)
     fn set_vote_threshold() -> Weight {
         // Minimum execution time: 10_135 nanoseconds.
-        Weight::from_ref_time(11_227_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(11_227_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Instance1Committee Members (r:1 w:0)
     // Proof Skipped: Instance1Committee Members (max_values: Some(1), max_size: None, mode: Measured)
@@ -65,7 +65,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee ReleaseCoordinator (max_values: Some(1), max_size: None, mode: Measured)
     fn set_release_coordinator() -> Weight {
         // Minimum execution time: 48_141 nanoseconds.
-        Weight::from_ref_time(53_229_000)
+        Weight::from_parts(53_229_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -73,7 +73,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee ExpiresAfter (max_values: Some(1), max_size: None, mode: Measured)
     fn set_expires_after() -> Weight {
         // Minimum execution time: 9_975 nanoseconds.
-        Weight::from_ref_time(11_197_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(11_197_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Instance1Committee Voting (r:1 w:1)
     // Proof Skipped: Instance1Committee Voting (max_values: None, max_size: None, mode: Measured)
@@ -91,7 +91,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee ExpiresAfter (max_values: Some(1), max_size: None, mode: Measured)
     fn vote_or_propose_new_proposal() -> Weight {
         // Minimum execution time: 149_715 nanoseconds.
-        Weight::from_ref_time(156_454_000)
+        Weight::from_parts(156_454_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -105,7 +105,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee VoteThreshold (max_values: Some(1), max_size: None, mode: Measured)
     fn vote_or_propose_existing_proposal() -> Weight {
         // Minimum execution time: 119_660 nanoseconds.
-        Weight::from_ref_time(135_473_000)
+        Weight::from_parts(135_473_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -123,7 +123,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee Proposals (max_values: Some(1), max_size: None, mode: Measured)
     fn vote_aye() -> Weight {
         // Minimum execution time: 266_349 nanoseconds.
-        Weight::from_ref_time(275_382_000)
+        Weight::from_parts(275_382_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -137,7 +137,7 @@ impl pallet_committee::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance1Committee VoteThreshold (max_values: Some(1), max_size: None, mode: Measured)
     fn vote_nay() -> Weight {
         // Minimum execution time: 107_030 nanoseconds.
-        Weight::from_ref_time(109_584_000)
+        Weight::from_parts(109_584_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_compliance_manager.rs b/pallets/weights/src/pallet_compliance_manager.rs
index d90a169fae..2c531b7812 100644
--- a/pallets/weights/src/pallet_compliance_manager.rs
+++ b/pallets/weights/src/pallet_compliance_manager.rs
@@ -59,15 +59,15 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `d` is `[1, 10]`.
     fn condition_costs(a: u32, b: u32, c: u32, d: u32) -> Weight {
         // Minimum execution time: 10_175 nanoseconds.
-        Weight::from_ref_time(10_696_000)
+        Weight::from_parts(10_696_000, 0)
             // Standard Error: 62_942
-            .saturating_add(Weight::from_ref_time(4_457_478).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(4_457_478, 0).saturating_mul(a.into()))
             // Standard Error: 62_942
-            .saturating_add(Weight::from_ref_time(496_104).saturating_mul(b.into()))
+            .saturating_add(Weight::from_parts(496_104, 0).saturating_mul(b.into()))
             // Standard Error: 62_942
-            .saturating_add(Weight::from_ref_time(1_188_416).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(1_188_416, 0).saturating_mul(c.into()))
             // Manually set for `d`
-            .saturating_add(Weight::from_ref_time(721_394).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(721_394, 0).saturating_mul(d.into()))
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -88,9 +88,9 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[1, 6]`.
     fn add_compliance_requirement(c: u32) -> Weight {
         // Minimum execution time: 56_464 nanoseconds.
-        Weight::from_ref_time(61_594_226)
+        Weight::from_parts(61_594_226, 0)
             // Standard Error: 149_493
-            .saturating_add(Weight::from_ref_time(1_040_910).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(1_040_910, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -106,7 +106,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager AssetCompliances (max_values: None, max_size: None, mode: Measured)
     fn remove_compliance_requirement() -> Weight {
         // Minimum execution time: 42_534 nanoseconds.
-        Weight::from_ref_time(45_248_000)
+        Weight::from_parts(45_248_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -122,7 +122,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager AssetCompliances (max_values: None, max_size: None, mode: Measured)
     fn pause_asset_compliance() -> Weight {
         // Minimum execution time: 45_218 nanoseconds.
-        Weight::from_ref_time(48_943_000)
+        Weight::from_parts(48_943_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -138,7 +138,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager AssetCompliances (max_values: None, max_size: None, mode: Measured)
     fn resume_asset_compliance() -> Weight {
         // Minimum execution time: 40_681 nanoseconds.
-        Weight::from_ref_time(41_382_000)
+        Weight::from_parts(41_382_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -158,7 +158,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager AssetCompliances (max_values: None, max_size: None, mode: Measured)
     fn add_default_trusted_claim_issuer() -> Weight {
         // Minimum execution time: 55_262 nanoseconds.
-        Weight::from_ref_time(56_735_000)
+        Weight::from_parts(56_735_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -174,7 +174,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager TrustedClaimIssuer (max_values: None, max_size: None, mode: Measured)
     fn remove_default_trusted_claim_issuer() -> Weight {
         // Minimum execution time: 39_650 nanoseconds.
-        Weight::from_ref_time(41_631_000)
+        Weight::from_parts(41_631_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -193,9 +193,9 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[1, 6]`.
     fn change_compliance_requirement(c: u32) -> Weight {
         // Minimum execution time: 50_094 nanoseconds.
-        Weight::from_ref_time(53_594_702)
+        Weight::from_parts(53_594_702, 0)
             // Standard Error: 148_982
-            .saturating_add(Weight::from_ref_time(1_820_606).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(1_820_606, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -214,9 +214,9 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 2]`.
     fn replace_asset_compliance(c: u32) -> Weight {
         // Minimum execution time: 47_191 nanoseconds.
-        Weight::from_ref_time(51_858_764)
+        Weight::from_parts(51_858_764, 0)
             // Standard Error: 325_921
-            .saturating_add(Weight::from_ref_time(10_811_499).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(10_811_499, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -232,7 +232,7 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     // Proof Skipped: ComplianceManager AssetCompliances (max_values: None, max_size: None, mode: Measured)
     fn reset_asset_compliance() -> Weight {
         // Minimum execution time: 34_480 nanoseconds.
-        Weight::from_ref_time(36_745_000)
+        Weight::from_parts(36_745_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -246,11 +246,11 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `t` is `[0, 1]`.
     fn is_condition_satisfied(c: u32, t: u32) -> Weight {
         // Minimum execution time: 19_079 nanoseconds.
-        Weight::from_ref_time(19_800_000)
+        Weight::from_parts(19_800_000, 0)
             // Standard Error: 2_678
-            .saturating_add(Weight::from_ref_time(4_485_426).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(4_485_426, 0).saturating_mul(c.into()))
             // Standard Error: 1_155_484
-            .saturating_add(Weight::from_ref_time(13_588_582).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(13_588_582, 0).saturating_mul(t.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(c.into())))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(t.into())))
@@ -260,16 +260,16 @@ impl pallet_compliance_manager::WeightInfo for SubstrateWeight {
     /// The range of component `e` is `[0, 1]`.
     fn is_identity_condition(e: u32) -> Weight {
         // Minimum execution time: 600 nanoseconds.
-        Weight::from_ref_time(1_073_485)
+        Weight::from_parts(1_073_485, 0)
             // Standard Error: 57_226
-            .saturating_add(Weight::from_ref_time(9_208_847).saturating_mul(e.into()))
+            .saturating_add(Weight::from_parts(9_208_847, 0).saturating_mul(e.into()))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(e.into())))
     }
     /// The range of component `i` is `[0, 10000]`.
     fn is_any_requirement_compliant(i: u32) -> Weight {
         // Minimum execution time: 611 nanoseconds.
-        Weight::from_ref_time(4_210_562)
+        Weight::from_parts(4_210_562, 0)
             // Standard Error: 197
-            .saturating_add(Weight::from_ref_time(111_013).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(111_013, 0).saturating_mul(i.into()))
     }
 }
diff --git a/pallets/weights/src/pallet_contracts.rs b/pallets/weights/src/pallet_contracts.rs
index c9dead5814..325f13773a 100644
--- a/pallets/weights/src/pallet_contracts.rs
+++ b/pallets/weights/src/pallet_contracts.rs
@@ -1,13 +1,13 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// 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
+// 	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,
@@ -15,2028 +15,1890 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_contracts
+//! Autogenerated weights for `pallet_contracts`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-11-03, STEPS: `100`, REPEAT: 5, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 512
-//! HOSTNAME: `ubuntu-8gb-nbg1-1-bench2`, CPU: `AMD EPYC-Milan Processor`
+//! DATE: 2023-07-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-ynta1nyy-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: ``, WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./polymesh
+// target/production/substrate-node
 // benchmark
 // pallet
-// -s
-// 100
-// -r
-// 5
-// -p=*
-// -e=*
-// --heap-pages
-// 4096
-// --db-cache
-// 512
-// --execution
-// wasm
-// --wasm-execution
-// compiled
-// --output
-// ./Polymesh/pallets/weights/src/
-// --template
-// ./Polymesh/.maintain/frame-weight-template.hbs
+// --steps=50
+// --repeat=20
+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/builds/parity/mirrors/substrate/.git/.artifacts/bench.json
+// --pallet=pallet_contracts
+// --chain=dev
+// --header=./HEADER-APACHE2
+// --output=./frame/contracts/src/weights.rs
+// --template=./.maintain/frame-weight-template.hbs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
 use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
 
-/// Weights for pallet_contracts using the Substrate node and recommended hardware.
+/// Weights for `pallet_contracts` using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;
-impl pallet_contracts::weights::WeightInfo for SubstrateWeight {
-    // Storage: Contracts DeletionQueue (r:1 w:0)
-    // Proof: Contracts DeletionQueue (max_values: Some(1), max_size: Some(133122), added: 133617, mode: Measured)
-    fn on_process_deletion_queue_batch() -> Weight {
-        // Minimum execution time: 4_196 nanoseconds.
-        Weight::from_ref_time(4_566_000).saturating_add(DbWeight::get().reads(1))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `k` is `[0, 1024]`.
-    fn on_initialize_per_trie_key(k: u32) -> Weight {
-        // Minimum execution time: 16_224 nanoseconds.
-        Weight::from_ref_time(16_555_000)
-            // Standard Error: 2_656
-            .saturating_add(Weight::from_ref_time(1_115_916).saturating_mul(k.into()))
-            .saturating_add(DbWeight::get().reads(1))
-            .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(k.into())))
-            .saturating_add(DbWeight::get().writes(1))
-            .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(k.into())))
-    }
-    // Storage: Contracts DeletionQueue (r:1 w:1)
-    // Proof: Contracts DeletionQueue (max_values: Some(1), max_size: Some(133122), added: 133617, mode: Measured)
-    /// The range of component `q` is `[0, 1024]`.
-    fn on_initialize_per_queue_item(q: u32) -> Weight {
-        // Minimum execution time: 4_497 nanoseconds.
-        Weight::from_ref_time(12_720_933)
-            // Standard Error: 9_880
-            .saturating_add(Weight::from_ref_time(1_979_223).saturating_mul(q.into()))
-            .saturating_add(DbWeight::get().reads(1))
-            .saturating_add(DbWeight::get().writes(1))
-    }
-    // Storage: Contracts PristineCode (r:1 w:0)
-    // Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured)
-    // Storage: Contracts CodeStorage (r:0 w:1)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    /// The range of component `c` is `[0, 61717]`.
-    fn reinstrument(c: u32) -> Weight {
-        // Minimum execution time: 37_846 nanoseconds.
-        Weight::from_ref_time(57_885_785)
-            // Standard Error: 136
-            .saturating_add(Weight::from_ref_time(57_096).saturating_mul(c.into()))
-            .saturating_add(DbWeight::get().reads(1))
-            .saturating_add(DbWeight::get().writes(1))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:1)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `c` is `[0, 125952]`.
-    fn call_with_code_per_byte(c: u32) -> Weight {
-        // Minimum execution time: 415_913 nanoseconds.
-        Weight::from_ref_time(456_003_585)
-            // Standard Error: 41
-            .saturating_add(Weight::from_ref_time(31_632).saturating_mul(c.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(4))
-    }
-    // Storage: Identity KeyRecords (r:3 w:1)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: Contracts Nonce (r:1 w:1)
-    // Proof: Contracts Nonce (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: System Account (r:2 w:2)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:3 w:3)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity DidKeys (r:0 w:1)
-    // Proof Skipped: Identity DidKeys (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyPortfolioPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyPortfolioPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyExtrinsicPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyExtrinsicPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyAssetPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts CodeStorage (r:0 w:1)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Contracts PristineCode (r:0 w:1)
-    // Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured)
-    /// The range of component `c` is `[0, 61717]`.
-    /// The range of component `i` is `[0, 1048576]`.
-    /// The range of component `s` is `[0, 1048576]`.
-    fn instantiate_with_code(c: u32, i: u32, s: u32) -> Weight {
-        // Minimum execution time: 3_269_226 nanoseconds.
-        Weight::from_ref_time(534_469_642)
-            // Standard Error: 282
-            .saturating_add(Weight::from_ref_time(105_094).saturating_mul(c.into()))
-            // Standard Error: 16
-            .saturating_add(Weight::from_ref_time(1_295).saturating_mul(i.into()))
-            // Standard Error: 16
-            .saturating_add(Weight::from_ref_time(1_449).saturating_mul(s.into()))
-            .saturating_add(DbWeight::get().reads(16))
-            .saturating_add(DbWeight::get().writes(15))
-    }
-    // Storage: Identity KeyRecords (r:3 w:1)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Contracts Nonce (r:1 w:1)
-    // Proof: Contracts Nonce (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: System Account (r:2 w:2)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity DidKeys (r:0 w:1)
-    // Proof Skipped: Identity DidKeys (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyPortfolioPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyPortfolioPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyExtrinsicPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyExtrinsicPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyAssetPermissions (r:0 w:1)
-    // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `i` is `[0, 1048576]`.
-    /// The range of component `s` is `[0, 1048576]`.
-    fn instantiate(i: u32, s: u32) -> Weight {
-        // Minimum execution time: 1_839_605 nanoseconds.
-        Weight::from_ref_time(424_244_743)
-            // Standard Error: 7
-            .saturating_add(Weight::from_ref_time(1_353).saturating_mul(i.into()))
-            // Standard Error: 7
-            .saturating_add(Weight::from_ref_time(1_445).saturating_mul(s.into()))
-            .saturating_add(DbWeight::get().reads(16))
-            .saturating_add(DbWeight::get().writes(12))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:1)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    fn call() -> Weight {
-        // Minimum execution time: 354_541 nanoseconds.
-        Weight::from_ref_time(373_550_000)
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(4))
-    }
-    // Storage: Identity KeyRecords (r:1 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:1 w:1)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts CodeStorage (r:0 w:1)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Contracts PristineCode (r:0 w:1)
-    // Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured)
-    /// The range of component `c` is `[0, 61717]`.
-    fn upload_code(c: u32) -> Weight {
-        // Minimum execution time: 552_677 nanoseconds.
-        Weight::from_ref_time(483_663_371)
-            // Standard Error: 231
-            .saturating_add(Weight::from_ref_time(99_121).saturating_mul(c.into()))
-            .saturating_add(DbWeight::get().reads(3))
-            .saturating_add(DbWeight::get().writes(4))
-    }
-    // Storage: Identity KeyRecords (r:1 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:1 w:1)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts CodeStorage (r:0 w:1)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Contracts PristineCode (r:0 w:1)
-    // Proof: Contracts PristineCode (max_values: None, max_size: Some(125988), added: 128463, mode: Measured)
-    fn remove_code() -> Weight {
-        // Minimum execution time: 43_706 nanoseconds.
-        Weight::from_ref_time(45_318_000)
-            .saturating_add(DbWeight::get().reads(3))
-            .saturating_add(DbWeight::get().writes(4))
-    }
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:2 w:2)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:3 w:3)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    fn set_code() -> Weight {
-        // Minimum execution time: 39_510 nanoseconds.
-        Weight::from_ref_time(40_220_000)
-            .saturating_add(DbWeight::get().reads(6))
-            .saturating_add(DbWeight::get().writes(6))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_caller(r: u32) -> Weight {
-        // Minimum execution time: 402_952 nanoseconds.
-        Weight::from_ref_time(433_384_068)
-            // Standard Error: 119_548
-            .saturating_add(Weight::from_ref_time(35_038_013).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1601 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_is_contract(r: u32) -> Weight {
-        // Minimum execution time: 400_320 nanoseconds.
-        Weight::from_ref_time(244_494_088)
-            // Standard Error: 965_160
-            .saturating_add(Weight::from_ref_time(322_072_864).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1601 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_code_hash(r: u32) -> Weight {
-        // Minimum execution time: 402_373 nanoseconds.
-        Weight::from_ref_time(186_896_462)
-            // Standard Error: 1_455_479
-            .saturating_add(Weight::from_ref_time(426_181_718).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_own_code_hash(r: u32) -> Weight {
-        // Minimum execution time: 400_470 nanoseconds.
-        Weight::from_ref_time(425_030_035)
-            // Standard Error: 138_254
-            .saturating_add(Weight::from_ref_time(48_072_386).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_caller_is_origin(r: u32) -> Weight {
-        // Minimum execution time: 395_382 nanoseconds.
-        Weight::from_ref_time(421_607_312)
-            // Standard Error: 89_893
-            .saturating_add(Weight::from_ref_time(11_186_383).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_address(r: u32) -> Weight {
-        // Minimum execution time: 399_168 nanoseconds.
-        Weight::from_ref_time(428_371_820)
-            // Standard Error: 129_246
-            .saturating_add(Weight::from_ref_time(34_999_207).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_gas_left(r: u32) -> Weight {
-        // Minimum execution time: 398_837 nanoseconds.
-        Weight::from_ref_time(431_153_666)
-            // Standard Error: 119_073
-            .saturating_add(Weight::from_ref_time(34_435_906).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:2 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_balance(r: u32) -> Weight {
-        // Minimum execution time: 395_643 nanoseconds.
-        Weight::from_ref_time(394_743_078)
-            // Standard Error: 1_055_960
-            .saturating_add(Weight::from_ref_time(190_373_824).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_value_transferred(r: u32) -> Weight {
-        // Minimum execution time: 436_795 nanoseconds.
-        Weight::from_ref_time(443_881_640)
-            // Standard Error: 156_759
-            .saturating_add(Weight::from_ref_time(33_196_438).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_minimum_balance(r: u32) -> Weight {
-        // Minimum execution time: 398_657 nanoseconds.
-        Weight::from_ref_time(420_094_398)
-            // Standard Error: 118_316
-            .saturating_add(Weight::from_ref_time(34_990_002).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_block_number(r: u32) -> Weight {
-        // Minimum execution time: 410_875 nanoseconds.
-        Weight::from_ref_time(441_455_942)
-            // Standard Error: 134_442
-            .saturating_add(Weight::from_ref_time(32_884_725).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_now(r: u32) -> Weight {
-        // Minimum execution time: 397_644 nanoseconds.
-        Weight::from_ref_time(432_177_372)
-            // Standard Error: 167_055
-            .saturating_add(Weight::from_ref_time(35_306_394).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: TransactionPayment NextFeeMultiplier (r:1 w:0)
-    // Proof Skipped: TransactionPayment NextFeeMultiplier (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_weight_to_fee(r: u32) -> Weight {
-        // Minimum execution time: 396_464 nanoseconds.
-        Weight::from_ref_time(435_733_297)
-            // Standard Error: 174_804
-            .saturating_add(Weight::from_ref_time(123_625_988).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_gas(r: u32) -> Weight {
-        // Minimum execution time: 239_389 nanoseconds.
-        Weight::from_ref_time(265_777_374)
-            // Standard Error: 105_317
-            .saturating_add(Weight::from_ref_time(8_650_419).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_input(r: u32) -> Weight {
-        // Minimum execution time: 396_805 nanoseconds.
-        Weight::from_ref_time(425_704_592)
-            // Standard Error: 109_330
-            .saturating_add(Weight::from_ref_time(25_480_169).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_input_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 429_292 nanoseconds.
-        Weight::from_ref_time(434_224_318)
-            // Standard Error: 13_292
-            .saturating_add(Weight::from_ref_time(8_023_407).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_return(r: u32) -> Weight {
-        // Minimum execution time: 390_716 nanoseconds.
-        Weight::from_ref_time(416_694_979)
-            // Standard Error: 5_011_570
-            .saturating_add(Weight::from_ref_time(2_163_020).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_return_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 400_910 nanoseconds.
-        Weight::from_ref_time(427_468_421)
-            // Standard Error: 3_837
-            .saturating_add(Weight::from_ref_time(167_988).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:4 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:4 w:4)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:4 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts DeletionQueue (r:1 w:1)
-    // Proof: Contracts DeletionQueue (max_values: Some(1), max_size: Some(133122), added: 133617, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:3 w:3)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_terminate(r: u32) -> Weight {
-        // Minimum execution time: 397_435 nanoseconds.
-        Weight::from_ref_time(421_207_891)
-            // Standard Error: 3_910_120
-            .saturating_add(Weight::from_ref_time(137_996_441).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((10_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((7_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: RandomnessCollectiveFlip RandomMaterial (r:1 w:0)
-    // Proof: RandomnessCollectiveFlip RandomMaterial (max_values: Some(1), max_size: Some(2594), added: 3089, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_random(r: u32) -> Weight {
-        // Minimum execution time: 397_695 nanoseconds.
-        Weight::from_ref_time(412_770_588)
-            // Standard Error: 642_546
-            .saturating_add(Weight::from_ref_time(203_884_444).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_deposit_event(r: u32) -> Weight {
-        // Minimum execution time: 393_819 nanoseconds.
-        Weight::from_ref_time(446_560_511)
-            // Standard Error: 488_344
-            .saturating_add(Weight::from_ref_time(335_162_778).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:322 w:322)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `t` is `[0, 4]`.
-    /// The range of component `n` is `[0, 16]`.
-    fn seal_deposit_event_per_topic_and_kb(t: u32, n: u32) -> Weight {
-        // Minimum execution time: 1_428_819 nanoseconds.
-        Weight::from_ref_time(761_625_462)
-            // Standard Error: 1_279_372
-            .saturating_add(Weight::from_ref_time(254_451_907).saturating_mul(t.into()))
-            // Standard Error: 348_731
-            .saturating_add(Weight::from_ref_time(45_728_474).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(t.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((80_u64).saturating_mul(t.into())))
-    }
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity KeyRecords (r:1 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_debug_message(r: u32) -> Weight {
-        // Minimum execution time: 245_528 nanoseconds.
-        Weight::from_ref_time(265_421_577)
-            // Standard Error: 98_182
-            .saturating_add(Weight::from_ref_time(16_600_590).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(11))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: MaxEncodedLen)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: MaxEncodedLen)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
-    // Storage: Identity KeyRecords (r:1 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `i` is `[0, 1024]`.
-    fn seal_debug_message_per_kb(i: u32) -> Weight {
-        // Minimum execution time: 493_851 nanoseconds.
-        Weight::from_ref_time(519_807_397)
-            // Standard Error: 3_527
-            .saturating_add(Weight::from_ref_time(689_766).saturating_mul(i.into()))
-            .saturating_add(DbWeight::get().reads(11))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 10]`.
-    fn seal_set_storage(r: u32) -> Weight {
-        // Minimum execution time: 399_327 nanoseconds.
-        Weight::from_ref_time(344_064_063)
-            // Standard Error: 1_115_209
-            .saturating_add(Weight::from_ref_time(507_996_691).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((80_u64).saturating_mul(r.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_set_storage_per_new_kb(n: u32) -> Weight {
-        // Minimum execution time: 599_178 nanoseconds.
-        Weight::from_ref_time(800_911_862)
-            // Standard Error: 2_292_239
-            .saturating_add(Weight::from_ref_time(83_258_764).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(60))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(51))
-            .saturating_add(DbWeight::get().writes((7_u64).saturating_mul(n.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_set_storage_per_old_kb(n: u32) -> Weight {
-        // Minimum execution time: 599_007 nanoseconds.
-        Weight::from_ref_time(742_152_135)
-            // Standard Error: 1_499_953
-            .saturating_add(Weight::from_ref_time(63_045_162).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(59))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(50))
-            .saturating_add(DbWeight::get().writes((7_u64).saturating_mul(n.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 10]`.
-    fn seal_clear_storage(r: u32) -> Weight {
-        // Minimum execution time: 398_537 nanoseconds.
-        Weight::from_ref_time(342_623_318)
-            // Standard Error: 1_005_340
-            .saturating_add(Weight::from_ref_time(498_984_244).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((80_u64).saturating_mul(r.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_clear_storage_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 562_752 nanoseconds.
-        Weight::from_ref_time(721_851_483)
-            // Standard Error: 1_833_772
-            .saturating_add(Weight::from_ref_time(62_110_653).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(58))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(49))
-            .saturating_add(DbWeight::get().writes((7_u64).saturating_mul(n.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 10]`.
-    fn seal_get_storage(r: u32) -> Weight {
-        // Minimum execution time: 398_046 nanoseconds.
-        Weight::from_ref_time(345_192_832)
-            // Standard Error: 980_010
-            .saturating_add(Weight::from_ref_time(420_438_228).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_get_storage_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 541_391 nanoseconds.
-        Weight::from_ref_time(682_834_854)
-            // Standard Error: 1_569_125
-            .saturating_add(Weight::from_ref_time(130_478_381).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(59))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 10]`.
-    fn seal_contains_storage(r: u32) -> Weight {
-        // Minimum execution time: 399_078 nanoseconds.
-        Weight::from_ref_time(351_894_096)
-            // Standard Error: 1_062_878
-            .saturating_add(Weight::from_ref_time(402_826_637).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_contains_storage_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 535_192 nanoseconds.
-        Weight::from_ref_time(664_758_693)
-            // Standard Error: 1_380_264
-            .saturating_add(Weight::from_ref_time(55_148_742).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(58))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 10]`.
-    fn seal_take_storage(r: u32) -> Weight {
-        // Minimum execution time: 398_837 nanoseconds.
-        Weight::from_ref_time(336_379_766)
-            // Standard Error: 1_144_458
-            .saturating_add(Weight::from_ref_time(516_948_294).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((80_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((80_u64).saturating_mul(r.into())))
-    }
-    // Storage: Skipped Metadata (r:0 w:0)
-    // Proof Skipped: Skipped Metadata (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 8]`.
-    fn seal_take_storage_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 570_674 nanoseconds.
-        Weight::from_ref_time(742_446_013)
-            // Standard Error: 1_979_836
-            .saturating_add(Weight::from_ref_time(136_197_558).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(59))
-            .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(n.into())))
-            .saturating_add(DbWeight::get().writes(50))
-            .saturating_add(DbWeight::get().writes((7_u64).saturating_mul(n.into())))
-    }
-    // Storage: Identity KeyRecords (r:1602 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1602 w:1601)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:3202 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_transfer(r: u32) -> Weight {
-        // Minimum execution time: 401_222 nanoseconds.
-        Weight::from_ref_time(419_377_000)
-            // Standard Error: 5_384_995
-            .saturating_add(Weight::from_ref_time(4_205_493_450).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().reads((320_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(4))
-            .saturating_add(DbWeight::get().writes((80_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:1602 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1601 w:1601)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:2 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1601 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:3202 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:1602 w:1602)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_call(r: u32) -> Weight {
-        // Minimum execution time: 401_251 nanoseconds.
-        Weight::from_ref_time(406_889_000)
-            // Standard Error: 16_965_406
-            .saturating_add(Weight::from_ref_time(29_549_960_620).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().reads((480_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((160_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1536 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:1537 w:1537)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_delegate_call(r: u32) -> Weight {
-        // Minimum execution time: 418_888 nanoseconds.
-        Weight::from_ref_time(428_462_000)
-            // Standard Error: 11_082_090
-            .saturating_add(Weight::from_ref_time(26_523_250_583).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((150_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((75_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:82 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:82 w:3)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:81 w:3)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:2 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:81 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:162 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:4 w:4)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `t` is `[0, 1]`.
-    /// The range of component `c` is `[0, 1024]`.
-    fn seal_call_per_transfer_clone_kb(t: u32, c: u32) -> Weight {
-        // Minimum execution time: 3_719_880 nanoseconds.
-        Weight::from_ref_time(16_024_523_241)
-            // Standard Error: 37_975
-            .saturating_add(Weight::from_ref_time(8_483_948).saturating_mul(c.into()))
-            .saturating_add(DbWeight::get().reads(493))
-            .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(t.into())))
-            .saturating_add(DbWeight::get().writes(163))
-    }
-    // Storage: Identity KeyRecords (r:3202 w:1600)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:3202 w:3202)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1601 w:1601)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1601 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts Nonce (r:1 w:1)
-    // Proof: Contracts Nonce (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1600 w:1600)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:1602 w:1602)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity DidKeys (r:0 w:1600)
-    // Proof Skipped: Identity DidKeys (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyPortfolioPermissions (r:0 w:1600)
-    // Proof Skipped: Identity KeyPortfolioPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyExtrinsicPermissions (r:0 w:1600)
-    // Proof Skipped: Identity KeyExtrinsicPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyAssetPermissions (r:0 w:1600)
-    // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_instantiate(r: u32) -> Weight {
-        // Minimum execution time: 408_952 nanoseconds.
-        Weight::from_ref_time(417_795_000)
-            // Standard Error: 63_972_123
-            .saturating_add(Weight::from_ref_time(44_427_256_573).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(14))
-            .saturating_add(DbWeight::get().reads((640_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(5))
-            .saturating_add(DbWeight::get().writes((800_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:162 w:80)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:162 w:162)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:81 w:81)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:2 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts Nonce (r:1 w:1)
-    // Proof: Contracts Nonce (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1 w:1)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:82 w:82)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity DidKeys (r:0 w:80)
-    // Proof Skipped: Identity DidKeys (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyPortfolioPermissions (r:0 w:80)
-    // Proof Skipped: Identity KeyPortfolioPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyExtrinsicPermissions (r:0 w:80)
-    // Proof Skipped: Identity KeyExtrinsicPermissions (max_values: None, max_size: None, mode: Measured)
-    // Storage: Identity KeyAssetPermissions (r:0 w:80)
-    // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `t` is `[0, 1]`.
-    /// The range of component `i` is `[0, 960]`.
-    /// The range of component `s` is `[0, 960]`.
-    fn seal_instantiate_per_transfer_input_salt_kb(t: u32, i: u32, s: u32) -> Weight {
-        // Minimum execution time: 127_621_399 nanoseconds.
-        Weight::from_ref_time(26_707_412_172)
-            // Standard Error: 112_882_618
-            .saturating_add(Weight::from_ref_time(2_160_248_963).saturating_mul(t.into()))
-            // Standard Error: 179_125
-            .saturating_add(Weight::from_ref_time(103_883_925).saturating_mul(i.into()))
-            // Standard Error: 179_125
-            .saturating_add(Weight::from_ref_time(104_574_561).saturating_mul(s.into()))
-            .saturating_add(DbWeight::get().reads(495))
-            .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(t.into())))
-            .saturating_add(DbWeight::get().writes(726))
-            .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(t.into())))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_hash_sha2_256(r: u32) -> Weight {
-        // Minimum execution time: 395_081 nanoseconds.
-        Weight::from_ref_time(420_563_212)
-            // Standard Error: 5_442_436
-            .saturating_add(Weight::from_ref_time(36_454_120).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_hash_sha2_256_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 446_798 nanoseconds.
-        Weight::from_ref_time(377_592_578)
-            // Standard Error: 64_257
-            .saturating_add(Weight::from_ref_time(62_093_877).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_hash_keccak_256(r: u32) -> Weight {
-        // Minimum execution time: 395_573 nanoseconds.
-        Weight::from_ref_time(418_488_726)
-            // Standard Error: 3_899_669
-            .saturating_add(Weight::from_ref_time(86_279_939).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_hash_keccak_256_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 483_343 nanoseconds.
-        Weight::from_ref_time(448_380_075)
-            // Standard Error: 80_439
-            .saturating_add(Weight::from_ref_time(224_354_532).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_hash_blake2_256(r: u32) -> Weight {
-        // Minimum execution time: 393_860 nanoseconds.
-        Weight::from_ref_time(419_515_104)
-            // Standard Error: 4_367_873
-            .saturating_add(Weight::from_ref_time(52_698_228).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_hash_blake2_256_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 449_562 nanoseconds.
-        Weight::from_ref_time(308_507_545)
-            // Standard Error: 81_633
-            .saturating_add(Weight::from_ref_time(87_987_668).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_hash_blake2_128(r: u32) -> Weight {
-        // Minimum execution time: 395_933 nanoseconds.
-        Weight::from_ref_time(419_926_441)
-            // Standard Error: 4_731_591
-            .saturating_add(Weight::from_ref_time(57_855_224).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `n` is `[0, 1024]`.
-    fn seal_hash_blake2_128_per_kb(n: u32) -> Weight {
-        // Minimum execution time: 457_575 nanoseconds.
-        Weight::from_ref_time(352_603_205)
-            // Standard Error: 37_067
-            .saturating_add(Weight::from_ref_time(87_784_334).saturating_mul(n.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_ecdsa_recover(r: u32) -> Weight {
-        // Minimum execution time: 399_558 nanoseconds.
-        Weight::from_ref_time(425_561_678)
-            // Standard Error: 4_624_024
-            .saturating_add(Weight::from_ref_time(3_679_707_987).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 1]`.
-    fn seal_ecdsa_to_eth_address(r: u32) -> Weight {
-        // Minimum execution time: 398_717 nanoseconds.
-        Weight::from_ref_time(424_055_413)
-            // Standard Error: 4_632_408
-            .saturating_add(Weight::from_ref_time(864_389_919).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1536 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts OwnerInfoOf (r:1536 w:1536)
-    // Proof: Contracts OwnerInfoOf (max_values: None, max_size: Some(88), added: 2563, mode: Measured)
-    // Storage: System EventTopics (r:1538 w:1538)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_set_code_hash(r: u32) -> Weight {
-        // Minimum execution time: 403_505 nanoseconds.
-        Weight::from_ref_time(417_356_000)
-            // Standard Error: 5_645_961
-            .saturating_add(Weight::from_ref_time(2_122_644_945).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().reads((225_u64).saturating_mul(r.into())))
-            .saturating_add(DbWeight::get().writes(3))
-            .saturating_add(DbWeight::get().writes((150_u64).saturating_mul(r.into())))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_reentrance_count(r: u32) -> Weight {
-        // Minimum execution time: 403_195 nanoseconds.
-        Weight::from_ref_time(425_364_083)
-            // Standard Error: 110_462
-            .saturating_add(Weight::from_ref_time(11_248_571).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_account_reentrance_count(r: u32) -> Weight {
-        // Minimum execution time: 399_949 nanoseconds.
-        Weight::from_ref_time(482_447_140)
-            // Standard Error: 261_088
-            .saturating_add(Weight::from_ref_time(23_808_762).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(12))
-            .saturating_add(DbWeight::get().writes(3))
-    }
-    // Storage: Identity KeyRecords (r:2 w:0)
-    // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
-    // Storage: System Account (r:1 w:0)
-    // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: Measured)
-    // Storage: Contracts ContractInfoOf (r:1 w:1)
-    // Proof: Contracts ContractInfoOf (max_values: None, max_size: Some(290), added: 2765, mode: Measured)
-    // Storage: Contracts CodeStorage (r:1 w:0)
-    // Proof: Contracts CodeStorage (max_values: None, max_size: Some(126001), added: 128476, mode: Measured)
-    // Storage: Timestamp Now (r:1 w:0)
-    // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: Identity IsDidFrozen (r:1 w:0)
-    // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
-    // Storage: Instance2Group ActiveMembers (r:1 w:0)
-    // Proof Skipped: Instance2Group ActiveMembers (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Identity Claims (r:2 w:0)
-    // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
-    // Storage: Contracts Nonce (r:1 w:1)
-    // Proof: Contracts Nonce (max_values: Some(1), max_size: Some(8), added: 503, mode: Measured)
-    // Storage: System EventTopics (r:2 w:2)
-    // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
-    /// The range of component `r` is `[0, 20]`.
-    fn seal_instantiation_nonce(r: u32) -> Weight {
-        // Minimum execution time: 398_967 nanoseconds.
-        Weight::from_ref_time(424_793_253)
-            // Standard Error: 108_421
-            .saturating_add(Weight::from_ref_time(9_435_694).saturating_mul(r.into()))
-            .saturating_add(DbWeight::get().reads(13))
-            .saturating_add(DbWeight::get().writes(4))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64const(r: u32) -> Weight {
-        // Minimum execution time: 1_432 nanoseconds.
-        Weight::from_ref_time(2_976_570)
-            // Standard Error: 6_517
-            .saturating_add(Weight::from_ref_time(407_720).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64load(r: u32) -> Weight {
-        // Minimum execution time: 1_872 nanoseconds.
-        Weight::from_ref_time(3_589_790)
-            // Standard Error: 10_171
-            .saturating_add(Weight::from_ref_time(965_092).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64store(r: u32) -> Weight {
-        // Minimum execution time: 1_893 nanoseconds.
-        Weight::from_ref_time(4_203_087)
-            // Standard Error: 15_164
-            .saturating_add(Weight::from_ref_time(1_005_754).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_select(r: u32) -> Weight {
-        // Minimum execution time: 1_563 nanoseconds.
-        Weight::from_ref_time(4_260_035)
-            // Standard Error: 6_545
-            .saturating_add(Weight::from_ref_time(994_576).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_if(r: u32) -> Weight {
-        // Minimum execution time: 1_602 nanoseconds.
-        Weight::from_ref_time(2_086_898)
-            // Standard Error: 10_617
-            .saturating_add(Weight::from_ref_time(1_108_430).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_br(r: u32) -> Weight {
-        // Minimum execution time: 1_652 nanoseconds.
-        Weight::from_ref_time(3_437_688)
-            // Standard Error: 6_796
-            .saturating_add(Weight::from_ref_time(604_159).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_br_if(r: u32) -> Weight {
-        // Minimum execution time: 1_543 nanoseconds.
-        Weight::from_ref_time(3_054_930)
-            // Standard Error: 6_967
-            .saturating_add(Weight::from_ref_time(828_109).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_br_table(r: u32) -> Weight {
-        // Minimum execution time: 1_512 nanoseconds.
-        Weight::from_ref_time(3_958_018)
-            // Standard Error: 7_334
-            .saturating_add(Weight::from_ref_time(1_014_253).saturating_mul(r.into()))
-    }
-    /// The range of component `e` is `[1, 256]`.
-    fn instr_br_table_per_entry(e: u32) -> Weight {
-        // Minimum execution time: 3_275 nanoseconds.
-        Weight::from_ref_time(4_240_081)
-            // Standard Error: 633
-            .saturating_add(Weight::from_ref_time(5_530).saturating_mul(e.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_call(r: u32) -> Weight {
-        // Minimum execution time: 1_552 nanoseconds.
-        Weight::from_ref_time(2_373_478)
-            // Standard Error: 14_786
-            .saturating_add(Weight::from_ref_time(4_184_040).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_call_indirect(r: u32) -> Weight {
-        // Minimum execution time: 1_822 nanoseconds.
-        Weight::from_ref_time(3_560_351)
-            // Standard Error: 17_730
-            .saturating_add(Weight::from_ref_time(5_295_361).saturating_mul(r.into()))
-    }
-    /// The range of component `p` is `[0, 128]`.
-    fn instr_call_indirect_per_param(p: u32) -> Weight {
-        // Minimum execution time: 7_711 nanoseconds.
-        Weight::from_ref_time(10_202_976)
-            // Standard Error: 2_580
-            .saturating_add(Weight::from_ref_time(206_299).saturating_mul(p.into()))
-    }
-    /// The range of component `l` is `[0, 1024]`.
-    fn instr_call_per_local(l: u32) -> Weight {
-        // Minimum execution time: 5_448 nanoseconds.
-        Weight::from_ref_time(7_501_165)
-            // Standard Error: 700
-            .saturating_add(Weight::from_ref_time(56_053).saturating_mul(l.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_local_get(r: u32) -> Weight {
-        // Minimum execution time: 3_015 nanoseconds.
-        Weight::from_ref_time(3_824_613)
-            // Standard Error: 4_987
-            .saturating_add(Weight::from_ref_time(327_097).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_local_set(r: u32) -> Weight {
-        // Minimum execution time: 3_015 nanoseconds.
-        Weight::from_ref_time(4_139_308)
-            // Standard Error: 4_601
-            .saturating_add(Weight::from_ref_time(387_086).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_local_tee(r: u32) -> Weight {
-        // Minimum execution time: 3_065 nanoseconds.
-        Weight::from_ref_time(4_332_200)
-            // Standard Error: 5_916
-            .saturating_add(Weight::from_ref_time(499_864).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_global_get(r: u32) -> Weight {
-        // Minimum execution time: 1_773 nanoseconds.
-        Weight::from_ref_time(2_883_358)
-            // Standard Error: 6_315
-            .saturating_add(Weight::from_ref_time(854_932).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_global_set(r: u32) -> Weight {
-        // Minimum execution time: 1_803 nanoseconds.
-        Weight::from_ref_time(3_279_564)
-            // Standard Error: 9_167
-            .saturating_add(Weight::from_ref_time(965_926).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_memory_current(r: u32) -> Weight {
-        // Minimum execution time: 1_853 nanoseconds.
-        Weight::from_ref_time(3_473_218)
-            // Standard Error: 6_816
-            .saturating_add(Weight::from_ref_time(653_966).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 1]`.
-    fn instr_memory_grow(r: u32) -> Weight {
-        // Minimum execution time: 1_502 nanoseconds.
-        Weight::from_ref_time(1_900_710)
-            // Standard Error: 129_819
-            .saturating_add(Weight::from_ref_time(171_899_955).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64clz(r: u32) -> Weight {
-        // Minimum execution time: 1_603 nanoseconds.
-        Weight::from_ref_time(3_177_847)
-            // Standard Error: 6_026
-            .saturating_add(Weight::from_ref_time(723_996).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64ctz(r: u32) -> Weight {
-        // Minimum execution time: 1_542 nanoseconds.
-        Weight::from_ref_time(3_119_678)
-            // Standard Error: 6_196
-            .saturating_add(Weight::from_ref_time(727_216).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64popcnt(r: u32) -> Weight {
-        // Minimum execution time: 1_552 nanoseconds.
-        Weight::from_ref_time(3_448_117)
-            // Standard Error: 6_549
-            .saturating_add(Weight::from_ref_time(721_565).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64eqz(r: u32) -> Weight {
-        // Minimum execution time: 1_533 nanoseconds.
-        Weight::from_ref_time(3_114_032)
-            // Standard Error: 6_329
-            .saturating_add(Weight::from_ref_time(703_819).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64extendsi32(r: u32) -> Weight {
-        // Minimum execution time: 1_622 nanoseconds.
-        Weight::from_ref_time(3_161_830)
-            // Standard Error: 5_953
-            .saturating_add(Weight::from_ref_time(736_429).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64extendui32(r: u32) -> Weight {
-        // Minimum execution time: 1_523 nanoseconds.
-        Weight::from_ref_time(2_798_383)
-            // Standard Error: 7_100
-            .saturating_add(Weight::from_ref_time(734_258).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i32wrapi64(r: u32) -> Weight {
-        // Minimum execution time: 1_532 nanoseconds.
-        Weight::from_ref_time(3_073_472)
-            // Standard Error: 6_735
-            .saturating_add(Weight::from_ref_time(762_407).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64eq(r: u32) -> Weight {
-        // Minimum execution time: 1_452 nanoseconds.
-        Weight::from_ref_time(4_360_231)
-            // Standard Error: 6_452
-            .saturating_add(Weight::from_ref_time(817_666).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64ne(r: u32) -> Weight {
-        // Minimum execution time: 1_492 nanoseconds.
-        Weight::from_ref_time(4_142_518)
-            // Standard Error: 5_983
-            .saturating_add(Weight::from_ref_time(812_616).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64lts(r: u32) -> Weight {
-        // Minimum execution time: 1_512 nanoseconds.
-        Weight::from_ref_time(3_928_570)
-            // Standard Error: 6_698
-            .saturating_add(Weight::from_ref_time(826_335).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64ltu(r: u32) -> Weight {
-        // Minimum execution time: 1_563 nanoseconds.
-        Weight::from_ref_time(4_196_087)
-            // Standard Error: 7_462
-            .saturating_add(Weight::from_ref_time(828_280).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64gts(r: u32) -> Weight {
-        // Minimum execution time: 1_543 nanoseconds.
-        Weight::from_ref_time(4_073_228)
-            // Standard Error: 6_635
-            .saturating_add(Weight::from_ref_time(800_911).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64gtu(r: u32) -> Weight {
-        // Minimum execution time: 1_442 nanoseconds.
-        Weight::from_ref_time(4_119_237)
-            // Standard Error: 7_041
-            .saturating_add(Weight::from_ref_time(827_018).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64les(r: u32) -> Weight {
-        // Minimum execution time: 1_452 nanoseconds.
-        Weight::from_ref_time(3_845_638)
-            // Standard Error: 5_829
-            .saturating_add(Weight::from_ref_time(825_088).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64leu(r: u32) -> Weight {
-        // Minimum execution time: 1_552 nanoseconds.
-        Weight::from_ref_time(4_458_429)
-            // Standard Error: 6_406
-            .saturating_add(Weight::from_ref_time(797_368).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64ges(r: u32) -> Weight {
-        // Minimum execution time: 1_522 nanoseconds.
-        Weight::from_ref_time(4_139_462)
-            // Standard Error: 7_744
-            .saturating_add(Weight::from_ref_time(842_176).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64geu(r: u32) -> Weight {
-        // Minimum execution time: 1_553 nanoseconds.
-        Weight::from_ref_time(4_083_952)
-            // Standard Error: 6_565
-            .saturating_add(Weight::from_ref_time(815_484).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64add(r: u32) -> Weight {
-        // Minimum execution time: 1_632 nanoseconds.
-        Weight::from_ref_time(3_998_358)
-            // Standard Error: 7_613
-            .saturating_add(Weight::from_ref_time(814_574).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64sub(r: u32) -> Weight {
-        // Minimum execution time: 1_672 nanoseconds.
-        Weight::from_ref_time(3_986_269)
-            // Standard Error: 6_328
-            .saturating_add(Weight::from_ref_time(801_303).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64mul(r: u32) -> Weight {
-        // Minimum execution time: 1_482 nanoseconds.
-        Weight::from_ref_time(3_864_893)
-            // Standard Error: 7_094
-            .saturating_add(Weight::from_ref_time(798_064).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64divs(r: u32) -> Weight {
-        // Minimum execution time: 1_502 nanoseconds.
-        Weight::from_ref_time(3_931_121)
-            // Standard Error: 7_138
-            .saturating_add(Weight::from_ref_time(1_038_410).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64divu(r: u32) -> Weight {
-        // Minimum execution time: 1_552 nanoseconds.
-        Weight::from_ref_time(3_615_189)
-            // Standard Error: 8_099
-            .saturating_add(Weight::from_ref_time(1_032_527).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64rems(r: u32) -> Weight {
-        // Minimum execution time: 1_552 nanoseconds.
-        Weight::from_ref_time(4_078_735)
-            // Standard Error: 7_090
-            .saturating_add(Weight::from_ref_time(980_061).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64remu(r: u32) -> Weight {
-        // Minimum execution time: 1_462 nanoseconds.
-        Weight::from_ref_time(3_788_425)
-            // Standard Error: 8_167
-            .saturating_add(Weight::from_ref_time(982_236).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64and(r: u32) -> Weight {
-        // Minimum execution time: 1_673 nanoseconds.
-        Weight::from_ref_time(3_848_049)
-            // Standard Error: 5_806
-            .saturating_add(Weight::from_ref_time(783_981).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64or(r: u32) -> Weight {
-        // Minimum execution time: 1_652 nanoseconds.
-        Weight::from_ref_time(3_872_354)
-            // Standard Error: 5_947
-            .saturating_add(Weight::from_ref_time(808_090).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64xor(r: u32) -> Weight {
-        // Minimum execution time: 1_502 nanoseconds.
-        Weight::from_ref_time(3_971_389)
-            // Standard Error: 6_872
-            .saturating_add(Weight::from_ref_time(809_865).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64shl(r: u32) -> Weight {
-        // Minimum execution time: 1_482 nanoseconds.
-        Weight::from_ref_time(3_887_491)
-            // Standard Error: 6_699
-            .saturating_add(Weight::from_ref_time(793_761).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64shrs(r: u32) -> Weight {
-        // Minimum execution time: 1_543 nanoseconds.
-        Weight::from_ref_time(3_998_830)
-            // Standard Error: 6_515
-            .saturating_add(Weight::from_ref_time(798_548).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64shru(r: u32) -> Weight {
-        // Minimum execution time: 1_472 nanoseconds.
-        Weight::from_ref_time(3_974_694)
-            // Standard Error: 7_624
-            .saturating_add(Weight::from_ref_time(792_433).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64rotl(r: u32) -> Weight {
-        // Minimum execution time: 1_533 nanoseconds.
-        Weight::from_ref_time(4_062_456)
-            // Standard Error: 7_297
-            .saturating_add(Weight::from_ref_time(800_364).saturating_mul(r.into()))
-    }
-    /// The range of component `r` is `[0, 50]`.
-    fn instr_i64rotr(r: u32) -> Weight {
-        // Minimum execution time: 1_542 nanoseconds.
-        Weight::from_ref_time(3_696_987)
-            // Standard Error: 6_337
-            .saturating_add(Weight::from_ref_time(801_635).saturating_mul(r.into()))
-    }
+impl pallet_contracts::WeightInfo for SubstrateWeight {
+	/// Storage: `Contracts::DeletionQueueCounter` (r:1 w:0)
+	/// Proof: `Contracts::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	fn on_process_deletion_queue_batch() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 2_527_000 picoseconds.
+		Weight::from_parts(2_651_000, 1627)
+			.saturating_add(DbWeight::get().reads(1_u64))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `k` is `[0, 1024]`.
+	fn on_initialize_per_trie_key(k: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `451 + k * (69 ±0)`
+		//  Estimated: `441 + k * (70 ±0)`
+		// Minimum execution time: 13_291_000 picoseconds.
+		Weight::from_parts(13_825_000, 441)
+			// Standard Error: 1_137
+			.saturating_add(Weight::from_parts(1_244_309, 0).saturating_mul(k.into()))
+			.saturating_add(DbWeight::get().reads(2_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(k.into())))
+			.saturating_add(DbWeight::get().writes(2_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(k.into())))
+			.saturating_add(Weight::from_parts(0, 70).saturating_mul(k.into()))
+	}
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553022fca90611ba8b7942f8bdb3b97f6580` (r:2 w:1)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553022fca90611ba8b7942f8bdb3b97f6580` (r:2 w:1)
+	/// The range of component `c` is `[0, 125952]`.
+	fn v9_migration_step(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211 + c * (1 ±0)`
+		//  Estimated: `6149 + c * (1 ±0)`
+		// Minimum execution time: 8_359_000 picoseconds.
+		Weight::from_parts(9_179_121, 6149)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_312, 0).saturating_mul(c.into()))
+			.saturating_add(DbWeight::get().reads(2_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
+	}
+	/// Storage: `Contracts::ContractInfoOf` (r:3 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	fn v10_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `709`
+		//  Estimated: `9124`
+		// Minimum execution time: 42_457_000 picoseconds.
+		Weight::from_parts(44_556_000, 9124)
+			.saturating_add(DbWeight::get().reads(4_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Contracts::DeletionQueue` (r:1 w:1025)
+	/// Proof: `Contracts::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
+	/// Storage: `Contracts::DeletionQueueCounter` (r:0 w:1)
+	/// Proof: `Contracts::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// The range of component `k` is `[0, 1024]`.
+	fn v11_migration_step(k: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `171 + k * (1 ±0)`
+		//  Estimated: `3635 + k * (1 ±0)`
+		// Minimum execution time: 3_839_000 picoseconds.
+		Weight::from_parts(3_462_337, 3635)
+			// Standard Error: 1_384
+			.saturating_add(Weight::from_parts(1_166_522, 0).saturating_mul(k.into()))
+			.saturating_add(DbWeight::get().reads(1_u64))
+			.saturating_add(DbWeight::get().writes(2_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(k.into())))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(k.into()))
+	}
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553053f13fd319a03c211337c76e0fe776df` (r:2 w:0)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553053f13fd319a03c211337c76e0fe776df` (r:2 w:0)
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553022fca90611ba8b7942f8bdb3b97f6580` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc553022fca90611ba8b7942f8bdb3b97f6580` (r:1 w:1)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:0 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// The range of component `c` is `[0, 125952]`.
+	fn v12_migration_step(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `325 + c * (1 ±0)`
+		//  Estimated: `6263 + c * (1 ±0)`
+		// Minimum execution time: 17_001_000 picoseconds.
+		Weight::from_parts(17_095_380, 6263)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(411, 0).saturating_mul(c.into()))
+			.saturating_add(DbWeight::get().reads(4_u64))
+			.saturating_add(DbWeight::get().writes(2_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
+	}
+	/// Storage: `Contracts::ContractInfoOf` (r:3 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	fn v13_migration_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `639`
+		//  Estimated: `9054`
+		// Minimum execution time: 35_342_000 picoseconds.
+		Weight::from_parts(36_839_000, 9054)
+			.saturating_add(DbWeight::get().reads(3_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:1)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	fn migration_noop() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 3_272_000 picoseconds.
+		Weight::from_parts(3_553_000, 1627)
+			.saturating_add(DbWeight::get().reads(1_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:1)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:1)
+	fn migrate() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `166`
+		//  Estimated: `3631`
+		// Minimum execution time: 12_788_000 picoseconds.
+		Weight::from_parts(13_163_000, 3631)
+			.saturating_add(DbWeight::get().reads(2_u64))
+			.saturating_add(DbWeight::get().writes(2_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	fn on_runtime_upgrade_noop() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 4_794_000 picoseconds.
+		Weight::from_parts(5_086_000, 3607)
+			.saturating_add(DbWeight::get().reads(1_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	fn on_runtime_upgrade_in_progress() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `167`
+		//  Estimated: `3632`
+		// Minimum execution time: 6_616_000 picoseconds.
+		Weight::from_parts(7_034_000, 3632)
+			.saturating_add(DbWeight::get().reads(2_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	/// Proof: UNKNOWN KEY `0x4342193e496fab7ec59d615ed0dc55304e7b9012096b41c4eb3aaf947f6ea429` (r:1 w:0)
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:1)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	fn on_runtime_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 6_985_000 picoseconds.
+		Weight::from_parts(7_477_000, 3607)
+			.saturating_add(DbWeight::get().reads(2_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `c` is `[0, 125952]`.
+	fn call_with_code_per_byte(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `783`
+		//  Estimated: `6732 + c * (1 ±0)`
+		// Minimum execution time: 306_088_000 picoseconds.
+		Weight::from_parts(268_361_911, 6732)
+			// Standard Error: 76
+			.saturating_add(Weight::from_parts(38_334, 0).saturating_mul(c.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(c.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:3 w:3)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Contracts::Nonce` (r:1 w:1)
+	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:0 w:1)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// The range of component `c` is `[0, 125952]`.
+	/// The range of component `i` is `[0, 1048576]`.
+	/// The range of component `s` is `[0, 1048576]`.
+	fn instantiate_with_code(c: u32, i: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `303`
+		//  Estimated: `8745`
+		// Minimum execution time: 4_224_657_000 picoseconds.
+		Weight::from_parts(451_557_864, 8745)
+			// Standard Error: 216
+			.saturating_add(Weight::from_parts(111_761, 0).saturating_mul(c.into()))
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(1_794, 0).saturating_mul(i.into()))
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(2_013, 0).saturating_mul(s.into()))
+			.saturating_add(DbWeight::get().reads(10_u64))
+			.saturating_add(DbWeight::get().writes(9_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Contracts::Nonce` (r:1 w:1)
+	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `i` is `[0, 1048576]`.
+	/// The range of component `s` is `[0, 1048576]`.
+	fn instantiate(i: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `527`
+		//  Estimated: `6517`
+		// Minimum execution time: 2_029_313_000 picoseconds.
+		Weight::from_parts(353_077_600, 6517)
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(1_781, 0).saturating_mul(i.into()))
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(1_729, 0).saturating_mul(s.into()))
+			.saturating_add(DbWeight::get().reads(10_u64))
+			.saturating_add(DbWeight::get().writes(7_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn call() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `817`
+		//  Estimated: `6757`
+		// Minimum execution time: 204_086_000 picoseconds.
+		Weight::from_parts(216_738_000, 6757)
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:1 w:1)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:0 w:1)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// The range of component `c` is `[0, 125952]`.
+	fn upload_code(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `3607`
+		// Minimum execution time: 269_337_000 picoseconds.
+		Weight::from_parts(220_186_006, 3607)
+			// Standard Error: 106
+			.saturating_add(Weight::from_parts(74_291, 0).saturating_mul(c.into()))
+			.saturating_add(DbWeight::get().reads(3_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:1 w:1)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:0 w:1)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	fn remove_code() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `259`
+		//  Estimated: `3724`
+		// Minimum execution time: 35_127_000 picoseconds.
+		Weight::from_parts(36_180_000, 3724)
+			.saturating_add(DbWeight::get().reads(3_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:2 w:2)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:3 w:3)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn set_code() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `576`
+		//  Estimated: `8991`
+		// Minimum execution time: 37_550_000 picoseconds.
+		Weight::from_parts(39_149_000, 8991)
+			.saturating_add(DbWeight::get().reads(7_u64))
+			.saturating_add(DbWeight::get().writes(6_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_caller(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `857 + r * (6 ±0)`
+		//  Estimated: `6798 + r * (6 ±0)`
+		// Minimum execution time: 269_991_000 picoseconds.
+		Weight::from_parts(293_993_592, 6798)
+			// Standard Error: 665
+			.saturating_add(Weight::from_parts(343_796, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1601 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_is_contract(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `924 + r * (232 ±0)`
+		//  Estimated: `6831 + r * (2707 ±0)`
+		// Minimum execution time: 274_151_000 picoseconds.
+		Weight::from_parts(83_529_206, 6831)
+			// Standard Error: 8_452
+			.saturating_add(Weight::from_parts(3_534_024, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 2707).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1601 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_code_hash(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `910 + r * (236 ±0)`
+		//  Estimated: `6835 + r * (2711 ±0)`
+		// Minimum execution time: 276_689_000 picoseconds.
+		Weight::from_parts(110_268_281, 6835)
+			// Standard Error: 8_106
+			.saturating_add(Weight::from_parts(4_376_136, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 2711).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_own_code_hash(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `864 + r * (6 ±0)`
+		//  Estimated: `6806 + r * (6 ±0)`
+		// Minimum execution time: 274_079_000 picoseconds.
+		Weight::from_parts(282_258_090, 6806)
+			// Standard Error: 1_343
+			.saturating_add(Weight::from_parts(464_680, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_caller_is_origin(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `854 + r * (3 ±0)`
+		//  Estimated: `6799 + r * (3 ±0)`
+		// Minimum execution time: 270_960_000 picoseconds.
+		Weight::from_parts(281_985_584, 6799)
+			// Standard Error: 378
+			.saturating_add(Weight::from_parts(184_462, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_caller_is_root(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `744 + r * (3 ±0)`
+		//  Estimated: `6684 + r * (3 ±0)`
+		// Minimum execution time: 244_835_000 picoseconds.
+		Weight::from_parts(270_660_753, 6684)
+			// Standard Error: 390
+			.saturating_add(Weight::from_parts(164_232, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(7_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_address(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `858 + r * (6 ±0)`
+		//  Estimated: `6800 + r * (6 ±0)`
+		// Minimum execution time: 273_269_000 picoseconds.
+		Weight::from_parts(274_468_168, 6800)
+			// Standard Error: 2_246
+			.saturating_add(Weight::from_parts(386_838, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_gas_left(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `854 + r * (6 ±0)`
+		//  Estimated: `6795 + r * (6 ±0)`
+		// Minimum execution time: 275_244_000 picoseconds.
+		Weight::from_parts(281_299_739, 6795)
+			// Standard Error: 2_890
+			.saturating_add(Weight::from_parts(600_498, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:2 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_balance(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `998 + r * (6 ±0)`
+		//  Estimated: `6922 + r * (6 ±0)`
+		// Minimum execution time: 271_540_000 picoseconds.
+		Weight::from_parts(298_456_935, 6922)
+			// Standard Error: 2_881
+			.saturating_add(Weight::from_parts(1_719_337, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_value_transferred(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `868 + r * (6 ±0)`
+		//  Estimated: `6817 + r * (6 ±0)`
+		// Minimum execution time: 274_832_000 picoseconds.
+		Weight::from_parts(286_078_648, 6817)
+			// Standard Error: 695
+			.saturating_add(Weight::from_parts(345_045, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_minimum_balance(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `866 + r * (6 ±0)`
+		//  Estimated: `6815 + r * (6 ±0)`
+		// Minimum execution time: 267_337_000 picoseconds.
+		Weight::from_parts(283_693_170, 6815)
+			// Standard Error: 580
+			.saturating_add(Weight::from_parts(345_350, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_block_number(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `863 + r * (6 ±0)`
+		//  Estimated: `6813 + r * (6 ±0)`
+		// Minimum execution time: 276_313_000 picoseconds.
+		Weight::from_parts(287_689_703, 6813)
+			// Standard Error: 1_251
+			.saturating_add(Weight::from_parts(342_536, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_now(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `854 + r * (6 ±0)`
+		//  Estimated: `6799 + r * (6 ±0)`
+		// Minimum execution time: 274_196_000 picoseconds.
+		Weight::from_parts(288_641_687, 6799)
+			// Standard Error: 530
+			.saturating_add(Weight::from_parts(336_194, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
+	/// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_weight_to_fee(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `928 + r * (14 ±0)`
+		//  Estimated: `6861 + r * (14 ±0)`
+		// Minimum execution time: 254_997_000 picoseconds.
+		Weight::from_parts(292_260_891, 6861)
+			// Standard Error: 1_019
+			.saturating_add(Weight::from_parts(1_447_021, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 14).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_input(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `856 + r * (6 ±0)`
+		//  Estimated: `6800 + r * (6 ±0)`
+		// Minimum execution time: 272_720_000 picoseconds.
+		Weight::from_parts(287_125_181, 6800)
+			// Standard Error: 491
+			.saturating_add(Weight::from_parts(294_488, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 6).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_input_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `860`
+		//  Estimated: `6800`
+		// Minimum execution time: 280_665_000 picoseconds.
+		Weight::from_parts(233_022_448, 6800)
+			// Standard Error: 23
+			.saturating_add(Weight::from_parts(996, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_return(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `844 + r * (45 ±0)`
+		//  Estimated: `6784 + r * (45 ±0)`
+		// Minimum execution time: 250_335_000 picoseconds.
+		Weight::from_parts(278_774_071, 6784)
+			// Standard Error: 873_509
+			.saturating_add(Weight::from_parts(4_562_628, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 45).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_return_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `854`
+		//  Estimated: `6807`
+		// Minimum execution time: 278_402_000 picoseconds.
+		Weight::from_parts(285_491_021, 6807)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(312, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:4 w:4)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:2 w:2)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::DeletionQueueCounter` (r:1 w:1)
+	/// Proof: `Contracts::DeletionQueueCounter` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:3 w:3)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Contracts::DeletionQueue` (r:0 w:1)
+	/// Proof: `Contracts::DeletionQueue` (`max_values`: None, `max_size`: Some(142), added: 2617, mode: `Measured`)
+	/// The range of component `r` is `[0, 1]`.
+	fn seal_terminate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2963 + r * (400 ±0)`
+		//  Estimated: `8903 + r * (7825 ±0)`
+		// Minimum execution time: 281_030_000 picoseconds.
+		Weight::from_parts(305_435_226, 8903)
+			// Standard Error: 816_824
+			.saturating_add(Weight::from_parts(131_691_873, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((6_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((9_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 7825).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `RandomnessCollectiveFlip::RandomMaterial` (r:1 w:0)
+	/// Proof: `RandomnessCollectiveFlip::RandomMaterial` (`max_values`: Some(1), `max_size`: Some(2594), added: 3089, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_random(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `935 + r * (10 ±0)`
+		//  Estimated: `6876 + r * (10 ±0)`
+		// Minimum execution time: 261_369_000 picoseconds.
+		Weight::from_parts(300_458_315, 6876)
+			// Standard Error: 3_506
+			.saturating_add(Weight::from_parts(1_971_733, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_deposit_event(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `854 + r * (10 ±0)`
+		//  Estimated: `6799 + r * (10 ±0)`
+		// Minimum execution time: 262_894_000 picoseconds.
+		Weight::from_parts(285_321_838, 6799)
+			// Standard Error: 6_585
+			.saturating_add(Weight::from_parts(3_998_744, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:6 w:6)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `t` is `[0, 4]`.
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_deposit_event_per_topic_and_byte(t: u32, n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `873 + t * (32 ±0)`
+		//  Estimated: `6820 + t * (2508 ±0)`
+		// Minimum execution time: 275_909_000 picoseconds.
+		Weight::from_parts(289_251_568, 6820)
+			// Standard Error: 94_431
+			.saturating_add(Weight::from_parts(3_007_409, 0).saturating_mul(t.into()))
+			// Standard Error: 26
+			.saturating_add(Weight::from_parts(815, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(t.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(0, 2508).saturating_mul(t.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_debug_message(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `853 + r * (7 ±0)`
+		//  Estimated: `6797 + r * (7 ±0)`
+		// Minimum execution time: 168_482_000 picoseconds.
+		Weight::from_parts(178_065_606, 6797)
+			// Standard Error: 371
+			.saturating_add(Weight::from_parts(242_851, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 7).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `MaxEncodedLen`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `i` is `[0, 1048576]`.
+	fn seal_debug_message_per_byte(i: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `125804`
+		//  Estimated: `131746`
+		// Minimum execution time: 407_401_000 picoseconds.
+		Weight::from_parts(426_585_443, 131746)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(986, 0).saturating_mul(i.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_set_storage(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `921 + r * (292 ±0)`
+		//  Estimated: `919 + r * (293 ±0)`
+		// Minimum execution time: 275_800_000 picoseconds.
+		Weight::from_parts(161_230_700, 919)
+			// Standard Error: 12_908
+			.saturating_add(Weight::from_parts(6_965_844, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 293).saturating_mul(r.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_set_storage_per_new_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1380`
+		//  Estimated: `1356`
+		// Minimum execution time: 289_258_000 picoseconds.
+		Weight::from_parts(334_318_402, 1356)
+			// Standard Error: 59
+			.saturating_add(Weight::from_parts(808, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(10_u64))
+			.saturating_add(DbWeight::get().writes(6_u64))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_set_storage_per_old_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1243 + n * (1 ±0)`
+		//  Estimated: `1243 + n * (1 ±0)`
+		// Minimum execution time: 277_874_000 picoseconds.
+		Weight::from_parts(303_956_600, 1243)
+			// Standard Error: 33
+			.saturating_add(Weight::from_parts(58, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_clear_storage(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `917 + r * (288 ±0)`
+		//  Estimated: `921 + r * (289 ±0)`
+		// Minimum execution time: 255_230_000 picoseconds.
+		Weight::from_parts(163_226_984, 921)
+			// Standard Error: 12_691
+			.saturating_add(Weight::from_parts(6_808_905, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 289).saturating_mul(r.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_clear_storage_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1239 + n * (1 ±0)`
+		//  Estimated: `1239 + n * (1 ±0)`
+		// Minimum execution time: 275_780_000 picoseconds.
+		Weight::from_parts(301_967_262, 1239)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(128, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_get_storage(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `911 + r * (296 ±0)`
+		//  Estimated: `916 + r * (297 ±0)`
+		// Minimum execution time: 279_295_000 picoseconds.
+		Weight::from_parts(208_289_066, 916)
+			// Standard Error: 8_330
+			.saturating_add(Weight::from_parts(5_600_713, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 297).saturating_mul(r.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_get_storage_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1255 + n * (1 ±0)`
+		//  Estimated: `1255 + n * (1 ±0)`
+		// Minimum execution time: 276_745_000 picoseconds.
+		Weight::from_parts(298_824_233, 1255)
+			// Standard Error: 36
+			.saturating_add(Weight::from_parts(717, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_contains_storage(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `932 + r * (288 ±0)`
+		//  Estimated: `933 + r * (289 ±0)`
+		// Minimum execution time: 275_137_000 picoseconds.
+		Weight::from_parts(196_695_898, 933)
+			// Standard Error: 9_207
+			.saturating_add(Weight::from_parts(5_466_071, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 289).saturating_mul(r.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_contains_storage_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1242 + n * (1 ±0)`
+		//  Estimated: `1242 + n * (1 ±0)`
+		// Minimum execution time: 269_315_000 picoseconds.
+		Weight::from_parts(296_795_271, 1242)
+			// Standard Error: 39
+			.saturating_add(Weight::from_parts(242, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_take_storage(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `905 + r * (296 ±0)`
+		//  Estimated: `912 + r * (297 ±0)`
+		// Minimum execution time: 256_406_000 picoseconds.
+		Weight::from_parts(156_850_288, 912)
+			// Standard Error: 12_496
+			.saturating_add(Weight::from_parts(7_055_305, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 297).saturating_mul(r.into()))
+	}
+	/// Storage: `Skipped::Metadata` (r:0 w:0)
+	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 16384]`.
+	fn seal_take_storage_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1256 + n * (1 ±0)`
+		//  Estimated: `1256 + n * (1 ±0)`
+		// Minimum execution time: 280_297_000 picoseconds.
+		Weight::from_parts(302_241_752, 1256)
+			// Standard Error: 34
+			.saturating_add(Weight::from_parts(748, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1602 w:1601)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_transfer(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1449 + r * (45 ±0)`
+		//  Estimated: `7346 + r * (2520 ±0)`
+		// Minimum execution time: 274_834_000 picoseconds.
+		Weight::from_parts(176_977_557, 7346)
+			// Standard Error: 32_386
+			.saturating_add(Weight::from_parts(39_393_162, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:801 w:801)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:2 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:2 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:803 w:803)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_call(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1304 + r * (268 ±0)`
+		//  Estimated: `9485 + r * (2744 ±0)`
+		// Minimum execution time: 279_802_000 picoseconds.
+		Weight::from_parts(287_995_000, 9485)
+			// Standard Error: 99_110
+			.saturating_add(Weight::from_parts(245_521_843, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(11_u64))
+			.saturating_add(DbWeight::get().reads((2_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(DbWeight::get().writes((2_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2744).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:736 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:736 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:737 w:737)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 800]`.
+	fn seal_delegate_call(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + r * (576 ±0)`
+		//  Estimated: `6803 + r * (2637 ±3)`
+		// Minimum execution time: 273_435_000 picoseconds.
+		Weight::from_parts(276_865_000, 6803)
+			// Standard Error: 148_051
+			.saturating_add(Weight::from_parts(244_660_274, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((3_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2637).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:3 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:2 w:2)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:2 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:2 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:4 w:4)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `c` is `[0, 1048576]`.
+	fn seal_call_per_transfer_clone_byte(t: u32, c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1322 + t * (310 ±0)`
+		//  Estimated: `12212 + t * (5260 ±0)`
+		// Minimum execution time: 477_593_000 picoseconds.
+		Weight::from_parts(69_887_451, 12212)
+			// Standard Error: 11_764_606
+			.saturating_add(Weight::from_parts(373_361_977, 0).saturating_mul(t.into()))
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(1_000, 0).saturating_mul(c.into()))
+			.saturating_add(DbWeight::get().reads(13_u64))
+			.saturating_add(DbWeight::get().reads((2_u64).saturating_mul(t.into())))
+			.saturating_add(DbWeight::get().writes(6_u64))
+			.saturating_add(DbWeight::get().writes((2_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(0, 5260).saturating_mul(t.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1602 w:1602)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:801 w:801)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:801 w:800)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:801 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::Nonce` (r:1 w:1)
+	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:802 w:802)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[1, 800]`.
+	fn seal_instantiate(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1380 + r * (255 ±0)`
+		//  Estimated: `7204 + r * (5206 ±0)`
+		// Minimum execution time: 652_387_000 picoseconds.
+		Weight::from_parts(658_670_000, 7204)
+			// Standard Error: 363_054
+			.saturating_add(Weight::from_parts(395_547_049, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(10_u64))
+			.saturating_add(DbWeight::get().reads((6_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(6_u64))
+			.saturating_add(DbWeight::get().writes((5_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:4 w:4)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:2 w:2)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:2 w:1)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:2 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::Nonce` (r:1 w:1)
+	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:3 w:3)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `t` is `[0, 1]`.
+	/// The range of component `i` is `[0, 983040]`.
+	/// The range of component `s` is `[0, 983040]`.
+	fn seal_instantiate_per_transfer_input_salt_byte(t: u32, i: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `1233 + t * (156 ±0)`
+		//  Estimated: `9663 + t * (2578 ±2)`
+		// Minimum execution time: 2_299_620_000 picoseconds.
+		Weight::from_parts(1_274_859_063, 9663)
+			// Standard Error: 12_129_871
+			.saturating_add(Weight::from_parts(16_608_792, 0).saturating_mul(t.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(1_014, 0).saturating_mul(i.into()))
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(1_180, 0).saturating_mul(s.into()))
+			.saturating_add(DbWeight::get().reads(15_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(t.into())))
+			.saturating_add(DbWeight::get().writes(10_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(t.into())))
+			.saturating_add(Weight::from_parts(0, 2578).saturating_mul(t.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_hash_sha2_256(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `853 + r * (8 ±0)`
+		//  Estimated: `6794 + r * (8 ±0)`
+		// Minimum execution time: 267_959_000 picoseconds.
+		Weight::from_parts(282_967_946, 6794)
+			// Standard Error: 624
+			.saturating_add(Weight::from_parts(402_344, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_hash_sha2_256_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `861`
+		//  Estimated: `6801`
+		// Minimum execution time: 274_585_000 picoseconds.
+		Weight::from_parts(272_480_647, 6801)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_089, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_hash_keccak_256(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `855 + r * (8 ±0)`
+		//  Estimated: `6797 + r * (8 ±0)`
+		// Minimum execution time: 268_346_000 picoseconds.
+		Weight::from_parts(284_168_231, 6797)
+			// Standard Error: 620
+			.saturating_add(Weight::from_parts(805_038, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_hash_keccak_256_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `863`
+		//  Estimated: `6805`
+		// Minimum execution time: 273_073_000 picoseconds.
+		Weight::from_parts(280_346_065, 6805)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(3_357, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_hash_blake2_256(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `855 + r * (8 ±0)`
+		//  Estimated: `6800 + r * (8 ±0)`
+		// Minimum execution time: 263_072_000 picoseconds.
+		Weight::from_parts(284_487_433, 6800)
+			// Standard Error: 668
+			.saturating_add(Weight::from_parts(458_763, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_hash_blake2_256_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `863`
+		//  Estimated: `6809`
+		// Minimum execution time: 271_488_000 picoseconds.
+		Weight::from_parts(273_877_727, 6809)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_202, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_hash_blake2_128(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `855 + r * (8 ±0)`
+		//  Estimated: `6801 + r * (8 ±0)`
+		// Minimum execution time: 271_365_000 picoseconds.
+		Weight::from_parts(285_100_883, 6801)
+			// Standard Error: 651
+			.saturating_add(Weight::from_parts(462_754, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 8).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 1048576]`.
+	fn seal_hash_blake2_128_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `863`
+		//  Estimated: `6803`
+		// Minimum execution time: 272_341_000 picoseconds.
+		Weight::from_parts(275_388_470, 6803)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_192, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `n` is `[0, 125697]`.
+	fn seal_sr25519_verify_per_byte(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `988 + n * (1 ±0)`
+		//  Estimated: `6925 + n * (1 ±0)`
+		// Minimum execution time: 341_302_000 picoseconds.
+		Weight::from_parts(354_111_630, 6925)
+			// Standard Error: 8
+			.saturating_add(Weight::from_parts(5_913, 0).saturating_mul(n.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 160]`.
+	fn seal_sr25519_verify(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `804 + r * (112 ±0)`
+		//  Estimated: `6742 + r * (112 ±0)`
+		// Minimum execution time: 275_325_000 picoseconds.
+		Weight::from_parts(333_041_903, 6742)
+			// Standard Error: 11_171
+			.saturating_add(Weight::from_parts(56_605_218, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 112).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 160]`.
+	fn seal_ecdsa_recover(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `898 + r * (76 ±0)`
+		//  Estimated: `6793 + r * (77 ±0)`
+		// Minimum execution time: 274_165_000 picoseconds.
+		Weight::from_parts(347_487_800, 6793)
+			// Standard Error: 15_398
+			.saturating_add(Weight::from_parts(46_072_020, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 77).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 160]`.
+	fn seal_ecdsa_to_eth_address(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `868 + r * (42 ±0)`
+		//  Estimated: `6807 + r * (42 ±0)`
+		// Minimum execution time: 270_855_000 picoseconds.
+		Weight::from_parts(320_777_105, 6807)
+			// Standard Error: 11_106
+			.saturating_add(Weight::from_parts(12_053_053, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 42).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1536 w:1536)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1536 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:1538 w:1538)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_set_code_hash(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + r * (965 ±0)`
+		//  Estimated: `6798 + r * (3090 ±10)`
+		// Minimum execution time: 257_732_000 picoseconds.
+		Weight::from_parts(280_982_000, 6798)
+			// Standard Error: 68_194
+			.saturating_add(Weight::from_parts(27_413_991, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((3_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((2_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 3090).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:33 w:32)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 32]`.
+	fn add_delegate_dependency(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `918 + r * (132 ±0)`
+		//  Estimated: `6870 + r * (2606 ±0)`
+		// Minimum execution time: 278_285_000 picoseconds.
+		Weight::from_parts(298_012_554, 6870)
+			// Standard Error: 24_160
+			.saturating_add(Weight::from_parts(6_363_118, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2606).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::CodeInfoOf` (r:33 w:32)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `MaxEncodedLen`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 32]`.
+	fn remove_delegate_dependency(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `965 + r * (183 ±0)`
+		//  Estimated: `129453 + r * (2568 ±0)`
+		// Minimum execution time: 258_198_000 picoseconds.
+		Weight::from_parts(290_090_206, 129453)
+			// Standard Error: 19_792
+			.saturating_add(Weight::from_parts(6_004_811, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(DbWeight::get().writes((1_u64).saturating_mul(r.into())))
+			.saturating_add(Weight::from_parts(0, 2568).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_reentrance_count(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `849 + r * (3 ±0)`
+		//  Estimated: `6799 + r * (3 ±0)`
+		// Minimum execution time: 263_315_000 picoseconds.
+		Weight::from_parts(284_093_748, 6799)
+			// Standard Error: 371
+			.saturating_add(Weight::from_parts(176_949, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_account_reentrance_count(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2082 + r * (39 ±0)`
+		//  Estimated: `7886 + r * (40 ±0)`
+		// Minimum execution time: 274_583_000 picoseconds.
+		Weight::from_parts(352_081_486, 7886)
+			// Standard Error: 1_799
+			.saturating_add(Weight::from_parts(313_433, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(8_u64))
+			.saturating_add(DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 40).saturating_mul(r.into()))
+	}
+	/// Storage: `Contracts::MigrationInProgress` (r:1 w:0)
+	/// Proof: `Contracts::MigrationInProgress` (`max_values`: Some(1), `max_size`: Some(1026), added: 1521, mode: `Measured`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `Measured`)
+	/// Storage: `Contracts::ContractInfoOf` (r:1 w:1)
+	/// Proof: `Contracts::ContractInfoOf` (`max_values`: None, `max_size`: Some(1819), added: 4294, mode: `Measured`)
+	/// Storage: `Contracts::CodeInfoOf` (r:1 w:0)
+	/// Proof: `Contracts::CodeInfoOf` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `Measured`)
+	/// Storage: `Contracts::PristineCode` (r:1 w:0)
+	/// Proof: `Contracts::PristineCode` (`max_values`: None, `max_size`: Some(125988), added: 128463, mode: `Measured`)
+	/// Storage: `Timestamp::Now` (r:1 w:0)
+	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `Contracts::Nonce` (r:1 w:1)
+	/// Proof: `Contracts::Nonce` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `Measured`)
+	/// Storage: `System::EventTopics` (r:2 w:2)
+	/// Proof: `System::EventTopics` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `r` is `[0, 1600]`.
+	fn seal_instantiation_nonce(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `852 + r * (3 ±0)`
+		//  Estimated: `6799 + r * (3 ±0)`
+		// Minimum execution time: 267_291_000 picoseconds.
+		Weight::from_parts(287_500_540, 6799)
+			// Standard Error: 393
+			.saturating_add(Weight::from_parts(152_587, 0).saturating_mul(r.into()))
+			.saturating_add(DbWeight::get().reads(9_u64))
+			.saturating_add(DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 3).saturating_mul(r.into()))
+	}
+	/// The range of component `r` is `[0, 5000]`.
+	fn instr_i64const(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 1_440_000 picoseconds.
+		Weight::from_parts(1_656_631, 0)
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(10_486, 0).saturating_mul(r.into()))
+	}
 }
diff --git a/pallets/weights/src/pallet_corporate_actions.rs b/pallets/weights/src/pallet_corporate_actions.rs
index 715f4cce59..e8dd6867dc 100644
--- a/pallets/weights/src/pallet_corporate_actions.rs
+++ b/pallets/weights/src/pallet_corporate_actions.rs
@@ -57,7 +57,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateAction MaxDetailsLength (max_values: Some(1), max_size: None, mode: Measured)
     fn set_max_details_length() -> Weight {
         // Minimum execution time: 9_604 nanoseconds.
-        Weight::from_ref_time(10_586_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(10_586_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -72,9 +72,9 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     /// The range of component `t` is `[0, 500]`.
     fn set_default_targets(t: u32) -> Weight {
         // Minimum execution time: 34_903 nanoseconds.
-        Weight::from_ref_time(43_628_601)
+        Weight::from_parts(43_628_601, 0)
             // Standard Error: 2_349
-            .saturating_add(Weight::from_ref_time(313_974).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(313_974, 0).saturating_mul(t.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -90,7 +90,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateAction DefaultWithholdingTax (max_values: None, max_size: None, mode: Measured)
     fn set_default_withholding_tax() -> Weight {
         // Minimum execution time: 35_834 nanoseconds.
-        Weight::from_ref_time(40_821_000)
+        Weight::from_parts(40_821_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -107,9 +107,9 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     /// The range of component `w` is `[0, 999]`.
     fn set_did_withholding_tax(w: u32) -> Weight {
         // Minimum execution time: 37_276 nanoseconds.
-        Weight::from_ref_time(58_202_009)
+        Weight::from_parts(58_202_009, 0)
             // Standard Error: 1_772
-            .saturating_add(Weight::from_ref_time(68_189).saturating_mul(w.into()))
+            .saturating_add(Weight::from_parts(68_189, 0).saturating_mul(w.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -155,11 +155,11 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     /// The range of component `t` is `[0, 500]`.
     fn initiate_corporate_action_use_defaults(w: u32, t: u32) -> Weight {
         // Minimum execution time: 164_487 nanoseconds.
-        Weight::from_ref_time(132_794_590)
+        Weight::from_parts(132_794_590, 0)
             // Standard Error: 1_984
-            .saturating_add(Weight::from_ref_time(71_890).saturating_mul(w.into()))
+            .saturating_add(Weight::from_parts(71_890, 0).saturating_mul(w.into()))
             // Standard Error: 3_966
-            .saturating_add(Weight::from_ref_time(72_435).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(72_435, 0).saturating_mul(t.into()))
             .saturating_add(DbWeight::get().reads(15))
             .saturating_add(DbWeight::get().writes(7))
     }
@@ -199,11 +199,11 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     /// The range of component `t` is `[0, 500]`.
     fn initiate_corporate_action_provided(w: u32, t: u32) -> Weight {
         // Minimum execution time: 268_151 nanoseconds.
-        Weight::from_ref_time(140_602_268)
+        Weight::from_parts(140_602_268, 0)
             // Standard Error: 2_141
-            .saturating_add(Weight::from_ref_time(140_908).saturating_mul(w.into()))
+            .saturating_add(Weight::from_parts(140_908, 0).saturating_mul(w.into()))
             // Standard Error: 4_281
-            .saturating_add(Weight::from_ref_time(278_367).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(278_367, 0).saturating_mul(t.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(7))
     }
@@ -224,9 +224,9 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     /// The range of component `d` is `[0, 1000]`.
     fn link_ca_doc(d: u32) -> Weight {
         // Minimum execution time: 42_243 nanoseconds.
-        Weight::from_ref_time(42_443_000)
+        Weight::from_parts(42_443_000, 0)
             // Standard Error: 7_796
-            .saturating_add(Weight::from_ref_time(4_013_372).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(4_013_372, 0).saturating_mul(d.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(d.into())))
             .saturating_add(DbWeight::get().writes(1))
@@ -259,7 +259,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateBallot RCV (max_values: None, max_size: None, mode: Measured)
     fn remove_ca_with_ballot() -> Weight {
         // Minimum execution time: 87_891 nanoseconds.
-        Weight::from_ref_time(107_050_000)
+        Weight::from_parts(107_050_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(8))
     }
@@ -287,7 +287,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateAction CADocLink (max_values: None, max_size: None, mode: Measured)
     fn remove_ca_with_dist() -> Weight {
         // Minimum execution time: 80_921 nanoseconds.
-        Weight::from_ref_time(85_537_000)
+        Weight::from_parts(85_537_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -321,7 +321,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint ScheduledCheckpoints (max_values: None, max_size: None, mode: Measured)
     fn change_record_date_with_ballot() -> Weight {
         // Minimum execution time: 99_510 nanoseconds.
-        Weight::from_ref_time(102_093_000)
+        Weight::from_parts(102_093_000, 0)
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -355,7 +355,7 @@ impl pallet_corporate_actions::WeightInfo for SubstrateWeight {
     // Proof Skipped: Checkpoint ScheduledCheckpoints (max_values: None, max_size: None, mode: Measured)
     fn change_record_date_with_dist() -> Weight {
         // Minimum execution time: 100_200 nanoseconds.
-        Weight::from_ref_time(101_983_000)
+        Weight::from_parts(101_983_000, 0)
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(6))
     }
diff --git a/pallets/weights/src/pallet_corporate_ballot.rs b/pallets/weights/src/pallet_corporate_ballot.rs
index 7684c915b9..3c2c12739d 100644
--- a/pallets/weights/src/pallet_corporate_ballot.rs
+++ b/pallets/weights/src/pallet_corporate_ballot.rs
@@ -80,9 +80,9 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1000]`.
     fn attach_ballot(c: u32) -> Weight {
         // Minimum execution time: 67_091 nanoseconds.
-        Weight::from_ref_time(74_961_125)
+        Weight::from_parts(74_961_125, 0)
             // Standard Error: 1_675
-            .saturating_add(Weight::from_ref_time(38_276).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(38_276, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -110,11 +110,11 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     /// The range of component `t` is `[0, 1000]`.
     fn vote(c: u32, t: u32) -> Weight {
         // Minimum execution time: 119_479 nanoseconds.
-        Weight::from_ref_time(80_064_182)
+        Weight::from_parts(80_064_182, 0)
             // Standard Error: 1_740
-            .saturating_add(Weight::from_ref_time(65_826).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(65_826, 0).saturating_mul(c.into()))
             // Standard Error: 1_740
-            .saturating_add(Weight::from_ref_time(80_482).saturating_mul(t.into()))
+            .saturating_add(Weight::from_parts(80_482, 0).saturating_mul(t.into()))
             .saturating_add(DbWeight::get().reads(10))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -132,7 +132,7 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
     fn change_end() -> Weight {
         // Minimum execution time: 44_336 nanoseconds.
-        Weight::from_ref_time(46_128_000)
+        Weight::from_parts(46_128_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -155,9 +155,9 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1000]`.
     fn change_meta(c: u32) -> Weight {
         // Minimum execution time: 47_822 nanoseconds.
-        Weight::from_ref_time(54_981_701)
+        Weight::from_parts(54_981_701, 0)
             // Standard Error: 1_669
-            .saturating_add(Weight::from_ref_time(39_212).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(39_212, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -177,7 +177,7 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateBallot RCV (max_values: None, max_size: None, mode: Measured)
     fn change_rcv() -> Weight {
         // Minimum execution time: 43_334 nanoseconds.
-        Weight::from_ref_time(46_760_000)
+        Weight::from_parts(46_760_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -201,7 +201,7 @@ impl pallet_corporate_actions::ballot::WeightInfo for SubstrateWeight {
     // Proof Skipped: CorporateBallot RCV (max_values: None, max_size: None, mode: Measured)
     fn remove_ballot() -> Weight {
         // Minimum execution time: 48_623 nanoseconds.
-        Weight::from_ref_time(50_136_000)
+        Weight::from_parts(50_136_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(4))
     }
diff --git a/pallets/weights/src/pallet_external_agents.rs b/pallets/weights/src/pallet_external_agents.rs
index 9775b31f13..b3157a5c4e 100644
--- a/pallets/weights/src/pallet_external_agents.rs
+++ b/pallets/weights/src/pallet_external_agents.rs
@@ -68,9 +68,9 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     /// The range of component `p` is `[0, 19]`.
     fn create_group(p: u32) -> Weight {
         // Minimum execution time: 35_183 nanoseconds.
-        Weight::from_ref_time(39_772_344)
+        Weight::from_parts(39_772_344, 0)
             // Standard Error: 28_474
-            .saturating_add(Weight::from_ref_time(569_661).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(569_661, 0).saturating_mul(p.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -89,9 +89,9 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     /// The range of component `p` is `[0, 19]`.
     fn set_group_permissions(p: u32) -> Weight {
         // Minimum execution time: 35_944 nanoseconds.
-        Weight::from_ref_time(39_599_164)
+        Weight::from_parts(39_599_164, 0)
             // Standard Error: 18_415
-            .saturating_add(Weight::from_ref_time(653_565).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(653_565, 0).saturating_mul(p.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -109,7 +109,7 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     // Proof Skipped: ExternalAgents AgentOf (max_values: None, max_size: None, mode: Measured)
     fn remove_agent() -> Weight {
         // Minimum execution time: 44_916 nanoseconds.
-        Weight::from_ref_time(45_919_000)
+        Weight::from_parts(45_919_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -123,7 +123,7 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     // Proof Skipped: ExternalAgents AgentOf (max_values: None, max_size: None, mode: Measured)
     fn abdicate() -> Weight {
         // Minimum execution time: 35_794 nanoseconds.
-        Weight::from_ref_time(39_620_000)
+        Weight::from_parts(39_620_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -141,7 +141,7 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     // Proof Skipped: ExternalAgents NumFullAgents (max_values: None, max_size: None, mode: Measured)
     fn change_group_custom() -> Weight {
         // Minimum execution time: 46_660 nanoseconds.
-        Weight::from_ref_time(50_255_000)
+        Weight::from_parts(50_255_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -157,7 +157,7 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     // Proof Skipped: ExternalAgents NumFullAgents (max_values: None, max_size: None, mode: Measured)
     fn change_group_builtin() -> Weight {
         // Minimum execution time: 42_934 nanoseconds.
-        Weight::from_ref_time(43_255_000)
+        Weight::from_parts(43_255_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -183,7 +183,7 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     // Proof Skipped: ExternalAgents AgentOf (max_values: None, max_size: None, mode: Measured)
     fn accept_become_agent() -> Weight {
         // Minimum execution time: 69_164 nanoseconds.
-        Weight::from_ref_time(71_556_000)
+        Weight::from_parts(71_556_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -210,9 +210,9 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     /// The range of component `p` is `[0, 19]`.
     fn create_group_and_add_auth(p: u32) -> Weight {
         // Minimum execution time: 52_729 nanoseconds.
-        Weight::from_ref_time(57_036_314)
+        Weight::from_parts(57_036_314, 0)
             // Standard Error: 26_050
-            .saturating_add(Weight::from_ref_time(570_204).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(570_204, 0).saturating_mul(p.into()))
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -233,9 +233,9 @@ impl pallet_external_agents::WeightInfo for SubstrateWeight {
     /// The range of component `p` is `[0, 19]`.
     fn create_and_change_custom_group(p: u32) -> Weight {
         // Minimum execution time: 60_300 nanoseconds.
-        Weight::from_ref_time(63_331_883)
+        Weight::from_parts(63_331_883, 0)
             // Standard Error: 32_956
-            .saturating_add(Weight::from_ref_time(563_391).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(563_391, 0).saturating_mul(p.into()))
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(4))
     }
diff --git a/pallets/weights/src/pallet_grandpa.rs b/pallets/weights/src/pallet_grandpa.rs
index 71e8da4c08..668cc2f4fb 100644
--- a/pallets/weights/src/pallet_grandpa.rs
+++ b/pallets/weights/src/pallet_grandpa.rs
@@ -54,36 +54,34 @@ use polymesh_runtime_common::{
 /// Weights for pallet_grandpa using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;
 impl pallet_grandpa::WeightInfo for SubstrateWeight {
-    fn report_equivocation(validator_count: u32) -> Weight {
+    fn report_equivocation(validator_count: u32, max_nominators_per_validator: u32) -> Weight {
         // we take the validator set count from the membership proof to
         // calculate the weight but we set a floor of 100 validators.
         let validator_count = validator_count.max(100) as u64;
 
-        // worst case we are considering is that the given offender
-        // is backed by 200 nominators
-        const MAX_NOMINATORS: u64 = 200;
-
         // checking membership proof
-        Weight::from_ref_time(35u64 * WEIGHT_REF_TIME_PER_MICROS)
+        Weight::from_parts(35u64 * WEIGHT_REF_TIME_PER_MICROS, 0)
             .saturating_add(
-                Weight::from_ref_time(175u64 * WEIGHT_REF_TIME_PER_NANOS)
+                Weight::from_parts(175u64 * WEIGHT_REF_TIME_PER_NANOS, 0)
                     .saturating_mul(validator_count),
             )
             .saturating_add(DbWeight::get().reads(5))
             // check equivocation proof
-            .saturating_add(Weight::from_ref_time(95u64 * WEIGHT_REF_TIME_PER_MICROS))
+            .saturating_add(Weight::from_parts(95u64 * WEIGHT_REF_TIME_PER_MICROS, 0))
             // report offence
-            .saturating_add(Weight::from_ref_time(110u64 * WEIGHT_REF_TIME_PER_MICROS))
-            .saturating_add(Weight::from_ref_time(
-                25u64 * WEIGHT_REF_TIME_PER_MICROS * MAX_NOMINATORS,
+            .saturating_add(Weight::from_parts(110u64 * WEIGHT_REF_TIME_PER_MICROS, 0))
+            .saturating_add(Weight::from_parts(
+                25u64 * WEIGHT_REF_TIME_PER_MICROS * max_nominators_per_validator as u64,
+                0,
             ))
-            .saturating_add(DbWeight::get().reads(14 + 3 * MAX_NOMINATORS))
-            .saturating_add(DbWeight::get().writes(10 + 3 * MAX_NOMINATORS))
+            .saturating_add(DbWeight::get().reads(14 + 3 * max_nominators_per_validator as u64))
+            .saturating_add(DbWeight::get().writes(10 + 3 * max_nominators_per_validator as u64))
             // fetching set id -> session index mappings
             .saturating_add(DbWeight::get().reads(2))
     }
-    // Storage: Grandpa Stalled (r:0 w:1)
+
     fn note_stalled() -> Weight {
-        Weight::from_ref_time(2_979_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(3u64 * WEIGHT_REF_TIME_PER_MICROS, 0)
+            .saturating_add(DbWeight::get().writes(1))
     }
 }
diff --git a/pallets/weights/src/pallet_group.rs b/pallets/weights/src/pallet_group.rs
index 9141ebfff9..f0610288d0 100644
--- a/pallets/weights/src/pallet_group.rs
+++ b/pallets/weights/src/pallet_group.rs
@@ -57,7 +57,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance2Group ActiveMembersLimit (max_values: Some(1), max_size: None, mode: Measured)
     fn set_active_members_limit() -> Weight {
         // Minimum execution time: 14_232 nanoseconds.
-        Weight::from_ref_time(15_674_000)
+        Weight::from_parts(15_674_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -71,7 +71,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn add_member() -> Weight {
         // Minimum execution time: 102_413 nanoseconds.
-        Weight::from_ref_time(108_412_000)
+        Weight::from_parts(108_412_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -81,7 +81,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance2Group InactiveMembers (max_values: Some(1), max_size: None, mode: Measured)
     fn remove_member() -> Weight {
         // Minimum execution time: 78_647 nanoseconds.
-        Weight::from_ref_time(80_401_000)
+        Weight::from_parts(80_401_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -95,7 +95,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Instance2Group InactiveMembers (max_values: Some(1), max_size: None, mode: Measured)
     fn disable_member() -> Weight {
         // Minimum execution time: 107_641 nanoseconds.
-        Weight::from_ref_time(113_250_000)
+        Weight::from_parts(113_250_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -107,7 +107,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn swap_member() -> Weight {
         // Minimum execution time: 125_188 nanoseconds.
-        Weight::from_ref_time(136_303_000)
+        Weight::from_parts(136_303_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -122,9 +122,9 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     /// The range of component `m` is `[1, 1000]`.
     fn reset_members(m: u32) -> Weight {
         // Minimum execution time: 47_890 nanoseconds.
-        Weight::from_ref_time(53_350_000)
+        Weight::from_parts(53_350_000, 0)
             // Standard Error: 37_131
-            .saturating_add(Weight::from_ref_time(14_607_210).saturating_mul(m.into()))
+            .saturating_add(Weight::from_parts(14_607_210, 0).saturating_mul(m.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(m.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -140,7 +140,7 @@ impl pallet_group::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn abdicate_membership() -> Weight {
         // Minimum execution time: 108_652 nanoseconds.
-        Weight::from_ref_time(120_459_000)
+        Weight::from_parts(120_459_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(2))
     }
diff --git a/pallets/weights/src/pallet_identity.rs b/pallets/weights/src/pallet_identity.rs
index a9e23ad764..e2d88a73b8 100644
--- a/pallets/weights/src/pallet_identity.rs
+++ b/pallets/weights/src/pallet_identity.rs
@@ -81,7 +81,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity ChildDid (max_values: None, max_size: None, mode: Measured)
     fn create_child_identity() -> Weight {
         // Minimum execution time: 75_032 nanoseconds.
-        Weight::from_ref_time(77_236_000)
+        Weight::from_parts(77_236_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(10))
     }
@@ -110,9 +110,9 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 100]`.
     fn create_child_identities(i: u32) -> Weight {
         // Minimum execution time: 28_963 nanoseconds.
-        Weight::from_ref_time(56_653_013)
+        Weight::from_parts(56_653_013, 0)
             // Standard Error: 56_157
-            .saturating_add(Weight::from_ref_time(83_550_764).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(83_550_764, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -126,7 +126,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity ChildDid (max_values: None, max_size: None, mode: Measured)
     fn unlink_child_identity() -> Weight {
         // Minimum execution time: 26_710 nanoseconds.
-        Weight::from_ref_time(28_303_000)
+        Weight::from_parts(28_303_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -157,9 +157,9 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 200]`.
     fn cdd_register_did(i: u32) -> Weight {
         // Minimum execution time: 46_980 nanoseconds.
-        Weight::from_ref_time(74_450_297)
+        Weight::from_parts(74_450_297, 0)
             // Standard Error: 37_790
-            .saturating_add(Weight::from_ref_time(15_103_103).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(15_103_103, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(10))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes(6))
@@ -175,7 +175,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn invalidate_cdd_claims() -> Weight {
         // Minimum execution time: 49_044 nanoseconds.
-        Weight::from_ref_time(52_138_000)
+        Weight::from_parts(52_138_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -198,9 +198,9 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 200]`.
     fn remove_secondary_keys(i: u32) -> Weight {
         // Minimum execution time: 17_726 nanoseconds.
-        Weight::from_ref_time(18_758_000)
+        Weight::from_parts(18_758_000, 0)
             // Standard Error: 18_807
-            .saturating_add(Weight::from_ref_time(20_191_800).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(20_191_800, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes((6_u64).saturating_mul(i.into())))
@@ -227,7 +227,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity DidKeys (max_values: None, max_size: None, mode: Measured)
     fn accept_primary_key() -> Weight {
         // Minimum execution time: 94_412 nanoseconds.
-        Weight::from_ref_time(95_482_000)
+        Weight::from_parts(95_482_000, 0)
             .saturating_add(DbWeight::get().reads(11))
             .saturating_add(DbWeight::get().writes(11))
     }
@@ -257,7 +257,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
     fn rotate_primary_key_to_secondary() -> Weight {
         // Minimum execution time: 94_401 nanoseconds.
-        Weight::from_ref_time(97_495_000)
+        Weight::from_parts(97_495_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(13))
     }
@@ -265,7 +265,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity CddAuthForPrimaryKeyRotation (max_values: Some(1), max_size: None, mode: Measured)
     fn change_cdd_requirement_for_mk_rotation() -> Weight {
         // Minimum execution time: 9_873 nanoseconds.
-        Weight::from_ref_time(10_345_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(10_345_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Identity Authorizations (r:1 w:1)
     // Proof Skipped: Identity Authorizations (max_values: None, max_size: None, mode: Measured)
@@ -299,7 +299,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
     fn join_identity_as_key() -> Weight {
         // Minimum execution time: 85_988 nanoseconds.
-        Weight::from_ref_time(90_807_000)
+        Weight::from_parts(90_807_000, 0)
             .saturating_add(DbWeight::get().reads(11))
             .saturating_add(DbWeight::get().writes(8))
     }
@@ -319,7 +319,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
     fn leave_identity_as_key() -> Weight {
         // Minimum execution time: 37_647 nanoseconds.
-        Weight::from_ref_time(38_818_000)
+        Weight::from_parts(38_818_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -337,7 +337,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn add_claim() -> Weight {
         // Minimum execution time: 42_213 nanoseconds.
-        Weight::from_ref_time(44_476_000)
+        Weight::from_parts(44_476_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -347,7 +347,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn revoke_claim() -> Weight {
         // Minimum execution time: 25_428 nanoseconds.
-        Weight::from_ref_time(25_869_000)
+        Weight::from_parts(25_869_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -357,7 +357,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Claims (max_values: None, max_size: None, mode: Measured)
     fn revoke_claim_by_index() -> Weight {
         // Minimum execution time: 25_438 nanoseconds.
-        Weight::from_ref_time(27_070_000)
+        Weight::from_parts(27_070_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -371,7 +371,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyPortfolioPermissions (max_values: None, max_size: None, mode: Measured)
     fn set_secondary_key_permissions() -> Weight {
         // Minimum execution time: 43_335 nanoseconds.
-        Weight::from_ref_time(44_738_000)
+        Weight::from_parts(44_738_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -381,15 +381,15 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `e` is `[0, 80]`.
     fn permissions_cost(a: u32, p: u32, l: u32, e: u32) -> Weight {
         // Minimum execution time: 236_785 nanoseconds.
-        Weight::from_ref_time(239_349_000)
+        Weight::from_parts(239_349_000, 0)
             // Manually set for `a`
-            .saturating_add(Weight::from_ref_time(100_000).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(100_000, 0).saturating_mul(a.into()))
             // Manually set for `p`
-            .saturating_add(Weight::from_ref_time(100_000).saturating_mul(p.into()))
+            .saturating_add(Weight::from_parts(100_000, 0).saturating_mul(p.into()))
             // Standard Error: 191_296
-            .saturating_add(Weight::from_ref_time(16_520_754).saturating_mul(l.into()))
+            .saturating_add(Weight::from_parts(16_520_754, 0).saturating_mul(l.into()))
             // Standard Error: 191_296
-            .saturating_add(Weight::from_ref_time(15_479_353).saturating_mul(e.into()))
+            .saturating_add(Weight::from_parts(15_479_353, 0).saturating_mul(e.into()))
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -397,7 +397,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
     fn freeze_secondary_keys() -> Weight {
         // Minimum execution time: 18_638 nanoseconds.
-        Weight::from_ref_time(23_155_000)
+        Weight::from_parts(23_155_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -407,7 +407,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
     fn unfreeze_secondary_keys() -> Weight {
         // Minimum execution time: 19_509 nanoseconds.
-        Weight::from_ref_time(21_011_000)
+        Weight::from_parts(21_011_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -423,7 +423,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Authorizations (max_values: None, max_size: None, mode: Measured)
     fn add_authorization() -> Weight {
         // Minimum execution time: 28_182 nanoseconds.
-        Weight::from_ref_time(30_175_000)
+        Weight::from_parts(30_175_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -439,7 +439,7 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AuthorizationsGiven (max_values: None, max_size: None, mode: Measured)
     fn remove_authorization() -> Weight {
         // Minimum execution time: 36_194 nanoseconds.
-        Weight::from_ref_time(36_805_000)
+        Weight::from_parts(36_805_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -464,9 +464,9 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 200]`.
     fn add_secondary_keys_with_authorization(i: u32) -> Weight {
         // Minimum execution time: 32_549 nanoseconds.
-        Weight::from_ref_time(59_806_284)
+        Weight::from_parts(59_806_284, 0)
             // Standard Error: 46_061
-            .saturating_add(Weight::from_ref_time(71_476_387).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(71_476_387, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes(1))
@@ -483,9 +483,9 @@ impl pallet_identity::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 2048]`.
     fn register_custom_claim_type(n: u32) -> Weight {
         // Minimum execution time: 26_490 nanoseconds.
-        Weight::from_ref_time(31_039_092)
+        Weight::from_parts(31_039_092, 0)
             // Standard Error: 342
-            .saturating_add(Weight::from_ref_time(5_119).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(5_119, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
diff --git a/pallets/weights/src/pallet_im_online.rs b/pallets/weights/src/pallet_im_online.rs
index 7988c83a6c..537cc5f8cb 100644
--- a/pallets/weights/src/pallet_im_online.rs
+++ b/pallets/weights/src/pallet_im_online.rs
@@ -1,13 +1,13 @@
 // This file is part of Substrate.
 
-// Copyright (C) 2021 Parity Technologies (UK) Ltd.
+// 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
+// 	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,
@@ -18,61 +18,61 @@
 //! Autogenerated weights for pallet_im_online
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-11-03, STEPS: `100`, REPEAT: 5, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 512
-//! HOSTNAME: `ubuntu-8gb-nbg1-1-bench2`, CPU: `AMD EPYC-Milan Processor`
+//! DATE: 2023-06-16, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `runner-e8ezs4ez-project-145-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
+//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
 
 // Executed Command:
-// ./polymesh
+// ./target/production/substrate
 // benchmark
 // pallet
-// -s
-// 100
-// -r
-// 5
-// -p=*
-// -e=*
-// --heap-pages
-// 4096
-// --db-cache
-// 512
-// --execution
-// wasm
-// --wasm-execution
-// compiled
-// --output
-// ./Polymesh/pallets/weights/src/
-// --template
-// ./Polymesh/.maintain/frame-weight-template.hbs
+// --chain=dev
+// --steps=50
+// --repeat=20
+// --pallet=pallet_im_online
+// --no-storage-info
+// --no-median-slopes
+// --no-min-squares
+// --extrinsic=*
+// --execution=wasm
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./frame/im-online/src/weights.rs
+// --header=./HEADER-APACHE2
+// --template=./.maintain/frame-weight-template.hbs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
+#![allow(missing_docs)]
 
 use polymesh_runtime_common::{RocksDbWeight as DbWeight, Weight};
 
 /// Weights for pallet_im_online using the Substrate node and recommended hardware.
 pub struct SubstrateWeight;
 impl pallet_im_online::WeightInfo for SubstrateWeight {
-    // Storage: Session Validators (r:1 w:0)
-    // Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: Session CurrentIndex (r:1 w:0)
-    // Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
-    // Storage: ImOnline Keys (r:1 w:0)
-    // Proof: ImOnline Keys (max_values: Some(1), max_size: Some(320002), added: 320497, mode: MaxEncodedLen)
-    // Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
-    // Proof: ImOnline ReceivedHeartbeats (max_values: None, max_size: Some(10021032), added: 10023507, mode: MaxEncodedLen)
-    // Storage: ImOnline AuthoredBlocks (r:1 w:0)
-    // Proof: ImOnline AuthoredBlocks (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
-    /// The range of component `k` is `[1, 1000]`.
-    /// The range of component `e` is `[1, 100]`.
-    fn validate_unsigned_and_then_heartbeat(k: u32, e: u32) -> Weight {
-        // Minimum execution time: 145_118 nanoseconds.
-        Weight::from_ref_time(132_204_244)
-            // Standard Error: 1_389
-            .saturating_add(Weight::from_ref_time(24_270).saturating_mul(k.into()))
-            // Standard Error: 14_024
-            .saturating_add(Weight::from_ref_time(542_646).saturating_mul(e.into()))
-            .saturating_add(DbWeight::get().reads(4))
-            .saturating_add(DbWeight::get().writes(1))
-    }
+	/// Storage: Session Validators (r:1 w:0)
+	/// Proof Skipped: Session Validators (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: Session CurrentIndex (r:1 w:0)
+	/// Proof Skipped: Session CurrentIndex (max_values: Some(1), max_size: None, mode: Measured)
+	/// Storage: ImOnline Keys (r:1 w:0)
+	/// Proof: ImOnline Keys (max_values: Some(1), max_size: Some(320002), added: 320497, mode: MaxEncodedLen)
+	/// Storage: ImOnline ReceivedHeartbeats (r:1 w:1)
+	/// Proof: ImOnline ReceivedHeartbeats (max_values: None, max_size: Some(25), added: 2500, mode: MaxEncodedLen)
+	/// Storage: ImOnline AuthoredBlocks (r:1 w:0)
+	/// Proof: ImOnline AuthoredBlocks (max_values: None, max_size: Some(56), added: 2531, mode: MaxEncodedLen)
+	/// The range of component `k` is `[1, 1000]`.
+	fn validate_unsigned_and_then_heartbeat(k: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `295 + k * (32 ±0)`
+		//  Estimated: `321487 + k * (1761 ±0)`
+		// Minimum execution time: 80_568_000 picoseconds.
+		Weight::from_parts(95_175_595, 321487)
+			// Standard Error: 627
+			.saturating_add(Weight::from_parts(39_094, 0).saturating_mul(k.into()))
+			.saturating_add(DbWeight::get().reads(4_u64))
+			.saturating_add(DbWeight::get().writes(1_u64))
+			.saturating_add(Weight::from_parts(0, 1761).saturating_mul(k.into()))
+	}
 }
diff --git a/pallets/weights/src/pallet_indices.rs b/pallets/weights/src/pallet_indices.rs
index e76220d2cc..a71e51aa80 100644
--- a/pallets/weights/src/pallet_indices.rs
+++ b/pallets/weights/src/pallet_indices.rs
@@ -57,7 +57,7 @@ impl pallet_indices::WeightInfo for SubstrateWeight {
     // Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
     fn claim() -> Weight {
         // Minimum execution time: 22_144 nanoseconds.
-        Weight::from_ref_time(24_166_000)
+        Weight::from_parts(24_166_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -67,7 +67,7 @@ impl pallet_indices::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn transfer() -> Weight {
         // Minimum execution time: 28_173 nanoseconds.
-        Weight::from_ref_time(32_519_000)
+        Weight::from_parts(32_519_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -75,7 +75,7 @@ impl pallet_indices::WeightInfo for SubstrateWeight {
     // Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
     fn free() -> Weight {
         // Minimum execution time: 24_186 nanoseconds.
-        Weight::from_ref_time(31_498_000)
+        Weight::from_parts(31_498_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -85,7 +85,7 @@ impl pallet_indices::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn force_transfer() -> Weight {
         // Minimum execution time: 26_850 nanoseconds.
-        Weight::from_ref_time(28_423_000)
+        Weight::from_parts(28_423_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -93,7 +93,7 @@ impl pallet_indices::WeightInfo for SubstrateWeight {
     // Proof: Indices Accounts (max_values: None, max_size: Some(69), added: 2544, mode: MaxEncodedLen)
     fn freeze() -> Weight {
         // Minimum execution time: 21_212 nanoseconds.
-        Weight::from_ref_time(22_885_000)
+        Weight::from_parts(22_885_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_multisig.rs b/pallets/weights/src/pallet_multisig.rs
index f35166d20a..fa85a9c779 100644
--- a/pallets/weights/src/pallet_multisig.rs
+++ b/pallets/weights/src/pallet_multisig.rs
@@ -80,9 +80,9 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 50]`.
     fn create_multisig(i: u32) -> Weight {
         // Minimum execution time: 67_951 nanoseconds.
-        Weight::from_ref_time(66_528_129)
+        Weight::from_parts(66_528_129, 0)
             // Standard Error: 38_800
-            .saturating_add(Weight::from_ref_time(13_064_257).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(13_064_257, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(10))
             .saturating_add(DbWeight::get().writes((2_u64).saturating_mul(i.into())))
@@ -111,7 +111,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig ProposalStates (max_values: None, max_size: None, mode: Measured)
     fn create_proposal() -> Weight {
         // Minimum execution time: 80_460 nanoseconds.
-        Weight::from_ref_time(85_689_000)
+        Weight::from_parts(85_689_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -135,7 +135,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig ProposalVoteCounts (max_values: None, max_size: None, mode: Measured)
     fn approve() -> Weight {
         // Minimum execution time: 69_423 nanoseconds.
-        Weight::from_ref_time(74_581_000)
+        Weight::from_parts(74_581_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -151,7 +151,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig ProposalStates (max_values: None, max_size: None, mode: Measured)
     fn execute_proposal() -> Weight {
         // Minimum execution time: 43_335 nanoseconds.
-        Weight::from_ref_time(46_059_000)
+        Weight::from_parts(46_059_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -177,7 +177,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig Proposals (max_values: None, max_size: None, mode: Measured)
     fn reject() -> Weight {
         // Minimum execution time: 77_705 nanoseconds.
-        Weight::from_ref_time(84_526_000)
+        Weight::from_parts(84_526_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -205,7 +205,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AuthorizationsGiven (max_values: None, max_size: None, mode: Measured)
     fn accept_multisig_signer() -> Weight {
         // Minimum execution time: 87_010 nanoseconds.
-        Weight::from_ref_time(91_728_000)
+        Weight::from_parts(91_728_000, 0)
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -228,9 +228,9 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 49]`.
     fn add_multisig_signers(i: u32) -> Weight {
         // Minimum execution time: 53_981 nanoseconds.
-        Weight::from_ref_time(44_757_621)
+        Weight::from_parts(44_757_621, 0)
             // Standard Error: 46_317
-            .saturating_add(Weight::from_ref_time(13_288_505).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(13_288_505, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
             .saturating_add(DbWeight::get().writes((2_u64).saturating_mul(i.into())))
@@ -252,9 +252,9 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[2, 50]`.
     fn remove_multisig_signers(i: u32) -> Weight {
         // Minimum execution time: 63_505 nanoseconds.
-        Weight::from_ref_time(49_344_283)
+        Weight::from_parts(49_344_283, 0)
             // Standard Error: 38_046
-            .saturating_add(Weight::from_ref_time(11_866_085).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(11_866_085, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes(3))
@@ -281,9 +281,9 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 49]`.
     fn add_multisig_signers_via_admin(i: u32) -> Weight {
         // Minimum execution time: 69_765 nanoseconds.
-        Weight::from_ref_time(63_090_803)
+        Weight::from_parts(63_090_803, 0)
             // Standard Error: 32_773
-            .saturating_add(Weight::from_ref_time(13_322_994).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(13_322_994, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
             .saturating_add(DbWeight::get().writes((2_u64).saturating_mul(i.into())))
@@ -307,9 +307,9 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[2, 50]`.
     fn remove_multisig_signers_via_admin(i: u32) -> Weight {
         // Minimum execution time: 71_507 nanoseconds.
-        Weight::from_ref_time(56_681_928)
+        Weight::from_parts(56_681_928, 0)
             // Standard Error: 35_587
-            .saturating_add(Weight::from_ref_time(11_972_501).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(11_972_501, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(i.into())))
             .saturating_add(DbWeight::get().writes(3))
@@ -329,7 +329,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig NextProposalId (max_values: None, max_size: None, mode: Measured)
     fn change_sigs_required() -> Weight {
         // Minimum execution time: 43_505 nanoseconds.
-        Weight::from_ref_time(55_693_000)
+        Weight::from_parts(55_693_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -349,7 +349,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig NextProposalId (max_values: None, max_size: None, mode: Measured)
     fn change_sigs_required_via_admin() -> Weight {
         // Minimum execution time: 59_249 nanoseconds.
-        Weight::from_ref_time(62_192_000)
+        Weight::from_parts(62_192_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -363,7 +363,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig AdminDid (max_values: None, max_size: None, mode: Measured)
     fn add_admin() -> Weight {
         // Minimum execution time: 30_275 nanoseconds.
-        Weight::from_ref_time(32_309_000)
+        Weight::from_parts(32_309_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -373,7 +373,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig AdminDid (max_values: None, max_size: None, mode: Measured)
     fn remove_admin_via_admin() -> Weight {
         // Minimum execution time: 31_397 nanoseconds.
-        Weight::from_ref_time(32_168_000)
+        Weight::from_parts(32_168_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -387,7 +387,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig PayingDid (max_values: None, max_size: None, mode: Measured)
     fn remove_payer() -> Weight {
         // Minimum execution time: 31_638 nanoseconds.
-        Weight::from_ref_time(33_621_000)
+        Weight::from_parts(33_621_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -397,7 +397,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig PayingDid (max_values: None, max_size: None, mode: Measured)
     fn remove_payer_via_payer() -> Weight {
         // Minimum execution time: 30_997 nanoseconds.
-        Weight::from_ref_time(32_099_000)
+        Weight::from_parts(32_099_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -437,7 +437,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig AuthToProposalId (max_values: None, max_size: None, mode: Measured)
     fn join_identity() -> Weight {
         // Minimum execution time: 110_895 nanoseconds.
-        Weight::from_ref_time(125_979_000)
+        Weight::from_parts(125_979_000, 0)
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(9))
     }
@@ -463,7 +463,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig ProposalStates (max_values: None, max_size: None, mode: Measured)
     fn create_join_identity() -> Weight {
         // Minimum execution time: 78_387 nanoseconds.
-        Weight::from_ref_time(81_713_000)
+        Weight::from_parts(81_713_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -487,7 +487,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig ProposalVoteCounts (max_values: None, max_size: None, mode: Measured)
     fn approve_join_identity() -> Weight {
         // Minimum execution time: 73_511 nanoseconds.
-        Weight::from_ref_time(76_465_000)
+        Weight::from_parts(76_465_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -501,7 +501,7 @@ impl pallet_multisig::WeightInfo for SubstrateWeight {
     // Proof Skipped: MultiSig AdminDid (max_values: None, max_size: None, mode: Measured)
     fn remove_admin() -> Weight {
         // Minimum execution time: 32_839 nanoseconds.
-        Weight::from_ref_time(33_820_000)
+        Weight::from_parts(33_820_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_nft.rs b/pallets/weights/src/pallet_nft.rs
index d379331888..c9d51fe9e7 100644
--- a/pallets/weights/src/pallet_nft.rs
+++ b/pallets/weights/src/pallet_nft.rs
@@ -94,9 +94,9 @@ impl pallet_nft::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 255]`.
     fn create_nft_collection(n: u32) -> Weight {
         // Minimum execution time: 112_277 nanoseconds.
-        Weight::from_ref_time(116_687_560)
+        Weight::from_parts(116_687_560, 0)
             // Standard Error: 12_225
-            .saturating_add(Weight::from_ref_time(2_590_390).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(2_590_390, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(11))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(12))
@@ -128,9 +128,9 @@ impl pallet_nft::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 255]`.
     fn issue_nft(n: u32) -> Weight {
         // Minimum execution time: 63_275 nanoseconds.
-        Weight::from_ref_time(65_757_843)
+        Weight::from_parts(65_757_843, 0)
             // Standard Error: 10_580
-            .saturating_add(Weight::from_ref_time(3_304_052).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(3_304_052, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(5))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(n.into())))
@@ -162,9 +162,9 @@ impl pallet_nft::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 255]`.
     fn redeem_nft(n: u32) -> Weight {
         // Minimum execution time: 83_425 nanoseconds.
-        Weight::from_ref_time(79_468_509)
+        Weight::from_parts(79_468_509, 0)
             // Standard Error: 9_091
-            .saturating_add(Weight::from_ref_time(4_986_847).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(4_986_847, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(4))
@@ -193,9 +193,9 @@ impl pallet_nft::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 10]`.
     fn base_nft_transfer(n: u32) -> Weight {
         // Minimum execution time: 132_779 nanoseconds.
-        Weight::from_ref_time(127_076_178)
+        Weight::from_parts(127_076_178, 0)
             // Standard Error: 135_156
-            .saturating_add(Weight::from_ref_time(14_141_631).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(14_141_631, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(11))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -226,9 +226,9 @@ impl pallet_nft::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 10]`.
     fn controller_transfer(n: u32) -> Weight {
         // Minimum execution time: 79_298 nanoseconds.
-        Weight::from_ref_time(70_256_608)
+        Weight::from_parts(70_256_608, 0)
             // Standard Error: 122_051
-            .saturating_add(Weight::from_ref_time(14_678_121).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(14_678_121, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(2))
diff --git a/pallets/weights/src/pallet_pips.rs b/pallets/weights/src/pallet_pips.rs
index 2ba7a31bbb..ebe8b78b7c 100644
--- a/pallets/weights/src/pallet_pips.rs
+++ b/pallets/weights/src/pallet_pips.rs
@@ -57,7 +57,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips PruneHistoricalPips (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn set_prune_historical_pips() -> Weight {
         // Minimum execution time: 17_519 nanoseconds.
-        Weight::from_ref_time(17_652_000)
+        Weight::from_parts(17_652_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -65,7 +65,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips MinimumProposalDeposit (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
     fn set_min_proposal_deposit() -> Weight {
         // Minimum execution time: 20_637 nanoseconds.
-        Weight::from_ref_time(21_244_000)
+        Weight::from_parts(21_244_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -73,7 +73,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips DefaultEnactmentPeriod (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn set_default_enactment_period() -> Weight {
         // Minimum execution time: 20_395 nanoseconds.
-        Weight::from_ref_time(20_535_000)
+        Weight::from_parts(20_535_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -81,7 +81,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof Skipped: Pips PendingPipExpiry (max_values: Some(1), max_size: None, mode: Measured)
     fn set_pending_pip_expiry() -> Weight {
         // Minimum execution time: 21_154 nanoseconds.
-        Weight::from_ref_time(21_741_000)
+        Weight::from_parts(21_741_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -89,7 +89,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips MaxPipSkipCount (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn set_max_pip_skip_count() -> Weight {
         // Minimum execution time: 17_035 nanoseconds.
-        Weight::from_ref_time(17_344_000)
+        Weight::from_parts(17_344_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -97,7 +97,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ActivePipLimit (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn set_active_pip_limit() -> Weight {
         // Minimum execution time: 19_938 nanoseconds.
-        Weight::from_ref_time(20_366_000)
+        Weight::from_parts(20_366_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -137,7 +137,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalStates (max_values: None, max_size: Some(13), added: 2488, mode: MaxEncodedLen)
     fn propose_from_community() -> Weight {
         // Minimum execution time: 129_932 nanoseconds.
-        Weight::from_ref_time(130_345_000)
+        Weight::from_parts(130_345_000, 0)
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(11))
     }
@@ -161,7 +161,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalStates (max_values: None, max_size: Some(13), added: 2488, mode: MaxEncodedLen)
     fn propose_from_committee() -> Weight {
         // Minimum execution time: 65_140 nanoseconds.
-        Weight::from_ref_time(65_704_000)
+        Weight::from_parts(65_704_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -181,7 +181,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof Skipped: Pips LiveQueue (max_values: Some(1), max_size: None, mode: Measured)
     fn vote() -> Weight {
         // Minimum execution time: 108_219 nanoseconds.
-        Weight::from_ref_time(115_627_000)
+        Weight::from_parts(115_627_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -199,7 +199,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips PipToSchedule (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
     fn approve_committee_proposal() -> Weight {
         // Minimum execution time: 65_605 nanoseconds.
-        Weight::from_ref_time(67_197_000)
+        Weight::from_parts(67_197_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -227,7 +227,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalResult (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
     fn reject_proposal() -> Weight {
         // Minimum execution time: 85_835 nanoseconds.
-        Weight::from_ref_time(87_787_000)
+        Weight::from_parts(87_787_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(9))
     }
@@ -247,7 +247,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalResult (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
     fn prune_proposal() -> Weight {
         // Minimum execution time: 61_597 nanoseconds.
-        Weight::from_ref_time(62_681_000)
+        Weight::from_parts(62_681_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(7))
     }
@@ -265,7 +265,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips PipToSchedule (max_values: None, max_size: Some(16), added: 2491, mode: MaxEncodedLen)
     fn reschedule_execution() -> Weight {
         // Minimum execution time: 77_090 nanoseconds.
-        Weight::from_ref_time(77_456_000)
+        Weight::from_parts(77_456_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -279,7 +279,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof Skipped: Pips SnapshotQueue (max_values: Some(1), max_size: None, mode: Measured)
     fn clear_snapshot() -> Weight {
         // Minimum execution time: 39_778 nanoseconds.
-        Weight::from_ref_time(40_192_000)
+        Weight::from_parts(40_192_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -297,7 +297,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips SnapshotMeta (max_values: Some(1), max_size: Some(40), added: 535, mode: MaxEncodedLen)
     fn snapshot() -> Weight {
         // Minimum execution time: 62_355 nanoseconds.
-        Weight::from_ref_time(70_260_000)
+        Weight::from_parts(70_260_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -332,13 +332,13 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 33]`.
     fn enact_snapshot_results(a: u32, r: u32, s: u32) -> Weight {
         // Minimum execution time: 977_352 nanoseconds.
-        Weight::from_ref_time(159_135_641)
+        Weight::from_parts(159_135_641, 0)
             // Standard Error: 45_263
-            .saturating_add(Weight::from_ref_time(38_431_937).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(38_431_937, 0).saturating_mul(a.into()))
             // Standard Error: 45_263
-            .saturating_add(Weight::from_ref_time(16_926_524).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(16_926_524, 0).saturating_mul(r.into()))
             // Standard Error: 45_263
-            .saturating_add(Weight::from_ref_time(7_970_390).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(7_970_390, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(a.into())))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(r.into())))
@@ -370,7 +370,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalResult (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
     fn execute_scheduled_pip() -> Weight {
         // Minimum execution time: 110_098 nanoseconds.
-        Weight::from_ref_time(111_819_000)
+        Weight::from_parts(111_819_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(9))
     }
@@ -400,7 +400,7 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     // Proof: Pips ProposalResult (max_values: None, max_size: Some(52), added: 2527, mode: MaxEncodedLen)
     fn expire_scheduled_pip() -> Weight {
         // Minimum execution time: 128_188 nanoseconds.
-        Weight::from_ref_time(129_249_000)
+        Weight::from_parts(129_249_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(10))
     }
@@ -420,11 +420,11 @@ impl pallet_pips::WeightInfo for SubstrateWeight {
     /// The range of component `v` is `[0, 128]`.
     fn remove_pending_storage(r: u32, v: u32) -> Weight {
         // Minimum execution time: 739_279 nanoseconds.
-        Weight::from_ref_time(63_144_485)
+        Weight::from_parts(63_144_485, 0)
             // Standard Error: 18_226
-            .saturating_add(Weight::from_ref_time(24_421_417).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(24_421_417, 0).saturating_mul(r.into()))
             // Standard Error: 18_226
-            .saturating_add(Weight::from_ref_time(5_613_829).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(5_613_829, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(r.into())))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(v.into())))
diff --git a/pallets/weights/src/pallet_portfolio.rs b/pallets/weights/src/pallet_portfolio.rs
index d1bb0e022f..98979c97ba 100644
--- a/pallets/weights/src/pallet_portfolio.rs
+++ b/pallets/weights/src/pallet_portfolio.rs
@@ -64,9 +64,9 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     /// The range of component `l` is `[1, 500]`.
     fn create_portfolio(l: u32) -> Weight {
         // Minimum execution time: 29_945 nanoseconds.
-        Weight::from_ref_time(37_050_913)
+        Weight::from_parts(37_050_913, 0)
             // Standard Error: 2_500
-            .saturating_add(Weight::from_ref_time(8_946).saturating_mul(l.into()))
+            .saturating_add(Weight::from_parts(8_946, 0).saturating_mul(l.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -88,7 +88,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio NameToNumber (max_values: None, max_size: None, mode: Measured)
     fn delete_portfolio() -> Weight {
         // Minimum execution time: 61_051 nanoseconds.
-        Weight::from_ref_time(69_163_000)
+        Weight::from_parts(69_163_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -101,9 +101,9 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 500]`.
     fn rename_portfolio(i: u32) -> Weight {
         // Minimum execution time: 36_695 nanoseconds.
-        Weight::from_ref_time(41_059_117)
+        Weight::from_parts(41_059_117, 0)
             // Standard Error: 1_347
-            .saturating_add(Weight::from_ref_time(20_675).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(20_675, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -115,7 +115,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio PortfoliosInCustody (max_values: None, max_size: None, mode: Measured)
     fn quit_portfolio_custody() -> Weight {
         // Minimum execution time: 36_354 nanoseconds.
-        Weight::from_ref_time(40_070_000)
+        Weight::from_parts(40_070_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -135,7 +135,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AuthorizationsGiven (max_values: None, max_size: None, mode: Measured)
     fn accept_portfolio_custody() -> Weight {
         // Minimum execution time: 59_127 nanoseconds.
-        Weight::from_ref_time(59_309_000)
+        Weight::from_parts(59_309_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -163,11 +163,11 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 100]`.
     fn move_portfolio_funds(f: u32, n: u32) -> Weight {
         // Minimum execution time: 324_106 nanoseconds.
-        Weight::from_ref_time(69_877_225)
+        Weight::from_parts(69_877_225, 0)
             // Standard Error: 363_511
-            .saturating_add(Weight::from_ref_time(24_738_302).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(24_738_302, 0).saturating_mul(f.into()))
             // Standard Error: 34_158
-            .saturating_add(Weight::from_ref_time(14_948_726).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(14_948_726, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().reads((4_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((2_u64).saturating_mul(n.into())))
@@ -185,7 +185,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio PreApprovedPortfolios (max_values: None, max_size: None, mode: Measured)
     fn pre_approve_portfolio() -> Weight {
         // Minimum execution time: 28_823 nanoseconds.
-        Weight::from_ref_time(34_331_000)
+        Weight::from_parts(34_331_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -199,7 +199,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio PreApprovedPortfolios (max_values: None, max_size: None, mode: Measured)
     fn remove_portfolio_pre_approval() -> Weight {
         // Minimum execution time: 28_793 nanoseconds.
-        Weight::from_ref_time(30_766_000)
+        Weight::from_parts(30_766_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -209,7 +209,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio AllowedCustodians (max_values: None, max_size: None, mode: Measured)
     fn allow_identity_to_create_portfolios() -> Weight {
         // Minimum execution time: 15_053 nanoseconds.
-        Weight::from_ref_time(16_504_000)
+        Weight::from_parts(16_504_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -219,7 +219,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio AllowedCustodians (max_values: None, max_size: None, mode: Measured)
     fn revoke_create_portfolios_permission() -> Weight {
         // Minimum execution time: 15_784 nanoseconds.
-        Weight::from_ref_time(17_936_000)
+        Weight::from_parts(17_936_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -239,7 +239,7 @@ impl pallet_portfolio::WeightInfo for SubstrateWeight {
     // Proof Skipped: Portfolio Portfolios (max_values: None, max_size: None, mode: Measured)
     fn create_custody_portfolio() -> Weight {
         // Minimum execution time: 46_910 nanoseconds.
-        Weight::from_ref_time(48_954_000)
+        Weight::from_parts(48_954_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(5))
     }
diff --git a/pallets/weights/src/pallet_preimage.rs b/pallets/weights/src/pallet_preimage.rs
index 0602812d2d..eda6894a87 100644
--- a/pallets/weights/src/pallet_preimage.rs
+++ b/pallets/weights/src/pallet_preimage.rs
@@ -60,9 +60,9 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 4194304]`.
     fn note_preimage(s: u32) -> Weight {
         // Minimum execution time: 29_554 nanoseconds.
-        Weight::from_ref_time(22_909_597)
+        Weight::from_parts(22_909_597, 0)
             // Standard Error: 4
-            .saturating_add(Weight::from_ref_time(1_370).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_370, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -73,9 +73,9 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 4194304]`.
     fn note_requested_preimage(s: u32) -> Weight {
         // Minimum execution time: 18_909 nanoseconds.
-        Weight::from_ref_time(19_329_000)
+        Weight::from_parts(19_329_000, 0)
             // Standard Error: 2
-            .saturating_add(Weight::from_ref_time(1_372).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_372, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -86,9 +86,9 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 4194304]`.
     fn note_no_deposit_preimage(s: u32) -> Weight {
         // Minimum execution time: 18_167 nanoseconds.
-        Weight::from_ref_time(18_468_000)
+        Weight::from_parts(18_468_000, 0)
             // Standard Error: 1
-            .saturating_add(Weight::from_ref_time(1_362).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_362, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -98,7 +98,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
     fn unnote_preimage() -> Weight {
         // Minimum execution time: 55_824 nanoseconds.
-        Weight::from_ref_time(57_286_000)
+        Weight::from_parts(57_286_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -108,7 +108,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
     fn unnote_no_deposit_preimage() -> Weight {
         // Minimum execution time: 35_714 nanoseconds.
-        Weight::from_ref_time(37_967_000)
+        Weight::from_parts(37_967_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -116,7 +116,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn request_preimage() -> Weight {
         // Minimum execution time: 32_498 nanoseconds.
-        Weight::from_ref_time(38_387_000)
+        Weight::from_parts(38_387_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -124,7 +124,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn request_no_deposit_preimage() -> Weight {
         // Minimum execution time: 19_108 nanoseconds.
-        Weight::from_ref_time(21_673_000)
+        Weight::from_parts(21_673_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -132,7 +132,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn request_unnoted_preimage() -> Weight {
         // Minimum execution time: 19_580 nanoseconds.
-        Weight::from_ref_time(21_141_000)
+        Weight::from_parts(21_141_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -140,7 +140,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn request_requested_preimage() -> Weight {
         // Minimum execution time: 10_837 nanoseconds.
-        Weight::from_ref_time(11_948_000)
+        Weight::from_parts(11_948_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -150,7 +150,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: MaxEncodedLen)
     fn unrequest_preimage() -> Weight {
         // Minimum execution time: 31_718 nanoseconds.
-        Weight::from_ref_time(34_052_000)
+        Weight::from_parts(34_052_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -158,7 +158,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn unrequest_unnoted_preimage() -> Weight {
         // Minimum execution time: 10_776 nanoseconds.
-        Weight::from_ref_time(11_267_000)
+        Weight::from_parts(11_267_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -166,7 +166,7 @@ impl pallet_preimage::WeightInfo for SubstrateWeight {
     // Proof: Preimage StatusFor (max_values: None, max_size: Some(91), added: 2566, mode: MaxEncodedLen)
     fn unrequest_multi_referenced_preimage() -> Weight {
         // Minimum execution time: 11_066 nanoseconds.
-        Weight::from_ref_time(11_577_000)
+        Weight::from_parts(11_577_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_protocol_fee.rs b/pallets/weights/src/pallet_protocol_fee.rs
index e2ad138c54..24a052964e 100644
--- a/pallets/weights/src/pallet_protocol_fee.rs
+++ b/pallets/weights/src/pallet_protocol_fee.rs
@@ -57,12 +57,12 @@ impl pallet_protocol_fee::WeightInfo for SubstrateWeight {
     // Proof Skipped: ProtocolFee Coefficient (max_values: Some(1), max_size: None, mode: Measured)
     fn change_coefficient() -> Weight {
         // Minimum execution time: 10_466 nanoseconds.
-        Weight::from_ref_time(10_776_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(10_776_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: ProtocolFee BaseFees (r:0 w:1)
     // Proof Skipped: ProtocolFee BaseFees (max_values: None, max_size: None, mode: Measured)
     fn change_base_fee() -> Weight {
         // Minimum execution time: 10_476 nanoseconds.
-        Weight::from_ref_time(12_649_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(12_649_000, 0).saturating_add(DbWeight::get().writes(1))
     }
 }
diff --git a/pallets/weights/src/pallet_relayer.rs b/pallets/weights/src/pallet_relayer.rs
index 70fe7d6f30..b61dfbcb91 100644
--- a/pallets/weights/src/pallet_relayer.rs
+++ b/pallets/weights/src/pallet_relayer.rs
@@ -65,7 +65,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity Authorizations (max_values: None, max_size: None, mode: Measured)
     fn set_paying_key() -> Weight {
         // Minimum execution time: 34_151 nanoseconds.
-        Weight::from_ref_time(35_943_000)
+        Weight::from_parts(35_943_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -91,7 +91,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AuthorizationsGiven (max_values: None, max_size: None, mode: Measured)
     fn accept_paying_key() -> Weight {
         // Minimum execution time: 93_059 nanoseconds.
-        Weight::from_ref_time(94_542_000)
+        Weight::from_parts(94_542_000, 0)
             .saturating_add(DbWeight::get().reads(14))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -103,7 +103,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AccountKeyRefCount (max_values: None, max_size: None, mode: Measured)
     fn remove_paying_key() -> Weight {
         // Minimum execution time: 36_174 nanoseconds.
-        Weight::from_ref_time(38_248_000)
+        Weight::from_parts(38_248_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -113,7 +113,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Relayer Subsidies (max_values: None, max_size: None, mode: Measured)
     fn update_polyx_limit() -> Weight {
         // Minimum execution time: 26_390 nanoseconds.
-        Weight::from_ref_time(28_032_000)
+        Weight::from_parts(28_032_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -123,7 +123,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Relayer Subsidies (max_values: None, max_size: None, mode: Measured)
     fn increase_polyx_limit() -> Weight {
         // Minimum execution time: 26_720 nanoseconds.
-        Weight::from_ref_time(27_942_000)
+        Weight::from_parts(27_942_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -133,7 +133,7 @@ impl pallet_relayer::WeightInfo for SubstrateWeight {
     // Proof Skipped: Relayer Subsidies (max_values: None, max_size: None, mode: Measured)
     fn decrease_polyx_limit() -> Weight {
         // Minimum execution time: 26_670 nanoseconds.
-        Weight::from_ref_time(28_093_000)
+        Weight::from_parts(28_093_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
diff --git a/pallets/weights/src/pallet_scheduler.rs b/pallets/weights/src/pallet_scheduler.rs
index a33d2fddb7..7d44ba1338 100644
--- a/pallets/weights/src/pallet_scheduler.rs
+++ b/pallets/weights/src/pallet_scheduler.rs
@@ -57,7 +57,7 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     // Proof: Scheduler IncompleteSince (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn service_agendas_base() -> Weight {
         // Minimum execution time: 4_257 nanoseconds.
-        Weight::from_ref_time(4_717_000)
+        Weight::from_parts(4_717_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -66,15 +66,15 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 50]`.
     fn service_agenda_base(s: u32) -> Weight {
         // Minimum execution time: 4_056 nanoseconds.
-        Weight::from_ref_time(8_535_926)
+        Weight::from_parts(8_535_926, 0)
             // Standard Error: 8_884
-            .saturating_add(Weight::from_ref_time(452_167).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(452_167, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
     fn service_task_base() -> Weight {
         // Minimum execution time: 5_879 nanoseconds.
-        Weight::from_ref_time(6_429_000)
+        Weight::from_parts(6_429_000, 0)
     }
     // Storage: Preimage PreimageFor (r:1 w:1)
     // Proof: Preimage PreimageFor (max_values: None, max_size: Some(4194344), added: 4196819, mode: Measured)
@@ -83,9 +83,9 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[128, 4194304]`.
     fn service_task_fetched(s: u32) -> Weight {
         // Minimum execution time: 23_575 nanoseconds.
-        Weight::from_ref_time(24_257_000)
+        Weight::from_parts(24_257_000, 0)
             // Standard Error: 1
-            .saturating_add(Weight::from_ref_time(730).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(730, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -93,28 +93,28 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     // Proof: Scheduler Lookup (max_values: None, max_size: Some(48), added: 2523, mode: MaxEncodedLen)
     fn service_task_named() -> Weight {
         // Minimum execution time: 7_281 nanoseconds.
-        Weight::from_ref_time(7_652_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(7_652_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     fn service_task_periodic() -> Weight {
         // Minimum execution time: 5_848 nanoseconds.
-        Weight::from_ref_time(6_821_000)
+        Weight::from_parts(6_821_000, 0)
     }
     fn execute_dispatch_signed() -> Weight {
         // Minimum execution time: 2_534 nanoseconds.
-        Weight::from_ref_time(3_205_000)
+        Weight::from_parts(3_205_000, 0)
     }
     fn execute_dispatch_unsigned() -> Weight {
         // Minimum execution time: 2_704 nanoseconds.
-        Weight::from_ref_time(4_746_000)
+        Weight::from_parts(4_746_000, 0)
     }
     // Storage: Scheduler Agenda (r:1 w:1)
     // Proof: Scheduler Agenda (max_values: None, max_size: Some(10463), added: 12938, mode: MaxEncodedLen)
     /// The range of component `s` is `[0, 49]`.
     fn schedule(s: u32) -> Weight {
         // Minimum execution time: 13_140 nanoseconds.
-        Weight::from_ref_time(19_895_615)
+        Weight::from_parts(19_895_615, 0)
             // Standard Error: 17_756
-            .saturating_add(Weight::from_ref_time(475_043).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(475_043, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -125,9 +125,9 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[1, 50]`.
     fn cancel(s: u32) -> Weight {
         // Minimum execution time: 17_917 nanoseconds.
-        Weight::from_ref_time(21_643_727)
+        Weight::from_parts(21_643_727, 0)
             // Standard Error: 13_734
-            .saturating_add(Weight::from_ref_time(682_001).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(682_001, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -138,9 +138,9 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 49]`.
     fn schedule_named(s: u32) -> Weight {
         // Minimum execution time: 16_564 nanoseconds.
-        Weight::from_ref_time(25_137_587)
+        Weight::from_parts(25_137_587, 0)
             // Standard Error: 17_033
-            .saturating_add(Weight::from_ref_time(508_209).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(508_209, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -151,9 +151,9 @@ impl pallet_scheduler::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[1, 50]`.
     fn cancel_named(s: u32) -> Weight {
         // Minimum execution time: 19_960 nanoseconds.
-        Weight::from_ref_time(24_138_408)
+        Weight::from_parts(24_138_408, 0)
             // Standard Error: 16_466
-            .saturating_add(Weight::from_ref_time(713_572).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(713_572, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
diff --git a/pallets/weights/src/pallet_session.rs b/pallets/weights/src/pallet_session.rs
index 9bc5cfc8a4..8ac32d5afe 100644
--- a/pallets/weights/src/pallet_session.rs
+++ b/pallets/weights/src/pallet_session.rs
@@ -61,7 +61,7 @@ impl pallet_session::WeightInfo for SubstrateWeight {
     // Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
     fn set_keys() -> Weight {
         // Minimum execution time: 60_480 nanoseconds.
-        Weight::from_ref_time(61_743_000)
+        Weight::from_parts(61_743_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -73,7 +73,7 @@ impl pallet_session::WeightInfo for SubstrateWeight {
     // Proof Skipped: Session KeyOwner (max_values: None, max_size: None, mode: Measured)
     fn purge_keys() -> Weight {
         // Minimum execution time: 42_173 nanoseconds.
-        Weight::from_ref_time(45_859_000)
+        Weight::from_parts(45_859_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(5))
     }
diff --git a/pallets/weights/src/pallet_settlement.rs b/pallets/weights/src/pallet_settlement.rs
index 969467f9f5..71a40ff2aa 100644
--- a/pallets/weights/src/pallet_settlement.rs
+++ b/pallets/weights/src/pallet_settlement.rs
@@ -71,11 +71,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 50]`.
     fn create_venue(d: u32, s: u32) -> Weight {
         // Minimum execution time: 38_007 nanoseconds.
-        Weight::from_ref_time(43_823_114)
+        Weight::from_parts(43_823_114, 0)
             // Standard Error: 328
-            .saturating_add(Weight::from_ref_time(338).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(338, 0).saturating_mul(d.into()))
             // Standard Error: 13_352
-            .saturating_add(Weight::from_ref_time(2_337_555).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(2_337_555, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(5))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -89,9 +89,9 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `d` is `[1, 2048]`.
     fn update_venue_details(d: u32) -> Weight {
         // Minimum execution time: 27_702 nanoseconds.
-        Weight::from_ref_time(34_850_082)
+        Weight::from_parts(34_850_082, 0)
             // Standard Error: 450
-            .saturating_add(Weight::from_ref_time(2_322).saturating_mul(d.into()))
+            .saturating_add(Weight::from_parts(2_322, 0).saturating_mul(d.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -101,7 +101,7 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     // Proof Skipped: Settlement VenueInfo (max_values: None, max_size: None, mode: Measured)
     fn update_venue_type() -> Weight {
         // Minimum execution time: 27_330 nanoseconds.
-        Weight::from_ref_time(28_732_000)
+        Weight::from_parts(28_732_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -116,9 +116,9 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 50]`.
     fn update_venue_signers(s: u32) -> Weight {
         // Minimum execution time: 29_644 nanoseconds.
-        Weight::from_ref_time(41_178_975)
+        Weight::from_parts(41_178_975, 0)
             // Standard Error: 25_032
-            .saturating_add(Weight::from_ref_time(4_526_473).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(4_526_473, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(s.into())))
             .saturating_add(DbWeight::get().writes(1))
@@ -136,7 +136,7 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     // Proof Skipped: Settlement VenueFiltering (max_values: None, max_size: None, mode: Measured)
     fn set_venue_filtering() -> Weight {
         // Minimum execution time: 33_059 nanoseconds.
-        Weight::from_ref_time(34_743_000)
+        Weight::from_parts(34_743_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -153,9 +153,9 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `v` is `[0, 100]`.
     fn allow_venues(v: u32) -> Weight {
         // Minimum execution time: 29_734 nanoseconds.
-        Weight::from_ref_time(34_041_969)
+        Weight::from_parts(34_041_969, 0)
             // Standard Error: 18_920
-            .saturating_add(Weight::from_ref_time(2_558_029).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(2_558_029, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(v.into())))
     }
@@ -172,9 +172,9 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `v` is `[0, 100]`.
     fn disallow_venues(v: u32) -> Weight {
         // Minimum execution time: 32_018 nanoseconds.
-        Weight::from_ref_time(35_158_836)
+        Weight::from_parts(35_158_836, 0)
             // Standard Error: 18_808
-            .saturating_add(Weight::from_ref_time(2_479_690).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(2_479_690, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(v.into())))
     }
@@ -217,13 +217,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn affirm_with_receipts(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 1_362_039 nanoseconds.
-        Weight::from_ref_time(30_752_065)
+        Weight::from_parts(30_752_065, 0)
             // Standard Error: 920_495
-            .saturating_add(Weight::from_ref_time(50_145_102).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(50_145_102, 0).saturating_mul(f.into()))
             // Standard Error: 85_148
-            .saturating_add(Weight::from_ref_time(37_317_225).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(37_317_225, 0).saturating_mul(n.into()))
             // Standard Error: 833_827
-            .saturating_add(Weight::from_ref_time(84_072_250).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(84_072_250, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((5_u64).saturating_mul(n.into())))
@@ -308,11 +308,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn execute_manual_instruction(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 4_326_122 nanoseconds.
-        Weight::from_ref_time(4_334_153_000)
+        Weight::from_parts(4_334_153_000, 0)
             // Standard Error: 5_116_456
-            .saturating_add(Weight::from_ref_time(248_402_942).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(248_402_942, 0).saturating_mul(f.into()))
             // Standard Error: 494_029
-            .saturating_add(Weight::from_ref_time(179_827_924).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(179_827_924, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(19))
             .saturating_add(DbWeight::get().reads((60_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((18_u64).saturating_mul(n.into())))
@@ -375,13 +375,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn add_instruction(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 649_862 nanoseconds.
-        Weight::from_ref_time(181_103_629)
+        Weight::from_parts(181_103_629, 0)
             // Standard Error: 859_961
-            .saturating_add(Weight::from_ref_time(49_562_998).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(49_562_998, 0).saturating_mul(f.into()))
             // Standard Error: 79_548
-            .saturating_add(Weight::from_ref_time(50_371_349).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(50_371_349, 0).saturating_mul(n.into()))
             // Standard Error: 778_992
-            .saturating_add(Weight::from_ref_time(377_069).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(377_069, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().reads((9_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((9_u64).saturating_mul(n.into())))
@@ -455,13 +455,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn add_and_affirm_instruction(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 1_044_625 nanoseconds.
-        Weight::from_ref_time(35_687_014)
+        Weight::from_parts(35_687_014, 0)
             // Standard Error: 1_353_987
-            .saturating_add(Weight::from_ref_time(88_363_287).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(88_363_287, 0).saturating_mul(f.into()))
             // Standard Error: 125_247
-            .saturating_add(Weight::from_ref_time(84_907_864).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(84_907_864, 0).saturating_mul(n.into()))
             // Standard Error: 1_226_503
-            .saturating_add(Weight::from_ref_time(10_688_477).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(10_688_477, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().reads((13_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((13_u64).saturating_mul(n.into())))
@@ -503,11 +503,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 100]`.
     fn affirm_instruction(f: u32, n: u32) -> Weight {
         // Minimum execution time: 573_378 nanoseconds.
-        Weight::from_ref_time(227_742_958)
+        Weight::from_parts(227_742_958, 0)
             // Standard Error: 621_956
-            .saturating_add(Weight::from_ref_time(33_924_547).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(33_924_547, 0).saturating_mul(f.into()))
             // Standard Error: 58_443
-            .saturating_add(Weight::from_ref_time(36_201_669).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(36_201_669, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(15))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((5_u64).saturating_mul(n.into())))
@@ -542,11 +542,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn withdraw_affirmation(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 472_688 nanoseconds.
-        Weight::from_ref_time(149_586_656)
+        Weight::from_parts(149_586_656, 0)
             // Standard Error: 627_411
-            .saturating_add(Weight::from_ref_time(35_874_804).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(35_874_804, 0).saturating_mul(f.into()))
             // Standard Error: 58_037
-            .saturating_add(Weight::from_ref_time(37_322_729).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(37_322_729, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().reads((5_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((5_u64).saturating_mul(n.into())))
@@ -592,13 +592,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn reject_instruction(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 580_358 nanoseconds.
-        Weight::from_ref_time(118_055_273)
+        Weight::from_parts(118_055_273, 0)
             // Standard Error: 1_085_190
-            .saturating_add(Weight::from_ref_time(28_028_976).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(28_028_976, 0).saturating_mul(f.into()))
             // Standard Error: 100_383
-            .saturating_add(Weight::from_ref_time(36_339_812).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(36_339_812, 0).saturating_mul(n.into()))
             // Standard Error: 983_014
-            .saturating_add(Weight::from_ref_time(11_885_329).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(11_885_329, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(n.into())))
@@ -677,11 +677,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn execute_instruction_paused(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 2_385_781 nanoseconds.
-        Weight::from_ref_time(2_426_592_000)
+        Weight::from_parts(2_426_592_000, 0)
             // Standard Error: 3_430_970
-            .saturating_add(Weight::from_ref_time(118_611_412).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(118_611_412, 0).saturating_mul(f.into()))
             // Standard Error: 331_283
-            .saturating_add(Weight::from_ref_time(176_390_618).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(176_390_618, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(16))
             .saturating_add(DbWeight::get().reads((26_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((18_u64).saturating_mul(n.into())))
@@ -762,11 +762,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn execute_scheduled_instruction(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 4_243_219 nanoseconds.
-        Weight::from_ref_time(4_250_300_000)
+        Weight::from_parts(4_250_300_000, 0)
             // Standard Error: 4_870_147
-            .saturating_add(Weight::from_ref_time(258_973_141).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(258_973_141, 0).saturating_mul(f.into()))
             // Standard Error: 470_246
-            .saturating_add(Weight::from_ref_time(175_126_988).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(175_126_988, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(17))
             .saturating_add(DbWeight::get().reads((60_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((18_u64).saturating_mul(n.into())))
@@ -778,7 +778,7 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     }
     fn ensure_root_origin() -> Weight {
         // Minimum execution time: 591 nanoseconds.
-        Weight::from_ref_time(651_000)
+        Weight::from_parts(651_000, 0)
     }
     // Storage: Identity KeyRecords (r:1 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -809,13 +809,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn affirm_with_receipts_rcv(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 1_165_554 nanoseconds.
-        Weight::from_ref_time(152_923_311)
+        Weight::from_parts(152_923_311, 0)
             // Standard Error: 520_828
-            .saturating_add(Weight::from_ref_time(21_184_928).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(21_184_928, 0).saturating_mul(f.into()))
             // Standard Error: 48_178
-            .saturating_add(Weight::from_ref_time(21_625_684).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(21_625_684, 0).saturating_mul(n.into()))
             // Standard Error: 471_790
-            .saturating_add(Weight::from_ref_time(85_672_760).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(85_672_760, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(n.into())))
@@ -845,11 +845,11 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 100]`.
     fn affirm_instruction_rcv(f: u32, n: u32) -> Weight {
         // Minimum execution time: 366_979 nanoseconds.
-        Weight::from_ref_time(152_848_331)
+        Weight::from_parts(152_848_331, 0)
             // Standard Error: 572_932
-            .saturating_add(Weight::from_ref_time(23_592_317).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(23_592_317, 0).saturating_mul(f.into()))
             // Standard Error: 53_837
-            .saturating_add(Weight::from_ref_time(21_858_616).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(21_858_616, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(15))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(n.into())))
@@ -878,13 +878,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn withdraw_affirmation_rcv(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 334_761 nanoseconds.
-        Weight::from_ref_time(135_422_202)
+        Weight::from_parts(135_422_202, 0)
             // Standard Error: 432_167
-            .saturating_add(Weight::from_ref_time(21_839_953).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(21_839_953, 0).saturating_mul(f.into()))
             // Standard Error: 39_976
-            .saturating_add(Weight::from_ref_time(21_464_027).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(21_464_027, 0).saturating_mul(n.into()))
             // Standard Error: 391_476
-            .saturating_add(Weight::from_ref_time(1_853_671).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(1_853_671, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(n.into())))
@@ -947,13 +947,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `m` is `[0, 4]`.
     fn add_instruction_with_mediators(f: u32, n: u32, o: u32, m: u32) -> Weight {
         // Minimum execution time: 633_118 nanoseconds.
-        Weight::from_ref_time(167_302_584)
+        Weight::from_parts(167_302_584, 0)
             // Standard Error: 809_143
-            .saturating_add(Weight::from_ref_time(50_685_362).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(50_685_362, 0).saturating_mul(f.into()))
             // Standard Error: 74_667
-            .saturating_add(Weight::from_ref_time(50_629_572).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(50_629_572, 0).saturating_mul(n.into()))
             // Standard Error: 733_198
-            .saturating_add(Weight::from_ref_time(3_558_326).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(3_558_326, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().reads((9_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((9_u64).saturating_mul(n.into())))
@@ -1029,13 +1029,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `m` is `[0, 4]`.
     fn add_and_affirm_with_mediators(f: u32, n: u32, o: u32, m: u32) -> Weight {
         // Minimum execution time: 1_081_398 nanoseconds.
-        Weight::from_ref_time(102_620_422)
+        Weight::from_parts(102_620_422, 0)
             // Standard Error: 1_211_850
-            .saturating_add(Weight::from_ref_time(79_234_687).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(79_234_687, 0).saturating_mul(f.into()))
             // Standard Error: 111_828
-            .saturating_add(Weight::from_ref_time(85_074_081).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(85_074_081, 0).saturating_mul(n.into()))
             // Standard Error: 1_098_106
-            .saturating_add(Weight::from_ref_time(13_898_085).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(13_898_085, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().reads((13_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((13_u64).saturating_mul(n.into())))
@@ -1058,7 +1058,7 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     // Proof Skipped: Settlement InstructionAffirmsPending (max_values: None, max_size: None, mode: Measured)
     fn affirm_instruction_as_mediator() -> Weight {
         // Minimum execution time: 97_645 nanoseconds.
-        Weight::from_ref_time(104_767_000)
+        Weight::from_parts(104_767_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -1074,7 +1074,7 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     // Proof Skipped: Settlement InstructionAffirmsPending (max_values: None, max_size: None, mode: Measured)
     fn withdraw_affirmation_as_mediator() -> Weight {
         // Minimum execution time: 100_541 nanoseconds.
-        Weight::from_ref_time(107_081_000)
+        Weight::from_parts(107_081_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -1113,13 +1113,13 @@ impl pallet_settlement::WeightInfo for SubstrateWeight {
     /// The range of component `o` is `[0, 10]`.
     fn reject_instruction_as_mediator(f: u32, n: u32, o: u32) -> Weight {
         // Minimum execution time: 603_653 nanoseconds.
-        Weight::from_ref_time(139_191_704)
+        Weight::from_parts(139_191_704, 0)
             // Standard Error: 1_088_239
-            .saturating_add(Weight::from_ref_time(25_785_995).saturating_mul(f.into()))
+            .saturating_add(Weight::from_parts(25_785_995, 0).saturating_mul(f.into()))
             // Standard Error: 100_665
-            .saturating_add(Weight::from_ref_time(36_080_056).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(36_080_056, 0).saturating_mul(n.into()))
             // Standard Error: 985_776
-            .saturating_add(Weight::from_ref_time(12_324_568).saturating_mul(o.into()))
+            .saturating_add(Weight::from_parts(12_324_568, 0).saturating_mul(o.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(f.into())))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(n.into())))
diff --git a/pallets/weights/src/pallet_staking.rs b/pallets/weights/src/pallet_staking.rs
index 0ff8604921..a120004342 100644
--- a/pallets/weights/src/pallet_staking.rs
+++ b/pallets/weights/src/pallet_staking.rs
@@ -67,7 +67,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
     fn bond() -> Weight {
         // Minimum execution time: 60_331 nanoseconds.
-        Weight::from_ref_time(70_966_000)
+        Weight::from_parts(70_966_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -85,7 +85,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
     fn bond_extra() -> Weight {
         // Minimum execution time: 57_987 nanoseconds.
-        Weight::from_ref_time(62_364_000)
+        Weight::from_parts(62_364_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -107,7 +107,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity IsDidFrozen (max_values: None, max_size: None, mode: Measured)
     fn unbond() -> Weight {
         // Minimum execution time: 61_993 nanoseconds.
-        Weight::from_ref_time(65_178_000)
+        Weight::from_parts(65_178_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -122,9 +122,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 100]`.
     fn withdraw_unbonded_update(s: u32) -> Weight {
         // Minimum execution time: 39_089 nanoseconds.
-        Weight::from_ref_time(43_312_712)
+        Weight::from_parts(43_312_712, 0)
             // Standard Error: 9_035
-            .saturating_add(Weight::from_ref_time(23_827).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(23_827, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -151,9 +151,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 100]`.
     fn withdraw_unbonded_kill(s: u32) -> Weight {
         // Minimum execution time: 65_528 nanoseconds.
-        Weight::from_ref_time(70_402_882)
+        Weight::from_parts(70_402_882, 0)
             // Standard Error: 20_479
-            .saturating_add(Weight::from_ref_time(1_555_243).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_555_243, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(6))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -184,7 +184,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking CounterForValidators (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn validate() -> Weight {
         // Minimum execution time: 67_872 nanoseconds.
-        Weight::from_ref_time(71_938_000)
+        Weight::from_parts(71_938_000, 0)
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -195,9 +195,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `k` is `[1, 128]`.
     fn kick(k: u32) -> Weight {
         // Minimum execution time: 34_292 nanoseconds.
-        Weight::from_ref_time(33_550_562)
+        Weight::from_parts(33_550_562, 0)
             // Standard Error: 22_924
-            .saturating_add(Weight::from_ref_time(8_737_552).saturating_mul(k.into()))
+            .saturating_add(Weight::from_parts(8_737_552, 0).saturating_mul(k.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(k.into())))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(k.into())))
@@ -229,9 +229,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 16]`.
     fn nominate(n: u32) -> Weight {
         // Minimum execution time: 83_956 nanoseconds.
-        Weight::from_ref_time(86_634_894)
+        Weight::from_parts(86_634_894, 0)
             // Standard Error: 69_456
-            .saturating_add(Weight::from_ref_time(4_443_175).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(4_443_175, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -252,7 +252,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking Nominators (max_values: None, max_size: Some(558), added: 3033, mode: MaxEncodedLen)
     fn chill() -> Weight {
         // Minimum execution time: 56_475 nanoseconds.
-        Weight::from_ref_time(57_165_000)
+        Weight::from_parts(57_165_000, 0)
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -262,7 +262,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking Payee (max_values: None, max_size: Some(73), added: 2548, mode: MaxEncodedLen)
     fn set_payee() -> Weight {
         // Minimum execution time: 17_556 nanoseconds.
-        Weight::from_ref_time(17_957_000)
+        Weight::from_parts(17_957_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -272,7 +272,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
     fn set_controller() -> Weight {
         // Minimum execution time: 29_294 nanoseconds.
-        Weight::from_ref_time(31_197_000)
+        Weight::from_parts(31_197_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -280,34 +280,34 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn set_validator_count() -> Weight {
         // Minimum execution time: 3_065 nanoseconds.
-        Weight::from_ref_time(3_475_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(3_475_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking ForceEra (r:0 w:1)
     // Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn force_no_eras() -> Weight {
         // Minimum execution time: 12_188 nanoseconds.
-        Weight::from_ref_time(18_618_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(18_618_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking ForceEra (r:0 w:1)
     // Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn force_new_era() -> Weight {
         // Minimum execution time: 10_927 nanoseconds.
-        Weight::from_ref_time(11_928_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(11_928_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking ForceEra (r:0 w:1)
     // Proof: Staking ForceEra (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn force_new_era_always() -> Weight {
         // Minimum execution time: 10_716 nanoseconds.
-        Weight::from_ref_time(11_498_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(11_498_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking Invulnerables (r:0 w:1)
     // Proof Skipped: Staking Invulnerables (max_values: Some(1), max_size: None, mode: Measured)
     /// The range of component `v` is `[0, 100]`.
     fn set_invulnerables(v: u32) -> Weight {
         // Minimum execution time: 3_135 nanoseconds.
-        Weight::from_ref_time(5_195_193)
+        Weight::from_parts(5_195_193, 0)
             // Standard Error: 4_599
-            .saturating_add(Weight::from_ref_time(4_304).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(4_304, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking Bonded (r:1 w:1)
@@ -333,9 +333,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[0, 100]`.
     fn force_unstake(s: u32) -> Weight {
         // Minimum execution time: 53_891 nanoseconds.
-        Weight::from_ref_time(61_359_846)
+        Weight::from_parts(61_359_846, 0)
             // Standard Error: 14_648
-            .saturating_add(Weight::from_ref_time(1_530_947).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_530_947, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(7))
             .saturating_add(DbWeight::get().writes(8))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -345,9 +345,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[1, 1000]`.
     fn cancel_deferred_slash(s: u32) -> Weight {
         // Minimum execution time: 113_771 nanoseconds.
-        Weight::from_ref_time(1_128_694_838)
+        Weight::from_parts(1_128_694_838, 0)
             // Standard Error: 90_787
-            .saturating_add(Weight::from_ref_time(5_999_718).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(5_999_718, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -376,9 +376,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 1024]`.
     fn payout_stakers_dead_controller(n: u32) -> Weight {
         // Minimum execution time: 179_739 nanoseconds.
-        Weight::from_ref_time(384_202_178)
+        Weight::from_parts(384_202_178, 0)
             // Standard Error: 54_301
-            .saturating_add(Weight::from_ref_time(41_015_005).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(41_015_005, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(3))
@@ -409,9 +409,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 1024]`.
     fn payout_stakers_alive_staked(n: u32) -> Weight {
         // Minimum execution time: 220_430 nanoseconds.
-        Weight::from_ref_time(367_311_716)
+        Weight::from_parts(367_311_716, 0)
             // Standard Error: 54_323
-            .saturating_add(Weight::from_ref_time(48_316_458).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(48_316_458, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(4))
@@ -430,9 +430,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `l` is `[1, 32]`.
     fn rebond(l: u32) -> Weight {
         // Minimum execution time: 43_566 nanoseconds.
-        Weight::from_ref_time(47_774_541)
+        Weight::from_parts(47_774_541, 0)
             // Standard Error: 22_727
-            .saturating_add(Weight::from_ref_time(83_350).saturating_mul(l.into()))
+            .saturating_add(Weight::from_parts(83_350, 0).saturating_mul(l.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -461,9 +461,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[1, 100]`.
     fn reap_stash(s: u32) -> Weight {
         // Minimum execution time: 75_182 nanoseconds.
-        Weight::from_ref_time(78_034_699)
+        Weight::from_parts(78_034_699, 0)
             // Standard Error: 13_681
-            .saturating_add(Weight::from_ref_time(1_564_606).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_564_606, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(8))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(s.into())))
@@ -534,11 +534,11 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 100]`.
     fn new_era(v: u32, n: u32) -> Weight {
         // Minimum execution time: 837_364 nanoseconds.
-        Weight::from_ref_time(838_106_000)
+        Weight::from_parts(838_106_000, 0)
             // Standard Error: 2_993_345
-            .saturating_add(Weight::from_ref_time(70_132_293).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(70_132_293, 0).saturating_mul(v.into()))
             // Standard Error: 308_742
-            .saturating_add(Weight::from_ref_time(34_964_910).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(34_964_910, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(18))
             .saturating_add(DbWeight::get().reads((8_u64).saturating_mul(v.into())))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(n.into())))
@@ -577,11 +577,11 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[50, 100]`.
     fn get_npos_voters(v: u32, n: u32) -> Weight {
         // Minimum execution time: 5_694_021 nanoseconds.
-        Weight::from_ref_time(5_725_067_000)
+        Weight::from_parts(5_725_067_000, 0)
             // Standard Error: 703_888
-            .saturating_add(Weight::from_ref_time(12_221_363).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(12_221_363, 0).saturating_mul(v.into()))
             // Standard Error: 703_888
-            .saturating_add(Weight::from_ref_time(3_495_830).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(3_495_830, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().reads((8_u64).saturating_mul(v.into())))
             .saturating_add(DbWeight::get().reads((6_u64).saturating_mul(n.into())))
@@ -612,9 +612,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `v` is `[50, 100]`.
     fn get_npos_targets(v: u32) -> Weight {
         // Minimum execution time: 1_999_726 nanoseconds.
-        Weight::from_ref_time(59_228_490)
+        Weight::from_parts(59_228_490, 0)
             // Standard Error: 120_461
-            .saturating_add(Weight::from_ref_time(39_021_437).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(39_021_437, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().reads((7_u64).saturating_mul(v.into())))
             .saturating_add(DbWeight::get().writes(1))
@@ -633,7 +633,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
     fn set_staking_configs_all_set() -> Weight {
         // Minimum execution time: 7_441 nanoseconds.
-        Weight::from_ref_time(8_243_000).saturating_add(DbWeight::get().writes(6))
+        Weight::from_parts(8_243_000, 0).saturating_add(DbWeight::get().writes(6))
     }
     // Storage: Staking MinCommission (r:0 w:1)
     // Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -649,7 +649,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking MinNominatorBond (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen)
     fn set_staking_configs_all_remove() -> Weight {
         // Minimum execution time: 6_690 nanoseconds.
-        Weight::from_ref_time(15_123_000).saturating_add(DbWeight::get().writes(6))
+        Weight::from_parts(15_123_000, 0).saturating_add(DbWeight::get().writes(6))
     }
     // Storage: Staking Ledger (r:1 w:0)
     // Proof: Staking Ledger (max_values: None, max_size: Some(1091), added: 3566, mode: MaxEncodedLen)
@@ -673,7 +673,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity AccountKeyRefCount (max_values: None, max_size: None, mode: Measured)
     fn chill_other() -> Weight {
         // Minimum execution time: 74_131 nanoseconds.
-        Weight::from_ref_time(75_763_000)
+        Weight::from_parts(75_763_000, 0)
             .saturating_add(DbWeight::get().reads(10))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -683,7 +683,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking Validators (max_values: None, max_size: Some(45), added: 2520, mode: MaxEncodedLen)
     fn force_apply_min_commission() -> Weight {
         // Minimum execution time: 16_385 nanoseconds.
-        Weight::from_ref_time(18_157_000)
+        Weight::from_parts(18_157_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -691,7 +691,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking MinCommission (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn set_min_commission() -> Weight {
         // Minimum execution time: 3_144 nanoseconds.
-        Weight::from_ref_time(3_806_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(3_806_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking PermissionedIdentity (r:1 w:1)
     // Proof Skipped: Staking PermissionedIdentity (max_values: None, max_size: None, mode: Measured)
@@ -705,7 +705,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
     fn add_permissioned_validator() -> Weight {
         // Minimum execution time: 41_553 nanoseconds.
-        Weight::from_ref_time(46_099_000)
+        Weight::from_parts(46_099_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -713,7 +713,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof Skipped: Staking PermissionedIdentity (max_values: None, max_size: None, mode: Measured)
     fn remove_permissioned_validator() -> Weight {
         // Minimum execution time: 21_923 nanoseconds.
-        Weight::from_ref_time(23_775_000)
+        Weight::from_parts(23_775_000, 0)
             .saturating_add(DbWeight::get().reads(1))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -721,7 +721,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof: Staking SlashingAllowedFor (max_values: Some(1), max_size: Some(1), added: 496, mode: MaxEncodedLen)
     fn change_slashing_allowed_for() -> Weight {
         // Minimum execution time: 8_042 nanoseconds.
-        Weight::from_ref_time(8_202_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(8_202_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Staking ValidatorCount (r:1 w:0)
     // Proof: Staking ValidatorCount (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
@@ -729,7 +729,7 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     // Proof Skipped: Staking PermissionedIdentity (max_values: None, max_size: None, mode: Measured)
     fn update_permissioned_validator_intended_count() -> Weight {
         // Minimum execution time: 15_513 nanoseconds.
-        Weight::from_ref_time(16_815_000)
+        Weight::from_parts(16_815_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -750,9 +750,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `s` is `[1, 100]`.
     fn chill_from_governance(s: u32) -> Weight {
         // Minimum execution time: 63_263 nanoseconds.
-        Weight::from_ref_time(39_954_272)
+        Weight::from_parts(39_954_272, 0)
             // Standard Error: 31_787
-            .saturating_add(Weight::from_ref_time(29_199_031).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(29_199_031, 0).saturating_mul(s.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((4_u64).saturating_mul(s.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -765,9 +765,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `m` is `[0, 150]`.
     fn set_commission_cap(m: u32) -> Weight {
         // Minimum execution time: 26_039 nanoseconds.
-        Weight::from_ref_time(36_161_210)
+        Weight::from_parts(36_161_210, 0)
             // Standard Error: 11_245
-            .saturating_add(Weight::from_ref_time(4_450_891).saturating_mul(m.into()))
+            .saturating_add(Weight::from_parts(4_450_891, 0).saturating_mul(m.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(m.into())))
             .saturating_add(DbWeight::get().writes(2))
@@ -804,9 +804,9 @@ impl pallet_staking::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 16]`.
     fn validate_cdd_expiry_nominators(n: u32) -> Weight {
         // Minimum execution time: 211_797 nanoseconds.
-        Weight::from_ref_time(153_423_017)
+        Weight::from_parts(153_423_017, 0)
             // Standard Error: 176_413
-            .saturating_add(Weight::from_ref_time(82_196_945).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(82_196_945, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().reads((10_u64).saturating_mul(n.into())))
             .saturating_add(DbWeight::get().writes(1))
diff --git a/pallets/weights/src/pallet_statistics.rs b/pallets/weights/src/pallet_statistics.rs
index 348e75f33f..bb46142804 100644
--- a/pallets/weights/src/pallet_statistics.rs
+++ b/pallets/weights/src/pallet_statistics.rs
@@ -68,9 +68,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 9]`.
     fn set_active_asset_stats(i: u32) -> Weight {
         // Minimum execution time: 39_780 nanoseconds.
-        Weight::from_ref_time(44_031_265)
+        Weight::from_parts(44_031_265, 0)
             // Standard Error: 77_955
-            .saturating_add(Weight::from_ref_time(330_085).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(330_085, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -89,9 +89,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 250]`.
     fn batch_update_asset_stats(i: u32) -> Weight {
         // Minimum execution time: 42_724 nanoseconds.
-        Weight::from_ref_time(39_205_484)
+        Weight::from_parts(39_205_484, 0)
             // Standard Error: 10_917
-            .saturating_add(Weight::from_ref_time(3_180_085).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(3_180_085, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
@@ -110,9 +110,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 3]`.
     fn set_asset_transfer_compliance(i: u32) -> Weight {
         // Minimum execution time: 42_233 nanoseconds.
-        Weight::from_ref_time(41_799_979)
+        Weight::from_parts(41_799_979, 0)
             // Standard Error: 257_984
-            .saturating_add(Weight::from_ref_time(4_691_354).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(4_691_354, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -129,9 +129,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 1000]`.
     fn set_entities_exempt(i: u32) -> Weight {
         // Minimum execution time: 28_813 nanoseconds.
-        Weight::from_ref_time(28_545_771)
+        Weight::from_parts(28_545_771, 0)
             // Standard Error: 5_396
-            .saturating_add(Weight::from_ref_time(3_090_924).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(3_090_924, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(i.into())))
     }
@@ -140,14 +140,14 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `a` is `[0, 1]`.
     fn max_investor_count_restriction(a: u32) -> Weight {
         // Minimum execution time: 541 nanoseconds.
-        Weight::from_ref_time(805_566)
+        Weight::from_parts(805_566, 0)
             // Standard Error: 43_814
-            .saturating_add(Weight::from_ref_time(7_416_767).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(7_416_767, 0).saturating_mul(a.into()))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(a.into())))
     }
     fn max_investor_ownership_restriction() -> Weight {
         // Minimum execution time: 861 nanoseconds.
-        Weight::from_ref_time(1_092_000)
+        Weight::from_parts(1_092_000, 0)
     }
     // Storage: Timestamp Now (r:1 w:0)
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
@@ -156,9 +156,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1]`.
     fn claim_count_restriction_no_stats(c: u32) -> Weight {
         // Minimum execution time: 571 nanoseconds.
-        Weight::from_ref_time(912_176)
+        Weight::from_parts(912_176, 0)
             // Standard Error: 229_762
-            .saturating_add(Weight::from_ref_time(18_293_823).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(18_293_823, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads((3_u64).saturating_mul(c.into())))
     }
     // Storage: Timestamp Now (r:1 w:0)
@@ -169,7 +169,7 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     // Proof Skipped: Statistics AssetStats (max_values: None, max_size: None, mode: Measured)
     fn claim_count_restriction_with_stats() -> Weight {
         // Minimum execution time: 21_162 nanoseconds.
-        Weight::from_ref_time(22_164_000).saturating_add(DbWeight::get().reads(4))
+        Weight::from_parts(22_164_000, 0).saturating_add(DbWeight::get().reads(4))
     }
     // Storage: Timestamp Now (r:1 w:0)
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
@@ -180,9 +180,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `a` is `[0, 1]`.
     fn claim_ownership_restriction(a: u32) -> Weight {
         // Minimum execution time: 14_992 nanoseconds.
-        Weight::from_ref_time(16_782_771)
+        Weight::from_parts(16_782_771, 0)
             // Standard Error: 400_993
-            .saturating_add(Weight::from_ref_time(7_463_562).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(7_463_562, 0).saturating_mul(a.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(a.into())))
     }
@@ -195,9 +195,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `a` is `[0, 2]`.
     fn update_asset_count_stats(a: u32) -> Weight {
         // Minimum execution time: 15_353 nanoseconds.
-        Weight::from_ref_time(16_605_847)
+        Weight::from_parts(16_605_847, 0)
             // Standard Error: 101_131
-            .saturating_add(Weight::from_ref_time(6_846_034).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(6_846_034, 0).saturating_mul(a.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(a.into())))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(a.into())))
@@ -211,9 +211,9 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `a` is `[0, 2]`.
     fn update_asset_balance_stats(a: u32) -> Weight {
         // Minimum execution time: 15_252 nanoseconds.
-        Weight::from_ref_time(16_650_158)
+        Weight::from_parts(16_650_158, 0)
             // Standard Error: 90_168
-            .saturating_add(Weight::from_ref_time(7_750_425).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(7_750_425, 0).saturating_mul(a.into()))
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().reads((1_u64).saturating_mul(a.into())))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(a.into())))
@@ -221,24 +221,24 @@ impl pallet_statistics::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[0, 4]`.
     fn verify_requirements(i: u32) -> Weight {
         // Minimum execution time: 421 nanoseconds.
-        Weight::from_ref_time(737_345)
+        Weight::from_parts(737_345, 0)
             // Standard Error: 20_511
-            .saturating_add(Weight::from_ref_time(162_577).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(162_577, 0).saturating_mul(i.into()))
     }
     // Storage: Statistics ActiveAssetStats (r:1 w:0)
     // Proof Skipped: Statistics ActiveAssetStats (max_values: None, max_size: None, mode: Measured)
     /// The range of component `a` is `[1, 10]`.
     fn active_asset_statistics_load(a: u32) -> Weight {
         // Minimum execution time: 7_381 nanoseconds.
-        Weight::from_ref_time(8_385_558)
+        Weight::from_parts(8_385_558, 0)
             // Standard Error: 24_708
-            .saturating_add(Weight::from_ref_time(23_673).saturating_mul(a.into()))
+            .saturating_add(Weight::from_parts(23_673, 0).saturating_mul(a.into()))
             .saturating_add(DbWeight::get().reads(1))
     }
     // Storage: Statistics TransferConditionExemptEntities (r:1 w:0)
     // Proof Skipped: Statistics TransferConditionExemptEntities (max_values: None, max_size: None, mode: Measured)
     fn is_exempt() -> Weight {
         // Minimum execution time: 8_683 nanoseconds.
-        Weight::from_ref_time(8_954_000).saturating_add(DbWeight::get().reads(1))
+        Weight::from_parts(8_954_000, 0).saturating_add(DbWeight::get().reads(1))
     }
 }
diff --git a/pallets/weights/src/pallet_sto.rs b/pallets/weights/src/pallet_sto.rs
index acfd2d4770..7b54b5b178 100644
--- a/pallets/weights/src/pallet_sto.rs
+++ b/pallets/weights/src/pallet_sto.rs
@@ -82,9 +82,9 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     /// The range of component `i` is `[1, 10]`.
     fn create_fundraiser(i: u32) -> Weight {
         // Minimum execution time: 92_389 nanoseconds.
-        Weight::from_ref_time(96_229_792)
+        Weight::from_parts(96_229_792, 0)
             // Standard Error: 44_701
-            .saturating_add(Weight::from_ref_time(91_319).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(91_319, 0).saturating_mul(i.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(4))
     }
@@ -164,7 +164,7 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     // Proof Skipped: Settlement InstructionLegStatus (max_values: None, max_size: None, mode: Measured)
     fn invest() -> Weight {
         // Minimum execution time: 1_051_755 nanoseconds.
-        Weight::from_ref_time(1_059_396_000)
+        Weight::from_parts(1_059_396_000, 0)
             .saturating_add(DbWeight::get().reads(131))
             .saturating_add(DbWeight::get().writes(50))
     }
@@ -180,7 +180,7 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     // Proof Skipped: Sto Fundraisers (max_values: None, max_size: None, mode: Measured)
     fn freeze_fundraiser() -> Weight {
         // Minimum execution time: 45_648 nanoseconds.
-        Weight::from_ref_time(46_720_000)
+        Weight::from_parts(46_720_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -196,7 +196,7 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     // Proof Skipped: Sto Fundraisers (max_values: None, max_size: None, mode: Measured)
     fn unfreeze_fundraiser() -> Weight {
         // Minimum execution time: 45_308 nanoseconds.
-        Weight::from_ref_time(46_350_000)
+        Weight::from_parts(46_350_000, 0)
             .saturating_add(DbWeight::get().reads(5))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -214,7 +214,7 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
     fn modify_fundraiser_window() -> Weight {
         // Minimum execution time: 53_299 nanoseconds.
-        Weight::from_ref_time(53_841_000)
+        Weight::from_parts(53_841_000, 0)
             .saturating_add(DbWeight::get().reads(6))
             .saturating_add(DbWeight::get().writes(1))
     }
@@ -228,7 +228,7 @@ impl pallet_sto::WeightInfo for SubstrateWeight {
     // Proof: Timestamp Now (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
     fn stop() -> Weight {
         // Minimum execution time: 48_333 nanoseconds.
-        Weight::from_ref_time(48_753_000)
+        Weight::from_parts(48_753_000, 0)
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().writes(2))
     }
diff --git a/pallets/weights/src/pallet_timestamp.rs b/pallets/weights/src/pallet_timestamp.rs
index 481cde03a1..5419d3de0a 100644
--- a/pallets/weights/src/pallet_timestamp.rs
+++ b/pallets/weights/src/pallet_timestamp.rs
@@ -59,12 +59,12 @@ impl pallet_timestamp::WeightInfo for SubstrateWeight {
     // Proof: Babe CurrentSlot (max_values: Some(1), max_size: Some(8), added: 503, mode: MaxEncodedLen)
     fn set() -> Weight {
         // Minimum execution time: 11_897 nanoseconds.
-        Weight::from_ref_time(14_401_000)
+        Weight::from_parts(14_401_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(1))
     }
     fn on_finalize() -> Weight {
         // Minimum execution time: 6_981 nanoseconds.
-        Weight::from_ref_time(7_231_000)
+        Weight::from_parts(7_231_000, 0)
     }
 }
diff --git a/pallets/weights/src/pallet_treasury.rs b/pallets/weights/src/pallet_treasury.rs
index 5eceffa59c..292fc28500 100644
--- a/pallets/weights/src/pallet_treasury.rs
+++ b/pallets/weights/src/pallet_treasury.rs
@@ -68,9 +68,9 @@ impl pallet_treasury::WeightInfo for SubstrateWeight {
     /// The range of component `b` is `[1, 128]`.
     fn disbursement(b: u32) -> Weight {
         // Minimum execution time: 74_051 nanoseconds.
-        Weight::from_ref_time(74_122_000)
+        Weight::from_parts(74_122_000, 0)
             // Standard Error: 52_798
-            .saturating_add(Weight::from_ref_time(43_799_861).saturating_mul(b.into()))
+            .saturating_add(Weight::from_parts(43_799_861, 0).saturating_mul(b.into()))
             .saturating_add(DbWeight::get().reads(4))
             .saturating_add(DbWeight::get().reads((5_u64).saturating_mul(b.into())))
             .saturating_add(DbWeight::get().writes(1))
@@ -88,7 +88,7 @@ impl pallet_treasury::WeightInfo for SubstrateWeight {
     // Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
     fn reimbursement() -> Weight {
         // Minimum execution time: 65_007 nanoseconds.
-        Weight::from_ref_time(71_107_000)
+        Weight::from_parts(71_107_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(2))
     }
diff --git a/pallets/weights/src/pallet_utility.rs b/pallets/weights/src/pallet_utility.rs
index 2cc70d8962..aeb1ea92ee 100644
--- a/pallets/weights/src/pallet_utility.rs
+++ b/pallets/weights/src/pallet_utility.rs
@@ -60,9 +60,9 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1000]`.
     fn batch(c: u32) -> Weight {
         // Minimum execution time: 7_891 nanoseconds.
-        Weight::from_ref_time(42_204_836)
+        Weight::from_parts(42_204_836, 0)
             // Standard Error: 6_633
-            .saturating_add(Weight::from_ref_time(12_620_887).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(12_620_887, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -73,9 +73,9 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1000]`.
     fn batch_all(c: u32) -> Weight {
         // Minimum execution time: 7_631 nanoseconds.
-        Weight::from_ref_time(52_382_563)
+        Weight::from_parts(52_382_563, 0)
             // Standard Error: 12_704
-            .saturating_add(Weight::from_ref_time(12_660_162).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(12_660_162, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -87,7 +87,7 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     // Proof Skipped: Permissions CurrentDispatchableName (max_values: Some(1), max_size: None, mode: Measured)
     fn dispatch_as() -> Weight {
         // Minimum execution time: 24_366 nanoseconds.
-        Weight::from_ref_time(27_251_000)
+        Weight::from_parts(27_251_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -98,9 +98,9 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     /// The range of component `c` is `[0, 1000]`.
     fn force_batch(c: u32) -> Weight {
         // Minimum execution time: 7_992 nanoseconds.
-        Weight::from_ref_time(49_345_801)
+        Weight::from_parts(49_345_801, 0)
             // Standard Error: 10_338
-            .saturating_add(Weight::from_ref_time(12_648_281).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(12_648_281, 0).saturating_mul(c.into()))
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(2))
     }
@@ -120,13 +120,13 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     // Proof Skipped: Permissions CurrentDispatchableName (max_values: Some(1), max_size: None, mode: Measured)
     fn relay_tx() -> Weight {
         // Minimum execution time: 128_001 nanoseconds.
-        Weight::from_ref_time(138_117_000)
+        Weight::from_parts(138_117_000, 0)
             .saturating_add(DbWeight::get().reads(9))
             .saturating_add(DbWeight::get().writes(3))
     }
     fn ensure_root() -> Weight {
         // Minimum execution time: 631 nanoseconds.
-        Weight::from_ref_time(711_000)
+        Weight::from_parts(711_000, 0)
     }
     // Storage: Identity CurrentPayer (r:1 w:1)
     // Proof Skipped: Identity CurrentPayer (max_values: Some(1), max_size: None, mode: Measured)
@@ -136,7 +136,7 @@ impl pallet_utility::WeightInfo for SubstrateWeight {
     // Proof Skipped: Permissions CurrentDispatchableName (max_values: Some(1), max_size: None, mode: Measured)
     fn as_derivative() -> Weight {
         // Minimum execution time: 20_030 nanoseconds.
-        Weight::from_ref_time(22_474_000)
+        Weight::from_parts(22_474_000, 0)
             .saturating_add(DbWeight::get().reads(3))
             .saturating_add(DbWeight::get().writes(3))
     }
diff --git a/pallets/weights/src/polymesh_contracts.rs b/pallets/weights/src/polymesh_contracts.rs
index cbfe399f30..b8aabf7b49 100644
--- a/pallets/weights/src/polymesh_contracts.rs
+++ b/pallets/weights/src/polymesh_contracts.rs
@@ -79,11 +79,11 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `v` is `[1, 8192]`.
     fn chain_extension_read_storage(k: u32, v: u32) -> Weight {
         // Minimum execution time: 420_509 nanoseconds.
-        Weight::from_ref_time(441_154_010)
+        Weight::from_parts(441_154_010, 0)
             // Standard Error: 270
-            .saturating_add(Weight::from_ref_time(4_894).saturating_mul(k.into()))
+            .saturating_add(Weight::from_parts(4_894, 0).saturating_mul(k.into()))
             // Standard Error: 270
-            .saturating_add(Weight::from_ref_time(980).saturating_mul(v.into()))
+            .saturating_add(Weight::from_parts(980, 0).saturating_mul(v.into()))
             .saturating_add(DbWeight::get().reads(13))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -108,9 +108,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_get_version(r: u32) -> Weight {
         // Minimum execution time: 404_026 nanoseconds.
-        Weight::from_ref_time(430_717_810)
+        Weight::from_parts(430_717_810, 0)
             // Standard Error: 116_585
-            .saturating_add(Weight::from_ref_time(57_558_916).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(57_558_916, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -135,9 +135,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[1, 20]`.
     fn chain_extension_get_key_did(r: u32) -> Weight {
         // Minimum execution time: 1_221_859 nanoseconds.
-        Weight::from_ref_time(23_864_904)
+        Weight::from_parts(23_864_904, 0)
             // Standard Error: 2_525_338
-            .saturating_add(Weight::from_ref_time(870_955_515).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(870_955_515, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().reads((200_u64).saturating_mul(r.into())))
             .saturating_add(DbWeight::get().writes(3))
@@ -163,9 +163,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_hash_twox_64(r: u32) -> Weight {
         // Minimum execution time: 407_721 nanoseconds.
-        Weight::from_ref_time(436_149_077)
+        Weight::from_parts(436_149_077, 0)
             // Standard Error: 136_925
-            .saturating_add(Weight::from_ref_time(78_627_903).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(78_627_903, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -190,9 +190,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 64]`.
     fn chain_extension_hash_twox_64_per_kb(n: u32) -> Weight {
         // Minimum execution time: 493_259 nanoseconds.
-        Weight::from_ref_time(545_127_910)
+        Weight::from_parts(545_127_910, 0)
             // Standard Error: 65_828
-            .saturating_add(Weight::from_ref_time(27_618_039).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(27_618_039, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -217,9 +217,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_hash_twox_128(r: u32) -> Weight {
         // Minimum execution time: 403_573 nanoseconds.
-        Weight::from_ref_time(444_653_976)
+        Weight::from_parts(444_653_976, 0)
             // Standard Error: 133_724
-            .saturating_add(Weight::from_ref_time(78_972_384).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(78_972_384, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -244,9 +244,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 64]`.
     fn chain_extension_hash_twox_128_per_kb(n: u32) -> Weight {
         // Minimum execution time: 490_355 nanoseconds.
-        Weight::from_ref_time(549_217_273)
+        Weight::from_parts(549_217_273, 0)
             // Standard Error: 60_751
-            .saturating_add(Weight::from_ref_time(34_565_161).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(34_565_161, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -271,9 +271,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_hash_twox_256(r: u32) -> Weight {
         // Minimum execution time: 412_718 nanoseconds.
-        Weight::from_ref_time(440_860_388)
+        Weight::from_parts(440_860_388, 0)
             // Standard Error: 110_188
-            .saturating_add(Weight::from_ref_time(85_042_455).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(85_042_455, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -298,9 +298,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[0, 64]`.
     fn chain_extension_hash_twox_256_per_kb(n: u32) -> Weight {
         // Minimum execution time: 498_587 nanoseconds.
-        Weight::from_ref_time(553_931_299)
+        Weight::from_parts(553_931_299, 0)
             // Standard Error: 63_823
-            .saturating_add(Weight::from_ref_time(48_829_146).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(48_829_146, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
@@ -333,9 +333,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `n` is `[1, 8188]`.
     fn chain_extension_call_runtime(n: u32) -> Weight {
         // Minimum execution time: 445_737 nanoseconds.
-        Weight::from_ref_time(480_099_782)
+        Weight::from_parts(480_099_782, 0)
             // Standard Error: 375
-            .saturating_add(Weight::from_ref_time(555).saturating_mul(n.into()))
+            .saturating_add(Weight::from_parts(555, 0).saturating_mul(n.into()))
             .saturating_add(DbWeight::get().reads(16))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -359,46 +359,46 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     // Proof Skipped: System EventTopics (max_values: None, max_size: None, mode: Measured)
     fn dummy_contract() -> Weight {
         // Minimum execution time: 242_023 nanoseconds.
-        Weight::from_ref_time(246_270_000)
+        Weight::from_parts(246_270_000, 0)
             .saturating_add(DbWeight::get().reads(12))
             .saturating_add(DbWeight::get().writes(3))
     }
     /// The range of component `n` is `[1, 8188]`.
     fn basic_runtime_call(_n: u32) -> Weight {
         // Minimum execution time: 1_963 nanoseconds.
-        Weight::from_ref_time(3_024_347)
+        Weight::from_parts(3_024_347, 0)
     }
     /// The range of component `i` is `[0, 1048576]`.
     /// The range of component `s` is `[0, 1048576]`.
     fn base_weight_with_hash(i: u32, s: u32) -> Weight {
         // Minimum execution time: 1_154_999 nanoseconds.
-        Weight::from_ref_time(73_388_718)
+        Weight::from_parts(73_388_718, 0)
             // Standard Error: 10
-            .saturating_add(Weight::from_ref_time(1_019).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(1_019, 0).saturating_mul(i.into()))
             // Standard Error: 10
-            .saturating_add(Weight::from_ref_time(1_157).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_157, 0).saturating_mul(s.into()))
     }
     /// The range of component `c` is `[0, 61717]`.
     /// The range of component `i` is `[0, 1048576]`.
     /// The range of component `s` is `[0, 1048576]`.
     fn base_weight_with_code(c: u32, i: u32, s: u32) -> Weight {
         // Minimum execution time: 1_206_667 nanoseconds.
-        Weight::from_ref_time(67_372_302)
+        Weight::from_parts(67_372_302, 0)
             // Standard Error: 167
-            .saturating_add(Weight::from_ref_time(1_447).saturating_mul(c.into()))
+            .saturating_add(Weight::from_parts(1_447, 0).saturating_mul(c.into()))
             // Standard Error: 9
-            .saturating_add(Weight::from_ref_time(996).saturating_mul(i.into()))
+            .saturating_add(Weight::from_parts(996, 0).saturating_mul(i.into()))
             // Standard Error: 9
-            .saturating_add(Weight::from_ref_time(1_137).saturating_mul(s.into()))
+            .saturating_add(Weight::from_parts(1_137, 0).saturating_mul(s.into()))
     }
     // Storage: PolymeshContracts CallRuntimeWhitelist (r:0 w:2000)
     // Proof Skipped: PolymeshContracts CallRuntimeWhitelist (max_values: None, max_size: None, mode: Measured)
     /// The range of component `u` is `[0, 2000]`.
     fn update_call_runtime_whitelist(u: u32) -> Weight {
         // Minimum execution time: 3_936 nanoseconds.
-        Weight::from_ref_time(4_167_000)
+        Weight::from_parts(4_167_000, 0)
             // Standard Error: 2_190
-            .saturating_add(Weight::from_ref_time(1_653_031).saturating_mul(u.into()))
+            .saturating_add(Weight::from_parts(1_653_031, 0).saturating_mul(u.into()))
             .saturating_add(DbWeight::get().writes((1_u64).saturating_mul(u.into())))
     }
     // Storage: Identity KeyRecords (r:2 w:1)
@@ -413,7 +413,7 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity KeyAssetPermissions (max_values: None, max_size: None, mode: Measured)
     fn link_contract_as_secondary_key() -> Weight {
         // Minimum execution time: 26_339 nanoseconds.
-        Weight::from_ref_time(28_423_000)
+        Weight::from_parts(28_423_000, 0)
             .saturating_add(DbWeight::get().reads(2))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -437,7 +437,7 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     // Proof Skipped: Identity ChildDid (max_values: None, max_size: None, mode: Measured)
     fn link_contract_as_primary_key() -> Weight {
         // Minimum execution time: 47_721 nanoseconds.
-        Weight::from_ref_time(52_568_000)
+        Weight::from_parts(52_568_000, 0)
             .saturating_add(DbWeight::get().reads(8))
             .saturating_add(DbWeight::get().writes(6))
     }
@@ -445,7 +445,7 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     // Proof Skipped: PolymeshContracts ApiNextUpgrade (max_values: None, max_size: None, mode: Measured)
     fn upgrade_api() -> Weight {
         // Minimum execution time: 12_098 nanoseconds.
-        Weight::from_ref_time(13_571_000).saturating_add(DbWeight::get().writes(1))
+        Weight::from_parts(13_571_000, 0).saturating_add(DbWeight::get().writes(1))
     }
     // Storage: Identity KeyRecords (r:2 w:0)
     // Proof Skipped: Identity KeyRecords (max_values: None, max_size: None, mode: Measured)
@@ -472,9 +472,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_get_latest_api_upgrade(r: u32) -> Weight {
         // Minimum execution time: 402_874 nanoseconds.
-        Weight::from_ref_time(468_862_333)
+        Weight::from_parts(468_862_333, 0)
             // Standard Error: 1_989_018
-            .saturating_add(Weight::from_ref_time(376_144_330).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(376_144_330, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(14))
             .saturating_add(DbWeight::get().writes(5))
     }
@@ -503,9 +503,9 @@ impl polymesh_contracts::WeightInfo for SubstrateWeight {
     /// The range of component `r` is `[0, 20]`.
     fn chain_extension_get_next_asset_id(r: u32) -> Weight {
         // Minimum execution time: 413_229 nanoseconds.
-        Weight::from_ref_time(437_313_575)
+        Weight::from_parts(437_313_575, 0)
             // Standard Error: 863_761
-            .saturating_add(Weight::from_ref_time(428_114_434).saturating_mul(r.into()))
+            .saturating_add(Weight::from_parts(428_114_434, 0).saturating_mul(r.into()))
             .saturating_add(DbWeight::get().reads(14))
             .saturating_add(DbWeight::get().writes(3))
     }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index fc9ef09d08..9c1631ed5c 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4", default-features = false }
-serde = { version = "1.0.104", optional = true, default-features = false, features = ["derive"] }
-serde_bytes = { version = "0.11.14", optional = true, default-features = false }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
+serde_bytes = { version = "0.11.14", default-features = false, features = ["alloc"] }
 rand_core = { version = "0.6", default-features = false }
 rand = { version = "0.8", default-features = false, optional = true }
 rustc-hex = { version = "2.1.0", default-features = false }
@@ -25,17 +25,18 @@ schnorrkel = { version = "0.11", default-features = false }
 
 # Substrate
 codec = { workspace = true, default-features = false, features = ["derive"] }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
-scale-info = { version = "2.0", default-features = false, features = ["derive", "decode"] }
-sp-application-crypto = { version = "7.0.0", default-features = false, optional = true }
-sp-arithmetic = { version = "6.0.0", default-features = false }
-sp-core = { version = "7.0.0", default-features = false }
-sp-io = { version = "7.0.0", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-runtime-interface = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-version = { version = "5.0.0", default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
+scale-info = { workspace = true, default-features = false, features = ["derive", "decode"] }
+sp-application-crypto = { workspace = true, default-features = false, optional = true }
+sp-arithmetic = { workspace = true, default-features = false }
+sp-core = { workspace = true, default-features = false }
+sp-debug-derive = { workspace = true, default-features = false }
+sp-io = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-runtime-interface = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-version = { workspace = true, default-features = false }
 libsecp256k1 = { version = "0.7", default-features = false, features = ["hmac", "static-context"] }
 
 [dev-dependencies]
@@ -56,8 +57,8 @@ std = [
     "codec/std",
     "frame-support/std",
     "frame-system/std",
-    "serde",
-    "serde_bytes",
+    "serde/std",
+    "serde_bytes/std",
     "sp-core/std",
     "sp-io/std",
     "sp-runtime-interface/std",
diff --git a/primitives/src/agent.rs b/primitives/src/agent.rs
index 48536de4de..b7361bd0c8 100644
--- a/primitives/src/agent.rs
+++ b/primitives/src/agent.rs
@@ -1,20 +1,19 @@
 use crate::impl_checked_inc;
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// A `Ticker`-local Agent Group ID.
 /// By *local*, we mean that the same number might be used for a different `Ticker`
 /// to uniquely identify a different Agent Group.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Debug)]
 pub struct AGId(pub u32);
 impl_checked_inc!(AGId);
 
 /// The available set of agent groups.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
 pub enum AgentGroup {
diff --git a/primitives/src/asset.rs b/primitives/src/asset.rs
index 61906809fb..bab0fe46cb 100644
--- a/primitives/src/asset.rs
+++ b/primitives/src/asset.rs
@@ -13,8 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
@@ -26,7 +25,7 @@ use crate::ticker::Ticker;
 use polymesh_primitives_derive::VecU8StrongTyped;
 
 /// An unique asset identifier.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub struct AssetId([u8; 16]);
diff --git a/primitives/src/asset_metadata.rs b/primitives/src/asset_metadata.rs
index 9dec799470..d0bbbce78c 100644
--- a/primitives/src/asset_metadata.rs
+++ b/primitives/src/asset_metadata.rs
@@ -19,15 +19,14 @@ use codec::MaxEncodedLen;
 use codec::{Decode, DecodeAll, Encode};
 use polymesh_primitives_derive::VecU8StrongTyped;
 use scale_info::{PortableRegistry, TypeInfo};
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::prelude::Vec;
 
 /// Asset Metadata Name.
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub struct AssetMetadataName(#[cfg_attr(feature = "std", serde(with = "serde_bytes"))] pub Vec<u8>);
+#[derive(Serialize, Deserialize)]
+pub struct AssetMetadataName(#[serde(with = "serde_bytes")] pub Vec<u8>);
 
 /// Asset Metadata Global Key.
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
@@ -125,24 +124,22 @@ impl<Moment> Default for AssetMetadataLockStatus<Moment> {
 /// Asset Metadata description.
 #[derive(Encode, Decode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub struct AssetMetadataDescription(
-    #[cfg_attr(feature = "std", serde(with = "serde_bytes"))] pub Vec<u8>,
-);
+#[derive(Serialize, Deserialize)]
+pub struct AssetMetadataDescription(#[serde(with = "serde_bytes")] pub Vec<u8>);
 
 /// Asset Metadata Specs.
 #[derive(Encode, Decode, TypeInfo)]
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct AssetMetadataSpec {
     /// Off-chain specs or documentation.
-    #[cfg_attr(feature = "std", serde(default))]
+    #[serde(default)]
     pub url: Option<Url>,
     /// Description of metadata type.
-    #[cfg_attr(feature = "std", serde(default))]
+    #[serde(default)]
     pub description: Option<AssetMetadataDescription>,
     /// Optional SCALE encoded `AssetMetadataTypeDef`.
-    #[cfg_attr(feature = "std", serde(with = "serde_bytes", default))]
+    #[serde(with = "serde_bytes", default)]
     pub type_def: Option<Vec<u8>>,
 }
 
diff --git a/primitives/src/authorization.rs b/primitives/src/authorization.rs
index f0a27e4557..e2d3e5b01f 100644
--- a/primitives/src/authorization.rs
+++ b/primitives/src/authorization.rs
@@ -15,7 +15,6 @@
 
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
@@ -27,7 +26,7 @@ use crate::{Balance, PortfolioId, Ticker};
 
 /// Authorization data for two step processes.
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum AuthorizationData<AccountId> {
     /// CDD provider's attestation to change primary key
     AttestPrimaryKeyRotation(IdentityId),
@@ -77,8 +76,9 @@ impl<AccountId> AuthorizationData<AccountId> {
 }
 
 /// Type of authorization.
-#[derive(Eq, PartialEq, Encode, Decode, Clone)]
-#[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
+#[derive(Eq, PartialEq, Encode, Decode, TypeInfo, Clone)]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 pub enum AuthorizationType {
     /// CDD Authorization to rotate primary key.
     AttestPrimaryKeyRotation,
@@ -104,7 +104,7 @@ pub enum AuthorizationType {
 
 /// Authorization struct
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Debug)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct Authorization<AccountId, Moment> {
     /// Enum that contains authorization type and data
     pub authorization_data: AuthorizationData<AccountId>,
diff --git a/primitives/src/calendar.rs b/primitives/src/calendar.rs
index 7eed73a760..9886728213 100644
--- a/primitives/src/calendar.rs
+++ b/primitives/src/calendar.rs
@@ -1,4 +1,4 @@
-use chrono::{Datelike, NaiveDate, NaiveDateTime};
+use chrono::{DateTime, Datelike, NaiveDate};
 use codec::{Decode, Encode};
 use core::num::NonZeroU64;
 use scale_info::TypeInfo;
@@ -201,14 +201,13 @@ fn next_checkpoint_secs(
         }
         FixedOrVariableCalendarUnit::Variable(variable_unit) => {
             // The period is of variable length.
-            let date_time_start = NaiveDateTime::from_timestamp_opt(i64::try_from(start).ok()?, 0)?;
-            let date_start = date_time_start.date();
+            let date_time_start = DateTime::from_timestamp(i64::try_from(start).ok()?, 0)?;
+            let date_start = date_time_start.date_naive();
             let year_start = date_start.year();
             let month_start = date_start.month();
             let day_start = date_start.day();
-            let date_time_now =
-                NaiveDateTime::from_timestamp_opt(i64::try_from(now_as_secs_utc).ok()?, 0)?;
-            let date_now = date_time_now.date();
+            let date_time_now = DateTime::from_timestamp(i64::try_from(now_as_secs_utc).ok()?, 0)?;
+            let date_now = date_time_now.date_naive();
             let date_next = match variable_unit {
                 VariableCalendarUnit::Month => {
                     // Convert the base unit amount to match the type of month.
@@ -261,7 +260,13 @@ fn next_checkpoint_secs(
                     )?
                 }
             };
-            Moment::try_from(date_next.and_time(date_time_start.time()).timestamp()).ok()
+            Moment::try_from(
+                date_next
+                    .and_time(date_time_start.time())
+                    .and_utc()
+                    .timestamp(),
+            )
+            .ok()
         }
     }
 }
diff --git a/primitives/src/cdd_id.rs b/primitives/src/cdd_id.rs
index b577cb4166..f703fd3c31 100644
--- a/primitives/src/cdd_id.rs
+++ b/primitives/src/cdd_id.rs
@@ -1,16 +1,12 @@
 use codec::{Decode, Encode};
 use polymesh_primitives_derive::SliceU8StrongTyped;
-#[cfg(feature = "std")]
 use polymesh_primitives_derive::{DeserializeU8StrongTyped, SerializeU8StrongTyped};
 use scale_info::TypeInfo;
 
 /// A CDD ID only has meaning to the CDD provider that issues a CDD claim.
 #[derive(Encode, Decode, TypeInfo, SliceU8StrongTyped)]
 #[derive(Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-#[cfg_attr(
-    feature = "std",
-    derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)
-)]
+#[derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)]
 pub struct CddId([u8; 32]);
 
 impl CddId {
diff --git a/primitives/src/compliance_manager.rs b/primitives/src/compliance_manager.rs
index b196dbed73..77c848aad2 100644
--- a/primitives/src/compliance_manager.rs
+++ b/primitives/src/compliance_manager.rs
@@ -16,13 +16,12 @@
 use crate::condition::{conditions_total_counts, Condition};
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
 /// A compliance requirement.
 /// All sender and receiver conditions of the same compliance requirement must be true in order to execute the transfer.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Default, Clone, PartialEq, Eq, Debug)]
 pub struct ComplianceRequirement {
     /// List of sender conditions
@@ -62,7 +61,8 @@ impl ComplianceRequirement {
 }
 
 /// A compliance requirement along with its evaluation result
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Hash)]
 pub struct ComplianceRequirementResult {
     /// List of sender conditions
@@ -88,7 +88,8 @@ impl From<ComplianceRequirement> for ComplianceRequirementResult {
 }
 
 /// An individual condition along with its evaluation result
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Hash)]
 pub struct ConditionResult {
     /// Condition being evaluated
@@ -107,7 +108,8 @@ impl From<Condition> for ConditionResult {
 }
 
 /// List of compliance requirements associated to an asset.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Default, Clone, PartialEq, Eq)]
 pub struct AssetCompliance {
     /// This flag indicates if asset compliance should be enforced
@@ -117,7 +119,8 @@ pub struct AssetCompliance {
 }
 
 /// Asset compliance and it's evaluation result.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, Clone, PartialEq, Eq, Hash)]
 pub struct AssetComplianceResult {
     /// This flag indicates if asset compliance should be enforced.
@@ -143,7 +146,8 @@ impl From<AssetCompliance> for AssetComplianceResult {
 }
 
 /// Holds detailed information for all asset's requirements.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo)]
 pub struct ComplianceReport {
     /// Set to `true` if any requirement is satisfied.
@@ -180,7 +184,8 @@ impl ComplianceReport {
 }
 
 /// Holds the information for an individual asset requirement.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo)]
 pub struct RequirementReport {
     /// Set to `true` if all conditions are satisfied.
@@ -226,7 +231,8 @@ impl RequirementReport {
 }
 
 /// Holds the information for an individual condition.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo)]
 pub struct ConditionReport {
     /// Set to `true` if the condition is satisfied.
diff --git a/primitives/src/condition.rs b/primitives/src/condition.rs
index 25a84acd01..1cbb41cb88 100644
--- a/primitives/src/condition.rs
+++ b/primitives/src/condition.rs
@@ -18,13 +18,12 @@ use codec::{Decode, Encode};
 use core::iter;
 use either::Either;
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::convert::TryInto;
 use sp_std::prelude::*;
 
 /// Defines a static / dynamic identity.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Copy, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum TargetIdentity {
     /// Matches any of the external agents of an asset. Resolved dynamically.
@@ -35,7 +34,7 @@ pub enum TargetIdentity {
 
 /// It defines the type of condition supported, and the filter information we will use to evaluate as a
 /// predicate.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum ConditionType {
     /// Condition to ensure that claim filter produces one claim.
@@ -63,7 +62,7 @@ impl ConditionType {
 }
 
 /// Denotes the set of `ClaimType`s for which an issuer is trusted.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum TrustedFor {
     /// Issuer is trusted for any `ClaimType`.
@@ -73,7 +72,7 @@ pub enum TrustedFor {
 }
 
 /// A trusted issuer for a certain compliance `Condition` and what `ClaimType`s is trusted for.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, Hash)]
 pub struct TrustedIssuer {
     /// The issuer trusted for the `Condition` or for the `Ticker`,
@@ -125,7 +124,7 @@ impl From<IdentityId> for TrustedIssuer {
 }
 
 /// Type of claim requirements that a condition can have
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, Hash)]
 pub struct Condition {
     /// Type of condition.
diff --git a/primitives/src/document.rs b/primitives/src/document.rs
index e8e1a91e63..281bb25c78 100644
--- a/primitives/src/document.rs
+++ b/primitives/src/document.rs
@@ -18,38 +18,36 @@ use crate::{DocumentHash, Moment};
 use codec::{Decode, Encode, MaxEncodedLen};
 use polymesh_primitives_derive::VecU8StrongTyped;
 use scale_info::TypeInfo;
-use sp_std::prelude::Vec;
-
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
+use sp_std::prelude::Vec;
 
 /// The local, per-ticker, ID of an asset documentation.
 #[derive(Decode, Encode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct DocumentId(pub u32);
 
 /// A wrapper for a document name.
 #[derive(Decode, Encode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct DocumentName(pub Vec<u8>);
 
 /// A wrapper for a document URI.
 #[derive(Decode, Encode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct DocumentUri(pub Vec<u8>);
 
 /// A wrapper for a document's type.
 #[derive(Decode, Encode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct DocumentType(pub Vec<u8>);
 
 /// Represents a document associated with an asset
 #[derive(Decode, Encode, TypeInfo, Clone, Debug, Default, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct Document {
     /// An URI where more details can be discovered.
     /// For example, this might link to an external `.pdf`.
diff --git a/primitives/src/document_hash.rs b/primitives/src/document_hash.rs
index 13f6585969..b24beaffbd 100644
--- a/primitives/src/document_hash.rs
+++ b/primitives/src/document_hash.rs
@@ -127,10 +127,8 @@ impl AsRef<[u8]> for DocumentHash {
 // Serde support
 // ======================
 
-#[cfg(feature = "std")]
 use serde::{de::Error as SerdeError, Deserialize, Deserializer, Serialize, Serializer};
 
-#[cfg(feature = "std")]
 impl Serialize for DocumentHash {
     #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -141,7 +139,6 @@ impl Serialize for DocumentHash {
     }
 }
 
-#[cfg(feature = "std")]
 impl<'de> Deserialize<'de> for DocumentHash {
     #[inline]
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
diff --git a/primitives/src/event_only.rs b/primitives/src/event_only.rs
index 71a4460cac..88784bd980 100644
--- a/primitives/src/event_only.rs
+++ b/primitives/src/event_only.rs
@@ -17,12 +17,11 @@
 
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 /// A protective newtype around any type,
 /// signalling that the contained element is only for use by events.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo)]
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default, Debug)]
 pub struct EventOnly<T>(T);
diff --git a/primitives/src/identity.rs b/primitives/src/identity.rs
index 849ae4e523..997c69cf4c 100644
--- a/primitives/src/identity.rs
+++ b/primitives/src/identity.rs
@@ -14,8 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
@@ -57,7 +56,7 @@ pub mod limits {
 /// Asset Identities don't have a primary key.
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Clone, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct DidRecord<AccountId> {
     /// The identity's primary key, if it has one.
     pub primary_key: Option<AccountId>,
diff --git a/primitives/src/identity_claim.rs b/primitives/src/identity_claim.rs
index 3b224f01e2..1b1a27dd56 100644
--- a/primitives/src/identity_claim.rs
+++ b/primitives/src/identity_claim.rs
@@ -18,20 +18,19 @@ use crate::{identity_id::IdentityId, impl_checked_inc, CddId, Moment};
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::{convert::From, prelude::*};
 
 use super::jurisdiction::CountryCode;
 
 /// The ID of a custom claim type.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Default, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, Hash)]
 pub struct CustomClaimTypeId(pub u32);
 impl_checked_inc!(CustomClaimTypeId);
 
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo)]
 #[derive(Clone, PartialEq, Eq, Debug, PartialOrd, Ord, Hash)]
 /// The scope of a claim.
@@ -74,7 +73,7 @@ impl Scope {
 }
 
 /// All possible claims in polymesh
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum Claim {
     /// User is Accredited.
@@ -139,7 +138,7 @@ impl Claim {
 }
 
 /// Claim type represent the claim without its data.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Clone, PartialEq, Eq, Debug, PartialOrd, Ord, Hash)]
 pub enum ClaimType {
@@ -166,7 +165,8 @@ pub enum ClaimType {
 }
 
 /// All information of a particular claim
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, Clone, PartialEq, Eq)]
 pub struct IdentityClaim {
     /// Issuer of the claim
diff --git a/primitives/src/identity_id.rs b/primitives/src/identity_id.rs
index ee704a0c2e..653e4fec16 100644
--- a/primitives/src/identity_id.rs
+++ b/primitives/src/identity_id.rs
@@ -13,9 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "std")]
 use polymesh_primitives_derive::{DeserializeU8StrongTyped, SerializeU8StrongTyped};
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -36,7 +34,8 @@ const UUID_LEN: usize = 32usize;
 
 /// The record to initialize an identity in the chain spec.
 #[derive(Clone)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, Debug))]
+#[cfg_attr(feature = "std", derive(Debug))]
+#[derive(Serialize, Deserialize)]
 pub struct GenesisIdentityRecord<AccountId> {
     /// Identity primary key.
     pub primary_key: Option<AccountId>,
@@ -88,10 +87,7 @@ impl GenesisIdentityRecord<AccountId> {
 ///  - "DID:poly:..."
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Default, PartialOrd, Ord, PartialEq, Eq, Clone, Copy, Hash)]
-#[cfg_attr(
-    feature = "std",
-    derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)
-)]
+#[derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)]
 pub struct IdentityId(pub [u8; UUID_LEN]);
 
 /// Alias for `EventOnly<IdentityId>`.
@@ -229,13 +225,13 @@ impl Printable for IdentityId {
 /// default ones are nameless.
 #[derive(Decode, Encode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct PortfolioName(pub Vec<u8>);
 
 /// The unique ID of a non-default portfolio.
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct PortfolioNumber(pub u64);
 
 impl Default for PortfolioNumber {
@@ -253,13 +249,13 @@ impl From<u64> for PortfolioNumber {
 /// The kind of a portfolio. It can be either a default portfolio or a user-defined one.
 #[derive(Decode, Encode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum PortfolioKind {
     /// The default portfolio of a DID.
-    #[cfg_attr(feature = "std", serde(alias = "default"))]
+    #[serde(alias = "default")]
     Default,
     /// A user-defined portfolio of a DID.
-    #[cfg_attr(feature = "std", serde(alias = "user"))]
+    #[serde(alias = "user")]
     User(PortfolioNumber),
 }
 
@@ -278,7 +274,7 @@ impl From<Option<PortfolioNumber>> for PortfolioKind {
 /// The identification of a portfolio. Contains the [`IdentityId`] of the portfolio owner and the [`PortfolioKind`].
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Clone, Copy, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct PortfolioId {
     /// The DID of the portfolio owner.
     pub did: IdentityId,
@@ -325,7 +321,7 @@ impl PortfolioId {
 }
 
 /// Result of a portfolio validity check.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct PortfolioValidityResult {
     /// Receiver portfolio is the same portfolio as the sender.
diff --git a/primitives/src/jurisdiction.rs b/primitives/src/jurisdiction.rs
index 5e37574919..4153ec0fe9 100644
--- a/primitives/src/jurisdiction.rs
+++ b/primitives/src/jurisdiction.rs
@@ -17,15 +17,14 @@
 
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
 macro_rules! country_codes {
     ( $([$discr:expr,$alpha2:ident, $alpha3:ident, $un:literal, $($extra:expr),*]),* $(,)? ) => {
         /// Existing country codes according to ISO-3166-1.
         #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Decode, Encode, MaxEncodedLen, TypeInfo, Hash)]
-        #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+        #[derive(Serialize, Deserialize)]
         pub enum CountryCode {
         $(
             $(#[doc=$extra])*
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
index 65a66a4a43..58ea3ccef4 100644
--- a/primitives/src/lib.rs
+++ b/primitives/src/lib.rs
@@ -25,15 +25,15 @@ use alloc::{
     format,
     string::{String, ToString},
 };
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{CompactAs, Decode, Encode, MaxEncodedLen};
 use core::ops::Add;
 use frame_support::traits::Get;
 use frame_support::weights::Weight;
 use polymesh_primitives_derive::{SliceU8StrongTyped, StringStrongTyped, VecU8StrongTyped};
 use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+use sp_debug_derive::RuntimeDebug;
 use sp_runtime::{generic, traits::BlakeTwo256, MultiSignature};
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
 use sp_std::prelude::Vec;
 
 /// An index to a block.
@@ -59,8 +59,8 @@ pub type ChainId = u32;
 /// A hash of some data used by the relay chain.
 pub type Hash = sp_core::H256;
 
-/// Index of a transaction in the relay chain. 32-bit should be plenty.
-pub type Index = u32;
+/// Nonce of a transaction. 32-bit should be plenty.
+pub type Nonce = u32;
 
 /// Alias for Gas.
 pub type Gas = Weight;
@@ -95,7 +95,7 @@ impl<const T: u32> GetExtra<u32> for ConstSize<T> {}
     TypeInfo,
     Debug
 )]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum MaybeBlock<BlockNumber> {
     /// Has a block number.
     Some(BlockNumber),
@@ -120,7 +120,7 @@ impl<T: Add<Output = T>> Add<T> for MaybeBlock<T> {
 }
 
 /// A positive coefficient: a pair of a numerator and a denominator. Defaults to `(1, 1)`.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, TypeInfo, MaxEncodedLen)]
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
 pub struct PosRatio(pub u32, pub u32);
@@ -328,13 +328,13 @@ pub struct Memo(pub [u8; 32]);
 /// Url for linking to off-chain resources.
 #[derive(Decode, Encode, TypeInfo, VecU8StrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub struct Url(#[cfg_attr(feature = "std", serde(with = "serde_bytes"))] pub Vec<u8>);
+#[derive(Serialize, Deserialize)]
+pub struct Url(#[serde(with = "serde_bytes")] pub Vec<u8>);
 
 /// The name of a pallet.
 #[derive(Encode, Decode, TypeInfo, StringStrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct PalletName(pub String);
 
 impl PalletName {
@@ -347,7 +347,7 @@ impl PalletName {
 /// The name of an extrinsic within a pallet.
 #[derive(Encode, Decode, TypeInfo, StringStrongTyped)]
 #[derive(Clone, Debug, Default, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct ExtrinsicName(pub String);
 
 impl ExtrinsicName {
@@ -357,6 +357,27 @@ impl ExtrinsicName {
     }
 }
 
+/// The old weight type.
+///
+/// NOTE: This type exists purely for compatibility purposes! Use [`weight_v2::Weight`] in all other
+/// cases.
+#[derive(
+    Decode,
+    Encode,
+    CompactAs,
+    PartialEq,
+    Eq,
+    Clone,
+    Copy,
+    RuntimeDebug,
+    Default,
+    MaxEncodedLen,
+    TypeInfo
+)]
+#[derive(Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct OldWeight(pub u64);
+
 /// Execute the supplied function in a new storage transaction,
 /// committing on `Ok(_)` and rolling back on `Err(_)`, returning the result.
 ///
diff --git a/primitives/src/migrate.rs b/primitives/src/migrate.rs
index 0065590a6a..5dfc63687e 100644
--- a/primitives/src/migrate.rs
+++ b/primitives/src/migrate.rs
@@ -59,7 +59,7 @@ pub fn frame_v2_migrate<P: PalletInfoAccess + GetStorageVersion>(
         current_version,
         target_version
     );
-    weight += Weight::from_ref_time(1_000);
+    weight += Weight::from_parts(1_000, 0);
     // Update the storage version
     target_version.put::<P>();
 
@@ -87,7 +87,7 @@ pub fn frame_v2_migrate<P: PalletInfoAccess + GetStorageVersion>(
             old_pallet_name.as_bytes(),
             pallet_name.as_bytes(),
         );
-        weight += Weight::from_ref_time(100_000_000);
+        weight += Weight::from_parts(100_000_000, 0);
     }
 
     weight
diff --git a/primitives/src/nft.rs b/primitives/src/nft.rs
index 42512a0217..925dbac35b 100644
--- a/primitives/src/nft.rs
+++ b/primitives/src/nft.rs
@@ -1,5 +1,4 @@
 use codec::MaxEncodedLen;
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 use codec::{Decode, Encode};
@@ -46,7 +45,7 @@ impl_checked_inc!(NFTCollectionId);
     PartialEq,
     TypeInfo
 )]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct NFTId(pub u64);
 impl_checked_inc!(NFTId);
 
@@ -85,7 +84,7 @@ impl NFTCollection {
 
 /// Represent all NFT being transferred for a given [`AssetId`].
 #[derive(Clone, Debug, Decode, Default, Encode, Eq, PartialEq, TypeInfo)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct NFTs {
     asset_id: AssetId,
     ids: Vec<NFTId>,
diff --git a/primitives/src/secondary_key.rs b/primitives/src/secondary_key.rs
index fbc49e53f9..a17a293c92 100644
--- a/primitives/src/secondary_key.rs
+++ b/primitives/src/secondary_key.rs
@@ -17,8 +17,7 @@ use crate::asset::AssetId;
 use crate::{ExtrinsicName, IdentityId, PalletName, PortfolioId, SubsetRestriction};
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::{
     cmp::{Ord, Ordering, PartialOrd},
     collections::btree_map::BTreeMap,
@@ -56,7 +55,7 @@ pub type ExtrinsicNames = SubsetRestriction<ExtrinsicName>;
 /// within a given pallet `pallet_name`.
 #[derive(Decode, Encode, TypeInfo)]
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct PalletPermissions {
     /// A subset of function names within the pallet.
     pub extrinsics: ExtrinsicNames,
@@ -104,7 +103,7 @@ impl PalletPermissions {
 /// Extrinsic permissions.
 #[derive(Decode, Encode, TypeInfo)]
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum ExtrinsicPermissions {
     /// Allow the whole pallet.
     #[default]
@@ -214,7 +213,7 @@ pub type PortfolioPermissions = SubsetRestriction<PortfolioId>;
 /// - `Permissions::default()`: full permissions.
 #[derive(Decode, Encode, TypeInfo)]
 #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct Permissions {
     /// The subset of assets under management.
     pub asset: AssetPermissions,
@@ -284,7 +283,7 @@ impl Permissions {
 /// Account key record.
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Clone, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum KeyRecord<AccountId> {
     /// Key is the primary key and has full permissions.
     ///
@@ -350,11 +349,11 @@ impl<AccountId> KeyRecord<AccountId> {
     Debug,
     TypeInfo
 )]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum Signatory<AccountId> {
-    #[cfg_attr(feature = "std", serde(alias = "identity"))]
+    #[serde(alias = "identity")]
     Identity(IdentityId),
-    #[cfg_attr(feature = "std", serde(alias = "account"))]
+    #[serde(alias = "account")]
     Account(AccountId),
 }
 
@@ -439,7 +438,7 @@ where
 /// A secondary key and its permissions.
 #[derive(Encode, Decode, TypeInfo)]
 #[derive(Clone, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub struct SecondaryKey<AccountId> {
     /// The account key.
     pub key: AccountId,
diff --git a/primitives/src/settlement.rs b/primitives/src/settlement.rs
index d12ddf1dd2..53ca91ef68 100644
--- a/primitives/src/settlement.rs
+++ b/primitives/src/settlement.rs
@@ -15,7 +15,6 @@
 
 //! Shareable types.
 
-#[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
 use codec::alloc::string::ToString;
@@ -179,7 +178,7 @@ pub struct LegId(pub u64);
 impl_checked_inc!(LegId);
 
 /// A global and unique instruction ID.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Clone, Copy, Debug, Default, Eq, Ord, PartialEq, PartialOrd)]
 pub struct InstructionId(pub u64);
@@ -211,7 +210,7 @@ pub struct Instruction<Moment, BlockNumber> {
 }
 
 /// Defines a [`Leg`] (i.e the action of a settlement).
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Clone, Debug, Decode, Encode, Eq, PartialEq, TypeInfo)]
 pub enum Leg {
     /// Fungible token
@@ -413,7 +412,7 @@ impl<AccountId, OffChainSignature> ReceiptDetails<AccountId, OffChainSignature>
 }
 
 /// Stores the number of fungible, non fungible and offchain transfers in a set of legs.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Clone,
     Copy,
@@ -717,7 +716,7 @@ impl FilteredLegs {
 }
 
 /// Holds the [`AssetCount`] for both the sender and receiver side and the number of offchain assets.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(
     Clone,
     Copy,
@@ -778,8 +777,8 @@ impl AffirmationCount {
 
 /// Stores the number of fungible, non fungible and offchain assets in an instruction, the consumed weight for executing the instruction,
 /// and if executing the instruction would fail, the error thrown.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-#[derive(Decode, Encode)]
+#[derive(Serialize, Deserialize)]
+#[derive(Decode, Encode, TypeInfo)]
 pub struct ExecuteInstructionInfo {
     /// Number of fungible tokens in the instruction.
     fungible_tokens: u32,
diff --git a/primitives/src/statistics.rs b/primitives/src/statistics.rs
index e0e6153430..a4054d3cac 100644
--- a/primitives/src/statistics.rs
+++ b/primitives/src/statistics.rs
@@ -17,15 +17,14 @@ use crate::asset::AssetId;
 use crate::{Claim, ClaimType, CountryCode, IdentityId, Scope};
 use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::{hash::Hash, hash::Hasher, ops::Deref, ops::DerefMut, prelude::*};
 
 /// Transfer manager percentage
 pub type Percentage = sp_arithmetic::Permill;
 
 /// Stats Operation type.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum StatOpType {
@@ -36,7 +35,7 @@ pub enum StatOpType {
 }
 
 /// The statistic type.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct StatType {
@@ -158,7 +157,7 @@ impl From<&StatClaim> for Stat2ndKey {
 
 /// Stats supported claims.
 ///
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, MaxEncodedLen, TypeInfo)]
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum StatClaim {
@@ -212,7 +211,7 @@ pub mod v1 {
     pub type Percentage = HashablePermill;
 
     /// Wrapper around `sp_arithmetic::Permill`
-    #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+    #[derive(Serialize, Deserialize)]
     #[derive(Decode, Encode, TypeInfo)]
     #[derive(Copy, Clone, Debug, Eq, PartialOrd, Ord, Default)]
     pub struct HashablePermill(pub sp_arithmetic::Permill);
@@ -245,7 +244,7 @@ pub mod v1 {
     }
 
     /// Transfer managers that can be attached to a Token for compliance.
-    #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+    #[derive(Serialize, Deserialize)]
     #[derive(Decode, Encode, TypeInfo)]
     #[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
     pub enum TransferManager {
@@ -256,7 +255,7 @@ pub mod v1 {
     }
 
     /// Result of a transfer manager check.
-    #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+    #[derive(Serialize, Deserialize)]
     #[derive(Decode, Encode, TypeInfo)]
     #[derive(Clone, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
     pub struct TransferManagerResult {
diff --git a/primitives/src/subset.rs b/primitives/src/subset.rs
index f929629f19..d50d165955 100644
--- a/primitives/src/subset.rs
+++ b/primitives/src/subset.rs
@@ -16,8 +16,7 @@
 use codec::{Decode, Encode};
 use core::ops::Sub;
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::{
     collections::btree_set::BTreeSet,
     iter::{self, FromIterator},
@@ -25,7 +24,7 @@ use sp_std::{
 
 /// Ordering in a lattice, for example, the lattice of subsets of a set.
 #[derive(Encode, Decode, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum LatticeOrdering {
     /// Inclusion of the first subset `A` into the second subset `B`.
     /// That is, `A ⊂ B`.
@@ -50,7 +49,7 @@ pub trait LatticeOrd {
 /// considered to be bigger than any finite set of its elements. This is true for infinite
 /// sets. When talking about finite sets, we have to add that they are _open_.
 #[derive(Encode, Decode, TypeInfo, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 pub enum SubsetRestriction<A: Ord> {
     /// No restrictions, the whole set.
     Whole,
diff --git a/primitives/src/ticker.rs b/primitives/src/ticker.rs
index d0b795bb09..d455c09ade 100644
--- a/primitives/src/ticker.rs
+++ b/primitives/src/ticker.rs
@@ -15,7 +15,6 @@
 
 //! Ticker symbol
 use codec::{Decode, Encode, MaxEncodedLen};
-#[cfg(feature = "std")]
 use polymesh_primitives_derive::{DeserializeU8StrongTyped, SerializeU8StrongTyped};
 use scale_info::TypeInfo;
 
@@ -31,10 +30,7 @@ pub const TICKER_LEN: usize = 12;
 /// representation using [`Ticker::canonize`].
 #[derive(Encode, Decode, MaxEncodedLen, TypeInfo)]
 #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, PartialOrd, Ord)]
-#[cfg_attr(
-    feature = "std",
-    derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)
-)]
+#[derive(SerializeU8StrongTyped, DeserializeU8StrongTyped)]
 pub struct Ticker([u8; TICKER_LEN]);
 
 impl Default for Ticker {
diff --git a/primitives/src/transfer_compliance.rs b/primitives/src/transfer_compliance.rs
index fe92f5e08f..dc439fdabe 100644
--- a/primitives/src/transfer_compliance.rs
+++ b/primitives/src/transfer_compliance.rs
@@ -19,12 +19,11 @@ use crate::{ClaimType, IdentityId};
 use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{pallet_prelude::Get, BoundedBTreeSet};
 use scale_info::TypeInfo;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use sp_std::prelude::*;
 
 /// Transfer condition.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, MaxEncodedLen, TypeInfo)]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TransferCondition {
@@ -94,7 +93,7 @@ impl From<v1::TransferManager> for TransferCondition {
 }
 
 /// Result of a transfer condition check.
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+#[derive(Serialize, Deserialize)]
 #[derive(Decode, Encode, TypeInfo)]
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TransferConditionResult {
diff --git a/primitives/src/weight_meter.rs b/primitives/src/weight_meter.rs
index 7c53a141a6..bb64e93010 100644
--- a/primitives/src/weight_meter.rs
+++ b/primitives/src/weight_meter.rs
@@ -56,30 +56,30 @@ impl WeightMeter {
 
     /// Returns the minimum charge if the consumed weight is less than the minimum, otherwise returns the consumed weight.
     pub fn consumed(&self) -> Weight {
-        if self.meter.consumed.ref_time() < self.minimum_charge.ref_time() {
+        if self.meter.consumed().ref_time() < self.minimum_charge.ref_time() {
             return self.minimum_charge;
         }
-        self.meter.consumed
+        self.meter.consumed()
     }
 
     /// Returns the maximum weight limit.
     pub fn limit(&self) -> Weight {
-        self.meter.limit
+        self.meter.limit()
     }
 
     /// Consumes the given weight after checking that it can be consumed. Returns an error otherwise.
     pub fn check_accrue(&mut self, weight: Weight) -> Result<(), String> {
-        if !self.meter.check_accrue(weight) {
-            return Err(String::from("Maximum weight limit exceeded"));
-        }
+        self.meter
+            .try_consume(weight)
+            .map_err(|_| "Maximum weight limit exceeded")?;
         Ok(())
     }
 
     /// Consumes the given `weight`.
     /// If the new consumed weight is greater than the limit, consumed will be set to limit and an error will be returned.
     pub fn consume_weight_until_limit(&mut self, weight: Weight) -> Result<(), String> {
-        if !self.meter.check_accrue(weight) {
-            self.meter.consumed = self.meter.limit;
+        if self.check_accrue(weight).is_err() {
+            self.meter.consume(self.meter.remaining());
             return Err(String::from("Maximum weight limit exceeded"));
         }
         Ok(())
diff --git a/primitives_derive/src/deserialize_u8_strong_typed.rs b/primitives_derive/src/deserialize_u8_strong_typed.rs
index 4b51bd5386..e87ea0b692 100644
--- a/primitives_derive/src/deserialize_u8_strong_typed.rs
+++ b/primitives_derive/src/deserialize_u8_strong_typed.rs
@@ -12,7 +12,7 @@ pub(crate) fn impl_deserialize_u8_strong_typed(ast: &syn::DeriveInput) -> TokenS
             {
                 let r = sp_core::bytes::deserialize(deserializer)?;
                 Decode::decode(&mut &r[..])
-                    .map_err(|e| serde::de::Error::custom(format!("Decode error: {}", e)))
+                    .map_err(|e| serde::de::Error::custom(scale_info::prelude::format!("Decode error: {}", e)))
             }
         }
     };
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 66929a2d0f..78b6f27b38 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -10,28 +10,28 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true, default-features = false, features = ["derive"] }
 jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-blockchain = { version = "4.0.0-dev" }
-sp-core = { version = "7.0.0", default-features = false }
-sp-rpc = { version = "6.0.0" }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = {version = "5.0.0", default-features = false }
-sp-weights = { version = "4.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-blockchain = { workspace = true }
+sp-core = { workspace = true, default-features = false }
+sp-rpc = { workspace = true }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-weights = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
-node-rpc-runtime-api = { path = "./runtime-api", default-features = false }
+node-rpc-runtime-api = { workspace = true, default-features = false }
 
-pallet-compliance-manager = { path = "../pallets/compliance-manager", default-features = false }
-pallet-pips = { path = "../pallets/pips", default-features = false }
-polymesh-primitives = { path = "../primitives", default-features = false }
+pallet-compliance-manager = { workspace = true, default-features = false }
+pallet-pips = { workspace = true, default-features = false }
+polymesh-primitives = { workspace = true, default-features = false }
 
-pallet-portfolio = { path = "../pallets/portfolio", default-features = false }
-pallet-identity = { path = "../pallets/identity", default-features = false }
-pallet-transaction-payment = { path = "../pallets/transaction-payment", default-features = false }
+pallet-portfolio = { workspace = true, default-features = false }
+pallet-identity = { workspace = true, default-features = false }
+pallet-transaction-payment = { workspace = true, default-features = false }
 
 # Others
-serde = { version = "1.0.104", optional = true, features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 
 [features]
 default = ["std"]
@@ -45,7 +45,7 @@ std = [
     "pallet-portfolio/std",
     "pallet-transaction-payment/std",
     "polymesh-primitives/std",
-    "serde",
+    "serde/std",
     "sp-api/std",
     "sp-core/std",
     "sp-runtime/std",
diff --git a/rpc/runtime-api/Cargo.toml b/rpc/runtime-api/Cargo.toml
index 7f6e55c3a5..fa706507b8 100644
--- a/rpc/runtime-api/Cargo.toml
+++ b/rpc/runtime-api/Cargo.toml
@@ -9,23 +9,23 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { workspace = true, default-features = false, features = ["derive"] }
-sp-api = { version = "4.0.0-dev", default-features = false }
-sp-runtime = { version = "7.0.0", default-features = false }
-sp-std = { version = "5.0.0", default-features = false }
-sp-weights = { version = "4.0.0", default-features = false }
-frame-support = { version = "4.0.0-dev", default-features = false }
-frame-system = { version = "4.0.0-dev", default-features = false }
+sp-api = { workspace = true, default-features = false }
+sp-runtime = { workspace = true, default-features = false }
+sp-std = { workspace = true, default-features = false }
+sp-weights = { workspace = true, default-features = false }
+frame-support = { workspace = true, default-features = false }
+frame-system = { workspace = true, default-features = false }
 
 # Our pallets
-polymesh-primitives = { path = "../../primitives", default-features = false }
-pallet-compliance-manager = { path = "../../pallets/compliance-manager", default-features = false }
-pallet-pips = { path = "../../pallets/pips", default-features = false }
-pallet-portfolio = { path = "../../pallets/portfolio", default-features = false }
-pallet-identity = { path = "../../pallets/identity", default-features = false }
-pallet-transaction-payment = { path = "../../pallets/transaction-payment", default-features = false }
+polymesh-primitives = { workspace = true, default-features = false }
+pallet-compliance-manager = { workspace = true, default-features = false }
+pallet-pips = { workspace = true, default-features = false }
+pallet-portfolio = { workspace = true, default-features = false }
+pallet-identity = { workspace = true, default-features = false }
+pallet-transaction-payment = { workspace = true, default-features = false }
 
 # Other
-serde = { version = "1.0.104", optional = true, features = ["derive"] }
+serde = { version = "1.0.104", default-features = false, features = ["alloc", "derive"] }
 
 [dev-dependencies]
 serde_json = "1.0.41"
@@ -42,7 +42,7 @@ std = [
     "pallet-portfolio/std",
     "pallet-transaction-payment/std",
     "polymesh-primitives/std",
-    "serde",
+    "serde/std",
     "sp-api/std",
     "sp-runtime/std",
     "sp-std/std",
diff --git a/rpc/runtime-api/src/pips.rs b/rpc/runtime-api/src/pips.rs
index 8d97279905..edd0237b07 100644
--- a/rpc/runtime-api/src/pips.rs
+++ b/rpc/runtime-api/src/pips.rs
@@ -27,12 +27,12 @@ pub mod capped {
     use codec::{Decode, Encode};
     use sp_runtime::traits::SaturatedConversion;
 
-    #[cfg(feature = "std")]
     use serde::{Deserialize, Serialize};
 
     #[derive(Eq, PartialEq, Encode, Decode)]
-    #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-    #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+    #[cfg_attr(feature = "std", derive(Debug))]
+    #[derive(Serialize, Deserialize)]
+    #[serde(rename_all = "camelCase")]
     pub enum VoteCount {
         /// Proposal was found and has the following votes.
         ProposalFound {
@@ -58,8 +58,9 @@ pub mod capped {
     }
 
     #[derive(Eq, PartialEq)]
-    #[cfg_attr(feature = "std", derive(Debug, Serialize, Deserialize))]
-    #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
+    #[cfg_attr(feature = "std", derive(Debug))]
+    #[derive(Serialize, Deserialize)]
+    #[serde(rename_all = "camelCase")]
     pub enum Vote {
         Yes(u64),
         No(u64),
diff --git a/rpc/runtime-api/src/transaction_payment.rs b/rpc/runtime-api/src/transaction_payment.rs
index a14fe1a244..57c7dda072 100644
--- a/rpc/runtime-api/src/transaction_payment.rs
+++ b/rpc/runtime-api/src/transaction_payment.rs
@@ -1,14 +1,14 @@
 use codec::Codec;
 
 pub use pallet_transaction_payment::{FeeDetails, InclusionFee, RuntimeDispatchInfo};
-use polymesh_primitives::Balance;
+use polymesh_primitives::{Balance, OldWeight};
 
 sp_api::decl_runtime_apis! {
     #[api_version(2)]
     pub trait TransactionPaymentApi
     {
         #[changed_in(2)]
-        fn query_info(uxt: Block::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance, sp_weights::OldWeight>;
+        fn query_info(uxt: Block::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance, OldWeight>;
         fn query_info(uxt: Block::Extrinsic, len: u32) -> RuntimeDispatchInfo<Balance>;
         fn query_fee_details(uxt: Block::Extrinsic, len: u32) -> FeeDetails<Balance>;
     }
diff --git a/rpc/src/transaction_payment.rs b/rpc/src/transaction_payment.rs
index ec9d1adfce..1fd977c866 100644
--- a/rpc/src/transaction_payment.rs
+++ b/rpc/src/transaction_payment.rs
@@ -16,23 +16,21 @@
 
 //! RPC interface for the transaction payment module.
 
-use std::{convert::TryInto, sync::Arc};
-
 use codec::Decode;
 use jsonrpsee::core::{Error as JsonRpseeError, RpcResult};
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::types::error::{CallError, ErrorCode, ErrorObject};
+pub use node_rpc_runtime_api::transaction_payment::{
+    FeeDetails, InclusionFee, RuntimeDispatchInfo,
+    TransactionPaymentApi as TransactionPaymentRuntimeApi,
+};
+use polymesh_primitives::{Balance, OldWeight};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use sp_blockchain::HeaderBackend;
 use sp_core::Bytes;
 use sp_rpc::number::NumberOrHex;
 use sp_runtime::traits::Block as BlockT;
-
-pub use node_rpc_runtime_api::transaction_payment::{
-    FeeDetails, InclusionFee, RuntimeDispatchInfo,
-    TransactionPaymentApi as TransactionPaymentRuntimeApi,
-};
-use polymesh_primitives::Balance;
+use std::{convert::TryInto, sync::Arc};
 
 use super::Error;
 
@@ -67,10 +65,8 @@ impl<C, P> TransactionPayment<C, P> {
 }
 
 impl<C, Block>
-    TransactionPaymentApiServer<
-        <Block as BlockT>::Hash,
-        RuntimeDispatchInfo<Balance, sp_weights::OldWeight>,
-    > for TransactionPayment<C, Block>
+    TransactionPaymentApiServer<<Block as BlockT>::Hash, RuntimeDispatchInfo<Balance, OldWeight>>
+    for TransactionPayment<C, Block>
 where
     Block: BlockT,
     C: ProvideRuntimeApi<Block> + HeaderBackend<Block> + Send + Sync + 'static,
@@ -80,7 +76,7 @@ where
         &self,
         encoded_xt: Bytes,
         at: Option<<Block as BlockT>::Hash>,
-    ) -> RpcResult<RuntimeDispatchInfo<Balance, sp_weights::OldWeight>> {
+    ) -> RpcResult<RuntimeDispatchInfo<Balance, OldWeight>> {
         let api = self.client.runtime_api();
         let at_hash = at.unwrap_or_else(|| {
             // If the block hash is not supplied assume the best block.
@@ -126,7 +122,7 @@ where
                 .map_err(|e| map_err(e, "Unable to query dispatch info."))?;
 
             Ok(RuntimeDispatchInfo {
-                weight: sp_weights::OldWeight(res.weight.ref_time()),
+                weight: OldWeight(res.weight.ref_time()),
                 class: res.class,
                 partial_fee: res.partial_fee,
             })
diff --git a/scripts/cli/chain_metadata.sh b/scripts/cli/chain_metadata.sh
index 3f16a2532f..02fe70b0a5 100755
--- a/scripts/cli/chain_metadata.sh
+++ b/scripts/cli/chain_metadata.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 set -e
-curl -H "Content-Type: application/json" -d '{"id":"1", "jsonrpc":"2.0", "method": "state_getMetadata", "params":[]}' http://localhost:9933 > polymesh-meta.json
+curl -H "Content-Type: application/json" -d '{"id":"1", "jsonrpc":"2.0", "method": "state_getMetadata", "params":[]}' http://localhost:9944 > polymesh-meta.json
diff --git a/src/chain_spec.rs b/src/chain_spec.rs
index 19a00c4e6e..543136662c 100644
--- a/src/chain_spec.rs
+++ b/src/chain_spec.rs
@@ -14,14 +14,13 @@ use polymesh_primitives::{
 use sc_chain_spec::{ChainSpecExtension, ChainType};
 use sc_service::Properties;
 use sc_telemetry::TelemetryEndpoints;
+use serde::{Deserialize, Serialize};
 use serde_json::json;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_consensus_babe::AuthorityId as BabeId;
 use sp_core::{sr25519, Pair, Public};
 use sp_runtime::traits::{AccountIdConversion, IdentifyAccount, Verify};
 use sp_runtime::PerThing;
-#[cfg(feature = "std")]
-use sp_runtime::{Deserialize, Serialize};
 use std::convert::TryInto;
 
 // The URL for the telemetry server.
@@ -133,6 +132,7 @@ macro_rules! asset {
             ticker_registration_config: ticker_registration_config(),
             reserved_country_currency_codes: currency_codes(),
             asset_metadata: asset_metadata(),
+            ..Default::default()
         }
     };
 }
@@ -146,7 +146,7 @@ fn ticker_registration_config() -> TickerRegistrationConfig<Moment> {
 
 fn currency_codes() -> Vec<Ticker> {
     // Fiat Currency Struct
-    #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+    #[derive(Serialize, Deserialize)]
     #[derive(Encode, Decode, Clone, Debug, PartialEq, Eq)]
     pub struct FiatCurrency<String> {
         pub codes: Vec<String>,
@@ -176,6 +176,7 @@ macro_rules! checkpoint {
         };
         pallet_asset::checkpoint::GenesisConfig {
             schedules_max_complexity: period.complexity(),
+            ..Default::default()
         }
     }};
 }
@@ -343,9 +344,10 @@ fn dev_genesis_processed_data(
     (vec![identity], stakers, balances)
 }
 
-fn frame(wasm_binary: Option<&[u8]>) -> frame_system::GenesisConfig {
+fn frame<T: frame_system::Config>(wasm_binary: Option<&[u8]>) -> frame_system::GenesisConfig<T> {
     frame_system::GenesisConfig {
         code: wasm_binary.expect("WASM binary was not generated").to_vec(),
+        ..Default::default()
     }
 }
 
@@ -359,6 +361,7 @@ macro_rules! session {
                     (x.0.clone(), x.0.clone(), sks)
                 })
                 .collect::<Vec<_>>(),
+            ..Default::default()
         }
     };
 }
@@ -386,6 +389,7 @@ macro_rules! pips {
             max_pip_skip_count: 2,
             active_pip_limit: $limit,
             pending_pip_expiry: $expiry,
+            ..Default::default()
         }
     };
 }
@@ -395,7 +399,7 @@ macro_rules! group_membership {
         pallet_group::GenesisConfig {
             active_members_limit: 20,
             active_members: vec![$(IdentityId::from($member)),*],
-            phantom: Default::default(),
+            ..Default::default()
         }
     };
 }
@@ -404,6 +408,7 @@ macro_rules! corporate_actions {
     () => {
         pallet_corporate_actions::GenesisConfig {
             max_details_length: 1024,
+            ..Default::default()
         }
     };
 }
@@ -418,7 +423,7 @@ macro_rules! committee {
             members: vec![],
             release_coordinator: IdentityId::from($rc),
             expires_after: <_>::default(),
-            phantom: Default::default(),
+            ..Default::default()
         }
     };
 }
@@ -435,6 +440,7 @@ macro_rules! protocol_fee {
         pallet_protocol_fee::GenesisConfig {
             base_fees: protocol_fees(),
             coefficient: PosRatio(1, 1),
+            ..Default::default()
         }
     };
 }
@@ -450,6 +456,7 @@ macro_rules! polymesh_contracts {
                 .expect("Wrong Length - should be length 4"),
             upgradable_major: 7,
             upgradable_owner: $root_key,
+            ..Default::default()
         }
     };
 }
@@ -471,7 +478,7 @@ pub mod general {
     use super::*;
     use polymesh_runtime_develop::{self as rt, constants::time};
 
-    pub type ChainSpec = GenericChainSpec<rt::runtime::GenesisConfig>;
+    pub type ChainSpec = GenericChainSpec<rt::runtime::RuntimeGenesisConfig>;
 
     session_keys!();
 
@@ -481,7 +488,7 @@ pub mod general {
         other_funded_accounts: Vec<AccountId>,
         treasury_amount: u128,
         key_amount: u128,
-    ) -> rt::runtime::GenesisConfig {
+    ) -> rt::runtime::RuntimeGenesisConfig {
         let (identities, stakers, balances) = dev_genesis_processed_data(
             &initial_authorities,
             other_funded_accounts,
@@ -489,7 +496,7 @@ pub mod general {
             key_amount,
         );
 
-        rt::runtime::GenesisConfig {
+        rt::runtime::RuntimeGenesisConfig {
             system: frame(rt::WASM_BINARY),
             asset: asset!(),
             checkpoint: checkpoint!(),
@@ -501,6 +508,7 @@ pub mod general {
             indices: pallet_indices::GenesisConfig { indices: vec![] },
             sudo: pallet_sudo::GenesisConfig {
                 key: Some(root_key.clone()),
+                ..Default::default()
             },
             session: session!(initial_authorities, session_keys),
             staking: staking!(
@@ -514,6 +522,7 @@ pub mod general {
             babe: pallet_babe::GenesisConfig {
                 authorities: vec![],
                 epoch_config: Some(rt::runtime::BABE_GENESIS_EPOCH_CONFIG),
+                ..Default::default()
             },
             grandpa: Default::default(),
             /*
@@ -547,7 +556,7 @@ pub mod general {
         }
     }
 
-    fn develop_genesis() -> rt::runtime::GenesisConfig {
+    fn develop_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![get_authority_keys_from_seed("Alice", false)],
             seeded_acc_id("Alice"),
@@ -566,7 +575,7 @@ pub mod general {
         name: &str,
         id: &str,
         ctype: ChainType,
-        genesis: impl 'static + Sync + Send + Fn() -> rt::runtime::GenesisConfig,
+        genesis: impl 'static + Sync + Send + Fn() -> rt::runtime::RuntimeGenesisConfig,
     ) -> ChainSpec {
         let props = Some(polymesh_props(42));
         ChainSpec::from_genesis(
@@ -592,7 +601,7 @@ pub mod general {
         )
     }
 
-    fn local_genesis() -> rt::runtime::GenesisConfig {
+    fn local_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
@@ -620,7 +629,7 @@ pub mod testnet {
     use super::*;
     use polymesh_runtime_testnet::{self as rt, constants::time};
 
-    pub type ChainSpec = GenericChainSpec<rt::runtime::GenesisConfig>;
+    pub type ChainSpec = GenericChainSpec<rt::runtime::RuntimeGenesisConfig>;
 
     session_keys!();
 
@@ -629,7 +638,7 @@ pub mod testnet {
         root_key: AccountId,
         treasury_amount: u128,
         key_amount: u128,
-    ) -> rt::runtime::GenesisConfig {
+    ) -> rt::runtime::RuntimeGenesisConfig {
         let (identities, stakers, balances) = genesis_processed_data(
             &initial_authorities,
             root_key.clone(),
@@ -637,7 +646,7 @@ pub mod testnet {
             key_amount,
         );
 
-        rt::runtime::GenesisConfig {
+        rt::runtime::RuntimeGenesisConfig {
             system: frame(rt::WASM_BINARY),
             asset: asset!(),
             checkpoint: checkpoint!(),
@@ -659,6 +668,7 @@ pub mod testnet {
             babe: pallet_babe::GenesisConfig {
                 authorities: vec![],
                 epoch_config: Some(rt::runtime::BABE_GENESIS_EPOCH_CONFIG),
+                ..Default::default()
             },
             grandpa: Default::default(),
             /*
@@ -692,7 +702,7 @@ pub mod testnet {
         }
     }
 
-    fn bootstrap_genesis() -> rt::runtime::GenesisConfig {
+    fn bootstrap_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
@@ -732,7 +742,7 @@ pub mod testnet {
         )
     }
 
-    fn develop_genesis() -> rt::runtime::GenesisConfig {
+    fn develop_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![get_authority_keys_from_seed("Alice", false)],
             seeded_acc_id("Eve"),
@@ -758,7 +768,7 @@ pub mod testnet {
         )
     }
 
-    fn local_genesis() -> rt::runtime::GenesisConfig {
+    fn local_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
@@ -793,7 +803,7 @@ pub mod mainnet {
     use super::*;
     use polymesh_runtime_mainnet::{self as rt, constants::time};
 
-    pub type ChainSpec = GenericChainSpec<rt::runtime::GenesisConfig>;
+    pub type ChainSpec = GenericChainSpec<rt::runtime::RuntimeGenesisConfig>;
 
     session_keys!();
 
@@ -802,7 +812,7 @@ pub mod mainnet {
         root_key: AccountId,
         treasury_amount: u128,
         key_amount: u128,
-    ) -> rt::runtime::GenesisConfig {
+    ) -> rt::runtime::RuntimeGenesisConfig {
         let (identities, stakers, balances) = genesis_processed_data(
             &initial_authorities,
             root_key.clone(),
@@ -810,7 +820,7 @@ pub mod mainnet {
             key_amount,
         );
 
-        rt::runtime::GenesisConfig {
+        rt::runtime::RuntimeGenesisConfig {
             system: frame(rt::WASM_BINARY),
             asset: asset!(),
             checkpoint: checkpoint!(),
@@ -832,6 +842,7 @@ pub mod mainnet {
             babe: pallet_babe::GenesisConfig {
                 authorities: vec![],
                 epoch_config: Some(rt::runtime::BABE_GENESIS_EPOCH_CONFIG),
+                ..Default::default()
             },
             grandpa: Default::default(),
             /*
@@ -865,7 +876,7 @@ pub mod mainnet {
         }
     }
 
-    fn bootstrap_genesis() -> rt::runtime::GenesisConfig {
+    fn bootstrap_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
@@ -913,7 +924,7 @@ pub mod mainnet {
         )
     }
 
-    fn develop_genesis() -> rt::runtime::GenesisConfig {
+    fn develop_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![get_authority_keys_from_seed("Alice", false)],
             seeded_acc_id("Eve"),
@@ -939,7 +950,7 @@ pub mod mainnet {
         )
     }
 
-    fn local_genesis() -> rt::runtime::GenesisConfig {
+    fn local_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
@@ -975,7 +986,7 @@ pub mod general {
     use super::*;
     use polymesh_runtime_develop::{self as rt, constants::time};
 
-    pub type ChainSpec = GenericChainSpec<rt::runtime::GenesisConfig>;
+    pub type ChainSpec = GenericChainSpec<rt::runtime::RuntimeGenesisConfig>;
 
     session_keys!();
 
@@ -984,7 +995,7 @@ pub mod general {
         root_key: AccountId,
         treasury_amount: u128,
         key_amount: u128,
-    ) -> rt::runtime::GenesisConfig {
+    ) -> rt::runtime::RuntimeGenesisConfig {
         let (identities, stakers, balances) = genesis_processed_data(
             &initial_authorities,
             root_key.clone(),
@@ -992,7 +1003,7 @@ pub mod general {
             key_amount,
         );
 
-        rt::runtime::GenesisConfig {
+        rt::runtime::RuntimeGenesisConfig {
             system: frame(rt::WASM_BINARY),
             asset: asset!(),
             checkpoint: checkpoint!(),
@@ -1004,6 +1015,7 @@ pub mod general {
             indices: pallet_indices::GenesisConfig { indices: vec![] },
             sudo: pallet_sudo::GenesisConfig {
                 key: Some(root_key.clone()),
+                ..Default::default()
             },
             session: session!(initial_authorities, session_keys),
             staking: staking!(initial_authorities, stakers, PerThing::zero()),
@@ -1013,6 +1025,7 @@ pub mod general {
             babe: pallet_babe::GenesisConfig {
                 authorities: vec![],
                 epoch_config: Some(rt::runtime::BABE_GENESIS_EPOCH_CONFIG),
+                ..Default::default()
             },
             grandpa: Default::default(),
             /*
@@ -1046,7 +1059,7 @@ pub mod general {
         }
     }
 
-    fn develop_genesis() -> rt::runtime::GenesisConfig {
+    fn develop_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![get_authority_keys_from_seed("Bob", false)],
             seeded_acc_id("Alice"),
@@ -1072,7 +1085,7 @@ pub mod general {
         )
     }
 
-    fn local_genesis() -> rt::runtime::GenesisConfig {
+    fn local_genesis() -> rt::runtime::RuntimeGenesisConfig {
         genesis(
             vec![
                 get_authority_keys_from_seed("Alice", false),
diff --git a/src/command.rs b/src/command.rs
index cb1b3505a5..b6d26cd122 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -24,7 +24,7 @@ use crate::service::{
     TestnetExecutor,
 };
 use frame_benchmarking_cli::*;
-use sc_cli::{ChainSpec, Result, RuntimeVersion, SubstrateCli};
+use sc_cli::{Result, SubstrateCli};
 use sc_service::{Configuration, TaskManager};
 use sp_keyring::Sr25519Keyring;
 
@@ -103,14 +103,6 @@ impl SubstrateCli for Cli {
             }
         })
     }
-
-    fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
-        match chain_spec.network() {
-            Network::Testnet => &polymesh_runtime_testnet::runtime::VERSION,
-            Network::Mainnet => &polymesh_runtime_mainnet::runtime::VERSION,
-            Network::Other => &polymesh_runtime_develop::runtime::VERSION,
-        }
-    }
 }
 
 /// Parses Polymesh specific CLI arguments and run the service.
@@ -216,7 +208,7 @@ pub fn run() -> Result<()> {
                                 .into());
                         }
 
-                        cmd.run::<Block, service::GeneralExecutor>(config)
+                        cmd.run::<Block, service::EHF>(config)
                     }
                     (BenchmarkCmd::Block(cmd), Network::Other) => {
                         let FullServiceComponents { client, .. } =
diff --git a/src/service.rs b/src/service.rs
index 7748138b03..874baeb515 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -1,28 +1,27 @@
 //! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
 
-use futures::stream::StreamExt;
+use futures::prelude::*;
 use polymesh_node_rpc as node_rpc;
-pub use polymesh_primitives::{AccountId, Block, IdentityId, Index as Nonce, Moment, Ticker};
+pub use polymesh_primitives::{AccountId, Block, IdentityId, Moment, Nonce, Ticker};
 pub use polymesh_runtime_develop;
 pub use polymesh_runtime_mainnet;
 pub use polymesh_runtime_testnet;
 use prometheus_endpoint::Registry;
 
-use sc_client_api::BlockBackend;
-
+use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_slots::SlotProportion;
 use sc_executor::NativeElseWasmExecutor;
-pub use sc_executor::NativeExecutionDispatch;
-use sc_network::NetworkService;
-use sc_network_common::{protocol::event::Event, service::NetworkEventStream};
+use sc_executor::NativeExecutionDispatch;
+use sc_network::{event::Event, NetworkEventStream, NetworkService};
+use sc_network_sync::SyncingService;
 use sc_service::{
     config::Configuration, error::Error as ServiceError, RpcHandlers, TaskManager, WarpSyncParams,
 };
-pub use sc_service::{config::PrometheusConfig, ChainSpec, Error};
+use sc_service::{config::PrometheusConfig, ChainSpec, Error};
 use sc_telemetry::{Telemetry, TelemetryWorker};
-pub use sp_api::ConstructRuntimeApi;
-
-pub use sp_runtime::traits::BlakeTwo256;
+use sc_transaction_pool_api::OffchainTransactionPoolFactory;
+use sp_api::ConstructRuntimeApi;
+use sp_runtime::traits::BlakeTwo256;
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;
 
@@ -68,12 +67,12 @@ macro_rules! native_executor_instance {
 }
 
 #[cfg(feature = "runtime-benchmarks")]
-type EHF = (
+pub type EHF = (
     frame_benchmarking::benchmarking::HostFunctions,
     polymesh_primitives::crypto::native_schnorrkel::HostFunctions,
 );
 #[cfg(not(feature = "runtime-benchmarks"))]
-type EHF = ();
+pub type EHF = ();
 
 native_executor_instance!(GeneralExecutor, polymesh_runtime_develop, EHF);
 native_executor_instance!(TestnetExecutor, polymesh_runtime_testnet, ());
@@ -166,6 +165,10 @@ pub type FullServiceComponents<R, D, F> = sc_service::PartialComponents<
 type FullBabeBlockImport<R, D> =
     sc_consensus_babe::BabeBlockImport<Block, FullClient<R, D>, FullGrandpaBlockImport<R, D>>;
 
+/// The minimum period of blocks on which justifications will be
+/// imported and generated.
+const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512;
+
 pub fn new_partial<R, D>(
     config: &mut Configuration,
 ) -> Result<
@@ -197,12 +200,7 @@ where
         })
         .transpose()?;
 
-    let executor = NativeElseWasmExecutor::<D>::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, R, NativeElseWasmExecutor<D>>(
@@ -231,6 +229,7 @@ where
 
     let (grandpa_block_import, grandpa_link) = grandpa::block_import(
         client.clone(),
+        GRANDPA_JUSTIFICATION_PERIOD,
         &(client.clone() as Arc<_>),
         select_chain.clone(),
         telemetry.as_ref().map(|x| x.handle()),
@@ -244,32 +243,35 @@ where
     )?;
 
     let slot_duration = babe_link.config().slot_duration();
-    let import_queue = sc_consensus_babe::import_queue(
-        babe_link.clone(),
-        block_import.clone(),
-        Some(Box::new(justification_import)),
-        client.clone(),
-        select_chain.clone(),
-        move |_, ()| async move {
-            let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+    let (import_queue, babe_worker_handle) = sc_consensus_babe::import_queue(
+        sc_consensus_babe::ImportQueueParams {
+            link: babe_link.clone(),
+            block_import: block_import.clone(),
+            justification_import: Some(Box::new(justification_import)),
+            client: client.clone(),
+            select_chain: select_chain.clone(),
+            create_inherent_data_providers: move |_, ()| async move {
+                let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 
-            let slot =
+                let slot =
                 sp_consensus_babe::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
                     *timestamp,
                     slot_duration,
                 );
 
-            Ok((slot, timestamp))
+                Ok((slot, timestamp))
+            },
+            spawner: &task_manager.spawn_essential_handle(),
+            registry: config.prometheus_registry(),
+            telemetry: telemetry.as_ref().map(|x| x.handle()),
+            offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
         },
-        &task_manager.spawn_essential_handle(),
-        config.prometheus_registry(),
-        telemetry.as_ref().map(|x| x.handle()),
     )?;
 
     let import_setup = (block_import, grandpa_link, babe_link);
 
     let (rpc_extensions_builder, rpc_setup) = {
-        let (_, grandpa_link, babe_link) = &import_setup;
+        let (_, grandpa_link, _) = &import_setup;
 
         let justification_stream = grandpa_link.justification_stream();
         let shared_authority_set = grandpa_link.shared_authority_set().clone();
@@ -281,13 +283,10 @@ where
             Some(shared_authority_set.clone()),
         );
 
-        let babe_config = babe_link.config().clone();
-        let shared_epoch_changes = babe_link.epoch_changes().clone();
-
         let client = client.clone();
         let pool = transaction_pool.clone();
         let select_chain = select_chain.clone();
-        let keystore = keystore_container.sync_keystore();
+        let keystore = keystore_container.keystore();
         let chain_spec = config.chain_spec.cloned_box();
 
         let rpc_backend = backend.clone();
@@ -299,9 +298,8 @@ where
                 chain_spec: chain_spec.cloned_box(),
                 deny_unsafe,
                 babe: node_rpc::BabeDeps {
-                    babe_config: babe_config.clone(),
-                    shared_epoch_changes: shared_epoch_changes.clone(),
                     keystore: keystore.clone(),
+                    babe_worker_handle: babe_worker_handle.clone(),
                 },
                 grandpa: node_rpc::GrandpaDeps {
                     shared_voter_state: shared_voter_state.clone(),
@@ -310,9 +308,10 @@ where
                     subscription_executor,
                     finality_provider: finality_proof_provider.clone(),
                 },
+                backend: rpc_backend.clone(),
             };
 
-            node_rpc::create_full(deps, rpc_backend.clone()).map_err(Into::into)
+            node_rpc::create_full(deps).map_err(Into::into)
         };
 
         (rpc_extensions_builder, rpc_setup)
@@ -343,6 +342,8 @@ where
     pub client: Arc<FullClient<R, D>>,
     /// The networking service of the node.
     pub network: Arc<NetworkService<Block, <Block as BlockT>::Hash>>,
+    /// The syncing service of the node.
+    pub sync: Arc<SyncingService<Block>>,
     /// The transaction pool of the node.
     pub transaction_pool: Arc<FullPool<R, D>>,
     /// The rpc handlers of the node.
@@ -373,6 +374,8 @@ where
 
     let shared_voter_state = rpc_setup;
     let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
+    let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+
     let grandpa_protocol_name = grandpa::protocol_standard_name(
         &client
             .block_hash(0)
@@ -381,22 +384,20 @@ where
             .expect("Genesis block exists; qed"),
         &config.chain_spec,
     );
+    net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
+        grandpa_protocol_name.clone(),
+    ));
 
-    config
-        .network
-        .extra_sets
-        .push(grandpa::grandpa_peers_set_config(
-            grandpa_protocol_name.clone(),
-        ));
     let warp_sync = Arc::new(grandpa::warp_proof::NetworkProvider::new(
         backend.clone(),
         import_setup.1.shared_authority_set().clone(),
         Vec::default(),
     ));
 
-    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(),
@@ -405,15 +406,6 @@ where
             warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
         })?;
 
-    if config.offchain_worker.enabled {
-        sc_service::build_offchain_workers(
-            &config,
-            task_manager.spawn_handle(),
-            client.clone(),
-            network.clone(),
-        );
-    }
-
     let role = config.role.clone();
     let force_authoring = config.force_authoring;
     let backoff_authoring_blocks = if false {
@@ -424,18 +416,20 @@ where
     let name = config.network.node_name.clone();
     let enable_grandpa = !config.disable_grandpa;
     let prometheus_registry = config.prometheus_registry().cloned();
+    let enable_offchain_worker = config.offchain_worker.enabled;
 
     let rpc_handlers = sc_service::spawn_tasks(sc_service::SpawnTasksParams {
         config,
-        backend,
+        backend: backend.clone(),
         client: client.clone(),
-        keystore: keystore_container.sync_keystore(),
+        keystore: keystore_container.keystore(),
         network: network.clone(),
         rpc_builder: Box::new(rpc_builder),
         transaction_pool: transaction_pool.clone(),
         task_manager: &mut task_manager,
         system_rpc_tx,
         tx_handler_controller,
+        sync_service: sync_service.clone(),
         telemetry: telemetry.as_mut(),
     })?;
 
@@ -455,13 +449,13 @@ where
         let client_clone = client.clone();
         let slot_duration = babe_link.config().slot_duration();
         let babe_config = sc_consensus_babe::BabeParams {
-            keystore: keystore_container.sync_keystore(),
+            keystore: keystore_container.keystore(),
             client: client.clone(),
             select_chain,
             env: proposer,
             block_import,
-            sync_oracle: network.clone(),
-            justification_sync_link: network.clone(),
+            sync_oracle: sync_service.clone(),
+            justification_sync_link: sync_service.clone(),
             create_inherent_data_providers: move |parent, ()| {
                 let client_clone = client_clone.clone();
                 async move {
@@ -534,19 +528,19 @@ where
     // if the node isn't actively participating in consensus then it doesn't
     // need a keystore, regardless of which protocol we use below.
     let keystore = if role.is_authority() {
-        Some(keystore_container.sync_keystore())
+        Some(keystore_container.keystore())
     } else {
         None
     };
 
-    let config = grandpa::Config {
+    let grandpa_config = grandpa::Config {
         // FIXME #1578 make this available through chainspec
         gossip_duration: std::time::Duration::from_millis(333),
-        justification_period: 512,
+        justification_generation_period: GRANDPA_JUSTIFICATION_PERIOD,
         name: Some(name),
         observer_enabled: false,
         keystore,
-        local_role: role,
+        local_role: role.clone(),
         telemetry: telemetry.as_ref().map(|x| x.handle()),
         protocol_name: grandpa_protocol_name,
     };
@@ -559,13 +553,15 @@ where
         // been tested extensively yet and having most nodes in a network run it
         // could lead to finality stalls.
         let grandpa_config = grandpa::GrandpaParams {
-            config,
+            config: grandpa_config,
             link: grandpa_link,
             network: network.clone(),
+            sync: Arc::new(sync_service.clone()),
             telemetry: telemetry.as_ref().map(|x| x.handle()),
             voting_rule: grandpa::VotingRulesBuilder::default().build(),
             prometheus_registry,
             shared_voter_state,
+            offchain_tx_pool_factory: OffchainTransactionPoolFactory::new(transaction_pool.clone()),
         };
 
         // the GRANDPA voter task is considered infallible, i.e.
@@ -577,11 +573,33 @@ where
         );
     }
 
+    if enable_offchain_worker {
+        task_manager.spawn_handle().spawn(
+            "offchain-workers-runner",
+            "offchain-work",
+            sc_offchain::OffchainWorkers::new(sc_offchain::OffchainWorkerOptions {
+                runtime_api_provider: client.clone(),
+                keystore: Some(keystore_container.keystore()),
+                offchain_db: backend.offchain_storage(),
+                transaction_pool: Some(OffchainTransactionPoolFactory::new(
+                    transaction_pool.clone(),
+                )),
+                network_provider: network.clone(),
+                is_validator: role.is_authority(),
+                enable_http_requests: true,
+                custom_extensions: move |_| vec![],
+            })
+            .run(client.clone(), task_manager.spawn_handle())
+            .boxed(),
+        );
+    }
+
     network_starter.start_network();
     Ok(NewFullBase {
         task_manager,
         client,
         network,
+        sync: sync_service,
         transaction_pool,
         rpc_handlers,
     })