diff --git a/Cargo.lock b/Cargo.lock
index 59990fe..f050472 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,9 +75,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
@@ -117,9 +117,9 @@ dependencies = [
[[package]]
name = "array-bytes"
-version = "4.1.0"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949"
+checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
[[package]]
name = "arrayref"
@@ -406,25 +406,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "bindgen"
-version = "0.60.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
-]
-
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -449,7 +430,7 @@ version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e"
dependencies = [
- "digest 0.10.5",
+ "digest 0.10.6",
]
[[package]]
@@ -459,7 +440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
dependencies = [
"arrayvec 0.4.12",
- "constant_time_eq",
+ "constant_time_eq 0.1.5",
]
[[package]]
@@ -470,7 +451,7 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
- "constant_time_eq",
+ "constant_time_eq 0.1.5",
]
[[package]]
@@ -481,20 +462,20 @@ checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
- "constant_time_eq",
+ "constant_time_eq 0.1.5",
]
[[package]]
name = "blake3"
-version = "1.3.1"
+version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
+checksum = "895adc16c8b3273fbbc32685a7d55227705eda08c01e77704020f3491924b44b"
dependencies = [
"arrayref",
"arrayvec 0.7.2",
"cc",
"cfg-if",
- "constant_time_eq",
+ "constant_time_eq 0.2.4",
]
[[package]]
@@ -600,20 +581,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.11+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
-]
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]]
name = "cache-padded"
@@ -654,22 +624,13 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.76"
+version = "1.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
dependencies = [
"jobserver",
]
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
[[package]]
name = "cfg-expr"
version = "0.10.3"
@@ -753,22 +714,11 @@ dependencies = [
"generic-array 0.14.6",
]
-[[package]]
-name = "clang-sys"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
[[package]]
name = "clap"
-version = "4.0.23"
+version = "4.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eb41c13df48950b20eb4cd0eefa618819469df1bffc49d11e8487c4ba0037e5"
+checksum = "2148adefda54e14492fb9bddcc600b4344c5d1a3123bd666dcb939c6f0e0e57e"
dependencies = [
"atty",
"bitflags",
@@ -811,17 +761,6 @@ dependencies = [
"unicode-width",
]
-[[package]]
-name = "comfy-table"
-version = "6.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2"
-dependencies = [
- "strum",
- "strum_macros",
- "unicode-width",
-]
-
[[package]]
name = "concurrent-queue"
version = "1.2.4"
@@ -852,17 +791,19 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+[[package]]
+name = "constant_time_eq"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279"
+
[[package]]
name = "contracts-node"
-version = "0.22.0"
+version = "0.22.1"
dependencies = [
"clap",
"contracts-node-runtime",
- "frame-benchmarking",
- "frame-benchmarking-cli",
- "frame-system",
"jsonrpsee",
- "pallet-transaction-payment",
"pallet-transaction-payment-rpc",
"sc-basic-authorship",
"sc-cli",
@@ -880,10 +821,7 @@ dependencies = [
"sp-api",
"sp-block-builder",
"sp-blockchain",
- "sp-consensus",
"sp-core",
- "sp-inherents",
- "sp-keyring",
"sp-runtime",
"sp-timestamp",
"substrate-build-script-utils",
@@ -892,15 +830,12 @@ dependencies = [
[[package]]
name = "contracts-node-runtime"
-version = "0.22.0"
+version = "0.22.1"
dependencies = [
- "frame-benchmarking",
"frame-executive",
"frame-support",
"frame-system",
- "frame-system-benchmarking",
"frame-system-rpc-runtime-api",
- "hex-literal",
"pallet-assets",
"pallet-assets-chain-extension",
"pallet-authorship",
@@ -1100,22 +1035,22 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.11"
+version = "0.9.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
- "memoffset",
+ "memoffset 0.7.1",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
dependencies = [
"cfg-if",
]
@@ -1228,9 +1163,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.81"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888"
+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -1240,9 +1175,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.81"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3"
+checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
dependencies = [
"cc",
"codespan-reporting",
@@ -1255,15 +1190,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
-version = "1.0.81"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f"
+checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.81"
+version = "1.0.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704"
+checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
dependencies = [
"proc-macro2",
"quote",
@@ -1342,9 +1277,9 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
"block-buffer 0.10.3",
"crypto-common",
@@ -1755,57 +1690,6 @@ dependencies = [
"sp-storage",
]
-[[package]]
-name = "frame-benchmarking-cli"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
-dependencies = [
- "Inflector",
- "array-bytes",
- "chrono",
- "clap",
- "comfy-table",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "gethostname",
- "handlebars",
- "hash-db",
- "itertools",
- "kvdb",
- "lazy_static",
- "linked-hash-map",
- "log",
- "memory-db",
- "parity-scale-codec",
- "rand 0.8.5",
- "rand_pcg 0.3.1",
- "sc-block-builder",
- "sc-cli",
- "sc-client-api",
- "sc-client-db",
- "sc-executor",
- "sc-service",
- "sc-sysinfo",
- "serde",
- "serde_json",
- "serde_nanos",
- "sp-api",
- "sp-blockchain",
- "sp-core",
- "sp-database",
- "sp-externalities",
- "sp-inherents",
- "sp-keystore",
- "sp-runtime",
- "sp-state-machine",
- "sp-storage",
- "sp-trie",
- "tempfile",
- "thiserror",
- "thousands",
-]
-
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
@@ -1920,21 +1804,6 @@ dependencies = [
"sp-weights",
]
-[[package]]
-name = "frame-system-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-core",
- "sp-runtime",
- "sp-std",
-]
-
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
@@ -1954,12 +1823,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "fs_extra"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
-
[[package]]
name = "funty"
version = "2.0.0"
@@ -2116,16 +1979,6 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "gethostname"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
-dependencies = [
- "libc",
- "winapi",
-]
-
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -2171,12 +2024,6 @@ dependencies = [
"stable_deref_trait",
]
-[[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
[[package]]
name = "globset"
version = "0.4.9"
@@ -2232,20 +2079,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "handlebars"
-version = "4.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
[[package]]
name = "hash-db"
version = "0.15.2"
@@ -2291,12 +2124,6 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-[[package]]
-name = "hex-literal"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
-
[[package]]
name = "hmac"
version = "0.8.1"
@@ -2405,9 +2232,9 @@ dependencies = [
[[package]]
name = "hyper-rustls"
-version = "0.23.0"
+version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac"
+checksum = "59df7c4e19c950e6e0e868dcc0a300b09a9b88e9ec55bd879ca819087a77355d"
dependencies = [
"http",
"hyper",
@@ -2522,9 +2349,9 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
@@ -2573,9 +2400,9 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1"
[[package]]
name = "ipconfig"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98"
+checksum = "bd302af1b90f2463a98fa5ad469fc212c8e3175a41c3068601bfa2727591c5be"
dependencies = [
"socket2",
"widestring",
@@ -2743,9 +2570,12 @@ dependencies = [
[[package]]
name = "keccak"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838"
+checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+dependencies = [
+ "cpufeatures",
+]
[[package]]
name = "kv-log-macro"
@@ -2777,50 +2607,18 @@ dependencies = [
"parking_lot 0.12.1",
]
-[[package]]
-name = "kvdb-rocksdb"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597"
-dependencies = [
- "kvdb",
- "log",
- "num_cpus",
- "parity-util-mem",
- "parking_lot 0.12.1",
- "regex",
- "rocksdb",
- "smallvec",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
[[package]]
name = "libc"
version = "0.2.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
[[package]]
name = "libm"
version = "0.2.6"
@@ -3148,9 +2946,9 @@ dependencies = [
[[package]]
name = "libp2p-yamux"
-version = "0.41.0"
+version = "0.41.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845"
+checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12"
dependencies = [
"futures",
"libp2p-core",
@@ -3160,21 +2958,6 @@ dependencies = [
"yamux",
]
-[[package]]
-name = "librocksdb-sys"
-version = "0.8.0+7.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d"
-dependencies = [
- "bindgen",
- "bzip2-sys",
- "cc",
- "glob",
- "libc",
- "libz-sys",
- "tikv-jemalloc-sys",
-]
-
[[package]]
name = "libsecp256k1"
version = "0.7.1"
@@ -3276,9 +3059,9 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
[[package]]
name = "linux-raw-sys"
-version = "0.1.2"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb68f22743a3fb35785f1e7f844ca5a3de2dde5bd0c0ef5b372065814699b121"
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
[[package]]
name = "lock_api"
@@ -3398,7 +3181,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb"
dependencies = [
- "rustix 0.36.1",
+ "rustix 0.36.3",
]
[[package]]
@@ -3419,6 +3202,15 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "memory-db"
version = "0.30.0"
@@ -3448,12 +3240,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
[[package]]
name = "miniz_oxide"
version = "0.5.4"
@@ -3541,7 +3327,7 @@ dependencies = [
"blake2s_simd",
"blake3",
"core2",
- "digest 0.10.5",
+ "digest 0.10.6",
"multihash-derive",
"sha2 0.10.6",
"sha3",
@@ -3709,16 +3495,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-[[package]]
-name = "nom"
-version = "7.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
[[package]]
name = "normalize-line-endings"
version = "0.3.0"
@@ -3896,9 +3672,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "os_str_bytes"
-version = "6.4.0"
+version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
[[package]]
name = "pallet-assets"
@@ -4159,7 +3935,6 @@ dependencies = [
"parity-util-mem-derive",
"parking_lot 0.12.1",
"primitive-types",
- "smallvec",
"winapi",
]
@@ -4267,62 +4042,12 @@ dependencies = [
"crypto-mac 0.11.1",
]
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
[[package]]
name = "percent-encoding"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-[[package]]
-name = "pest"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe"
-dependencies = [
- "once_cell",
- "pest",
- "sha1",
-]
-
[[package]]
name = "petgraph"
version = "0.6.2"
@@ -4439,9 +4164,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "predicates"
-version = "2.1.2"
+version = "2.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab68289ded120dcbf9d571afcf70163233229052aec9b08ab09532f698d0e1e6"
+checksum = "ed6bd09a7f7e68f3f0bf710fb7ab9c4615a488b58b5f653382a687701e458c92"
dependencies = [
"difflib",
"float-cmp",
@@ -4453,15 +4178,15 @@ dependencies = [
[[package]]
name = "predicates-core"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e7125585d872860e9955ca571650b27a4979c5823084168c5ed5bbfb016b56"
+checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
[[package]]
name = "predicates-tree"
-version = "1.0.6"
+version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3f7fa8d61e139cbc7c3edfebf3b6678883a53f5ffac65d1259329a93ee43a5"
+checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
dependencies = [
"predicates-core",
"termtree",
@@ -4691,7 +4416,7 @@ dependencies = [
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
- "rand_pcg 0.2.1",
+ "rand_pcg",
]
[[package]]
@@ -4771,15 +4496,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "rand_pcg"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e"
-dependencies = [
- "rand_core 0.6.4",
-]
-
[[package]]
name = "rawpointer"
version = "0.2.1"
@@ -4788,11 +4504,10 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
[[package]]
name = "rayon"
-version = "1.5.3"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
+checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b"
dependencies = [
- "autocfg",
"crossbeam-deque",
"either",
"rayon-core",
@@ -4800,9 +4515,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.9.3"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
+checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -4933,16 +4648,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "rocksdb"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc"
-dependencies = [
- "libc",
- "librocksdb-sys",
-]
-
[[package]]
name = "rpassword"
version = "7.1.0"
@@ -5020,15 +4725,15 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.36.1"
+version = "0.36.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812a2ec2043c4d6bc6482f5be2ab8244613cac2493d128d36c0759e52a626ab3"
+checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
dependencies = [
"bitflags",
"errno",
"io-lifetimes 1.0.1",
"libc",
- "linux-raw-sys 0.1.2",
+ "linux-raw-sys 0.1.3",
"windows-sys 0.42.0",
]
@@ -5260,7 +4965,6 @@ dependencies = [
"hash-db",
"kvdb",
"kvdb-memorydb",
- "kvdb-rocksdb",
"linked-hash-map",
"log",
"parity-db",
@@ -5947,7 +5651,7 @@ dependencies = [
"libc",
"log",
"rand 0.7.3",
- "rand_pcg 0.2.1",
+ "rand_pcg",
"regex",
"sc-telemetry",
"serde",
@@ -6265,24 +5969,15 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.87"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
"itoa",
"ryu",
"serde",
]
-[[package]]
-name = "serde_nanos"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e44969a61f5d316be20a42ff97816efb3b407a924d06824c3d8a49fa8450de0e"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "sha-1"
version = "0.9.8"
@@ -6296,17 +5991,6 @@ dependencies = [
"opaque-debug 0.3.0",
]
-[[package]]
-name = "sha1"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.5",
-]
-
[[package]]
name = "sha2"
version = "0.8.2"
@@ -6340,7 +6024,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
- "digest 0.10.5",
+ "digest 0.10.6",
]
[[package]]
@@ -6349,7 +6033,7 @@ version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
dependencies = [
- "digest 0.10.5",
+ "digest 0.10.6",
"keccak",
]
@@ -6362,12 +6046,6 @@ dependencies = [
"lazy_static",
]
-[[package]]
-name = "shlex"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
-
[[package]]
name = "signal-hook"
version = "0.3.14"
@@ -6432,9 +6110,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "snap"
-version = "1.0.5"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45456094d1983e2ee2a18fdfebce3189fa451699d0502cb8e3b49dba5ba41451"
+checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
[[package]]
name = "snow"
@@ -6719,7 +6397,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5e
dependencies = [
"blake2",
"byteorder",
- "digest 0.10.5",
+ "digest 0.10.6",
"sha2 0.10.6",
"sha3",
"sp-std",
@@ -7188,9 +6866,9 @@ dependencies = [
[[package]]
name = "ss58-registry"
-version = "1.34.0"
+version = "1.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a9821878e1f13aba383aa40a86fb1b33c7265774ec91e32563cb1dd1577496"
+checksum = "fa0813c10b9dbdc842c2305f949f724c64866e4ef4d09c9151e96f6a2106773c"
dependencies = [
"Inflector",
"num-format",
@@ -7465,12 +7143,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "thousands"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
-
[[package]]
name = "thread_local"
version = "1.1.4"
@@ -7489,17 +7161,6 @@ dependencies = [
"num_cpus",
]
-[[package]]
-name = "tikv-jemalloc-sys"
-version = "0.5.2+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3"
-dependencies = [
- "cc",
- "fs_extra",
- "libc",
-]
-
[[package]]
name = "time"
version = "0.1.44"
@@ -7547,9 +7208,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.21.2"
+version = "1.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
dependencies = [
"autocfg",
"bytes",
@@ -7799,7 +7460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
dependencies = [
"cfg-if",
- "digest 0.10.5",
+ "digest 0.10.6",
"rand 0.8.5",
"static_assertions",
]
@@ -7810,12 +7471,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-[[package]]
-name = "ucd-trie"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
-
[[package]]
name = "uint"
version = "0.9.4"
@@ -8278,7 +7933,7 @@ dependencies = [
"log",
"mach",
"memfd",
- "memoffset",
+ "memoffset 0.6.5",
"paste",
"rand 0.8.5",
"rustix 0.35.13",
@@ -8532,18 +8187,18 @@ checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
name = "winreg"
-version = "0.7.0"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
dependencies = [
"winapi",
]
[[package]]
name = "wyz"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
dependencies = [
"tap",
]
@@ -8615,9 +8270,9 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.1+zstd.1.5.2"
+version = "2.0.2+zstd.1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
+checksum = "24faa29d97c8ddca9b37b680e3bd2d5439d864a9cac3a0640d086b71c908bb83"
dependencies = [
"cc",
"libc",
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 6b7042b..918be01 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -20,24 +20,19 @@ path = "src/main.rs"
[dependencies]
clap = { version = "4", features = ["derive"] }
-sc-cli = { git = "https://github.com/paritytech/substrate", package = "sc-cli", features = ["wasmtime"] , branch = "polkadot-v0.9.32" }
+sc-cli = { git = "https://github.com/paritytech/substrate", package = "sc-cli", default-features = false, features = ["wasmtime"] , branch = "polkadot-v0.9.32" }
sp-core = { git = "https://github.com/paritytech/substrate", package = "sp-core" , branch = "polkadot-v0.9.32" }
sc-executor = { git = "https://github.com/paritytech/substrate", package = "sc-executor", features = ["wasmtime"] , branch = "polkadot-v0.9.32" }
-sc-service = { git = "https://github.com/paritytech/substrate", package = "sc-service", features = ["wasmtime"] , branch = "polkadot-v0.9.32" }
+sc-service = { git = "https://github.com/paritytech/substrate", package = "sc-service", default-features = false, features = ["wasmtime"] , branch = "polkadot-v0.9.32" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", package = "sc-telemetry" , branch = "polkadot-v0.9.32" }
sc-keystore = { git = "https://github.com/paritytech/substrate", package = "sc-keystore" , branch = "polkadot-v0.9.32" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", package = "sc-transaction-pool" , branch = "polkadot-v0.9.32" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", package = "sc-transaction-pool-api" , branch = "polkadot-v0.9.32" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", package = "sp-consensus" , branch = "polkadot-v0.9.32" }
sc-consensus = { git = "https://github.com/paritytech/substrate", package = "sc-consensus" , branch = "polkadot-v0.9.32" }
sc-consensus-manual-seal = { git = "https://github.com/paritytech/substrate", package = "sc-consensus-manual-seal" , branch = "polkadot-v0.9.32" }
sc-client-api = { git = "https://github.com/paritytech/substrate", package = "sc-client-api" , branch = "polkadot-v0.9.32" }
sp-runtime = { git = "https://github.com/paritytech/substrate", package = "sp-runtime" , branch = "polkadot-v0.9.32" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", package = "sp-timestamp" , branch = "polkadot-v0.9.32" }
-sp-inherents = { git = "https://github.com/paritytech/substrate", package = "sp-inherents" , branch = "polkadot-v0.9.32" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", package = "sp-keyring" , branch = "polkadot-v0.9.32" }
-frame-system = { git = "https://github.com/paritytech/substrate", package = "frame-system" , branch = "polkadot-v0.9.32" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", package = "pallet-transaction-payment" , branch = "polkadot-v0.9.32" }
# These dependencies are used for the node's RPCs
jsonrpsee = { version = "0.15.1", features = ["server"] }
@@ -50,10 +45,6 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", package
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", package = "substrate-frame-rpc-system" , branch = "polkadot-v0.9.32" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", package = "pallet-transaction-payment-rpc" , branch = "polkadot-v0.9.32" }
-# These dependencies are used for runtime benchmarking
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", package = "frame-benchmarking" , branch = "polkadot-v0.9.32" }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", package = "frame-benchmarking-cli" , branch = "polkadot-v0.9.32" }
-
# Local Dependencies
contracts-node-runtime = { path = "../runtime" }
diff --git a/node/src/benchmarking.rs b/node/src/benchmarking.rs
deleted file mode 100644
index a69e02e..0000000
--- a/node/src/benchmarking.rs
+++ /dev/null
@@ -1,183 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2022 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-//! Setup code for [`super::command`] which would otherwise bloat that module.
-//!
-//! Should only be used for benchmarking as it may break in other contexts.
-
-use crate::service::FullClient;
-
-use contracts_node_runtime as runtime;
-use runtime::{AccountId, Balance, BalancesCall, SystemCall};
-use sc_cli::Result;
-use sc_client_api::BlockBackend;
-use sp_core::{Encode, Pair};
-use sp_inherents::{InherentData, InherentDataProvider};
-use sp_keyring::Sr25519Keyring;
-use sp_runtime::{OpaqueExtrinsic, SaturatedConversion};
-
-use std::{sync::Arc, time::Duration};
-
-/// Generates extrinsics for the `benchmark overhead` command.
-///
-/// Note: Should only be used for benchmarking.
-pub struct RemarkBuilder {
- client: Arc,
-}
-
-impl RemarkBuilder {
- /// Creates a new [`Self`] from the given client.
- pub fn new(client: Arc) -> Self {
- Self { client }
- }
-}
-
-impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
- fn pallet(&self) -> &str {
- "system"
- }
-
- fn extrinsic(&self) -> &str {
- "remark"
- }
-
- fn build(&self, nonce: u32) -> std::result::Result {
- let acc = Sr25519Keyring::Bob.pair();
- let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic(
- self.client.as_ref(),
- acc,
- SystemCall::remark { remark: vec![] }.into(),
- nonce,
- )
- .into();
-
- Ok(extrinsic)
- }
-}
-
-/// Generates `Balances::TransferKeepAlive` extrinsics for the benchmarks.
-///
-/// Note: Should only be used for benchmarking.
-pub struct TransferKeepAliveBuilder {
- client: Arc,
- dest: AccountId,
- value: Balance,
-}
-
-impl TransferKeepAliveBuilder {
- /// Creates a new [`Self`] from the given client.
- pub fn new(client: Arc, dest: AccountId, value: Balance) -> Self {
- Self { client, dest, value }
- }
-}
-
-impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
- fn pallet(&self) -> &str {
- "balances"
- }
-
- fn extrinsic(&self) -> &str {
- "transfer_keep_alive"
- }
-
- fn build(&self, nonce: u32) -> std::result::Result {
- let acc = Sr25519Keyring::Bob.pair();
- let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic(
- self.client.as_ref(),
- acc,
- BalancesCall::transfer_keep_alive {
- dest: self.dest.clone().into(),
- value: self.value.into(),
- }
- .into(),
- nonce,
- )
- .into();
-
- Ok(extrinsic)
- }
-}
-
-/// Create a transaction using the given `call`.
-///
-/// Note: Should only be used for benchmarking.
-pub fn create_benchmark_extrinsic(
- client: &FullClient,
- sender: sp_core::sr25519::Pair,
- call: runtime::RuntimeCall,
- nonce: u32,
-) -> runtime::UncheckedExtrinsic {
- let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
- let best_hash = client.chain_info().best_hash;
- let best_block = client.chain_info().best_number;
-
- let period = runtime::BlockHashCount::get()
- .checked_next_power_of_two()
- .map(|c| c / 2)
- .unwrap_or(2) as u64;
- let extra: runtime::SignedExtra = (
- frame_system::CheckNonZeroSender::::new(),
- frame_system::CheckSpecVersion::::new(),
- frame_system::CheckTxVersion::::new(),
- frame_system::CheckGenesis::::new(),
- frame_system::CheckEra::::from(sp_runtime::generic::Era::mortal(
- period,
- best_block.saturated_into(),
- )),
- frame_system::CheckNonce::::from(nonce),
- frame_system::CheckWeight::::new(),
- pallet_transaction_payment::ChargeTransactionPayment::::from(0),
- );
-
- let raw_payload = runtime::SignedPayload::from_raw(
- call.clone(),
- extra.clone(),
- (
- (),
- runtime::VERSION.spec_version,
- runtime::VERSION.transaction_version,
- genesis_hash,
- best_hash,
- (),
- (),
- (),
- ),
- );
- let signature = raw_payload.using_encoded(|e| sender.sign(e));
-
- runtime::UncheckedExtrinsic::new_signed(
- call.clone(),
- sp_runtime::AccountId32::from(sender.public()).into(),
- runtime::Signature::Sr25519(signature.clone()),
- extra.clone(),
- )
-}
-
-/// Generates inherent data for the `benchmark overhead` command.
-///
-/// Note: Should only be used for benchmarking.
-pub fn inherent_benchmark_data() -> Result {
- let mut inherent_data = InherentData::new();
- let d = Duration::from_millis(0);
- let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
-
- timestamp
- .provide_inherent_data(&mut inherent_data)
- .map_err(|e| format!("creating inherent data: {:?}", e))?;
- Ok(inherent_data)
-}
diff --git a/node/src/cli.rs b/node/src/cli.rs
index 5bc6c9b..cdbdf7b 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -36,10 +36,6 @@ pub enum Subcommand {
/// Revert the chain to a previous state.
Revert(sc_cli::RevertCmd),
- /// Sub-commands concerned with benchmarking.
- #[clap(subcommand)]
- Benchmark(frame_benchmarking_cli::BenchmarkCmd),
-
/// Db meta columns information.
ChainInfo(sc_cli::ChainInfoCmd),
}
diff --git a/node/src/command.rs b/node/src/command.rs
index c374db9..5a0b4dd 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -1,14 +1,11 @@
use crate::{
- benchmarking::{inherent_benchmark_data, RemarkBuilder, TransferKeepAliveBuilder},
chain_spec,
cli::{Cli, Subcommand},
service,
};
-use contracts_node_runtime::{Block, EXISTENTIAL_DEPOSIT};
-use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
+use contracts_node_runtime::Block;
use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
use sc_service::PartialComponents;
-use sp_keyring::Sr25519Keyring;
impl SubstrateCli for Cli {
fn impl_name() -> String {
@@ -116,51 +113,6 @@ pub fn run() -> sc_cli::Result<()> {
Ok((cmd.run(client, backend, None), task_manager))
})
},
- Some(Subcommand::Benchmark(cmd)) => {
- let runner = cli.create_runner(cmd)?;
-
- runner.sync_run(|config| {
- // This switch needs to be in the client, since the client decides
- // which sub-commands it wants to support.
- // In the case of substrate-contract-node we only support benchmark for pallet
- match cmd {
- BenchmarkCmd::Pallet(_) | BenchmarkCmd::Storage(_) =>
- Err("Runtime Benchmarking not supported.")?,
- BenchmarkCmd::Block(cmd) => {
- let PartialComponents { client, .. } = service::new_partial(&config)?;
- cmd.run(client)
- },
- BenchmarkCmd::Overhead(cmd) => {
- let PartialComponents { client, .. } = service::new_partial(&config)?;
- let ext_builder = RemarkBuilder::new(client.clone());
-
- cmd.run(
- config,
- client,
- inherent_benchmark_data()?,
- Vec::new(),
- &ext_builder,
- )
- },
- BenchmarkCmd::Extrinsic(cmd) => {
- let PartialComponents { client, .. } = service::new_partial(&config)?;
- // Register the *Remark* and *TKA* builders.
- let ext_factory = ExtrinsicFactory(vec![
- Box::new(RemarkBuilder::new(client.clone())),
- Box::new(TransferKeepAliveBuilder::new(
- client.clone(),
- Sr25519Keyring::Alice.to_account_id(),
- EXISTENTIAL_DEPOSIT,
- )),
- ]);
-
- cmd.run(client, inherent_benchmark_data()?, Vec::new(), &ext_factory)
- },
- BenchmarkCmd::Machine(cmd) =>
- cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()),
- }
- })
- },
Some(Subcommand::ChainInfo(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run::(&config))
diff --git a/node/src/main.rs b/node/src/main.rs
index 426cbab..4449d28 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -4,7 +4,6 @@
mod chain_spec;
#[macro_use]
mod service;
-mod benchmarking;
mod cli;
mod command;
mod rpc;
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 0f09966..6e46622 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -41,11 +41,6 @@ sp-version = { git = "https://github.com/paritytech/substrate", package = "sp-ve
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", package = "frame-system-rpc-runtime-api", default-features = false , branch = "polkadot-v0.9.32" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", package = "pallet-transaction-payment-rpc-runtime-api", default-features = false , branch = "polkadot-v0.9.32" }
-# Used for runtime benchmarking
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, package = "frame-benchmarking", optional = true , branch = "polkadot-v0.9.32" }
-frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, package = "frame-system-benchmarking", optional = true , branch = "polkadot-v0.9.32" }
-hex-literal = { version = "0.3.4", optional = true }
-
# Contracts specific packages
pallet-contracts = { git = "https://github.com/paritytech/substrate", package = "pallet-contracts", default-features = false, features = ["unstable-interface"], branch = "polkadot-v0.9.32" }
pallet-contracts-primitives = { git = "https://github.com/paritytech/substrate", package = "pallet-contracts-primitives", default-features = false , branch = "polkadot-v0.9.32" }