diff --git a/Cargo.lock b/Cargo.lock
index fefd05372..01c9deb3a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -305,6 +305,15 @@ dependencies = [
"serde",
]
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "bitflags"
version = "1.3.2"
@@ -540,6 +549,7 @@ dependencies = [
"serde",
"serde_json",
"sp-core",
+ "sp-runtime",
"sp-weights",
"substrate-build-script-utils",
"subxt",
@@ -770,6 +780,15 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+[[package]]
+name = "cpp_demangle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f"
+dependencies = [
+ "cfg-if",
+]
+
[[package]]
name = "cpufeatures"
version = "0.2.5"
@@ -779,6 +798,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "cranelift-entity"
+version = "0.88.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "crc32fast"
version = "1.3.2"
@@ -1056,6 +1084,27 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2"
+[[package]]
+name = "ed25519"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+dependencies = [
+ "signature",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "ed25519",
+ "sha2 0.9.9",
+ "zeroize",
+]
+
[[package]]
name = "ed25519-zebra"
version = "3.1.0"
@@ -1137,6 +1186,12 @@ version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
[[package]]
name = "fastrand"
version = "1.8.0"
@@ -1337,10 +1392,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if",
- "js-sys",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
- "wasm-bindgen",
]
[[package]]
@@ -1361,6 +1414,10 @@ name = "gimli"
version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+dependencies = [
+ "fallible-iterator",
+ "stable_deref_trait",
+]
[[package]]
name = "glob"
@@ -1482,6 +1539,15 @@ dependencies = [
"digest 0.9.0",
]
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.6",
+]
+
[[package]]
name = "hmac-drbg"
version = "0.3.0"
@@ -1656,6 +1722,7 @@ checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown 0.12.3",
+ "serde",
]
[[package]]
@@ -1865,6 +1932,12 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "io-lifetimes"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
+
[[package]]
name = "io-lifetimes"
version = "1.0.1"
@@ -1882,8 +1955,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
dependencies = [
"hermit-abi 0.2.6",
- "io-lifetimes",
- "rustix",
+ "io-lifetimes 1.0.1",
+ "rustix 0.36.4",
"windows-sys 0.42.0",
]
@@ -2121,6 +2194,12 @@ dependencies = [
"cc",
]
+[[package]]
+name = "linux-raw-sys"
+version = "0.0.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+
[[package]]
name = "linux-raw-sys"
version = "0.1.3"
@@ -2156,6 +2235,15 @@ dependencies = [
"hashbrown 0.12.3",
]
+[[package]]
+name = "mach"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "matchers"
version = "0.0.1"
@@ -2180,15 +2268,23 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
[[package]]
name = "memory-db"
-version = "0.30.0"
+version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269"
+checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66"
dependencies = [
"hash-db",
"hashbrown 0.12.3",
- "parity-util-mem",
]
[[package]]
@@ -2358,6 +2454,9 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
dependencies = [
+ "crc32fast",
+ "hashbrown 0.12.3",
+ "indexmap",
"memchr",
]
@@ -2408,9 +2507,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pallet-contracts-primitives"
-version = "7.0.0"
+version = "12.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33fd2f159dc7cc71def8ac684fa4938b2a66ef158436d3c7ab4aa6b69390d562"
+checksum = "3c73c104a4bc750a070201026de531a85d9324825a5e8f8454bfe457ccb729da"
dependencies = [
"bitflags",
"parity-scale-codec",
@@ -2446,32 +2545,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "parity-util-mem"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8"
-dependencies = [
- "cfg-if",
- "hashbrown 0.12.3",
- "impl-trait-for-tuples",
- "parity-util-mem-derive",
- "parking_lot",
- "primitive-types",
- "winapi",
-]
-
-[[package]]
-name = "parity-util-mem-derive"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
-dependencies = [
- "proc-macro2",
- "syn",
- "synstructure",
-]
-
[[package]]
name = "parity-wasm"
version = "0.45.0"
@@ -2515,20 +2588,20 @@ checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
[[package]]
name = "pbkdf2"
-version = "0.4.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
dependencies = [
- "crypto-mac 0.8.0",
+ "crypto-mac 0.11.1",
]
[[package]]
name = "pbkdf2"
-version = "0.8.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
- "crypto-mac 0.11.1",
+ "digest 0.10.6",
]
[[package]]
@@ -2571,9 +2644,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "platforms"
-version = "1.1.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
+checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94"
[[package]]
name = "polling"
@@ -2703,6 +2776,15 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "psm"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "ptr_meta"
version = "0.1.4"
@@ -2749,7 +2831,6 @@ dependencies = [
"rand_chacha 0.2.2",
"rand_core 0.5.1",
"rand_hc",
- "rand_pcg",
]
[[package]]
@@ -2810,15 +2891,6 @@ dependencies = [
"rand_core 0.5.1",
]
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
[[package]]
name = "redox_syscall"
version = "0.2.16"
@@ -2983,6 +3055,20 @@ dependencies = [
"semver",
]
+[[package]]
+name = "rustix"
+version = "0.35.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes 0.7.5",
+ "libc",
+ "linux-raw-sys 0.0.46",
+ "windows-sys 0.42.0",
+]
+
[[package]]
name = "rustix"
version = "0.36.4"
@@ -2991,9 +3077,9 @@ checksum = "cb93e85278e08bb5788653183213d3a60fc242b10cb9be96586f5a73dcb67c23"
dependencies = [
"bitflags",
"errno",
- "io-lifetimes",
+ "io-lifetimes 1.0.1",
"libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.1.3",
"windows-sys 0.42.0",
]
@@ -3358,6 +3444,12 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+
[[package]]
name = "slab"
version = "0.4.7"
@@ -3400,9 +3492,9 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
-version = "7.0.0"
+version = "12.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a70f8245ad75c773c43e46d16e81adb62290d37cd07efcde6cef06d93235e5"
+checksum = "a72575f160b1b134ee277a2ab46af4361c072a3fe661c48e474255406cb01c97"
dependencies = [
"parity-scale-codec",
"scale-info",
@@ -3414,31 +3506,29 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
-version = "6.0.0"
+version = "9.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3856b3e912f0a7a1332f1642b5fd3c2e76476e894c656538d32c004698690157"
+checksum = "2038010f7514d50775dcbd3edb569e17fa9bda63128580a9e172abb1795f2c1d"
dependencies = [
"integer-sqrt",
"num-traits",
"parity-scale-codec",
"scale-info",
"serde",
- "sp-debug-derive",
"sp-std",
"static_assertions",
]
[[package]]
name = "sp-core"
-version = "7.0.0"
+version = "11.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c78530907dbf7949af928d0ce88b485067389201b6d9b468074b1924f209f0"
+checksum = "d99984f57c9eb858d29fbe0e4cf44092eec484b2ff72176d5afa4ab7bf1dc8b1"
dependencies = [
"array-bytes",
"base58",
"bitflags",
"blake2",
- "byteorder",
"dyn-clonable",
"ed25519-zebra",
"futures",
@@ -3449,11 +3539,10 @@ dependencies = [
"libsecp256k1",
"log",
"merlin",
- "num-traits",
"parity-scale-codec",
"parking_lot",
"primitive-types",
- "rand 0.7.3",
+ "rand 0.8.5",
"regex",
"scale-info",
"schnorrkel",
@@ -3470,15 +3559,14 @@ dependencies = [
"substrate-bip39",
"thiserror",
"tiny-bip39",
- "wasmi",
"zeroize",
]
[[package]]
name = "sp-core-hashing"
-version = "5.0.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a"
+checksum = "cbc2d1947252b7a4e403b0a260f596920443742791765ec111daa2bbf98eff25"
dependencies = [
"blake2",
"byteorder",
@@ -3491,9 +3579,9 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
-version = "5.0.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9ba7352773b96a4aa57e903447f841c6bc26e8c798377db6e7eb332346454"
+checksum = "66fb9dc63d54de7d7bed62a505b6e0bd66c122525ea1abb348f6564717c3df2d"
dependencies = [
"proc-macro2",
"quote",
@@ -3502,9 +3590,9 @@ dependencies = [
[[package]]
name = "sp-externalities"
-version = "0.13.0"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef739442230f49d88ece41259e5d886d6b8bc0f4197ef7f1585c39c762ce7ef2"
+checksum = "dc754e1cec66b93df0b48a8986d019c1a2a90431c42cf2614cc35a291597c329"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -3514,17 +3602,17 @@ dependencies = [
[[package]]
name = "sp-io"
-version = "7.0.0"
+version = "12.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6280bd3643354f7ff0b2abd36c687745455779231a7a86d90945608f0d4924c4"
+checksum = "8ac917b37c7733e3778e7ffc3958f1181a151ac3b14116d65fb10fe7b08db10e"
dependencies = [
"bytes",
+ "ed25519",
+ "ed25519-dalek",
"futures",
- "hash-db",
"libsecp256k1",
"log",
"parity-scale-codec",
- "parking_lot",
"secp256k1 0.24.2",
"sp-core",
"sp-externalities",
@@ -3534,16 +3622,15 @@ dependencies = [
"sp-std",
"sp-tracing",
"sp-trie",
- "sp-wasm-interface",
"tracing",
"tracing-core",
]
[[package]]
name = "sp-keystore"
-version = "0.13.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44bec4f0d036b6993c14bbee4216781f21275e5c201e43e45fed4a434bf0e5a"
+checksum = "6ada8b7a72404bda58b3353830bc42f027ec764e13a28b4cd4386cf34fb1ae7c"
dependencies = [
"async-trait",
"futures",
@@ -3558,9 +3645,9 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
-version = "5.0.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97549ec99cb289db2a9f5c656b6880f7c90097135e1ca6c6ae4fe5694232e526"
+checksum = "4abed79c3d5b3622f65ab065676addd9923b9b122cd257df23e2757ce487c6d2"
dependencies = [
"backtrace",
"lazy_static",
@@ -3569,18 +3656,17 @@ dependencies = [
[[package]]
name = "sp-runtime"
-version = "7.0.0"
+version = "12.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfc5c54c2b31d2f0cf904d472a0bff7125c0c2a2e2330507842e56f9a27444"
+checksum = "c86578c67b060a6ecab52af64f1cf18b3892fca7fba5ffc5c49934b2e76b1929"
dependencies = [
"either",
"hash256-std-hasher",
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
- "parity-util-mem",
"paste",
- "rand 0.7.3",
+ "rand 0.8.5",
"scale-info",
"serde",
"sp-application-crypto",
@@ -3593,9 +3679,9 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
-version = "7.0.0"
+version = "10.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b886a5d34400b0e0c12d389e3bb48b7a93d651cddf7e248124b81fe64c339251"
+checksum = "f3858935567385728ea45f6d159f9970b0b278eb22a8e77625bbf4a63e43a85a"
dependencies = [
"bytes",
"impl-trait-for-tuples",
@@ -3612,9 +3698,9 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
-version = "6.0.0"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a157f1ce0108b9b87f87e826726049d9b6253318b74410c814be7fc2af416b51"
+checksum = "00083a77e938c4f35d0bde7ca0b6e5f616158ebe11af6063795aa664d92a238b"
dependencies = [
"Inflector",
"proc-macro-crate 1.2.1",
@@ -3625,16 +3711,15 @@ dependencies = [
[[package]]
name = "sp-state-machine"
-version = "0.13.0"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5c2d97ad69011d34ca257f0383532b80096d53f889f5894ae2b24a211bec66f"
+checksum = "f1fd4c600df0b5abf26c19b6c61d928b64e0c2b8a709a3dbef872be0507cd1ca"
dependencies = [
"hash-db",
"log",
- "num-traits",
"parity-scale-codec",
"parking_lot",
- "rand 0.7.3",
+ "rand 0.8.5",
"smallvec",
"sp-core",
"sp-externalities",
@@ -3643,20 +3728,19 @@ dependencies = [
"sp-trie",
"thiserror",
"tracing",
- "trie-root",
]
[[package]]
name = "sp-std"
-version = "5.0.0"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3fd4c1d304be101e6ebbafd3d4be9a37b320c970ef4e8df188b16873981c93"
+checksum = "af0ee286f98455272f64ac5bb1384ff21ac029fbb669afbaf48477faff12760e"
[[package]]
name = "sp-storage"
-version = "7.0.0"
+version = "9.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb987ed2e4d7d870170a225083ea962f2a359d75cdf76935d5ed8d91bee912d9"
+checksum = "9acb4059eb0ae4fa8cf9ca9119b0178ad312a592d4c6054bd17b411034f233e9"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -3668,9 +3752,9 @@ dependencies = [
[[package]]
name = "sp-tracing"
-version = "6.0.0"
+version = "7.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e761df87dc940d87720939de8f976d1fc0657e523886ae0d7bf3f7e2e2f0abb6"
+checksum = "b22d28a0bc2365dfb86644d14f2682a79da35891d4656d4896fb09fb05ff1e6c"
dependencies = [
"parity-scale-codec",
"sp-std",
@@ -3681,9 +3765,9 @@ dependencies = [
[[package]]
name = "sp-trie"
-version = "7.0.0"
+version = "11.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f4f48c887e90050537e399d2d8b6ee82787ebec0fe46e4880b42cab0c2d5ba6"
+checksum = "db085f134cb444e52ca569a442d12c84bd17667532613d78dd6f568942632da4"
dependencies = [
"ahash",
"hash-db",
@@ -3705,24 +3789,24 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
-version = "7.0.0"
+version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f43c40afab6ecac20505907631c929957ed636b7af8795984649bbaa6ff38c3"
+checksum = "3ebc377987d42f8fc20e3f4ec4fd1147dd098fe90bcb4269e1eddb04e920f889"
dependencies = [
"impl-trait-for-tuples",
"log",
"parity-scale-codec",
"sp-std",
"wasmi",
+ "wasmtime",
]
[[package]]
name = "sp-weights"
-version = "4.0.0"
+version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c671673133b30e6ab6d88139b06adcdaec5aa06548abe0e155a0c830b592793b"
+checksum = "90eca2a19f48978e9cd605e23905d0602419f7880a9360ac717b03412e9c7916"
dependencies = [
- "impl-trait-for-tuples",
"parity-scale-codec",
"scale-info",
"serde",
@@ -3754,6 +3838,12 @@ dependencies = [
"unicode-xid",
]
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
[[package]]
name = "static_assertions"
version = "1.1.0"
@@ -3800,9 +3890,9 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
-version = "3.0.0"
+version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd540ba72520174c2c73ce96bf507eeba3cc8a481f58be92525b69110e1fa645"
+checksum = "c2d759bb4b0598322e6223fbd546fe71eaa692c2864e19fe81d48d79730b3fab"
dependencies = [
"platforms",
]
@@ -3815,25 +3905,30 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "subxt"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3cbc78fd36035a24883eada29e0205b9b1416172530a7d00a60c07d0337db0c"
+checksum = "44ddcf2435955202d5f97934e80eb56bbafc85d31949a857ae77431b19f5eddf"
dependencies = [
- "bitvec",
+ "base58",
+ "blake2",
"derivative",
"frame-metadata",
"futures",
"getrandom 0.2.8",
"hex",
+ "impl-serde",
"jsonrpsee",
"parity-scale-codec",
"parking_lot",
+ "primitive-types",
+ "scale-bits",
"scale-decode",
"scale-info",
"scale-value",
"serde",
"serde_json",
"sp-core",
+ "sp-core-hashing",
"sp-runtime",
"subxt-macro",
"subxt-metadata",
@@ -3843,9 +3938,9 @@ dependencies = [
[[package]]
name = "subxt-codegen"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7722c31febf55eb300c73d977da5d65cfd6fb443419b1185b9abcdd9925fd7be"
+checksum = "0217ebd818e3d4ff1f56cdba4fcc08ede2b9c8eaf2945ad1b442685f674a465f"
dependencies = [
"darling",
"frame-metadata",
@@ -3864,9 +3959,9 @@ dependencies = [
[[package]]
name = "subxt-macro"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f64826f2c4ba20e3b2a86ec81a6ae8655ca6b6a4c2a6ccc888b6615efc2df14"
+checksum = "bd0663fedcacc1b3d1430c05e429c2ac40efeab41399efcaaf6ad4070737f3e9"
dependencies = [
"darling",
"proc-macro-error",
@@ -3876,14 +3971,14 @@ dependencies = [
[[package]]
name = "subxt-metadata"
-version = "0.25.0"
+version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "869af75e23513538ad0af046af4a97b8d684e8d202e35ff4127ee061c1110813"
+checksum = "419b06bdd1926c3b2c53d5ea4f2c875c29afaede2e5de11346f67199ed180685"
dependencies = [
"frame-metadata",
"parity-scale-codec",
"scale-info",
- "sp-core",
+ "sp-core-hashing",
]
[[package]]
@@ -3915,6 +4010,12 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+[[package]]
+name = "target-lexicon"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d"
+
[[package]]
name = "tempfile"
version = "3.3.0"
@@ -3975,17 +4076,17 @@ dependencies = [
[[package]]
name = "tiny-bip39"
-version = "0.8.2"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
+checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
dependencies = [
"anyhow",
- "hmac 0.8.1",
+ "hmac 0.12.1",
"once_cell",
- "pbkdf2 0.4.0",
- "rand 0.7.3",
+ "pbkdf2 0.11.0",
+ "rand 0.8.5",
"rustc-hash",
- "sha2 0.9.9",
+ "sha2 0.10.6",
"thiserror",
"unicode-normalization",
"wasm-bindgen",
@@ -4547,6 +4648,137 @@ dependencies = [
"num-traits",
]
+[[package]]
+name = "wasmparser"
+version = "0.89.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab5d3e08b13876f96dd55608d03cd4883a0545884932d5adf11925876c96daef"
+dependencies = [
+ "indexmap",
+]
+
+[[package]]
+name = "wasmtime"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731"
+dependencies = [
+ "anyhow",
+ "bincode",
+ "cfg-if",
+ "indexmap",
+ "libc",
+ "log",
+ "object",
+ "once_cell",
+ "paste",
+ "psm",
+ "serde",
+ "target-lexicon",
+ "wasmparser",
+ "wasmtime-environ",
+ "wasmtime-jit",
+ "wasmtime-runtime",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "wasmtime-asm-macros"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "wasmtime-environ"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644"
+dependencies = [
+ "anyhow",
+ "cranelift-entity",
+ "gimli",
+ "indexmap",
+ "log",
+ "object",
+ "serde",
+ "target-lexicon",
+ "thiserror",
+ "wasmparser",
+ "wasmtime-types",
+]
+
+[[package]]
+name = "wasmtime-jit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681"
+dependencies = [
+ "addr2line",
+ "anyhow",
+ "bincode",
+ "cfg-if",
+ "cpp_demangle",
+ "gimli",
+ "log",
+ "object",
+ "rustc-demangle",
+ "rustix 0.35.13",
+ "serde",
+ "target-lexicon",
+ "thiserror",
+ "wasmtime-environ",
+ "wasmtime-runtime",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "wasmtime-jit-debug"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "wasmtime-runtime"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd"
+dependencies = [
+ "anyhow",
+ "cc",
+ "cfg-if",
+ "indexmap",
+ "libc",
+ "log",
+ "mach",
+ "memoffset",
+ "paste",
+ "rand 0.8.5",
+ "rustix 0.35.13",
+ "thiserror",
+ "wasmtime-asm-macros",
+ "wasmtime-environ",
+ "wasmtime-jit-debug",
+ "windows-sys 0.36.1",
+]
+
+[[package]]
+name = "wasmtime-types"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb"
+dependencies = [
+ "cranelift-entity",
+ "serde",
+ "thiserror",
+ "wasmparser",
+]
+
[[package]]
name = "web-sys"
version = "0.3.60"
diff --git a/crates/cargo-contract/Cargo.toml b/crates/cargo-contract/Cargo.toml
index 900342984..1940e8d27 100644
--- a/crates/cargo-contract/Cargo.toml
+++ b/crates/cargo-contract/Cargo.toml
@@ -36,16 +36,17 @@ rust_decimal = "1.28"
# dependencies for extrinsics (deploying and calling a contract)
async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
-sp-core = "7.0.0"
-sp-weights = "4.0.0"
-pallet-contracts-primitives = "7.0.0"
-subxt = "0.25.0"
+sp-core = "11.0.0"
+sp-runtime = "12.0.0"
+sp-weights = "8.0.0"
+pallet-contracts-primitives = "12.0.0"
+subxt = "0.26.0"
hex = "0.4.3"
jsonrpsee = { version = "0.16.2", features = ["ws-client"] }
[build-dependencies]
anyhow = "1.0.68"
-substrate-build-script-utils = "3.0.0"
+substrate-build-script-utils = "4.0.0"
current_platform = "0.2.0"
which = "4.4.0"
diff --git a/crates/cargo-contract/src/cmd/extrinsics/error.rs b/crates/cargo-contract/src/cmd/extrinsics/error.rs
index 75607dbcc..417b0fe8c 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/error.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/error.rs
@@ -14,8 +14,8 @@
// You should have received a copy of the GNU General Public License
// along with cargo-contract. If not, see .
+use sp_runtime::DispatchError;
use std::fmt::Display;
-use subxt::ext::sp_runtime::DispatchError;
#[derive(serde::Serialize)]
pub enum ErrorVariant {
diff --git a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
index 38c5ee7ad..018d84e90 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/instantiate.rs
@@ -53,10 +53,7 @@ use contract_build::{
use pallet_contracts_primitives::ContractInstantiateResult;
use scale::Encode;
-use sp_core::{
- crypto::Ss58Codec,
- Bytes,
-};
+use sp_core::Bytes;
use sp_weights::Weight;
use subxt::{
blocks::ExtrinsicEvents,
@@ -200,7 +197,7 @@ impl Exec {
Ok(ref ret_val) => {
let dry_run_result = InstantiateDryRunResult {
result: String::from("Success!"),
- contract: ret_val.account_id.to_ss58check(),
+ contract: ret_val.account_id.to_string(),
reverted: ret_val.result.did_revert(),
data: ret_val.result.data.clone().into(),
gas_consumed: result.gas_consumed,
@@ -318,7 +315,7 @@ impl Exec {
&self,
result: &ExtrinsicEvents,
code_hash: Option,
- contract_address: sp_core::crypto::AccountId32,
+ contract_address: subxt::utils::AccountId32,
token_metadata: &TokenMetadata,
) -> Result<(), ErrorVariant> {
let events = DisplayEvents::from_events(
@@ -326,7 +323,7 @@ impl Exec {
Some(&self.transcoder),
&self.client.metadata(),
)?;
- let contract_address = contract_address.to_ss58check();
+ let contract_address = contract_address.to_string();
if self.output_json {
let display_instantiate_result = InstantiateResult {
diff --git a/crates/cargo-contract/src/cmd/extrinsics/mod.rs b/crates/cargo-contract/src/cmd/extrinsics/mod.rs
index 13c2a7061..33dfae550 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/mod.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/mod.rs
@@ -66,6 +66,7 @@ use sp_core::{
use sp_weights::Weight;
use subxt::{
blocks,
+ config,
tx,
Config,
OnlineClient,
@@ -356,15 +357,17 @@ pub fn display_contract_exec_result_debug(
///
/// Currently this will report success once the transaction is included in a block. In the future
/// there could be a flag to wait for finality before reporting success.
-async fn submit_extrinsic(
+async fn submit_extrinsic(
client: &OnlineClient,
call: &Call,
- signer: &(dyn tx::Signer + Send + Sync),
+ signer: &Signer,
) -> core::result::Result, subxt::Error>
where
T: Config,
- >::OtherParams: Default,
Call: tx::TxPayload,
+ Signer: tx::Signer,
+ >::OtherParams:
+ Default,
{
client
.tx()
diff --git a/crates/cargo-contract/src/cmd/extrinsics/runtime_api/mod.rs b/crates/cargo-contract/src/cmd/extrinsics/runtime_api/mod.rs
index 39f69da7f..892613024 100644
--- a/crates/cargo-contract/src/cmd/extrinsics/runtime_api/mod.rs
+++ b/crates/cargo-contract/src/cmd/extrinsics/runtime_api/mod.rs
@@ -17,9 +17,10 @@
#![allow(clippy::too_many_arguments)]
#[subxt::subxt(
- runtime_metadata_path = "src/cmd/extrinsics/runtime_api/contracts_runtime.scale"
+ runtime_metadata_path = "src/cmd/extrinsics/runtime_api/contracts_runtime.scale",
+ substitute_type(
+ type = "sp_weights::weight_v2::Weight",
+ with = "::sp_weights::Weight"
+ )
)]
-pub mod api {
- #[subxt(substitute_type = "sp_weights::weight_v2::Weight")]
- use ::sp_weights::Weight;
-}
+pub mod api {}
diff --git a/crates/transcode/Cargo.toml b/crates/transcode/Cargo.toml
index 78677a56d..69afeadfe 100644
--- a/crates/transcode/Cargo.toml
+++ b/crates/transcode/Cargo.toml
@@ -32,8 +32,8 @@ scale = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.152", default-features = false, features = ["derive"] }
serde_json = "1.0.91"
-sp-core = "7.0.0"
-sp-runtime = "7.0.0"
+sp-core = "11.0.0"
+sp-runtime = "12.0.0"
[dev-dependencies]
assert_matches = "1.5.0"