From ee473d361cdd01b7ff1bf0a9ef505af7291dffd3 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Thu, 15 Dec 2022 12:08:11 -0700 Subject: [PATCH 01/29] Bump all deps to 0.9.34 and start working on compilation --- Cargo.lock | 2952 ++++++++--------- client/Cargo.toml | 8 +- pallets/asset-registry/Cargo.toml | 24 +- pallets/hasher/Cargo.toml | 18 +- pallets/key-storage/Cargo.toml | 20 +- pallets/linkable-tree/Cargo.toml | 26 +- pallets/linkable-tree/rpc/Cargo.toml | 10 +- .../linkable-tree/rpc/runtime-api/Cargo.toml | 4 +- pallets/mixer/Cargo.toml | 26 +- pallets/mixer/src/mock.rs | 6 - pallets/mt/Cargo.toml | 20 +- pallets/mt/rpc/Cargo.toml | 10 +- pallets/mt/rpc/runtime-api/Cargo.toml | 2 +- pallets/relayer-registry/Cargo.toml | 22 +- pallets/signature-bridge/Cargo.toml | 20 +- pallets/signature-bridge/src/mock.rs | 1 - pallets/token-wrapper-handler/Cargo.toml | 26 +- .../src/mock_signature_bridge.rs | 7 - pallets/token-wrapper/Cargo.toml | 27 +- pallets/token-wrapper/src/mock.rs | 6 - pallets/vanchor-handler/Cargo.toml | 32 +- .../src/mock_signature_bridge.rs | 8 - pallets/vanchor-verifier/Cargo.toml | 20 +- pallets/vanchor/Cargo.toml | 34 +- pallets/vanchor/src/mock.rs | 6 - pallets/verifier/Cargo.toml | 20 +- pallets/xanchor/Cargo.toml | 52 +- pallets/xanchor/src/mock/parachain.rs | 43 +- primitives/Cargo.toml | 16 +- rust-toolchain.toml | 2 +- standalone/node/Cargo.toml | 102 +- standalone/runtime/Cargo.toml | 116 +- standalone/runtime/src/lib.rs | 181 +- standalone/runtime/src/orml_token_impls.rs | 187 ++ 34 files changed, 2016 insertions(+), 2038 deletions(-) create mode 100644 standalone/runtime/src/orml_token_impls.rs diff --git a/Cargo.lock b/Cargo.lock index 867fca1e2..664a2a84c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "opaque-debug 0.3.0", ] @@ -56,7 +56,7 @@ checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" dependencies = [ "aead", "aes", - "cipher 0.3.0", + "cipher", "ctr", "ghash", "subtle", @@ -194,7 +194,7 @@ dependencies = [ "ark-serialize", "ark-std", "derivative", - "num-bigint 0.4.3", + "num-bigint", "num-traits", "paste", "rustc_version 0.3.3", @@ -217,7 +217,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ - "num-bigint 0.4.3", + "num-bigint", "num-traits", "quote", "syn", @@ -250,7 +250,7 @@ dependencies = [ "ark-relations", "ark-std", "derivative", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", "tracing", @@ -280,7 +280,7 @@ dependencies = [ "ark-relations", "ark-std", "derivative", - "num-bigint 0.4.3", + "num-bigint", "num-traits", "tracing", ] @@ -424,15 +424,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - [[package]] name = "arrayvec" version = "0.5.2" @@ -532,24 +523,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "async-process" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" -dependencies = [ - "async-io", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", -] - [[package]] name = "async-std" version = "1.12.0" @@ -561,7 +534,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -578,21 +550,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "async-std-resolver" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2f8a4a203be3325981310ab243a28e6e4ea55b6519bffce05d41ab60e09ad8" -dependencies = [ - "async-std", - "async-trait", - "futures-io", - "futures-util", - "pin-utils", - "socket2", - "trust-dns-resolver", -] - [[package]] name = "async-task" version = "4.3.0" @@ -635,7 +592,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -700,12 +657,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bimap" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" - [[package]] name = "bincode" version = "1.3.3" @@ -717,9 +668,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -772,16 +723,6 @@ dependencies = [ "digest 0.10.5", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq", -] - [[package]] name = "blake2b_simd" version = "1.0.0" @@ -1025,7 +966,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6" dependencies = [ "cfg-if", - "cipher 0.3.0", + "cipher", "cpufeatures", "zeroize", ] @@ -1038,7 +979,7 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead", "chacha20", - "cipher 0.3.0", + "cipher", "poly1305", "zeroize", ] @@ -1080,16 +1021,6 @@ dependencies = [ "generic-array 0.14.6", ] -[[package]] -name = "cipher" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" -dependencies = [ - "crypto-common", - "inout", -] - [[package]] name = "clang-sys" version = "1.4.0" @@ -1098,7 +1029,7 @@ checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" dependencies = [ "glob", "libc", - "libloading 0.7.3", + "libloading", ] [[package]] @@ -1109,8 +1040,8 @@ checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ "atty", "bitflags", - "clap_derive", - "clap_lex", + "clap_derive 3.2.18", + "clap_lex 0.2.4", "indexmap", "once_cell", "strsim", @@ -1118,13 +1049,41 @@ dependencies = [ "textwrap", ] +[[package]] +name = "clap" +version = "4.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +dependencies = [ + "bitflags", + "clap_derive 4.0.21", + "clap_lex 0.3.0", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + [[package]] name = "clap_derive" version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ - "heck 0.4.0", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_derive" +version = "4.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +dependencies = [ + "heck", "proc-macro-error", "proc-macro2", "quote", @@ -1141,12 +1100,12 @@ dependencies = [ ] [[package]] -name = "cmake" -version = "0.1.49" +name = "clap_lex" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" +checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" dependencies = [ - "cc", + "os_str_bytes", ] [[package]] @@ -1165,8 +1124,8 @@ version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2" dependencies = [ - "strum 0.24.1", - "strum_macros 0.24.3", + "strum", + "strum_macros", "unicode-width", ] @@ -1181,9 +1140,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "constant_time_eq" @@ -1392,9 +1351,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.6", "rand_core 0.6.4", @@ -1448,18 +1407,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" dependencies = [ - "cipher 0.3.0", -] - -[[package]] -name = "cuckoofilter" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" -dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", + "cipher", ] [[package]] @@ -1608,11 +1556,12 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "zeroize", ] [[package]] @@ -1637,6 +1586,12 @@ dependencies = [ "syn", ] +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.8.1" @@ -1717,6 +1672,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -1758,9 +1719,9 @@ checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -1813,13 +1774,14 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest 0.10.5", "ff", "generic-array 0.14.6", "group", @@ -1831,11 +1793,11 @@ dependencies = [ [[package]] name = "enum-as-inner" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "syn", @@ -1919,7 +1881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfb684ac8fa8f6c5759f788862bb22ec6fe3cb392f6bfd08e3c64b603661e3f8" dependencies = [ "crunchy", - "fixed-hash", + "fixed-hash 0.7.0", "tiny-keccak", ] @@ -1930,7 +1892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05136f7057fe789f06e6d41d07b34e6f70d8c86e5693b60f97aaa6553553bdaf" dependencies = [ "ethbloom", - "fixed-hash", + "fixed-hash 0.7.0", "primitive-types 0.10.1", "uint", ] @@ -1982,9 +1944,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", "subtle", @@ -2033,6 +1995,17 @@ name = "fixed-hash" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +dependencies = [ + "byteorder", + "rustc-hex", + "static_assertions", +] + +[[package]] +name = "fixed-hash" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -2057,6 +2030,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + [[package]] name = "fnv" version = "1.0.7" @@ -2066,7 +2048,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", ] @@ -2080,10 +2062,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", @@ -2094,24 +2082,24 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "Inflector", "array-bytes", "chrono", - "clap", + "clap 4.0.29", "comfy-table", "frame-benchmarking", "frame-support", @@ -2140,15 +2128,16 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tempfile", "thiserror", "thousands", @@ -2157,7 +2146,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2168,33 +2157,33 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -2212,7 +2201,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "bitflags", "frame-metadata", @@ -2227,24 +2216,24 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-weights", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "Inflector", "cfg-expr", @@ -2258,7 +2247,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2270,7 +2259,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro2", "quote", @@ -2280,57 +2269,45 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", - "sp-weights", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "sp-api", ] -[[package]] -name = "fs-swap" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d47dad3685eceed8488986cad3d5027165ea5edb164331770e2059555f10a5" -dependencies = [ - "lazy_static", - "libc", - "libloading 0.5.2", - "winapi", -] - [[package]] name = "fs2" version = "0.4.3" @@ -2533,8 +2510,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2591,9 +2570,9 @@ dependencies = [ [[package]] name = "group" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff", "rand_core 0.6.4", @@ -2666,15 +2645,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.0" @@ -2690,6 +2660,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -2721,12 +2700,6 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "hex_fmt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" - [[package]] name = "hmac" version = "0.8.1" @@ -2747,6 +2720,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.5", +] + [[package]] name = "hmac-drbg" version = "0.3.0" @@ -2846,6 +2828,7 @@ dependencies = [ "rustls-native-certs", "tokio", "tokio-rustls", + "webpki-roots", ] [[package]] @@ -2911,9 +2894,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "1.1.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015a7df1eb6dda30df37f34b63ada9b7b352984b0e84de2a20ed526345000791" +checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" dependencies = [ "async-io", "core-foundation", @@ -2938,9 +2921,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -2967,15 +2950,6 @@ dependencies = [ "serde", ] -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array 0.14.6", -] - [[package]] name = "instant" version = "0.1.12" @@ -3000,6 +2974,16 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" +[[package]] +name = "io-lifetimes" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "ip_network" version = "0.4.1" @@ -3024,6 +3008,18 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +[[package]] +name = "is-terminal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +dependencies = [ + "hermit-abi 0.2.6", + "io-lifetimes 1.0.3", + "rustix 0.36.5", + "windows-sys 0.42.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -3078,25 +3074,36 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core", + "jsonrpsee-core 0.15.1", "jsonrpsee-http-server", "jsonrpsee-proc-macros", - "jsonrpsee-types", + "jsonrpsee-types 0.15.1", "jsonrpsee-ws-server", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +dependencies = [ + "jsonrpsee-client-transport", + "jsonrpsee-core 0.16.2", + "jsonrpsee-http-client", + "jsonrpsee-types 0.16.2", +] + [[package]] name = "jsonrpsee-client-transport" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8752740ecd374bcbf8b69f3e80b0327942df76f793f8d4e60d3355650c31fb74" +checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", "pin-project", "rustls-native-certs", "soketto", @@ -3116,16 +3123,14 @@ checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" dependencies = [ "anyhow", "arrayvec 0.7.2", - "async-lock", "async-trait", "beef", "futures-channel", - "futures-timer", "futures-util", "globset", "http", "hyper", - "jsonrpsee-types", + "jsonrpsee-types 0.15.1", "lazy_static", "parking_lot 0.12.1", "rand 0.8.5", @@ -3136,10 +3141,51 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-futures", "unicase", ] +[[package]] +name = "jsonrpsee-core" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +dependencies = [ + "anyhow", + "async-lock", + "async-trait", + "beef", + "futures-channel", + "futures-timer", + "futures-util", + "hyper", + "jsonrpsee-types 0.16.2", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "jsonrpsee-http-client" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +dependencies = [ + "async-trait", + "hyper", + "hyper-rustls", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", + "rustc-hash", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "jsonrpsee-http-server" version = "0.15.1" @@ -3149,8 +3195,8 @@ dependencies = [ "futures-channel", "futures-util", "hyper", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", "serde", "serde_json", "tokio", @@ -3184,6 +3230,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "jsonrpsee-types" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +dependencies = [ + "anyhow", + "beef", + "serde", + "serde_json", + "thiserror", + "tracing", +] + [[package]] name = "jsonrpsee-ws-server" version = "0.15.1" @@ -3193,8 +3253,8 @@ dependencies = [ "futures-channel", "futures-util", "http", - "jsonrpsee-core", - "jsonrpsee-types", + "jsonrpsee-core 0.15.1", + "jsonrpsee-types 0.15.1", "serde_json", "soketto", "tokio", @@ -3206,14 +3266,14 @@ dependencies = [ [[package]] name = "k256" -version = "0.10.4" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19c3a5e0a0b8450278feda242592512e09f61c72e018b8cd5c859482802daf2d" +checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b" dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", - "sec1", + "sha2 0.10.6", ] [[package]] @@ -3233,9 +3293,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" +checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" dependencies = [ "parity-util-mem", "smallvec", @@ -3243,9 +3303,9 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" +checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" dependencies = [ "kvdb", "parity-util-mem", @@ -3254,15 +3314,13 @@ dependencies = [ [[package]] name = "kvdb-rocksdb" -version = "0.15.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" +checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" dependencies = [ - "fs-swap", "kvdb", "log", "num_cpus", - "owning_ref", "parity-util-mem", "parking_lot 0.12.1", "regex", @@ -3288,16 +3346,6 @@ version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - [[package]] name = "libloading" version = "0.7.3" @@ -3316,9 +3364,9 @@ checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "libp2p" -version = "0.46.1" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81327106887e42d004fbdab1fef93675be2e2e07c1b95fce45e2cc813485611d" +checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" dependencies = [ "bytes", "futures", @@ -3326,12 +3374,8 @@ dependencies = [ "getrandom 0.2.8", "instant", "lazy_static", - "libp2p-autonat", "libp2p-core", - "libp2p-deflate", "libp2p-dns", - "libp2p-floodsub", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-mdns", @@ -3339,49 +3383,24 @@ dependencies = [ "libp2p-mplex", "libp2p-noise", "libp2p-ping", - "libp2p-plaintext", - "libp2p-pnet", - "libp2p-relay", - "libp2p-rendezvous", "libp2p-request-response", "libp2p-swarm", "libp2p-swarm-derive", "libp2p-tcp", - "libp2p-uds", "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", "multiaddr", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", "smallvec", ] -[[package]] -name = "libp2p-autonat" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4decc51f3573653a9f4ecacb31b1b922dd20c25a6322bb15318ec04287ec46f9" -dependencies = [ - "async-trait", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-request-response", - "libp2p-swarm", - "log", - "prost 0.10.4", - "prost-build 0.10.4", - "rand 0.8.5", -] - [[package]] name = "libp2p-core" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf9b94cefab7599b2d3dff2f93bee218c6621d68590b23ede4485813cbcece6" +checksum = "799676bb0807c788065e57551c6527d461ad572162b0519d1958946ff9e0539d" dependencies = [ "asn1_der", "bs58", @@ -3392,17 +3411,15 @@ dependencies = [ "futures-timer", "instant", "lazy_static", - "libsecp256k1", "log", "multiaddr", "multihash", "multistream-select", "parking_lot 0.12.1", "pin-project", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "rand 0.8.5", - "ring", "rw-stream-sink", "sha2 0.10.6", "smallvec", @@ -3412,24 +3429,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "libp2p-deflate" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0183dc2a3da1fbbf85e5b6cf51217f55b14f5daea0c455a9536eef646bfec71" -dependencies = [ - "flate2", - "futures", - "libp2p-core", -] - [[package]] name = "libp2p-dns" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbf54723250fa5d521383be789bf60efdabe6bacfb443f87da261019a49b4b5" +checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" dependencies = [ - "async-std-resolver", "futures", "libp2p-core", "log", @@ -3438,57 +3443,11 @@ dependencies = [ "trust-dns-resolver", ] -[[package]] -name = "libp2p-floodsub" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98a4b6ffd53e355775d24b76f583fdda54b3284806f678499b57913adb94f231" -dependencies = [ - "cuckoofilter", - "fnv", - "futures", - "libp2p-core", - "libp2p-swarm", - "log", - "prost 0.10.4", - "prost-build 0.10.4", - "rand 0.7.3", - "smallvec", -] - -[[package]] -name = "libp2p-gossipsub" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b4b888cfbeb1f5551acd3aa1366e01bf88ede26cc3c4645d0d2d004d5ca7b0" -dependencies = [ - "asynchronous-codec", - "base64", - "byteorder", - "bytes", - "fnv", - "futures", - "hex_fmt", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "prometheus-client", - "prost 0.10.4", - "prost-build 0.10.4", - "rand 0.7.3", - "regex", - "sha2 0.10.6", - "smallvec", - "unsigned-varint", - "wasm-timer", -] - [[package]] name = "libp2p-identify" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50b585518f8efd06f93ac2f976bd672e17cdac794644b3117edd078e96bda06" +checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" dependencies = [ "asynchronous-codec", "futures", @@ -3497,8 +3456,8 @@ dependencies = [ "libp2p-swarm", "log", "lru", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "prost-codec", "smallvec", "thiserror", @@ -3507,9 +3466,9 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.38.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740862893bb5f06ac24acc9d49bdeadc3a5e52e51818a30a25c1f3519da2c851" +checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -3522,9 +3481,9 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "prost 0.10.4", - "prost-build 0.10.4", - "rand 0.7.3", + "prost", + "prost-build", + "rand 0.8.5", "sha2 0.10.6", "smallvec", "thiserror", @@ -3535,46 +3494,43 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.38.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e5e5919509603281033fd16306c61df7a4428ce274b67af5e14b07de5cdcb2" +checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" dependencies = [ - "async-io", "data-encoding", "dns-parser", "futures", "if-watch", - "lazy_static", "libp2p-core", "libp2p-swarm", "log", "rand 0.8.5", "smallvec", "socket2", + "tokio", "void", ] [[package]] name = "libp2p-metrics" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8aff4a1abef42328fbb30b17c853fff9be986dc39af17ee39f9c5f755c5e0c" +checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" dependencies = [ "libp2p-core", - "libp2p-gossipsub", "libp2p-identify", "libp2p-kad", "libp2p-ping", - "libp2p-relay", "libp2p-swarm", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fd1b20638ec209c5075dfb2e8ce6a7ea4ec3cd3ad7b77f7a477c06d53322e2" +checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" dependencies = [ "asynchronous-codec", "bytes", @@ -3583,16 +3539,16 @@ dependencies = [ "log", "nohash-hasher", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-noise" -version = "0.37.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762408cb5d84b49a600422d7f9a42c18012d8da6ebcd570f9a4a4290ba41fb6f" +checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" dependencies = [ "bytes", "curve25519-dalek 3.2.0", @@ -3600,8 +3556,8 @@ dependencies = [ "lazy_static", "libp2p-core", "log", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "rand 0.8.5", "sha2 0.10.6", "snow", @@ -3612,105 +3568,25 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100a6934ae1dbf8a693a4e7dd1d730fd60b774dafc45688ed63b554497c6c925" -dependencies = [ - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "rand 0.7.3", - "void", -] - -[[package]] -name = "libp2p-plaintext" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be27bf0820a6238a4e06365b096d428271cce85a129cf16f2fe9eb1610c4df86" -dependencies = [ - "asynchronous-codec", - "bytes", - "futures", - "libp2p-core", - "log", - "prost 0.10.4", - "prost-build 0.10.4", - "unsigned-varint", - "void", -] - -[[package]] -name = "libp2p-pnet" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5a702574223aa55d8878bdc8bf55c84a6086f87ddaddc28ce730b4caa81538" -dependencies = [ - "futures", - "log", - "pin-project", - "rand 0.8.5", - "salsa20", - "sha3 0.10.6", -] - -[[package]] -name = "libp2p-relay" -version = "0.10.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4931547ee0cce03971ccc1733ff05bb0c4349fd89120a39e9861e2bbe18843c3" +checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" dependencies = [ - "asynchronous-codec", - "bytes", - "either", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-swarm", - "log", - "pin-project", - "prost 0.10.4", - "prost-build 0.10.4", - "prost-codec", - "rand 0.8.5", - "smallvec", - "static_assertions", - "thiserror", - "void", -] - -[[package]] -name = "libp2p-rendezvous" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9511c9672ba33284838e349623319c8cad2d18cfad243ae46c6b7e8a2982ea4e" -dependencies = [ - "asynchronous-codec", - "bimap", "futures", "futures-timer", "instant", "libp2p-core", "libp2p-swarm", "log", - "prost 0.10.4", - "prost-build 0.10.4", "rand 0.8.5", - "sha2 0.10.6", - "thiserror", - "unsigned-varint", "void", ] [[package]] name = "libp2p-request-response" -version = "0.19.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "508a189e2795d892c8f5c1fa1e9e0b1845d32d7b0b249dbf7b05b18811361843" +checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" dependencies = [ "async-trait", "bytes", @@ -3719,16 +3595,16 @@ dependencies = [ "libp2p-core", "libp2p-swarm", "log", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "unsigned-varint", ] [[package]] name = "libp2p-swarm" -version = "0.37.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ac5be6c2de2d1ff3f7693fda6faf8a827b1f3e808202277783fea9f527d114" +checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" dependencies = [ "either", "fnv", @@ -3738,7 +3614,7 @@ dependencies = [ "libp2p-core", "log", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "thiserror", "void", @@ -3746,48 +3622,36 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f54a64b6957249e0ce782f8abf41d97f69330d02bf229f0672d864f0650cc76" +checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" dependencies = [ + "heck", "quote", "syn", ] [[package]] name = "libp2p-tcp" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6771dc19aa3c65d6af9a8c65222bfc8fcd446630ddca487acd161fa6096f3b" +checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" dependencies = [ - "async-io", "futures", "futures-timer", "if-watch", - "ipnet", "libc", "libp2p-core", "log", "socket2", -] - -[[package]] -name = "libp2p-uds" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d125e3e5f0d58f3c6ac21815b20cf4b6a88b8db9dc26368ea821838f4161fd4d" -dependencies = [ - "async-std", - "futures", - "libp2p-core", - "log", + "tokio", ] [[package]] name = "libp2p-wasm-ext" -version = "0.34.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec894790eec3c1608f8d1a8a0bdf0dbeb79ed4de2dce964222011c2896dfa05a" +checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" dependencies = [ "futures", "js-sys", @@ -3799,9 +3663,9 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.36.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9808e57e81be76ff841c106b4c5974fb4d41a233a7bdd2afbf1687ac6def3818" +checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" dependencies = [ "either", "futures", @@ -3818,12 +3682,13 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.38.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6dea686217a06072033dc025631932810e2f6ad784e4fafa42e27d311c7a81c" +checksum = "0d6874d66543c4f7e26e3b8ca9a6bead351563a13ab4fafd43c7927f7c0d6c12" dependencies = [ "futures", "libp2p-core", + "log", "parking_lot 0.12.1", "thiserror", "yamux", @@ -3831,9 +3696,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -3943,6 +3808,12 @@ version = "0.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + [[package]] name = "lock_api" version = "0.4.9" @@ -3965,9 +3836,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.8" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" dependencies = [ "hashbrown 0.12.3", ] @@ -4052,7 +3923,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" dependencies = [ - "rustix", + "rustix 0.35.13", ] [[package]] @@ -4075,21 +3946,15 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" dependencies = [ "hash-db", "hashbrown 0.12.3", "parity-util-mem", ] -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - [[package]] name = "memory_units" version = "0.4.0" @@ -4135,6 +4000,33 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "mockall" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "multiaddr" version = "0.14.0" @@ -4203,9 +4095,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a84be6453a70e63513660f4894ef815daf88e3356bffcda9ca27d810ce83b" +checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", "futures", @@ -4225,7 +4117,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", "rand 0.8.5", "rand_distr", @@ -4330,12 +4222,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -4353,15 +4239,10 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.2.6" +name = "normalize-line-endings" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-bigint" @@ -4403,18 +4284,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -4422,7 +4291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", ] @@ -4443,7 +4312,7 @@ version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", ] @@ -4486,7 +4355,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" +source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ "frame-support", "frame-system", @@ -4495,15 +4364,15 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" +source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ "frame-support", "frame-system", @@ -4511,14 +4380,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" +source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4527,24 +4396,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.30#ae13a54dbc1a654df0e2d5e9dc18582b62716365" +source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4553,15 +4422,6 @@ version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "pallet-asset-registry" version = "0.1.0" @@ -4576,11 +4436,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "xcm", ] @@ -4588,54 +4448,55 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "pallet-transaction-payment", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-authority-discovery", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", @@ -4643,14 +4504,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4661,20 +4522,20 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4684,17 +4545,17 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4702,14 +4563,14 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4718,16 +4579,16 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4737,16 +4598,16 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4754,32 +4615,34 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4790,33 +4653,33 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", - "strum 0.24.1", + "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4824,17 +4687,17 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4844,14 +4707,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4877,17 +4740,17 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4895,15 +4758,15 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -4912,29 +4775,29 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keyring 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keyring", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4950,10 +4813,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4983,10 +4846,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4994,15 +4857,15 @@ dependencies = [ name = "pallet-linkable-tree-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "pallet-linkable-tree", "pallet-linkable-tree-rpc-runtime-api", "parity-scale-codec", "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "webb-primitives", ] @@ -5014,7 +4877,7 @@ dependencies = [ "pallet-linkable-tree", "parity-scale-codec", "sp-api", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5049,10 +4912,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5076,10 +4939,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5087,15 +4950,15 @@ dependencies = [ name = "pallet-mt-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "pallet-mt", "pallet-mt-rpc-runtime-api", "parity-scale-codec", "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "webb-primitives", ] @@ -5112,39 +4975,40 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", @@ -5153,54 +5017,55 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5217,17 +5082,17 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -5235,15 +5100,15 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", @@ -5252,13 +5117,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5277,18 +5142,18 @@ dependencies = [ "pallet-vanchor-handler", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5300,17 +5165,17 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5321,21 +5186,21 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -5344,9 +5209,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] @@ -5365,11 +5230,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5391,11 +5256,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "webb-proposals", ] @@ -5403,49 +5268,51 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", @@ -5455,24 +5322,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5510,10 +5377,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5546,11 +5413,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "webb-proposals", ] @@ -5569,10 +5436,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5590,20 +5457,20 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] [[package]] name = "parity-db" -version = "0.3.17" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fdb726a43661fa54b43e7114e6b88b2289cae388eb3ad766d9d1754d83fce" +checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "crc32fast", "fs2", "hex", @@ -5651,16 +5518,16 @@ checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" [[package]] name = "parity-util-mem" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" dependencies = [ "cfg-if", "hashbrown 0.12.3", "impl-trait-for-tuples", "parity-util-mem-derive", "parking_lot 0.12.1", - "primitive-types 0.11.1", + "primitive-types 0.12.1", "smallvec", "winapi", ] @@ -5676,21 +5543,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "parity-wasm" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ad52817c4d343339b3bc2e26861bd21478eda0b7509acf83505727000512ac" -dependencies = [ - "byteorder", -] - -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "parity-wasm" version = "0.45.0" @@ -5881,13 +5733,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ "der", "spki", - "zeroize", ] [[package]] @@ -5945,13 +5796,43 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +[[package]] +name = "predicates" +version = "2.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "primitive-types" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" dependencies = [ - "fixed-hash", + "fixed-hash 0.7.0", "uint", ] @@ -5961,17 +5842,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ - "fixed-hash", + "fixed-hash 0.7.0", "uint", ] [[package]] name = "primitive-types" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ - "fixed-hash", + "fixed-hash 0.8.0", "impl-codec", "impl-serde", "scale-info", @@ -6044,37 +5925,27 @@ dependencies = [ [[package]] name = "prometheus-client" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1abe0255c04d15f571427a2d1e00099016506cf3297b53853acd2b7eb87825" +checksum = "83cd1b99916654a69008fd66b4f9397fbe08e6e51dfe23d4417acf5d3b8cb87c" dependencies = [ "dtoa", "itoa", - "owning_ref", + "parking_lot 0.12.1", "prometheus-client-derive-text-encode", ] [[package]] name = "prometheus-client-derive-text-encode" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e12d01b9d66ad9eb4529c57666b6263fc1993cb30261d83ead658fdd932652" +checksum = "66a455fbcb954c1a7decf3c586e860fd7889cddf4b8e164be736dbac95a953cd" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive 0.10.1", -] - [[package]] name = "prost" version = "0.11.0" @@ -6082,29 +5953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" dependencies = [ "bytes", - "prost-derive 0.11.0", -] - -[[package]] -name = "prost-build" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" -dependencies = [ - "bytes", - "cfg-if", - "cmake", - "heck 0.4.0", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.10.4", - "prost-types 0.10.1", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -6114,14 +5963,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" dependencies = [ "bytes", - "heck 0.4.0", + "heck", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.11.0", - "prost-types 0.11.1", + "prost", + "prost-types", "regex", "tempfile", "which", @@ -6129,30 +5978,17 @@ dependencies = [ [[package]] name = "prost-codec" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00af1e92c33b4813cc79fda3f2dbf56af5169709be0202df730e9ebc3e4cd007" +checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" dependencies = [ "asynchronous-codec", "bytes", - "prost 0.10.4", + "prost", "thiserror", "unsigned-varint", ] -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "prost-derive" version = "0.11.0" @@ -6166,16 +6002,6 @@ dependencies = [ "syn", ] -[[package]] -name = "prost-types" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" -dependencies = [ - "bytes", - "prost 0.10.4", -] - [[package]] name = "prost-types" version = "0.11.1" @@ -6183,7 +6009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" dependencies = [ "bytes", - "prost 0.11.0", + "prost", ] [[package]] @@ -6456,12 +6282,12 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ef608575f6392792f9ecf7890c00086591d29a83910939d430753f7c050525" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint", - "hmac 0.11.0", + "hmac 0.12.1", "zeroize", ] @@ -6482,9 +6308,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -6568,9 +6394,23 @@ checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", "errno", - "io-lifetimes", + "io-lifetimes 0.7.5", + "libc", + "linux-raw-sys 0.0.46", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustix" +version = "0.36.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes 1.0.3", "libc", - "linux-raw-sys", + "linux-raw-sys 0.1.4", "windows-sys 0.42.0", ] @@ -6639,15 +6479,6 @@ dependencies = [ "rustc_version 0.2.3", ] -[[package]] -name = "salsa20" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213" -dependencies = [ - "cipher 0.4.3", -] - [[package]] name = "same-file" version = "1.0.6" @@ -6660,18 +6491,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures", @@ -6680,17 +6511,17 @@ dependencies = [ "libp2p", "log", "parity-scale-codec", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "rand 0.7.3", "sc-client-api", "sc-network-common", "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6698,7 +6529,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "futures-timer", @@ -6712,32 +6543,32 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -6747,14 +6578,14 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6765,11 +6596,11 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "chrono", - "clap", + "clap 4.0.29", "fdlimit", "futures", "libp2p", @@ -6791,11 +6622,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keyring 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keyring", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", "tiny-bip39", @@ -6805,7 +6636,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "fnv", "futures", @@ -6819,21 +6650,21 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "hash-db", "kvdb", @@ -6846,19 +6677,19 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures", @@ -6872,9 +6703,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6882,19 +6713,18 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "fork-tree", "futures", "log", "merlin", - "num-bigint 0.2.6", - "num-rational 0.2.4", + "num-bigint", + "num-rational", "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", "sc-client-api", "sc-consensus", "sc-consensus-epochs", @@ -6904,18 +6734,18 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -6924,42 +6754,42 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures", @@ -6969,32 +6799,32 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "lazy_static", "lru", @@ -7004,75 +6834,74 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core-hashing-proc-macro", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tasks", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", - "wasmi 0.13.2", + "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "environmental", "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "wasm-instrument", - "wasmi 0.13.2", + "wasmi", ] [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "wasmi 0.13.2", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "wasmi", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "cfg-if", "libc", "log", "once_cell", "parity-scale-codec", - "parity-wasm 0.45.0", - "rustix", + "parity-wasm", + "rustix 0.35.13", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-sandbox", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ahash", "array-bytes", @@ -7098,14 +6927,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -7113,11 +6942,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "finality-grandpa", "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", @@ -7126,15 +6955,15 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ansi_term", "futures", @@ -7145,28 +6974,28 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "async-trait", @@ -7188,7 +7017,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost 0.10.4", + "prost", "rand 0.7.3", "sc-block-builder", "sc-client-api", @@ -7199,11 +7028,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -7213,18 +7042,18 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "cid", "futures", "libp2p", "log", - "prost 0.11.0", - "prost-build 0.11.1", + "prost", + "prost-build", "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "unsigned-varint", "void", @@ -7233,7 +7062,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "bitflags", @@ -7243,7 +7072,7 @@ dependencies = [ "libp2p", "linked_hash_set", "parity-scale-codec", - "prost-build 0.10.4", + "prost-build", "sc-consensus", "sc-peerset", "serde", @@ -7251,7 +7080,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -7259,7 +7088,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ahash", "futures", @@ -7269,7 +7098,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "tracing", ] @@ -7277,56 +7106,59 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "futures", "libp2p", "log", "parity-scale-codec", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "sc-client-api", "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", + "async-trait", "fork-tree", "futures", "libp2p", "log", "lru", + "mockall", "parity-scale-codec", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "sc-client-api", "sc-consensus", "sc-network-common", "sc-peerset", + "sc-utils", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "futures", @@ -7338,14 +7170,14 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "bytes", @@ -7365,9 +7197,9 @@ dependencies = [ "sc-peerset", "sc-utils", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "threadpool", "tracing", ] @@ -7375,7 +7207,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "libp2p", @@ -7388,7 +7220,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7397,11 +7229,11 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "hash-db", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7415,11 +7247,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-offchain", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-version", ] @@ -7427,10 +7259,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7439,10 +7271,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -7450,20 +7282,39 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", ] +[[package]] +name = "sc-rpc-spec-v2" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +dependencies = [ + "futures", + "hex", + "jsonrpsee 0.15.1", + "parity-scale-codec", + "sc-chain-spec", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "thiserror", +] + [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "directories", @@ -7471,7 +7322,7 @@ dependencies = [ "futures", "futures-timer", "hash-db", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "parity-util-mem", @@ -7495,6 +7346,7 @@ dependencies = [ "sc-offchain", "sc-rpc", "sc-rpc-server", + "sc-rpc-spec-v2", "sc-sysinfo", "sc-telemetry", "sc-tracing", @@ -7504,22 +7356,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -7533,7 +7385,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", "parity-scale-codec", @@ -7541,15 +7393,15 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -7559,14 +7411,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "libc", @@ -7577,15 +7429,15 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "chrono", "futures", @@ -7603,7 +7455,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ansi_term", "atty", @@ -7621,10 +7473,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", "tracing-log", @@ -7634,7 +7486,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7645,8 +7497,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ + "async-trait", "futures", "futures-timer", "linked-hash-map", @@ -7660,9 +7513,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -7671,20 +7524,21 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ + "async-trait", "futures", "log", "serde", "sp-blockchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "futures-timer", @@ -7836,10 +7690,11 @@ dependencies = [ [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array 0.14.6", "pkcs8", @@ -7847,31 +7702,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" -dependencies = [ - "secp256k1-sys 0.4.2", -] - [[package]] name = "secp256k1" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" dependencies = [ - "secp256k1-sys 0.6.1", -] - -[[package]] -name = "secp256k1-sys" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -8114,16 +7951,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.0" @@ -8135,11 +7962,11 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.9.0", + "digest 0.10.5", "rand_core 0.6.4", ] @@ -8228,17 +8055,17 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "hash-db", "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -8246,7 +8073,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "blake2 0.10.4", "proc-macro-crate", @@ -8257,103 +8084,103 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acb4490364cb3b097a6755343e552495b0013778152300714be4647d107e9a2e" +checksum = "30a70f8245ad75c773c43e46d16e81adb62290d37cd07efcde6cef06d93235e5" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-arithmetic" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef21f82cc10f75ed046b65e2f8048080ee76e59f1b8aed55c7150daebfd35b" +checksum = "3856b3e912f0a7a1332f1642b5fd3c2e76476e894c656538d32c004698690157" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", ] [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", ] [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures", "log", @@ -8363,26 +8190,26 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures", "futures-timer", "log", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -8390,25 +8217,25 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus", "sp-consensus-slots", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "merlin", @@ -8416,61 +8243,61 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-core" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77963e2aa8fadb589118c3aede2e78b6c4bcf1c01d588fbf33e915b390825fbd" +checksum = "88c78530907dbf7949af928d0ce88b485067389201b6d9b468074b1924f209f0" dependencies = [ + "array-bytes", "base58", "bitflags", - "blake2-rfc", + "blake2 0.10.4", "byteorder", "dyn-clonable", - "ed25519-dalek", + "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", - "hex", "impl-serde", "lazy_static", "libsecp256k1", @@ -8478,34 +8305,33 @@ dependencies = [ "merlin", "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", - "primitive-types 0.11.1", + "primitive-types 0.12.1", "rand 0.7.3", "regex", "scale-info", "schnorrkel", - "secp256k1 0.21.3", + "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core-hashing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi 0.9.1", + "wasmi", "zeroize", ] [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "array-bytes", "base58", @@ -8524,73 +8350,73 @@ dependencies = [ "merlin", "num-traits", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", - "primitive-types 0.11.1", + "primitive-types 0.12.1", "rand 0.7.3", "regex", "scale-info", "schnorrkel", - "secp256k1 0.24.1", + "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi 0.13.2", + "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec864a6a67249f0c8dd3d5acab43623a61677e85ff4f2f9b04b802d2fe780e83" +checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a" dependencies = [ - "blake2-rfc", + "blake2 0.10.4", "byteorder", - "sha2 0.9.9", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak", + "digest 0.10.5", + "sha2 0.10.6", + "sha3 0.10.6", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "twox-hash", ] [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "blake2 0.10.4", "byteorder", "digest 0.10.5", "sha2 0.10.6", "sha3 0.10.6", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "syn", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8598,9 +8424,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d676664972e22a0796176e81e7bec41df461d1edf52090955cdab55f2c956ff2" +checksum = "a9e9ba7352773b96a4aa57e903447f841c6bc26e8c798377db6e7eb332346454" dependencies = [ "proc-macro2", "quote", @@ -8609,8 +8435,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "proc-macro2", "quote", @@ -8619,31 +8445,31 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcfd91f92a2a59224230a77c4a5d6f51709620c0aab4e51f108ccece6adc56f" +checksum = "ef739442230f49d88ece41259e5d886d6b8bc0f4197ef7f1585c39c762ce7ef2" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "finality-grandpa", "log", @@ -8651,107 +8477,97 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-io" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "935fd3c71bad6811a7984cabb74d323b8ca3107024024c3eabb610e0182ba8d3" +checksum = "6280bd3643354f7ff0b2abd36c687745455779231a7a86d90945608f0d4924c4" dependencies = [ + "bytes", "futures", "hash-db", "libsecp256k1", "log", "parity-scale-codec", "parking_lot 0.12.1", - "secp256k1 0.21.3", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-keystore 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-state-machine 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-wasm-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "secp256k1", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-keystore 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-state-machine 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", ] [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "bytes", + "ed25519-dalek", "futures", "hash-db", "libsecp256k1", "log", "parity-scale-codec", "parking_lot 0.12.1", - "secp256k1 0.24.1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "secp256k1", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", "tracing-core", ] [[package]] name = "sp-keyring" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92ae05359a224787068adb14ebd007545543de07b907b4eb71947a7d49004f73" -dependencies = [ - "lazy_static", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "strum 0.23.0", -] - -[[package]] -name = "sp-keyring" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "lazy_static", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "strum 0.24.1", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "strum", ] [[package]] name = "sp-keystore" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3261eddca8c8926e3e1de136a7980cb3afc3455247d9d6f3119d9b292f73aaee" +checksum = "a44bec4f0d036b6993c14bbee4216781f21275e5c201e43e45fed4a434bf0e5a" dependencies = [ "async-trait", "futures", @@ -8759,15 +8575,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnorrkel", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures", @@ -8776,15 +8592,15 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "thiserror", "zstd", @@ -8793,32 +8609,32 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-panic-handler" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2101f3c555fceafcfcfb0e61c55ea9ed80dc60bd77d54d9f25b369edb029e9a4" +checksum = "97549ec99cb289db2a9f5c656b6880f7c90097135e1ca6c6ae4fe5694232e526" dependencies = [ "backtrace", "lazy_static", @@ -8827,8 +8643,8 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "backtrace", "lazy_static", @@ -8838,18 +8654,18 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "rustc-hash", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-runtime" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d8a8d5ab5d349c6cf9300af1721b7b6446ba63401dbb11c10a1d65197aa5f" +checksum = "0edfc5c54c2b31d2f0cf904d472a0bff7125c0c2a2e2330507842e56f9a27444" dependencies = [ "either", "hash256-std-hasher", @@ -8861,17 +8677,18 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-arithmetic 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-application-crypto 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-weights 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "either", "hash256-std-hasher", @@ -8883,55 +8700,56 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-weights", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "158bf0305c75a50fc0e334b889568f519a126e32b87900c3f4251202dece7b4b" +checksum = "b886a5d34400b0e0c12d389e3bb48b7a93d651cddf7e248124b81fe64c339251" dependencies = [ + "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "primitive-types 0.11.1", - "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface-proc-macro 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-wasm-interface 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "primitive-types 0.12.1", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface-proc-macro 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "primitive-types 0.11.1", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "primitive-types 0.12.1", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ecb916b9664ed9f90abef0ff5a3e61454c1efea5861b2997e03f39b59b955f" +checksum = "a157f1ce0108b9b87f87e826726049d9b6253318b74410c814be7fc2af416b51" dependencies = [ "Inflector", "proc-macro-crate", @@ -8942,8 +8760,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "Inflector", "proc-macro-crate", @@ -8955,47 +8773,47 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "wasmi 0.13.2", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "wasmi", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-state-machine" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecee3b33eb78c99997676a571656bcc35db6886abecfddd13e76a73b5871c6c1" +checksum = "d5c2d97ad69011d34ca257f0383532b80096d53f889f5894ae2b24a211bec66f" dependencies = [ "hash-db", "log", @@ -9004,21 +8822,20 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-panic-handler 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-panic-handler 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tracing", - "trie-db 0.23.1", "trie-root", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "hash-db", "log", @@ -9027,11 +8844,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", "trie-root", @@ -9039,59 +8856,46 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14804d6069ee7a388240b665f17908d98386ffb0b5d39f89a4099fc7a2a4c03f" +checksum = "cf3fd4c1d304be101e6ebbafd3d4be9a37b320c970ef4e8df188b16873981c93" [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" [[package]] name = "sp-storage" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dab53af846068e3e0716d3ccc70ea0db44035c79b2ed5821aaa6635039efa37" +checksum = "eb987ed2e4d7d870170a225083ea962f2a359d75cdf76935d5ed8d91bee912d9" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-tasks" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" -dependencies = [ - "log", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "futures-timer", @@ -9099,19 +8903,19 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-tracing" -version = "5.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a67e555d171c4238bd223393cda747dd20ec7d4f5fe5c042c056cb7fde9eda" +checksum = "e761df87dc940d87720939de8f976d1fc0657e523886ae0d7bf3f7e2e2f0abb6" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", "tracing-subscriber", @@ -9119,11 +8923,11 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", "tracing-core", "tracing-subscriber", @@ -9132,48 +8936,56 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "async-trait", "log", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-trie" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fc34f4f291886914733e083b62708d829f3e6b8d7a7ca7fa8a55a3d7640b0b" +checksum = "2f4f48c887e90050537e399d2d8b6ee82787ebec0fe46e4880b42cab0c2d5ba6" dependencies = [ + "ahash", "hash-db", + "hashbrown 0.12.3", + "lazy_static", + "lru", "memory-db", + "nohash-hasher", "parity-scale-codec", + "parking_lot 0.12.1", "scale-info", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "trie-db 0.23.1", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", + "tracing", + "trie-db", "trie-root", ] [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ahash", "hash-db", @@ -9185,27 +8997,27 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", - "trie-db 0.24.0", + "trie-db", "trie-root", ] [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.45.0", + "parity-wasm", "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version-proc-macro", "thiserror", ] @@ -9213,7 +9025,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9223,44 +9035,61 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d88debe690c2b24eaa9536a150334fcef2ae184c21a0e5b3e80135407a7d52" +checksum = "4f43c40afab6ecac20505907631c929957ed636b7af8795984649bbaa6ff38c3" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wasmi 0.9.1", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi", ] [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "wasmi 0.13.2", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "wasmi", "wasmtime", ] [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c671673133b30e6ab6d88139b06adcdaec5aa06548abe0e155a0c830b592793b" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -9271,9 +9100,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", "der", @@ -9281,9 +9110,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.33.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab7554f8a8b6f8d71cd5a8e6536ef116e2ce0504cf97ebf16311d58065dc8a6" +checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" dependencies = [ "Inflector", "num-format", @@ -9353,35 +9182,13 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strum" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" -dependencies = [ - "strum_macros 0.23.1", -] - [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum_macros" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "rustversion", - "syn", + "strum_macros", ] [[package]] @@ -9390,7 +9197,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck 0.4.0", + "heck", "proc-macro2", "quote", "rustversion", @@ -9422,11 +9229,11 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", @@ -9436,14 +9243,14 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "futures-util", "hyper", @@ -9456,39 +9263,39 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "trie-db 0.24.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "trie-db", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "ansi_term", "build-helper", "cargo_metadata", "filetime", "sp-maybe-compressed-blob", - "strum 0.24.1", + "strum", "tempfile", "toml", "walkdir", - "wasm-gc-api", + "wasm-opt", ] [[package]] @@ -9499,16 +9306,17 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a8757ee0e19f87e722577282ab1386c86592a4b13ff963b9c6ec4176348104c" +checksum = "e3cbc78fd36035a24883eada29e0205b9b1416172530a7d00a60c07d0337db0c" dependencies = [ "bitvec", "derivative", "frame-metadata", "futures", + "getrandom 0.2.8", "hex", - "jsonrpsee", + "jsonrpsee 0.16.2", "parity-scale-codec", "parking_lot 0.12.1", "scale-decode", @@ -9516,8 +9324,8 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-macro", "subxt-metadata", "thiserror", @@ -9526,13 +9334,15 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb77f93e11e6ff3ff95fe33e3d24c27c342e16feca8ef47759993614ebe90d2c" +checksum = "7722c31febf55eb300c73d977da5d65cfd6fb443419b1185b9abcdd9925fd7be" dependencies = [ "darling", "frame-metadata", - "heck 0.4.0", + "heck", + "hex", + "jsonrpsee 0.16.2", "parity-scale-codec", "proc-macro-error", "proc-macro2", @@ -9540,13 +9350,14 @@ dependencies = [ "scale-info", "subxt-metadata", "syn", + "tokio", ] [[package]] name = "subxt-macro" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "051cc21d77a54ae944b872eafdf9edfe1d9134fdfcfc3477dc10f763c76564a9" +checksum = "6f64826f2c4ba20e3b2a86ec81a6ae8655ca6b6a4c2a6ccc888b6615efc2df14" dependencies = [ "darling", "proc-macro-error", @@ -9556,14 +9367,14 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed78d80db3a97d55e8b1cfecc1f6f9e21793a589d4e2e5f4fe2d6d5850c2e54" +checksum = "869af75e23513538ad0af046af4a97b8d684e8d202e35ff4127ee061c1110813" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -9645,6 +9456,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + [[package]] name = "textwrap" version = "0.16.0" @@ -9697,9 +9514,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.4.3+5.2.1-patched.2" +version = "0.5.2+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" dependencies = [ "cc", "fs_extra", @@ -9762,9 +9579,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" dependencies = [ "autocfg", "bytes", @@ -9777,7 +9594,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -9930,19 +9747,6 @@ dependencies = [ "tracing-serde", ] -[[package]] -name = "trie-db" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32d034c0d3db64b43c31de38e945f15b40cd4ca6d2dcfc26d4798ce8de4ab83" -dependencies = [ - "hash-db", - "hashbrown 0.12.3", - "log", - "rustc-hex", - "smallvec", -] - [[package]] name = "trie-db" version = "0.24.0" @@ -9967,9 +9771,9 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" +checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" dependencies = [ "async-trait", "cfg-if", @@ -9981,30 +9785,32 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "log", "rand 0.8.5", "smallvec", "thiserror", "tinyvec", + "tokio", + "tracing", "url", ] [[package]] name = "trust-dns-resolver" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" +checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" dependencies = [ "cfg-if", "futures-util", "ipconfig", "lazy_static", - "log", "lru-cache", "parking_lot 0.12.1", "resolv-conf", "smallvec", "thiserror", + "tokio", + "tracing", "trust-dns-proto", ] @@ -10097,12 +9903,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - [[package]] name = "unicode-width" version = "0.1.10" @@ -10300,23 +10100,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] -name = "wasm-gc-api" -version = "0.1.11" +name = "wasm-instrument" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c32691b6c7e6c14e7f8fd55361a9088b507aa49620fcd06c09b3a1082186b9" +checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" dependencies = [ - "log", - "parity-wasm 0.32.0", - "rustc-demangle", + "parity-wasm", ] [[package]] -name = "wasm-instrument" -version = "0.3.0" +name = "wasm-opt" +version = "0.110.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd" +checksum = "b68e8037b4daf711393f4be2056246d12d975651b14d581520ad5d1f19219cec" +dependencies = [ + "anyhow", + "libc", + "strum", + "strum_macros", + "tempfile", + "thiserror", + "wasm-opt-cxx-sys", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-cxx-sys" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91adbad477e97bba3fbd21dd7bfb594e7ad5ceb9169ab1c93ab9cb0ada636b6f" +dependencies = [ + "anyhow", + "cxx", + "cxx-build", + "wasm-opt-sys", +] + +[[package]] +name = "wasm-opt-sys" +version = "0.110.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec4fa5a322a4e6ac22fd141f498d56afbdbf9df5debeac32380d2dcaa3e06941" dependencies = [ - "parity-wasm 0.45.0", + "anyhow", + "cc", + "cxx", + "cxx-build", + "regex", ] [[package]] @@ -10334,48 +10164,24 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" -dependencies = [ - "downcast-rs", - "libc", - "memory_units 0.3.0", - "num-rational 0.2.4", - "num-traits", - "parity-wasm 0.42.2", - "wasmi-validation 0.4.1", -] - [[package]] name = "wasmi" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "parity-wasm 0.45.0", - "wasmi-validation 0.5.0", + "parity-wasm", + "wasmi-validation", "wasmi_core", ] -[[package]] -name = "wasmi-validation" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" -dependencies = [ - "parity-wasm 0.42.2", -] - [[package]] name = "wasmi-validation" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.45.0", + "parity-wasm", ] [[package]] @@ -10386,8 +10192,8 @@ checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", "libm", - "memory_units 0.4.0", - "num-rational 0.4.1", + "memory_units", + "num-rational", "num-traits", ] @@ -10449,7 +10255,7 @@ dependencies = [ "directories-next", "file-per-thread-logger", "log", - "rustix", + "rustix 0.35.13", "serde", "sha2 0.9.9", "toml", @@ -10512,7 +10318,7 @@ dependencies = [ "log", "object", "rustc-demangle", - "rustix", + "rustix 0.35.13", "serde", "target-lexicon", "thiserror", @@ -10530,7 +10336,7 @@ checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37" dependencies = [ "object", "once_cell", - "rustix", + "rustix 0.35.13", ] [[package]] @@ -10550,7 +10356,7 @@ dependencies = [ "memoffset", "paste", "rand 0.8.5", - "rustix", + "rustix 0.35.13", "thiserror", "wasmtime-asm-macros", "wasmtime-environ", @@ -10600,9 +10406,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keyring 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keyring", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "subxt", "tokio", "webb-primitives", @@ -10634,10 +10440,10 @@ dependencies = [ "serde", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-proposals", ] @@ -10662,7 +10468,7 @@ version = "1.0.0" dependencies = [ "ark-bn254", "arkworks-setups", - "clap", + "clap 3.2.23", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -10670,7 +10476,7 @@ dependencies = [ "futures", "itertools", "jsonrpc-core", - "jsonrpsee", + "jsonrpsee 0.15.1", "log", "pallet-asset-tx-payment", "pallet-im-online", @@ -10712,12 +10518,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", "sp-inherents", - "sp-keyring 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-keyring", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -10799,15 +10605,15 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", "sp-offchain", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "sp-version", "static_assertions", @@ -11065,22 +10871,22 @@ dependencies = [ [[package]] name = "xcm" -version = "0.9.30" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" +version = "0.9.34" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" dependencies = [ "derivative", "impl-trait-for-tuples", "log", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "xcm-procedural", ] [[package]] name = "xcm-procedural" -version = "0.9.30" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.30#064536093f5ff70d867f4bbce8d4c41a406d317a" +version = "0.9.34" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" dependencies = [ "Inflector", "proc-macro2", diff --git a/client/Cargo.toml b/client/Cargo.toml index d983af519..7d40fcd45 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,16 +7,16 @@ edition = "2021" [dependencies] async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } -subxt = { version = "0.24.0" } +subxt = { version = "0.25.0" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full", "bit-vec"] } [dev-dependencies] hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-keyring = { version = "6.0.0" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } tokio = { version = "1.17.0", features = ["full"] } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # arkworks related deps diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 6822b00c5..20e0919f5 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -19,23 +19,23 @@ serde = { features = ["derive"], optional = true, version = "1.0.101" } webb-primitives = { path = "../../primitives", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } # Substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] -polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } [features] default = ["std"] diff --git a/pallets/hasher/Cargo.toml b/pallets/hasher/Cargo.toml index 0a9deee4e..e83a69a05 100644 --- a/pallets/hasher/Cargo.toml +++ b/pallets/hasher/Cargo.toml @@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../primitives", default-features = false } #Optional dependencies -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] hex-literal = "0.2.1" hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false } ark-ec = { version = "^0.3.0", default-features = false } diff --git a/pallets/key-storage/Cargo.toml b/pallets/key-storage/Cargo.toml index 90ad27a42..b1ed4fb18 100644 --- a/pallets/key-storage/Cargo.toml +++ b/pallets/key-storage/Cargo.toml @@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } [features] default = ["std"] diff --git a/pallets/linkable-tree/Cargo.toml b/pallets/linkable-tree/Cargo.toml index f0bb81e39..58de0a161 100644 --- a/pallets/linkable-tree/Cargo.toml +++ b/pallets/linkable-tree/Cargo.toml @@ -13,28 +13,28 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-hasher = { path = "../hasher", default-features = false } pallet-mt = { path = "../mt", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } serde = { version = "1.0.119", optional = true } [dev-dependencies] -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } diff --git a/pallets/linkable-tree/rpc/Cargo.toml b/pallets/linkable-tree/rpc/Cargo.toml index 8f0b82a38..c862da4cc 100644 --- a/pallets/linkable-tree/rpc/Cargo.toml +++ b/pallets/linkable-tree/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] jsonrpsee = { version = "0.15.0", features = ["server"] } thiserror = "1.0" -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../../primitives", default-features = false } pallet-linkable-tree = { path = "../", default-features = false } diff --git a/pallets/linkable-tree/rpc/runtime-api/Cargo.toml b/pallets/linkable-tree/rpc/runtime-api/Cargo.toml index ec0b4dc8d..30a22de40 100644 --- a/pallets/linkable-tree/rpc/runtime-api/Cargo.toml +++ b/pallets/linkable-tree/rpc/runtime-api/Cargo.toml @@ -12,8 +12,8 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-linkable-tree = { default-features = false, path = "../../" } webb-primitives = { path = "../../../../primitives", default-features = false } diff --git a/pallets/mixer/Cargo.toml b/pallets/mixer/Cargo.toml index cb0fdd882..83f91d709 100644 --- a/pallets/mixer/Cargo.toml +++ b/pallets/mixer/Cargo.toml @@ -14,20 +14,20 @@ codec = {package = "parity-scale-codec", version = "3", default-features = false scale-info = { version = "2.1.1", default-features = false, features = ["derive"]} log = "0.4" webb-primitives = {path = "../../primitives", features = ["verifying"], default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-asset-registry = {path = "../asset-registry", default-features = false} pallet-hasher = {path = "../hasher", default-features = false} pallet-mt = {path = "../mt", default-features = false} pallet-verifier = {path = "../verifier", default-features = false} -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-system-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] ark-bls12-377 = { version = "^0.3.0", default-features = false, features = ["curve", "r1cs"]} @@ -42,13 +42,13 @@ ark-std = { version = "^0.3.0", default-features = false} arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } serde = { version = "1.0.119"} hex = "0.4" -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } [features] default = ["std"] diff --git a/pallets/mixer/src/mock.rs b/pallets/mixer/src/mock.rs index 1abdea94b..3f20f3288 100644 --- a/pallets/mixer/src/mock.rs +++ b/pallets/mixer/src/mock.rs @@ -202,15 +202,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/mt/Cargo.toml b/pallets/mt/Cargo.toml index bb9f74de4..bace7d432 100644 --- a/pallets/mt/Cargo.toml +++ b/pallets/mt/Cargo.toml @@ -13,15 +13,15 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-hasher = { path = "../hasher", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } @@ -29,10 +29,10 @@ ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" hex-literal = "0.2.1" hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false } ark-std = { version = "^0.3.0", default-features = false } diff --git a/pallets/mt/rpc/Cargo.toml b/pallets/mt/rpc/Cargo.toml index 23b2dccdf..760124656 100644 --- a/pallets/mt/rpc/Cargo.toml +++ b/pallets/mt/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] jsonrpsee = { version = "0.15.0", features = ["server"] } thiserror = "1.0" -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../../primitives", default-features = false } pallet-mt = { path = "../", default-features = false } diff --git a/pallets/mt/rpc/runtime-api/Cargo.toml b/pallets/mt/rpc/runtime-api/Cargo.toml index de62a1f74..1dd44e317 100644 --- a/pallets/mt/rpc/runtime-api/Cargo.toml +++ b/pallets/mt/rpc/runtime-api/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-mt = { default-features = false, path = "../../" } webb-primitives = { path = "../../../../primitives", default-features = false } diff --git a/pallets/relayer-registry/Cargo.toml b/pallets/relayer-registry/Cargo.toml index bc00230a5..0cc9e1d90 100644 --- a/pallets/relayer-registry/Cargo.toml +++ b/pallets/relayer-registry/Cargo.toml @@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-identity = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-identity = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } [features] default = ["std"] diff --git a/pallets/signature-bridge/Cargo.toml b/pallets/signature-bridge/Cargo.toml index c728cb559..1729e33ce 100644 --- a/pallets/signature-bridge/Cargo.toml +++ b/pallets/signature-bridge/Cargo.toml @@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } # frame dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-token-wrapper-handler = { path = "../token-wrapper-handler", default-features = false } pallet-vanchor-handler = { path = "../vanchor-handler", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } webb-primitives = { path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.7.0", default-features = false, optional = true } @@ -37,7 +37,7 @@ impl-trait-for-tuples = "0.2.2" [dev-dependencies] libsecp256k1 = "0.7.0" -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } [features] default = ["std"] diff --git a/pallets/signature-bridge/src/mock.rs b/pallets/signature-bridge/src/mock.rs index 18d01b469..2b7927d49 100644 --- a/pallets/signature-bridge/src/mock.rs +++ b/pallets/signature-bridge/src/mock.rs @@ -114,7 +114,6 @@ impl Config for Test { type ChainIdentifier = ChainIdentifier; type ChainType = ChainType; type RuntimeEvent = RuntimeEvent; - type Proposal = RuntimeCall; type ProposalLifetime = ProposalLifetime; type ProposalNonce = u32; type SetResourceProposalFilter = SetResourceProposalFilter; diff --git a/pallets/token-wrapper-handler/Cargo.toml b/pallets/token-wrapper-handler/Cargo.toml index c1dde782b..add351357 100644 --- a/pallets/token-wrapper-handler/Cargo.toml +++ b/pallets/token-wrapper-handler/Cargo.toml @@ -16,27 +16,27 @@ codec = {package = "parity-scale-codec", version = "3", default-features = false scale-info = { version = "2.1.1", default-features = false, features = ["derive"]} asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", default-features = false} webb-primitives = {path = "../../primitives", default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } -sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } hex-literal = "0.3.4" #Optional dependencies -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } [features] diff --git a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs index eda98cb84..105665ee3 100644 --- a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs +++ b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs @@ -120,15 +120,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); type MaxReserves = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = [u8; 8]; } @@ -235,7 +229,6 @@ impl pallet_signature_bridge::Config for Test { type ChainIdentifier = ChainIdentifier; type ChainType = ChainType; type RuntimeEvent = RuntimeEvent; - type Proposal = RuntimeCall; type ProposalLifetime = ProposalLifetime; type ProposalNonce = ProposalNonce; type SetResourceProposalFilter = SetResourceProposalFilter; diff --git a/pallets/token-wrapper/Cargo.toml b/pallets/token-wrapper/Cargo.toml index 786da3e61..b4b14829f 100644 --- a/pallets/token-wrapper/Cargo.toml +++ b/pallets/token-wrapper/Cargo.toml @@ -17,23 +17,24 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", default-features = false} webb-primitives = {path = "../../primitives", default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git",branch = "polkadot-v0.9.30", default-features = false } -sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } + +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } #Optional dependencies -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } [features] default = ["std"] diff --git a/pallets/token-wrapper/src/mock.rs b/pallets/token-wrapper/src/mock.rs index 8c0725b95..0d00cddbd 100644 --- a/pallets/token-wrapper/src/mock.rs +++ b/pallets/token-wrapper/src/mock.rs @@ -114,15 +114,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); - type MaxReserves = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/vanchor-handler/Cargo.toml b/pallets/vanchor-handler/Cargo.toml index f32a26f27..4721251a0 100644 --- a/pallets/vanchor-handler/Cargo.toml +++ b/pallets/vanchor-handler/Cargo.toml @@ -18,32 +18,32 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals # frame dependencies scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } hex-literal = "0.3.4" [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-hasher = { path = "../hasher", default-features = false } pallet-mixer = { path = "../mixer", default-features = false } pallet-mt = { path = "../mt", default-features = false } @@ -53,8 +53,8 @@ pallet-token-wrapper = { path = "../token-wrapper", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-key-storage = {path = "../key-storage"} ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = ["curve"] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } diff --git a/pallets/vanchor-handler/src/mock_signature_bridge.rs b/pallets/vanchor-handler/src/mock_signature_bridge.rs index a4b52d8a3..66853ce11 100644 --- a/pallets/vanchor-handler/src/mock_signature_bridge.rs +++ b/pallets/vanchor-handler/src/mock_signature_bridge.rs @@ -205,15 +205,8 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); - type OnNewTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); - type OnKilledTokenAccount = (); - type MaxReserves = (); type ReserveIdentifier = [u8; 8]; } @@ -313,7 +306,6 @@ impl pallet_signature_bridge::Config for Test { type ChainIdentifier = ChainIdentifier; type ChainType = ChainType; type RuntimeEvent = RuntimeEvent; - type Proposal = RuntimeCall; type ProposalLifetime = ProposalLifetime; type ProposalNonce = ProposalNonce; type SetResourceProposalFilter = SetResourceProposalFilter; diff --git a/pallets/vanchor-verifier/Cargo.toml b/pallets/vanchor-verifier/Cargo.toml index e2f31f495..6d740f45d 100644 --- a/pallets/vanchor-verifier/Cargo.toml +++ b/pallets/vanchor-verifier/Cargo.toml @@ -15,21 +15,21 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } [features] diff --git a/pallets/vanchor/Cargo.toml b/pallets/vanchor/Cargo.toml index 3dce3e73c..dd6a0f8de 100644 --- a/pallets/vanchor/Cargo.toml +++ b/pallets/vanchor/Cargo.toml @@ -13,39 +13,39 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-hasher = { path = "../hasher", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-vanchor-verifier = { path = "../vanchor-verifier", default-features = false } webb-primitives = { path = "../../primitives", default-features = false, features = ["hashing", "verifying", "field_ops"] } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } arkworks-native-gadgets = { version = "1.2.0", default-features = false } ark-std = { version = "^0.3.0", default-features = false } ark-ff = { version = "^0.3.0", default-features = false} -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-key-storage = {path = "../key-storage"} -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false} diff --git a/pallets/vanchor/src/mock.rs b/pallets/vanchor/src/mock.rs index 2f8a0a4de..20208e9dd 100644 --- a/pallets/vanchor/src/mock.rs +++ b/pallets/vanchor/src/mock.rs @@ -191,15 +191,9 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/verifier/Cargo.toml b/pallets/verifier/Cargo.toml index b79a62da3..28bfe06c4 100644 --- a/pallets/verifier/Cargo.toml +++ b/pallets/verifier/Cargo.toml @@ -15,21 +15,21 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } [features] diff --git a/pallets/xanchor/Cargo.toml b/pallets/xanchor/Cargo.toml index ae7189d8d..2ea3334f0 100644 --- a/pallets/xanchor/Cargo.toml +++ b/pallets/xanchor/Cargo.toml @@ -8,39 +8,39 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } pallet-hasher = { path = "../hasher", default-features = false } pallet-verifier = { path = "../verifier", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } # XCM dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.30", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.34", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.34", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } @@ -56,13 +56,13 @@ arkworks-native-gadgets = { version = "1.2.0", default-features = false } webb-primitives = { path = "../../primitives" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.30", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } [features] default = ["std"] diff --git a/pallets/xanchor/src/mock/parachain.rs b/pallets/xanchor/src/mock/parachain.rs index 73ae8ceb3..444fdb89a 100644 --- a/pallets/xanchor/src/mock/parachain.rs +++ b/pallets/xanchor/src/mock/parachain.rs @@ -444,12 +444,9 @@ impl orml_tokens::Config for Runtime { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); type ReserveIdentifier = [u8; 8]; } @@ -515,33 +512,38 @@ impl pallet_xanchor::Config for Runtime { type XcmSender = XcmRouter; } +parameter_types! { + pub const PreimageMaxSize: u32 = 4096 * 1024; + pub const PreimageBaseDeposit: Balance = 1_000; + // One cent: $10,000 / MB + pub const PreimageByteDeposit: Balance = 10; +} + impl pallet_preimage::Config for Runtime { - type BaseDeposit = (); - type ByteDeposit = (); - type Currency = (); + type WeightInfo = pallet_preimage::weights::SubstrateWeight; type RuntimeEvent = RuntimeEvent; - type ManagerOrigin = frame_system::EnsureRoot; - type MaxSize = frame_support::traits::ConstU32<1024>; - type WeightInfo = (); + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type BaseDeposit = PreimageBaseDeposit; + type ByteDeposit = PreimageByteDeposit; } parameter_types! { - pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block; - pub const NoPreimagePostponement: Option = Some(2); + pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * + RuntimeBlockWeights::get().max_block; } impl pallet_scheduler::Config for Runtime { - type Call = RuntimeCall; type RuntimeEvent = RuntimeEvent; - type MaxScheduledPerBlock = (); - type MaximumWeight = MaximumSchedulerWeight; - type NoPreimagePostponement = NoPreimagePostponement; type RuntimeOrigin = RuntimeOrigin; - type OriginPrivilegeCmp = frame_support::traits::EqualPrivilegeOnly; type PalletsOrigin = OriginCaller; - type PreimageProvider = Preimage; + type RuntimeCall = RuntimeCall; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; - type WeightInfo = (); + type MaxScheduledPerBlock = ConstU32<512>; + type WeightInfo = pallet_scheduler::weights::SubstrateWeight; + type OriginPrivilegeCmp = EqualPrivilegeOnly; + type Preimages = Preimage; } parameter_types! { @@ -598,13 +600,14 @@ impl pallet_democracy::Config for Runtime { type MinimumDeposit = MinimumDeposit; type OperationalPreimageOrigin = EnsureSignedBy; type PalletsOrigin = OriginCaller; - type PreimageByteDeposit = PreimageByteDeposit; - type Proposal = RuntimeCall; type Scheduler = Scheduler; type Slash = (); type VetoOrigin = EnsureSignedBy; type VoteLockingPeriod = VoteLockingPeriod; type VotingPeriod = VotingPeriod; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; type WeightInfo = (); } diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 7e66ae4d4..a4d9ba28f 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -10,14 +10,14 @@ edition = "2018" serde = { version = "1.0.119", optional = true, features = ["derive"] } codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-consensus-babe = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-consensus-babe = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } # Arkworks ark-ff = { version = "^0.3.0", default-features = false } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 29d7a0048..a202f88e7 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2022-06-22" +channel = "nightly-2022-10-22" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index e5cef1dc5..ae2559307 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -42,64 +42,58 @@ webb-runtime = { package = "webb-standalone-runtime", path = "../runtime", versi webb-primitives = { path = "../../primitives", version = "0.1.0" } # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ - "wasmtime", -] } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ - "wasmtime", -] } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", features = [ - "wasmtime", -] } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } # RPC related dependencies jsonrpc-core = "18.0.0" -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 413b7eb58..ed6f738f2 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -11,7 +11,7 @@ version = "0.1.0" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } [dependencies] codec = {package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"]} @@ -24,9 +24,9 @@ static_assertions = "1.1.0" # local dependencies webb-primitives = {path = "../../primitives", default-features = false, features = ["hashing"]} -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-vanchor = {path = "../../pallets/vanchor", default-features = false } pallet-vanchor-handler = {path = "../../pallets/vanchor-handler", default-features = false } pallet-asset-registry = {path = "../../pallets/asset-registry", default-features = false } @@ -45,67 +45,67 @@ pallet-relayer-registry = {path = "../../pallets/relayer-registry", default-feat pallet-key-storage = {path = "../../pallets/key-storage", default-features = false} # Substrate dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.30", default-features = false } -frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.30", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.34", default-features = false } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.34", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false, features = [ +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, features = [ "historical", ]} -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } [features] default = ["std"] diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 1795cbcc9..be7c4391a 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -7,16 +7,22 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); pub mod constants; +pub mod orml_token_impls; + use constants::{constants::*, currency::*, time::*}; +use orml_token_impls::*; pub use webb_primitives::{types::runtime::Moment, *}; pub mod impls; mod voter_bags; use frame_election_provider_support::{onchain, ExtendedBalance, SequentialPhragmen, VoteWeight}; use frame_support::{ - traits::{Contains, EitherOfDiverse, EqualPrivilegeOnly}, + traits::{AsEnsureOriginWithArg, Contains, EitherOfDiverse, EqualPrivilegeOnly}, weights::{constants::RocksDbWeight, ConstantMultiplier}, }; +use frame_system::EnsureSigned; use impls::{Author, CreditToBlockAuthor}; +use orml_tokens::TransferDust; +use orml_traits::currency::MutationHooks; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, }; @@ -35,14 +41,16 @@ use sp_runtime::{ generic::Era, impl_opaque_keys, traits::{ - self, AccountIdConversion, BlakeTwo256, Block as BlockT, Convert, ConvertInto, NumberFor, - OpaqueKeys, SaturatedConversion, StaticLookup, + self, AccountIdConversion, BlakeTwo256, Block as BlockT, Bounded, Convert, ConvertInto, + NumberFor, OpaqueKeys, SaturatedConversion, StaticLookup, }, transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity}, - ApplyExtrinsicResult, FixedPointNumber, Perbill, Percent, Permill, Perquintill, + AccountId32, ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Percent, Permill, + Perquintill, }; use sp_std::{ convert::{TryFrom, TryInto}, + marker, prelude::*, }; use static_assertions::const_assert; @@ -260,6 +268,7 @@ parameter_types! { pub const TargetBlockFullness: Perquintill = Perquintill::from_percent(25); pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(1, 100_000); pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000_000u128); + pub MaximumMultiplier: Multiplier = Bounded::max_value(); } impl pallet_transaction_payment::Config for Runtime { @@ -268,8 +277,13 @@ impl pallet_transaction_payment::Config for Runtime { type OperationalFeeMultiplier = OperationalFeeMultiplier; type WeightToFee = IdentityFee; type LengthToFee = ConstantMultiplier; - type FeeMultiplierUpdate = - TargetedFeeAdjustment; + type FeeMultiplierUpdate = TargetedFeeAdjustment< + Self, + TargetBlockFullness, + AdjustmentVariable, + MinimumMultiplier, + MaximumMultiplier, + >; } impl pallet_asset_tx_payment::Config for Runtime { @@ -290,40 +304,38 @@ parameter_types! { BondingDuration::get() as u64 * SessionsPerEra::get() as u64 * EpochDuration::get(); } +parameter_types! { + pub const PreimageMaxSize: u32 = 4096 * 1024; + pub const PreimageBaseDeposit: Balance = 1 * DOLLARS; + // One cent: $10,000 / MB + pub const PreimageByteDeposit: Balance = 1 * CENTS; +} + +impl pallet_preimage::Config for Runtime { + type WeightInfo = pallet_preimage::weights::SubstrateWeight; + type RuntimeEvent = RuntimeEvent; + type Currency = Balances; + type ManagerOrigin = EnsureRoot; + type BaseDeposit = PreimageBaseDeposit; + type ByteDeposit = PreimageByteDeposit; +} + parameter_types! { pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * RuntimeBlockWeights::get().max_block; - // Retry a scheduled item every 10 blocks (1 minute) until the preimage exists. - pub const NoPreimagePostponement: Option = Some(10); } impl pallet_scheduler::Config for Runtime { - type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; - type MaxScheduledPerBlock = ConstU32<50>; - type MaximumWeight = MaximumSchedulerWeight; - type NoPreimagePostponement = NoPreimagePostponement; type RuntimeOrigin = RuntimeOrigin; - type OriginPrivilegeCmp = EqualPrivilegeOnly; type PalletsOrigin = OriginCaller; - type PreimageProvider = Preimage; + type RuntimeCall = RuntimeCall; + type MaximumWeight = MaximumSchedulerWeight; type ScheduleOrigin = EnsureRoot; + type MaxScheduledPerBlock = ConstU32<512>; type WeightInfo = pallet_scheduler::weights::SubstrateWeight; -} - -parameter_types! { - pub const PreimageMaxSize: u32 = 4096 * 1024; - pub const PreimageBaseDeposit: Balance = DOLLARS; -} - -impl pallet_preimage::Config for Runtime { - type BaseDeposit = PreimageBaseDeposit; - type ByteDeposit = PreimageByteDeposit; - type Currency = Balances; - type RuntimeEvent = RuntimeEvent; - type ManagerOrigin = EnsureRoot; - type MaxSize = PreimageMaxSize; - type WeightInfo = pallet_preimage::weights::SubstrateWeight; + type OriginPrivilegeCmp = EqualPrivilegeOnly; + type Preimages = Preimage; } impl pallet_babe::Config for Runtime { @@ -428,7 +440,7 @@ impl pallet_staking::Config for Runtime { type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type ElectionProvider = ElectionProviderMultiPhase; - type GenesisElectionProvider = onchain::UnboundedExecution; + type GenesisElectionProvider = onchain::OnChainExecution; type VoterList = BagsList; type MaxUnlockingChunks = ConstU32<32>; type OnStakerSlash = NominationPools; @@ -475,7 +487,14 @@ frame_election_provider_support::generate_solution_type!( parameter_types! { pub MaxNominations: u32 = ::LIMIT as u32; - pub MaxElectingVoters: u32 = 10_000; + pub MaxElectingVoters: u32 = 40_000; + pub MaxElectableTargets: u16 = 10_000; + // OnChain values are lower. + pub MaxOnChainElectingVoters: u32 = 5000; + pub MaxOnChainElectableTargets: u16 = 1250; + // The maximum winners that can be elected by the Election pallet which is equivalent to the + // maximum active validators the staking pallet can have. + pub MaxActiveValidators: u32 = 1000; } /// The numbers configured here could always be more than the the maximum limits of staking pallet @@ -525,11 +544,9 @@ impl onchain::Config for OnChainSeqPhragmen { >; type DataProvider = ::DataProvider; type WeightInfo = frame_election_provider_support::weights::SubstrateWeight; -} - -impl onchain::BoundedConfig for OnChainSeqPhragmen { - type VotersBound = MaxElectingVoters; - type TargetsBound = ConstU32<2_000>; + type MaxWinners = ::MaxWinners; + type VotersBound = MaxOnChainElectingVoters; + type TargetsBound = MaxOnChainElectableTargets; } pub struct WebbMinerConfig; @@ -566,11 +583,12 @@ impl pallet_election_provider_multi_phase::Config for Runtime { type SlashHandler = (); // burn slashes type RewardHandler = (); // nothing to do upon rewards type DataProvider = Staking; - type Fallback = onchain::BoundedExecution; - type GovernanceFallback = onchain::BoundedExecution; + type Fallback = onchain::OnChainExecution; + type GovernanceFallback = onchain::OnChainExecution; type Solver = SequentialPhragmen, ()>; type ForceOrigin = EnsureRoot; type MaxElectableTargets = ConstU16<{ u16::MAX }>; + type MaxWinners = MaxActiveValidators; type MaxElectingVoters = MaxElectingVoters; type BenchmarkingConfig = ElectionProviderBenchmarkConfig; type WeightInfo = pallet_election_provider_multi_phase::weights::SubstrateWeight; @@ -611,11 +629,10 @@ impl pallet_nomination_pools::Config for Runtime { type WeightInfo = (); type RuntimeEvent = RuntimeEvent; type Currency = Balances; - type CurrencyBalance = Balance; - type RewardCounter = sp_runtime::FixedU128; + type RewardCounter = FixedU128; type BalanceToU256 = BalanceToU256; type U256ToBalance = U256ToBalance; - type StakingInterface = pallet_staking::Pallet; + type Staking = Staking; type PostUnbondingPoolsWindow = PostUnbondPoolsWindow; type MaxMetadataLen = ConstU32<256>; type MaxUnbonding = ConstU32<8>; @@ -631,8 +648,6 @@ parameter_types! { pub const MinimumDeposit: Balance = 100 * DOLLARS; pub const EnactmentPeriod: BlockNumber = 30 * 24 * 60 * MINUTES; pub const CooloffPeriod: BlockNumber = 28 * 24 * 60 * MINUTES; - // One cent: $10,000 / MB - pub const PreimageByteDeposit: Balance = CENTS; pub const MaxVotes: u32 = 100; pub const MaxProposals: u32 = 100; } @@ -678,10 +693,7 @@ impl pallet_democracy::Config for Runtime { type MaxVotes = MaxVotes; // Same as EnactmentPeriod type MinimumDeposit = MinimumDeposit; - type OperationalPreimageOrigin = pallet_collective::EnsureMember; type PalletsOrigin = OriginCaller; - type PreimageByteDeposit = PreimageByteDeposit; - type Proposal = RuntimeCall; type Scheduler = Scheduler; type Slash = Treasury; // Any single technical committee member may veto a coming council proposal, @@ -689,6 +701,9 @@ impl pallet_democracy::Config for Runtime { type VetoOrigin = pallet_collective::EnsureMember; type VoteLockingPeriod = EnactmentPeriod; type VotingPeriod = VotingPeriod; + type Preimages = Preimage; + type MaxDeposits = ConstU32<100>; + type MaxBlacklisted = ConstU32<100>; type WeightInfo = pallet_democracy::weights::SubstrateWeight; } @@ -700,13 +715,13 @@ parameter_types! { type CouncilCollective = pallet_collective::Instance1; impl pallet_collective::Config for Runtime { - type DefaultVote = pallet_collective::PrimeDefaultVote; - type RuntimeEvent = RuntimeEvent; - type MaxMembers = CouncilMaxMembers; - type MaxProposals = CouncilMaxProposals; - type MotionDuration = CouncilMotionDuration; type RuntimeOrigin = RuntimeOrigin; type Proposal = RuntimeCall; + type RuntimeEvent = RuntimeEvent; + type MotionDuration = CouncilMotionDuration; + type MaxProposals = CouncilMaxProposals; + type MaxMembers = CouncilMaxMembers; + type DefaultVote = pallet_collective::PrimeDefaultVote; type WeightInfo = pallet_collective::weights::SubstrateWeight; } @@ -919,7 +934,6 @@ impl InstanceFilter for ProxyType { ProxyType::AssetOwner => matches!( c, RuntimeCall::Assets(pallet_assets::Call::create { .. }) | - RuntimeCall::Assets(pallet_assets::Call::destroy { .. }) | RuntimeCall::Assets(pallet_assets::Call::transfer_ownership { .. }) | RuntimeCall::Assets(pallet_assets::Call::set_team { .. }) | RuntimeCall::Assets(pallet_assets::Call::set_metadata { .. }) | @@ -969,34 +983,33 @@ impl pallet_proxy::Config for Runtime { } parameter_types! { - pub const AssetDeposit: Balance = UNITS; // 1 UNIT deposit to create asset - pub const ApprovalDeposit: Balance = EXISTENTIAL_DEPOSIT; - pub const AssetsStringLimit: u32 = 50; - /// Key = 32 bytes, Value = 36 bytes (32+1+1+1+1) - // https://github.com/paritytech/substrate/blob/069917b/frame/assets/src/lib.rs#L257L271 - pub const MetadataDepositBase: Balance = deposit(1, 68); - pub const MetadataDepositPerByte: Balance = deposit(0, 1); + pub const AssetDeposit: Balance = 100 * DOLLARS; + pub const ApprovalDeposit: Balance = 1 * DOLLARS; + pub const StringLimit: u32 = 50; + pub const MetadataDepositBase: Balance = 10 * DOLLARS; + pub const MetadataDepositPerByte: Balance = 1 * DOLLARS; } -/// We allow root and the Relay Chain council to execute privileged asset -/// operations. -pub type AssetsForceOrigin = EnsureRoot; - impl pallet_assets::Config for Runtime { - type ApprovalDeposit = ApprovalDeposit; - type AssetAccountDeposit = ConstU128; - type AssetDeposit = AssetDeposit; - type AssetId = u32; + type RuntimeEvent = RuntimeEvent; type Balance = u128; + type AssetId = u32; + type AssetIdParameter = codec::Compact; type Currency = Balances; - type RuntimeEvent = RuntimeEvent; - type Extra = (); + type CreateOrigin = AsEnsureOriginWithArg>; type ForceOrigin = EnsureRoot; - type Freezer = (); + type AssetDeposit = AssetDeposit; + type AssetAccountDeposit = ConstU128; type MetadataDepositBase = MetadataDepositBase; type MetadataDepositPerByte = MetadataDepositPerByte; + type ApprovalDeposit = ApprovalDeposit; type StringLimit = StringLimit; + type Freezer = (); + type Extra = (); type WeightInfo = pallet_assets::weights::SubstrateWeight; + type RemoveItemsLimit = ConstU32<1000>; + #[cfg(feature = "runtime-benchmarks")] + type BenchmarkHelper = (); } impl pallet_sudo::Config for Runtime { @@ -1110,10 +1123,6 @@ impl pallet_grandpa::Config for Runtime { type WeightInfo = (); } -parameter_types! { - pub const StringLimit: u32 = 50; -} - impl pallet_hasher::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; @@ -1188,22 +1197,34 @@ parameter_types! { pub DustReceiver: AccountId = PalletId(*b"orml/dst").into_account_truncating(); } +pub struct CurrencyHooks(marker::PhantomData); +impl MutationHooks + for CurrencyHooks +where + T::AccountId: From + Into, + T::CurrencyId: From + Into, +{ + type OnDust = TransferDust; + type OnSlash = OnSlashHook; + type PreDeposit = PreDeposit; + type PostDeposit = PostDeposit; + type PreTransfer = PreTransfer; + type PostTransfer = PostTransfer; + type OnNewTokenAccount = TrackCreatedAccounts; + type OnKilledTokenAccount = TrackKilledAccounts; +} + impl orml_tokens::Config for Runtime { type Amount = Amount; type Balance = Balance; type CurrencyId = webb_primitives::AssetId; + type CurrencyHooks = CurrencyHooks; type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = ConstU32<2>; type MaxReserves = ConstU32<2>; - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); type ReserveIdentifier = ReserveIdentifier; } diff --git a/standalone/runtime/src/orml_token_impls.rs b/standalone/runtime/src/orml_token_impls.rs new file mode 100644 index 000000000..c8e067fe2 --- /dev/null +++ b/standalone/runtime/src/orml_token_impls.rs @@ -0,0 +1,187 @@ +use super::*; +use frame_support::pallet_prelude::*; +use orml_tokens::AccountData; +use orml_traits::{ + currency::{OnDeposit, OnSlash, OnTransfer}, + Happened, +}; +use sp_std::{cell::RefCell, marker, prelude::*, thread}; + +thread_local! { + pub static CREATED: RefCell> = RefCell::new(vec![]); + pub static KILLED: RefCell> = RefCell::new(vec![]); +} + +pub struct TrackCreatedAccounts(marker::PhantomData); +impl TrackCreatedAccounts +where + T::AccountId: From + Into, + T::CurrencyId: From + Into, +{ + pub fn accounts() -> Vec<(T::AccountId, T::CurrencyId)> { + CREATED + .with(|accounts| accounts.borrow().clone()) + .iter() + .map(|account| (account.0.clone().into(), account.1.clone().into())) + .collect() + } + + pub fn reset() { + CREATED.with(|accounts| { + accounts.replace(vec![]); + }); + } +} +impl Happened<(T::AccountId, T::CurrencyId)> for TrackCreatedAccounts +where + T::AccountId: From + Into, + T::CurrencyId: From + Into, +{ + fn happened((who, currency): &(T::AccountId, T::CurrencyId)) { + CREATED.with(|accounts| { + accounts.borrow_mut().push((who.clone().into(), (*currency).into())); + }); + } +} + +pub struct TrackKilledAccounts(marker::PhantomData); +impl TrackKilledAccounts +where + T::AccountId: From + Into, + T::CurrencyId: From + Into, +{ + pub fn accounts() -> Vec<(T::AccountId, T::CurrencyId)> { + KILLED + .with(|accounts| accounts.borrow().clone()) + .iter() + .map(|account| (account.0.clone().into(), account.1.clone().into())) + .collect() + } + + pub fn reset() { + KILLED.with(|accounts| { + accounts.replace(vec![]); + }); + } +} +impl Happened<(T::AccountId, T::CurrencyId)> for TrackKilledAccounts +where + T::AccountId: From + Into, + T::CurrencyId: From + Into, +{ + fn happened((who, currency): &(T::AccountId, T::CurrencyId)) { + KILLED.with(|accounts| { + accounts.borrow_mut().push((who.clone().into(), (*currency).into())); + }); + } +} + +thread_local! { + pub static ON_SLASH_CALLS: RefCell = RefCell::new(0); + pub static ON_DEPOSIT_PREHOOK_CALLS: RefCell = RefCell::new(0); + pub static ON_DEPOSIT_POSTHOOK_CALLS: RefCell = RefCell::new(0); + pub static ON_TRANSFER_PREHOOK_CALLS: RefCell = RefCell::new(0); + pub static ON_TRANSFER_POSTHOOK_CALLS: RefCell = RefCell::new(0); +} + +pub struct OnSlashHook(marker::PhantomData); +impl OnSlash for OnSlashHook { + fn on_slash(_currency_id: T::CurrencyId, _account_id: &T::AccountId, _amount: T::Balance) { + ON_SLASH_CALLS.with(|cell| *cell.borrow_mut() += 1); + } +} +impl OnSlashHook { + pub fn calls() -> u32 { + ON_SLASH_CALLS.with(|accounts| *accounts.borrow()) + } +} + +pub struct PreDeposit(marker::PhantomData); +impl OnDeposit for PreDeposit { + fn on_deposit( + _currency_id: T::CurrencyId, + _account_id: &T::AccountId, + _amount: T::Balance, + ) -> DispatchResult { + ON_DEPOSIT_PREHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); + Ok(()) + } +} +impl PreDeposit { + pub fn calls() -> u32 { + ON_DEPOSIT_PREHOOK_CALLS.with(|accounts| accounts.borrow().clone()) + } +} + +pub struct PostDeposit(marker::PhantomData); +impl OnDeposit for PostDeposit { + fn on_deposit( + currency_id: T::CurrencyId, + account_id: &T::AccountId, + amount: T::Balance, + ) -> DispatchResult { + ON_DEPOSIT_POSTHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); + let account_balance: AccountData = orml_tokens::Pallet::::accounts::< + T::AccountId, + T::CurrencyId, + >(account_id.clone(), currency_id); + assert!( + account_balance.free.ge(&amount), + "Posthook must run after the account balance is updated." + ); + Ok(()) + } +} +impl PostDeposit { + pub fn calls() -> u32 { + ON_DEPOSIT_POSTHOOK_CALLS.with(|accounts| accounts.borrow().clone()) + } +} + +pub struct PreTransfer(marker::PhantomData); +impl OnTransfer + for PreTransfer +{ + fn on_transfer( + _currency_id: T::CurrencyId, + _from: &T::AccountId, + _to: &T::AccountId, + _amount: T::Balance, + ) -> DispatchResult { + ON_TRANSFER_PREHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); + Ok(()) + } +} +impl PreTransfer { + pub fn calls() -> u32 { + ON_TRANSFER_PREHOOK_CALLS.with(|accounts| accounts.borrow().clone()) + } +} + +pub struct PostTransfer(marker::PhantomData); +impl OnTransfer + for PostTransfer +{ + fn on_transfer( + currency_id: T::CurrencyId, + _from: &T::AccountId, + to: &T::AccountId, + amount: T::Balance, + ) -> DispatchResult { + ON_TRANSFER_POSTHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); + let account_balance: AccountData = orml_tokens::Pallet::::accounts::< + T::AccountId, + T::CurrencyId, + >(to.clone(), currency_id); + assert!( + account_balance.free.ge(&amount), + "Posthook must run after the account balance is updated." + ); + Ok(()) + } +} +impl PostTransfer { + pub fn calls() -> u32 { + ON_TRANSFER_POSTHOOK_CALLS.with(|accounts| accounts.borrow().clone()) + } +} From 57dae40c830d03985024bbb77e1e51fdc23c5c2b Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Thu, 15 Dec 2022 14:58:54 -0700 Subject: [PATCH 02/29] Building the runtime --- Cargo.lock | 63 ++----- primitives/Cargo.toml | 1 + primitives/src/verifying/arkworks.rs | 3 - primitives/src/verifying/mod.rs | 3 + standalone/node/Cargo.toml | 15 +- standalone/node/src/benchmarking.rs | 88 ++-------- standalone/node/src/lib.rs | 1 - standalone/runtime/src/lib.rs | 21 +-- standalone/runtime/src/orml_token_impls.rs | 187 --------------------- 9 files changed, 47 insertions(+), 335 deletions(-) delete mode 100644 standalone/runtime/src/orml_token_impls.rs diff --git a/Cargo.lock b/Cargo.lock index 664a2a84c..46b3035bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -868,9 +868,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" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" [[package]] name = "bzip2-sys" @@ -1032,23 +1032,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive 3.2.18", - "clap_lex 0.2.4", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - [[package]] name = "clap" version = "4.0.29" @@ -1056,27 +1039,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" dependencies = [ "bitflags", - "clap_derive 4.0.21", - "clap_lex 0.3.0", + "clap_derive", + "clap_lex", "is-terminal", "once_cell", "strsim", "termcolor", ] -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "clap_derive" version = "4.0.21" @@ -1090,15 +1060,6 @@ dependencies = [ "syn", ] -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.3.0" @@ -2099,7 +2060,7 @@ dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.0.29", + "clap", "comfy-table", "frame-benchmarking", "frame-support", @@ -6600,7 +6561,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "array-bytes", "chrono", - "clap 4.0.29", + "clap", "fdlimit", "futures", "libp2p", @@ -9462,12 +9423,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.37" @@ -10468,7 +10423,8 @@ version = "1.0.0" dependencies = [ "ark-bn254", "arkworks-setups", - "clap 3.2.23", + "array-bytes", + "clap", "frame-benchmarking", "frame-benchmarking-cli", "frame-system", @@ -10485,7 +10441,8 @@ dependencies = [ "pallet-mt-rpc", "pallet-mt-rpc-runtime-api", "pallet-transaction-payment-rpc", - "rand 0.7.3", + "parity-scale-codec", + "rand 0.8.5", "sc-authority-discovery", "sc-basic-authorship", "sc-chain-spec", diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index a4d9ba28f..c698888be 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -29,6 +29,7 @@ ark-bls12-381 = { version = "^0.3.0", default-features = false, features = [ "cu ark-bls12-377 = { version = "^0.3.0", default-features = false, features = [ "curve", "r1cs" ], optional = true } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ], optional = true } ark-groth16 = { version = "^0.3.0", default-features = false } +# ark-circom = { git = "https://github.com/gakonst/ark-circom.git", default-features = false } blake2 = { version = "0.9", default-features = false } digest = { version = "0.9", default-features = false } diff --git a/primitives/src/verifying/arkworks.rs b/primitives/src/verifying/arkworks.rs index fbdba5a01..29446bcbf 100644 --- a/primitives/src/verifying/arkworks.rs +++ b/primitives/src/verifying/arkworks.rs @@ -28,6 +28,3 @@ impl InstanceVerifier for ArkworksVerifierGroth16 { use ark_bn254::Bn254; pub type ArkworksVerifierBn254 = ArkworksVerifierGroth16; - -use ark_bls12_381::Bls12_381; -pub type ArkworksVerifierBls381 = ArkworksVerifierGroth16; diff --git a/primitives/src/verifying/mod.rs b/primitives/src/verifying/mod.rs index a37b3a023..6ef47bf2f 100644 --- a/primitives/src/verifying/mod.rs +++ b/primitives/src/verifying/mod.rs @@ -1,2 +1,5 @@ pub mod arkworks; pub use arkworks::*; + +// pub mod circom; +// pub use circom::*; diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index ae2559307..c2c61a1fa 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -24,13 +24,15 @@ targets = ["x86_64-unknown-linux-gnu"] substrate-build-script-utils = "3.0.0" [dependencies] -futures = { version = "0.3.16" } -clap = { version = "3.0", features = ["derive"] } -log = "0.4.8" -serde = { version = "1.0.101", features = ["derive"] } -rand = "0.7.2" itertools = "0.10.0" -jsonrpsee = { version = "0.15.0", features = ["server"] } +array-bytes = "4.1" +clap = { version = "4.0.9", features = ["derive"], optional = true } +codec = { package = "parity-scale-codec", version = "3.0.0" } +serde = { version = "1.0.136", features = ["derive"] } +jsonrpsee = { version = "0.15.1", features = ["server"] } +futures = "0.3.21" +log = "0.4.17" +rand = "0.8" pallet-mt-rpc = { path = "../../pallets/mt/rpc", version = "0.1.0" } pallet-mt-rpc-runtime-api = { path = "../../pallets/mt/rpc/runtime-api" } @@ -84,6 +86,7 @@ sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate" sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } + # RPC related dependencies jsonrpc-core = "18.0.0" sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index 4c61269f2..16ea9109d 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -20,20 +20,18 @@ //! //! Should only be used for benchmarking as it may break in other contexts. -use crate::service::FullClient; +use crate::service::{create_extrinsic, FullClient}; -use runtime::{AccountId, Balance, BalancesCall, SystemCall}; +use kitchensink_runtime::{BalancesCall, SystemCall}; +use node_primitives::{AccountId, Balance}; 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 webb_runtime as runtime; +use sp_runtime::OpaqueExtrinsic; use std::{sync::Arc, time::Duration}; -/// Generates extrinsics for the `benchmark overhead` command. +/// Generates `System::Remark` extrinsics for the benchmarks. /// /// Note: Should only be used for benchmarking. pub struct RemarkBuilder { @@ -58,11 +56,11 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder { fn build(&self, nonce: u32) -> std::result::Result { let acc = Sr25519Keyring::Bob.pair(); - let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic( + let extrinsic: OpaqueExtrinsic = create_extrinsic( self.client.as_ref(), acc, - SystemCall::remark { remark: vec![] }.into(), - nonce, + SystemCall::remark { remark: vec![] }, + Some(nonce), ) .into(); @@ -97,12 +95,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { fn build(&self, nonce: u32) -> std::result::Result { let acc = Sr25519Keyring::Bob.pair(); - let extrinsic: OpaqueExtrinsic = create_benchmark_extrinsic( + let extrinsic: OpaqueExtrinsic = create_extrinsic( self.client.as_ref(), acc, - BalancesCall::transfer_keep_alive { dest: self.dest.clone().into(), value: self.value } - .into(), - nonce, + BalancesCall::transfer_keep_alive { + dest: self.dest.clone().into(), + value: self.value.into(), + }, + Some(nonce), ) .into(); @@ -110,71 +110,13 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { } } -/// 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_asset_tx_payment::ChargeAssetTxPayment::::from(0, None), - ); - - 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, - sp_runtime::AccountId32::from(sender.public()).into(), - runtime::Signature::Sr25519(signature), - extra, - ) -} - /// 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) + futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data)) .map_err(|e| format!("creating inherent data: {:?}", e))?; Ok(inherent_data) } diff --git a/standalone/node/src/lib.rs b/standalone/node/src/lib.rs index f8010d9d3..1c044cd00 100644 --- a/standalone/node/src/lib.rs +++ b/standalone/node/src/lib.rs @@ -1,6 +1,5 @@ #![warn(unused_crate_dependencies)] -pub mod benchmarking; pub mod chain_spec; pub mod rpc; pub mod service; diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index be7c4391a..6f26c4d11 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -7,10 +7,8 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); pub mod constants; -pub mod orml_token_impls; use constants::{constants::*, currency::*, time::*}; -use orml_token_impls::*; pub use webb_primitives::{types::runtime::Moment, *}; pub mod impls; mod voter_bags; @@ -1201,17 +1199,16 @@ pub struct CurrencyHooks(marker::PhantomData); impl MutationHooks for CurrencyHooks where - T::AccountId: From + Into, - T::CurrencyId: From + Into, + T::AccountId: From, { - type OnDust = TransferDust; - type OnSlash = OnSlashHook; - type PreDeposit = PreDeposit; - type PostDeposit = PostDeposit; - type PreTransfer = PreTransfer; - type PostTransfer = PostTransfer; - type OnNewTokenAccount = TrackCreatedAccounts; - type OnKilledTokenAccount = TrackKilledAccounts; + type OnDust = orml_tokens::TransferDust; + type OnSlash = (); + type PreDeposit = (); + type PostDeposit = (); + type PreTransfer = (); + type PostTransfer = (); + type OnNewTokenAccount = (); + type OnKilledTokenAccount = (); } impl orml_tokens::Config for Runtime { diff --git a/standalone/runtime/src/orml_token_impls.rs b/standalone/runtime/src/orml_token_impls.rs deleted file mode 100644 index c8e067fe2..000000000 --- a/standalone/runtime/src/orml_token_impls.rs +++ /dev/null @@ -1,187 +0,0 @@ -use super::*; -use frame_support::pallet_prelude::*; -use orml_tokens::AccountData; -use orml_traits::{ - currency::{OnDeposit, OnSlash, OnTransfer}, - Happened, -}; -use sp_std::{cell::RefCell, marker, prelude::*, thread}; - -thread_local! { - pub static CREATED: RefCell> = RefCell::new(vec![]); - pub static KILLED: RefCell> = RefCell::new(vec![]); -} - -pub struct TrackCreatedAccounts(marker::PhantomData); -impl TrackCreatedAccounts -where - T::AccountId: From + Into, - T::CurrencyId: From + Into, -{ - pub fn accounts() -> Vec<(T::AccountId, T::CurrencyId)> { - CREATED - .with(|accounts| accounts.borrow().clone()) - .iter() - .map(|account| (account.0.clone().into(), account.1.clone().into())) - .collect() - } - - pub fn reset() { - CREATED.with(|accounts| { - accounts.replace(vec![]); - }); - } -} -impl Happened<(T::AccountId, T::CurrencyId)> for TrackCreatedAccounts -where - T::AccountId: From + Into, - T::CurrencyId: From + Into, -{ - fn happened((who, currency): &(T::AccountId, T::CurrencyId)) { - CREATED.with(|accounts| { - accounts.borrow_mut().push((who.clone().into(), (*currency).into())); - }); - } -} - -pub struct TrackKilledAccounts(marker::PhantomData); -impl TrackKilledAccounts -where - T::AccountId: From + Into, - T::CurrencyId: From + Into, -{ - pub fn accounts() -> Vec<(T::AccountId, T::CurrencyId)> { - KILLED - .with(|accounts| accounts.borrow().clone()) - .iter() - .map(|account| (account.0.clone().into(), account.1.clone().into())) - .collect() - } - - pub fn reset() { - KILLED.with(|accounts| { - accounts.replace(vec![]); - }); - } -} -impl Happened<(T::AccountId, T::CurrencyId)> for TrackKilledAccounts -where - T::AccountId: From + Into, - T::CurrencyId: From + Into, -{ - fn happened((who, currency): &(T::AccountId, T::CurrencyId)) { - KILLED.with(|accounts| { - accounts.borrow_mut().push((who.clone().into(), (*currency).into())); - }); - } -} - -thread_local! { - pub static ON_SLASH_CALLS: RefCell = RefCell::new(0); - pub static ON_DEPOSIT_PREHOOK_CALLS: RefCell = RefCell::new(0); - pub static ON_DEPOSIT_POSTHOOK_CALLS: RefCell = RefCell::new(0); - pub static ON_TRANSFER_PREHOOK_CALLS: RefCell = RefCell::new(0); - pub static ON_TRANSFER_POSTHOOK_CALLS: RefCell = RefCell::new(0); -} - -pub struct OnSlashHook(marker::PhantomData); -impl OnSlash for OnSlashHook { - fn on_slash(_currency_id: T::CurrencyId, _account_id: &T::AccountId, _amount: T::Balance) { - ON_SLASH_CALLS.with(|cell| *cell.borrow_mut() += 1); - } -} -impl OnSlashHook { - pub fn calls() -> u32 { - ON_SLASH_CALLS.with(|accounts| *accounts.borrow()) - } -} - -pub struct PreDeposit(marker::PhantomData); -impl OnDeposit for PreDeposit { - fn on_deposit( - _currency_id: T::CurrencyId, - _account_id: &T::AccountId, - _amount: T::Balance, - ) -> DispatchResult { - ON_DEPOSIT_PREHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); - Ok(()) - } -} -impl PreDeposit { - pub fn calls() -> u32 { - ON_DEPOSIT_PREHOOK_CALLS.with(|accounts| accounts.borrow().clone()) - } -} - -pub struct PostDeposit(marker::PhantomData); -impl OnDeposit for PostDeposit { - fn on_deposit( - currency_id: T::CurrencyId, - account_id: &T::AccountId, - amount: T::Balance, - ) -> DispatchResult { - ON_DEPOSIT_POSTHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); - let account_balance: AccountData = orml_tokens::Pallet::::accounts::< - T::AccountId, - T::CurrencyId, - >(account_id.clone(), currency_id); - assert!( - account_balance.free.ge(&amount), - "Posthook must run after the account balance is updated." - ); - Ok(()) - } -} -impl PostDeposit { - pub fn calls() -> u32 { - ON_DEPOSIT_POSTHOOK_CALLS.with(|accounts| accounts.borrow().clone()) - } -} - -pub struct PreTransfer(marker::PhantomData); -impl OnTransfer - for PreTransfer -{ - fn on_transfer( - _currency_id: T::CurrencyId, - _from: &T::AccountId, - _to: &T::AccountId, - _amount: T::Balance, - ) -> DispatchResult { - ON_TRANSFER_PREHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); - Ok(()) - } -} -impl PreTransfer { - pub fn calls() -> u32 { - ON_TRANSFER_PREHOOK_CALLS.with(|accounts| accounts.borrow().clone()) - } -} - -pub struct PostTransfer(marker::PhantomData); -impl OnTransfer - for PostTransfer -{ - fn on_transfer( - currency_id: T::CurrencyId, - _from: &T::AccountId, - to: &T::AccountId, - amount: T::Balance, - ) -> DispatchResult { - ON_TRANSFER_POSTHOOK_CALLS.with(|cell| *cell.borrow_mut() += 1); - let account_balance: AccountData = orml_tokens::Pallet::::accounts::< - T::AccountId, - T::CurrencyId, - >(to.clone(), currency_id); - assert!( - account_balance.free.ge(&amount), - "Posthook must run after the account balance is updated." - ); - Ok(()) - } -} -impl PostTransfer { - pub fn calls() -> u32 { - ON_TRANSFER_POSTHOOK_CALLS.with(|accounts| accounts.borrow().clone()) - } -} From fd4feec035b73a5c542b786503acf9cccfa0c8e4 Mon Sep 17 00:00:00 2001 From: Drew Stone Date: Thu, 15 Dec 2022 15:01:53 -0700 Subject: [PATCH 03/29] Add feature --- primitives/src/verifying/circom.rs | 39 +++++++++++++++++++++++++++++ standalone/node/Cargo.toml | 5 +++- standalone/node/src/benchmarking.rs | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 primitives/src/verifying/circom.rs diff --git a/primitives/src/verifying/circom.rs b/primitives/src/verifying/circom.rs new file mode 100644 index 000000000..ef1c44594 --- /dev/null +++ b/primitives/src/verifying/circom.rs @@ -0,0 +1,39 @@ +use crate::*; +use ark_circom::circom; +use ark_crypto_primitives::{Error, SNARK}; +use ark_ec::PairingEngine; +use ark_groth16::{Groth16, Proof as ArkProof, VerifyingKey as ArkVerifyingKey, PreparedVerifyingKey}; +use ark_groth16::{ + prepare_verifying_key, verify_proof, +}; +use ark_serialize::CanonicalDeserialize; +use arkworks_native_gadgets::to_field_elements; +use ark_circom::ethereum::Proof; +use ark_circom::ethereum::VerifyingKey; +use sp_std::marker::PhantomData; +pub struct CircomVerifierGroth16(PhantomData); + +pub fn verify_groth16( + vk: &PreparedVerifyingKey, + public_inputs: &[E::Fr], + proof: &ArkProof, +) -> Result { + let res = verify_proof(vk, proof, public_inputs)?; + Ok(res) +} + +impl InstanceVerifier for CircomVerifierGroth16 { + fn verify(public_inp_bytes: &[u8], proof_bytes: &[u8], vk_bytes: &[u8]) -> Result { + let public_input_field_elts = to_field_elements::(public_inp_bytes)?; + let circom_vk = VerifyingKey::from(vk_bytes); + let circom_proof = Proof::from(proof_bytes); + let vk = ArkVerifyingKey::::from(circom_vk)?; + let proof = ArkProof::::from(circom_proof)?; + let res = verify_groth16::(&vk.into(), &public_input_field_elts, &proof)?; + Ok(res) + } +} + +use ark_bn254::Bn254; +pub type CircomVerifierBn254 = CircomVerifierGroth16; + diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index c2c61a1fa..d6d20515d 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -103,5 +103,8 @@ arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = f ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } [features] -default = [] +default = ["cli"] +cli = [ + "clap" +] runtime-benchmarks = ["webb-runtime/runtime-benchmarks"] diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index 16ea9109d..74b977154 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -23,7 +23,7 @@ use crate::service::{create_extrinsic, FullClient}; use kitchensink_runtime::{BalancesCall, SystemCall}; -use node_primitives::{AccountId, Balance}; +use webb_primitives::{AccountId, Balance}; use sc_cli::Result; use sp_inherents::{InherentData, InherentDataProvider}; use sp_keyring::Sr25519Keyring; From 2b76ee2a5ce3854e9182a7f5608471be51c593ae Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 16 Dec 2022 11:17:04 -0500 Subject: [PATCH 04/29] cargo check passes --- .gitmodules | 3 + .vscode/settings.json | 10 +- Cargo.lock | 602 ++++++++++++++++------------ protocol-substrate-fixtures | 1 + standalone/node/src/benchmarking.rs | 4 +- standalone/node/src/chain_spec.rs | 6 +- standalone/node/src/service.rs | 73 ++++ 7 files changed, 432 insertions(+), 267 deletions(-) create mode 100644 .gitmodules create mode 160000 protocol-substrate-fixtures diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..7bd409da7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "protocol-substrate-fixtures"] + path = protocol-substrate-fixtures + url = https://github.com/webb-tools/protocol-substrate-fixtures diff --git a/.vscode/settings.json b/.vscode/settings.json index 69acf829a..0b6af746a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,8 @@ { - "git.ignoredRepositories": ["open-runtime-module-library"], - "rust-analyzer.updates.channel": "stable" -} + "git.ignoredRepositories": [ + "open-runtime-module-library" + ], + "rust-analyzer.updates.channel": "stable", + "cargo.automaticCheck": false, + "rust-analyzer.checkOnSave.enable": false +} \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 46b3035bd..771cb519c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.0", ] [[package]] @@ -75,9 +84,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", ] @@ -414,9 +423,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" @@ -454,9 +463,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" dependencies = [ "concurrent-queue", "event-listener", @@ -465,15 +474,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" dependencies = [ + "async-lock", "async-task", "concurrent-queue", "fastrand", "futures-lite", - "once_cell", "slab", ] @@ -495,9 +504,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" dependencies = [ "async-lock", "autocfg", @@ -510,7 +519,7 @@ dependencies = [ "slab", "socket2", "waker-fn", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -558,9 +567,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" dependencies = [ "proc-macro2", "quote", @@ -569,9 +578,9 @@ dependencies = [ [[package]] name = "asynchronous-codec" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" +checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" dependencies = [ "bytes", "futures-sink", @@ -605,16 +614,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.30.0", "rustc-demangle", ] @@ -716,11 +725,11 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" +checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -731,7 +740,7 @@ checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" dependencies = [ "arrayref", "arrayvec 0.7.2", - "constant_time_eq", + "constant_time_eq 0.1.5", ] [[package]] @@ -742,20 +751,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.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" dependencies = [ "arrayref", "arrayvec 0.7.2", "cc", "cfg-if", - "constant_time_eq", + "constant_time_eq 0.2.4", ] [[package]] @@ -806,16 +815,16 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" dependencies = [ "async-channel", + "async-lock", "async-task", "atomic-waker", "fastrand", "futures-lite", - "once_cell", ] [[package]] @@ -883,12 +892,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" - [[package]] name = "camino" version = "1.1.1" @@ -922,9 +925,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.74" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" dependencies = [ "jobserver", ] @@ -986,9 +989,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" dependencies = [ "iana-time-zone", "js-sys", @@ -1081,9 +1084,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.2" +version = "6.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1090f39f45786ec6dc6286f8ea9c75d0a7ef0a0d3cda674cef0c3af7b307fbc2" +checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" dependencies = [ "strum", "strum_macros", @@ -1092,11 +1095,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "1.2.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" dependencies = [ - "cache-padded", + "crossbeam-utils", ] [[package]] @@ -1111,6 +1114,12 @@ 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 = "core-foundation" version = "0.9.3" @@ -1156,18 +1165,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44409ccf2d0f663920cab563d2b79fcd6b2e9a2bcc6e929fef76c8f82ad6c17a" +checksum = "52056f6d0584484b57fa6c1a65c1fcb15f3780d8b6a758426d9e3084169b2ddd" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de2018ad96eb97f621f7d6b900a0cc661aec8d02ea4a50e56ecb48e5a2fcaf" +checksum = "18fed94c8770dc25d01154c3ffa64ed0b3ba9d583736f305fed7beebe5d9cf74" dependencies = [ "arrayvec 0.7.2", "bumpalo", @@ -1176,7 +1185,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log", "regalloc2", "smallvec", @@ -1185,33 +1194,33 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5287ce36e6c4758fbaf298bd1a8697ad97a4f2375a3d1b61142ea538db4877e5" +checksum = "1c451b81faf237d11c7e4f3165eeb6bac61112762c5cfe7b4c0fb7241474358f" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2855c24219e2f08827f3f4ffb2da92e134ae8d8ecc185b11ec8f9878cf5f588e" +checksum = "e7c940133198426d26128f08be2b40b0bd117b84771fd36798969c4d712d81fc" [[package]] name = "cranelift-entity" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b65673279d75d34bf11af9660ae2dbd1c22e6d28f163f5c72f4e1dc56d56103" +checksum = "87a0f1b2fdc18776956370cf8d9b009ded3f855350c480c1c52142510961f352" dependencies = [ "serde", ] [[package]] name = "cranelift-frontend" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed2b3d7a4751163f6c4a349205ab1b7d9c00eecf19dcea48592ef1f7688eefc" +checksum = "34897538b36b216cc8dd324e73263596d51b8cf610da6498322838b2546baf8a" dependencies = [ "cranelift-codegen", "log", @@ -1221,15 +1230,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be64cecea9d90105fc6a2ba2d003e98c867c1d6c4c86cc878f97ad9fb916293" +checksum = "1b2629a569fae540f16a76b70afcc87ad7decb38dc28fa6c648ac73b51e78470" [[package]] name = "cranelift-native" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a03a6ac1b063e416ca4b93f6247978c991475e8271465340caa6f92f3c16a4" +checksum = "20937dab4e14d3e225c5adfc9c7106bafd4ac669bdb43027b911ff794c6fb318" dependencies = [ "cranelift-codegen", "libc", @@ -1238,9 +1247,9 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.88.1" +version = "0.88.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c699873f7b30bc5f20dd03a796b4183e073a46616c91704792ec35e45d13f913" +checksum = "80fc2288957a94fd342a015811479de1837850924166d1f1856d8406e6f3609b" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -1284,22 +1293,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", ] @@ -1399,22 +1408,23 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-pre.1" +version = "4.0.0-pre.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4033478fbf70d6acf2655ac70da91ee65852d69daf7a67bf7a2f518fb47aafcf" +checksum = "67bc65846be335cb20f4e52d49a437b773a2c1fdb42b19fc84e79e6f6771536f" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", + "cfg-if", + "fiat-crypto", + "packed_simd_2", + "platforms 3.0.2", "subtle", "zeroize", ] [[package]] name = "cxx" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" dependencies = [ "cc", "cxxbridge-flags", @@ -1424,9 +1434,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" dependencies = [ "cc", "codespan-reporting", @@ -1439,15 +1449,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" +checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" [[package]] name = "cxxbridge-macro" -version = "1.0.80" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2", "quote", @@ -1491,9 +1501,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "data-encoding-macro" @@ -1573,9 +1583,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", @@ -1742,7 +1752,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.5", + "digest 0.10.6", "ff", "generic-array 0.14.6", "group", @@ -1786,9 +1796,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -1799,9 +1809,9 @@ dependencies = [ [[package]] name = "environmental" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" +checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] name = "errno" @@ -1913,6 +1923,12 @@ dependencies = [ "subtle", ] +[[package]] +name = "fiat-crypto" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" + [[package]] name = "file-per-thread-logger" version = "0.1.5" @@ -1925,9 +1941,9 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" dependencies = [ "cfg-if", "libc", @@ -1982,9 +1998,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" dependencies = [ "crc32fast", "libz-sys", @@ -2498,6 +2514,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + [[package]] name = "glob" version = "0.3.0" @@ -2519,9 +2541,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b" dependencies = [ "futures-channel", "futures-core", @@ -2687,7 +2709,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -2754,9 +2776,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.22" +version = "0.14.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" +checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" dependencies = [ "bytes", "futures-channel", @@ -2778,9 +2800,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ "http", "hyper", @@ -2902,9 +2924,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 0.12.3", @@ -2953,9 +2975,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", @@ -2965,9 +2987,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "is-terminal" @@ -3239,9 +3261,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" @@ -3303,15 +3328,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -3319,9 +3344,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.5" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" + +[[package]] +name = "libm" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libp2p" @@ -3880,18 +3911,18 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "480b5a5de855d11ff13195950bdc8b98b5e942ef47afc447f6615cdcc4e15d80" +checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.35.13", + "rustix 0.36.5", ] [[package]] name = "memmap2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" +checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" dependencies = [ "libc", ] @@ -3905,6 +3936,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" @@ -3942,9 +3982,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" dependencies = [ "adler", ] @@ -4027,7 +4067,7 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.5", + "digest 0.10.6", "multihash-derive", "sha2 0.10.6", "sha3 0.10.6", @@ -4174,9 +4214,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags", "cfg-if", @@ -4227,9 +4267,9 @@ dependencies = [ [[package]] name = "num-format" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec 0.7.2", "itoa", @@ -4264,7 +4304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", + "libm 0.2.6", ] [[package]] @@ -4289,6 +4329,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.16.0" @@ -4379,9 +4428,19 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.1" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "packed_simd_2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" +checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +dependencies = [ + "cfg-if", + "libm 0.1.4", +] [[package]] name = "pallet-asset-registry" @@ -5431,7 +5490,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43" dependencies = [ - "blake2 0.10.4", + "blake2 0.10.5", "crc32fast", "fs2", "hex", @@ -5524,7 +5583,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -5534,14 +5593,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.4", + "parking_lot_core 0.9.5", ] [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -5553,9 +5612,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ "cfg-if", "libc", @@ -5566,9 +5625,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" [[package]] name = "pbkdf2" @@ -5602,9 +5661,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8" +checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" dependencies = [ "thiserror", "ucd-trie", @@ -5612,9 +5671,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f" +checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" dependencies = [ "pest", "pest_generator", @@ -5622,9 +5681,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4" +checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" dependencies = [ "pest", "pest_meta", @@ -5635,9 +5694,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.4.1" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe" +checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" dependencies = [ "once_cell", "pest", @@ -5714,18 +5773,24 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" +[[package]] +name = "platforms" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" + [[package]] name = "polling" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg", "cfg-if", "libc", "log", "wepoll-ffi", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -5753,9 +5818,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" @@ -5787,6 +5852,16 @@ dependencies = [ "termtree", ] +[[package]] +name = "prettyplease" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "primitive-types" version = "0.8.0" @@ -5909,9 +5984,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" +checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" dependencies = [ "bytes", "prost-derive", @@ -5919,9 +5994,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" dependencies = [ "bytes", "heck", @@ -5930,9 +6005,11 @@ dependencies = [ "log", "multimap", "petgraph", + "prettyplease", "prost", "prost-types", "regex", + "syn", "tempfile", "which", ] @@ -5952,9 +6029,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" +checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" dependencies = [ "anyhow", "itertools", @@ -5965,9 +6042,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" dependencies = [ "bytes", "prost", @@ -6122,21 +6199,19 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[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", @@ -6198,9 +6273,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -6218,9 +6293,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "remove_dir_all" @@ -6279,11 +6354,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c9f5d2a0c3e2ea729ab3706d22217177770654c3ef5056b68b69d07332d3f5" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi", ] @@ -6302,6 +6378,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "rustc-demangle" version = "0.1.21" @@ -7534,9 +7620,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8" +checksum = "001cf62ece89779fd16105b5f515ad0e5cedcd5440d3dd806bb067978e7c3608" dependencies = [ "bitvec", "cfg-if", @@ -7548,9 +7634,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496" +checksum = "303959cf613a6f6efd19ed4b4ad5bf79966a13352716299ad532cfb115f4205c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7665,9 +7751,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" +checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" dependencies = [ "secp256k1-sys", ] @@ -7766,18 +7852,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" dependencies = [ "proc-macro2", "quote", @@ -7797,9 +7883,9 @@ 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", @@ -7836,7 +7922,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -7872,7 +7958,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.5", + "digest 0.10.6", ] [[package]] @@ -7893,7 +7979,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", ] @@ -7927,7 +8013,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.5", + "digest 0.10.6", "rand_core 0.6.4", ] @@ -7966,9 +8052,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" @@ -7977,9 +8063,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", - "blake2 0.10.4", + "blake2 0.10.5", "chacha20poly1305", - "curve25519-dalek 4.0.0-pre.1", + "curve25519-dalek 4.0.0-pre.5", "rand_core 0.6.4", "ring", "rustc_version 0.4.0", @@ -8036,7 +8122,7 @@ name = "sp-api-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "blake2 0.10.4", + "blake2 0.10.5", "proc-macro-crate", "proc-macro2", "quote", @@ -8252,7 +8338,7 @@ dependencies = [ "array-bytes", "base58", "bitflags", - "blake2 0.10.4", + "blake2 0.10.5", "byteorder", "dyn-clonable", "ed25519-zebra", @@ -8297,7 +8383,7 @@ dependencies = [ "array-bytes", "base58", "bitflags", - "blake2 0.10.4", + "blake2 0.10.5", "byteorder", "dyn-clonable", "ed25519-zebra", @@ -8340,9 +8426,9 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a" dependencies = [ - "blake2 0.10.4", + "blake2 0.10.5", "byteorder", - "digest 0.10.5", + "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -8354,9 +8440,9 @@ name = "sp-core-hashing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "blake2 0.10.4", + "blake2 0.10.5", "byteorder", - "digest 0.10.5", + "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", @@ -9106,7 +9192,7 @@ dependencies = [ "cfg_aliases", "libc", "parking_lot 0.11.2", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "static_init_macro", "winapi", ] @@ -9184,7 +9270,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd540ba72520174c2c73ce96bf507eeba3cc8a481f58be92525b69110e1fa645" dependencies = [ - "platforms", + "platforms 1.1.0", ] [[package]] @@ -9340,9 +9426,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", @@ -9390,9 +9476,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02424087780c9b71cc96799eaeddff35af2bc513278cda5c99fc1f5d026d3c1" +checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" [[package]] name = "tempfile" @@ -9480,9 +9566,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -9554,9 +9640,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", @@ -9602,9 +9688,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" dependencies = [ "serde", ] @@ -9788,7 +9874,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", ] @@ -9806,9 +9892,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" @@ -9818,9 +9904,9 @@ checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "uint" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -10146,7 +10232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", - "libm", + "libm 0.2.6", "memory_units", "num-rational", "num-traits", @@ -10163,9 +10249,9 @@ dependencies = [ [[package]] name = "wasmtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f511c4917c83d04da68333921107db75747c4e11a2f654a8e909cc5e0520dc" +checksum = "4ad5af6ba38311282f2a21670d96e78266e8c8e2f38cbcd52c254df6ccbc7731" dependencies = [ "anyhow", "bincode", @@ -10173,7 +10259,7 @@ dependencies = [ "indexmap", "libc", "log", - "object", + "object 0.29.0", "once_cell", "paste", "psm", @@ -10191,18 +10277,18 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39bf3debfe744bf19dd3732990ce6f8c0ced7439e2370ba4e1d8f5a3660a3178" +checksum = "45de63ddfc8b9223d1adc8f7b2ee5f35d1f6d112833934ad7ea66e4f4339e597" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece42fa4676a263f7558cdaaf5a71c2592bebcbac22a0580e33cf3406c103da2" +checksum = "bcd849399d17d2270141cfe47fa0d91ee52d5f8ea9b98cf7ddde0d53e5f79882" dependencies = [ "anyhow", "base64", @@ -10220,9 +10306,9 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058217e28644b012bdcdf0e445f58d496d78c2e0b6a6dd93558e701591dad705" +checksum = "4bd91339b742ff20bfed4532a27b73c86b5bcbfedd6bea2dcdf2d64471e1b5c6" dependencies = [ "anyhow", "cranelift-codegen", @@ -10230,9 +10316,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -10241,16 +10327,16 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7af06848df28b7661471d9a80d30a973e0f401f2e3ed5396ad7e225ed217047" +checksum = "ebb881c61f4f627b5d45c54e629724974f8a8890d455bcbe634330cc27309644" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log", - "object", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -10260,18 +10346,18 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9028fb63a54185b3c192b7500ef8039c7bb8d7f62bfc9e7c258483a33a3d13bb" +checksum = "1985c628011fe26adf5e23a5301bdc79b245e0e338f14bb58b39e4e25e4d8681" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "rustc-demangle", "rustix 0.35.13", "serde", @@ -10285,20 +10371,20 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37" +checksum = "f671b588486f5ccec8c5a3dba6b4c07eac2e66ab8c60e6f4e53717c77f709731" dependencies = [ - "object", + "object 0.29.0", "once_cell", "rustix 0.35.13", ] [[package]] name = "wasmtime-runtime" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0e9bea7d517d114fe66b930b2124ee086516ee93eeebfd97f75f366c5b0553" +checksum = "ee8f92ad4b61736339c29361da85769ebc200f184361959d1792832e592a1afd" dependencies = [ "anyhow", "cc", @@ -10308,7 +10394,7 @@ dependencies = [ "log", "mach", "memfd", - "memoffset", + "memoffset 0.6.5", "paste", "rand 0.8.5", "rustix 0.35.13", @@ -10321,9 +10407,9 @@ dependencies = [ [[package]] name = "wasmtime-types" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b83e93ed41b8fdc936244cfd5e455480cf1eca1fd60c78a0040038b4ce5075" +checksum = "d23d61cb4c46e837b431196dd06abb11731541021916d03476a178b54dc07aeb" dependencies = [ "cranelift-entity", "serde", @@ -10590,9 +10676,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.5" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki", ] @@ -10799,18 +10885,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", ] @@ -10882,9 +10968,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", @@ -10913,9 +10999,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.4+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0" dependencies = [ "cc", "libc", diff --git a/protocol-substrate-fixtures b/protocol-substrate-fixtures new file mode 160000 index 000000000..845bdb051 --- /dev/null +++ b/protocol-substrate-fixtures @@ -0,0 +1 @@ +Subproject commit 845bdb05177a4ab2fd3101bfee4cddf9f19a6821 diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index 74b977154..5893f00e2 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -19,10 +19,8 @@ //! 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::{create_extrinsic, FullClient}; - -use kitchensink_runtime::{BalancesCall, SystemCall}; +use webb_runtime::{BalancesCall, SystemCall}; use webb_primitives::{AccountId, Balance}; use sc_cli::Result; use sp_inherents::{InherentData, InherentDataProvider}; diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 15778ca4a..e54ec120e 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -200,19 +200,19 @@ fn testnet_genesis( log::info!("Verifier params for mixer"); let mixer_verifier_bn254_params = { let vk_bytes = - include_bytes!("../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); + include_bytes!("../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); vk_bytes.to_vec() }; log::info!("Verifier params for vanchor"); let vanchor_verifier_2_2_bn254_params = { let vk_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"); + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"); vk_bytes.to_vec() }; let vanchor_verifier_2_16_bn254_params = { let vk_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"); + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"); vk_bytes.to_vec() }; diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs index 0db8fc7b2..56d0fb1d7 100644 --- a/standalone/node/src/service.rs +++ b/standalone/node/src/service.rs @@ -33,6 +33,11 @@ use std::sync::Arc; use webb_primitives::opaque::Block; use webb_runtime::RuntimeApi; +use sp_runtime::SaturatedConversion; +use sp_core::{Pair, Encode}; +use sp_api::ProvideRuntimeApi; +use substrate_frame_rpc_system::AccountNonceApi; + // Declare an instance of the native executor named `ExecutorDispatch`. Include the wasm binary as // the equivalent wasm code. pub struct ExecutorDispatch; @@ -496,3 +501,71 @@ pub fn new_full( new_full_base(config, disable_hardware_benchmarks, |_, _| ()) .map(|NewFullBase { task_manager, .. }| task_manager) } + +/// Fetch the nonce of the given `account` from the chain state. +/// +/// Note: Should only be used for tests. +pub fn fetch_nonce(client: &FullClient, account: sp_core::sr25519::Pair) -> u32 { + let best_hash = client.chain_info().best_hash; + client + .runtime_api() + .account_nonce(&sp_runtime::generic::BlockId::Hash(best_hash), account.public().into()) + .expect("Fetching account nonce works; qed") +} + +pub fn create_extrinsic( + client: &FullClient, + sender: sp_core::sr25519::Pair, + function: impl Into, + nonce: Option, +) -> webb_runtime::UncheckedExtrinsic { + let function = function.into(); + 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 nonce = nonce.unwrap_or_else(|| fetch_nonce(client, sender.clone())); + + let period = webb_runtime::BlockHashCount::get() + .checked_next_power_of_two() + .map(|c| c / 2) + .unwrap_or(2) as u64; + let tip = 0; + let extra: webb_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_asset_tx_payment::ChargeAssetTxPayment::::from( + tip, None, + ), + ); + + let raw_payload = webb_runtime::SignedPayload::from_raw( + function.clone(), + extra.clone(), + ( + (), + webb_runtime::VERSION.spec_version, + webb_runtime::VERSION.transaction_version, + genesis_hash, + best_hash, + (), + (), + (), + ), + ); + let signature = raw_payload.using_encoded(|e| sender.sign(e)); + + webb_runtime::UncheckedExtrinsic::new_signed( + function, + sp_runtime::AccountId32::from(sender.public()).into(), + webb_runtime::Signature::Sr25519(signature), + extra, + ) +} From 859bfaf99c024525ebdfa2a79780af0c70461bca Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 16 Dec 2022 12:21:42 -0500 Subject: [PATCH 05/29] wip --- Cargo.lock | 1185 ++++++++--------- Cargo.toml | 2 +- client/Cargo.toml | 2 +- client/tests/integration_tests.rs | 8 +- pallets/mixer/src/mock.rs | 1 + pallets/mixer/src/tests.rs | 4 +- pallets/signature-bridge/src/mock.rs | 7 + .../src/mock_signature_bridge.rs | 2 + pallets/token-wrapper/src/mock.rs | 3 +- .../src/mock_signature_bridge.rs | 3 + pallets/vanchor/src/benchmarking.rs | 8 +- pallets/vanchor/src/mock.rs | 1 + pallets/vanchor/src/tests.rs | 8 +- standalone/runtime/src/lib.rs | 1 - 14 files changed, 613 insertions(+), 622 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 771cb519c..46f56fd9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2059,13 +2059,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", ] [[package]] @@ -2105,16 +2105,16 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-database", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0", "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-trie 7.0.0", "tempfile", "thiserror", "thousands", @@ -2141,10 +2141,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -2156,11 +2156,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -2193,16 +2193,16 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tt-call", ] @@ -2253,10 +2253,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -2271,9 +2271,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4374,9 +4374,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4390,8 +4390,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4406,9 +4406,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "xcm", ] @@ -4421,9 +4421,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4456,11 +4456,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", "xcm", ] @@ -4477,10 +4477,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4493,8 +4493,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4507,10 +4507,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-authority-discovery", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4524,8 +4524,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4542,14 +4542,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -4565,11 +4565,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", ] [[package]] @@ -4583,8 +4583,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4599,10 +4599,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4618,10 +4618,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4635,10 +4635,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4653,10 +4653,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4673,12 +4673,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "static_assertions", "strum", ] @@ -4693,7 +4693,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", ] [[package]] @@ -4707,11 +4707,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4727,14 +4727,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -4760,10 +4760,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -4778,9 +4778,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4795,12 +4795,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -4813,11 +4813,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", "sp-keyring", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -4833,10 +4833,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -4866,10 +4866,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -4884,8 +4884,8 @@ dependencies = [ "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", "webb-primitives", ] @@ -4897,7 +4897,7 @@ dependencies = [ "pallet-linkable-tree", "parity-scale-codec", "sp-api", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", "webb-primitives", ] @@ -4932,10 +4932,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -4959,10 +4959,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -4977,8 +4977,8 @@ dependencies = [ "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", "webb-primitives", ] @@ -5003,9 +5003,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5018,11 +5018,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -5037,9 +5037,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -5053,10 +5053,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5069,9 +5069,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5084,8 +5084,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5102,10 +5102,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -5120,9 +5120,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5137,13 +5137,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", + "sp-trie 7.0.0", ] [[package]] @@ -5162,11 +5162,11 @@ dependencies = [ "pallet-vanchor-handler", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -5185,11 +5185,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -5212,9 +5212,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5229,9 +5229,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -5250,11 +5250,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -5276,11 +5276,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", "webb-proposals", ] @@ -5295,10 +5295,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5311,9 +5311,9 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -5325,7 +5325,7 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -5342,8 +5342,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5356,10 +5356,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -5397,10 +5397,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -5433,11 +5433,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", "webb-proposals", ] @@ -5456,10 +5456,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -5477,10 +5477,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-primitives", ] @@ -6541,8 +6541,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-wasm-interface 7.0.0", "thiserror", ] @@ -6566,9 +6566,9 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -6590,9 +6590,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", ] @@ -6606,10 +6606,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", ] [[package]] @@ -6625,8 +6625,8 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -6669,11 +6669,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-keyring", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-panic-handler 5.0.0", + "sp-runtime 7.0.0", "sp-version", "thiserror", "tiny-bip39", @@ -6697,14 +6697,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-database", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-storage 7.0.0", + "sp-trie 7.0.0", "substrate-prometheus-endpoint", ] @@ -6724,13 +6724,13 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-database", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-trie 7.0.0", ] [[package]] @@ -6750,9 +6750,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -6781,18 +6781,18 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -6810,13 +6810,13 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -6830,7 +6830,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", ] [[package]] @@ -6846,14 +6846,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "thiserror", ] @@ -6864,7 +6864,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "thiserror", ] @@ -6881,15 +6881,15 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-core-hashing-proc-macro", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0", + "sp-io 7.0.0", + "sp-panic-handler 5.0.0", + "sp-runtime-interface 7.0.0", + "sp-trie 7.0.0", "sp-version", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0", "tracing", "wasmi", ] @@ -6904,7 +6904,7 @@ dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0", "thiserror", "wasm-instrument", "wasmi", @@ -6919,9 +6919,9 @@ dependencies = [ "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0", "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0", "wasmi", ] @@ -6939,9 +6939,9 @@ dependencies = [ "rustix 0.35.13", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0", "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0", "wasmtime", ] @@ -6974,14 +6974,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -7002,8 +7002,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -7021,7 +7021,7 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", ] [[package]] @@ -7033,9 +7033,9 @@ dependencies = [ "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-keystore 0.13.0", "thiserror", ] @@ -7075,11 +7075,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -7100,7 +7100,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "thiserror", "unsigned-varint", "void", @@ -7127,7 +7127,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -7145,7 +7145,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -7166,8 +7166,8 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -7193,12 +7193,12 @@ dependencies = [ "sc-peerset", "sc-utils", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-finality-grandpa", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "thiserror", ] @@ -7217,7 +7217,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "substrate-prometheus-endpoint", ] @@ -7244,9 +7244,9 @@ dependencies = [ "sc-peerset", "sc-utils", "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-offchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "threadpool", "tracing", ] @@ -7294,11 +7294,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-keystore 0.13.0", "sp-offchain", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "sp-session", "sp-version", ] @@ -7318,10 +7318,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "sp-version", "thiserror", ] @@ -7353,8 +7353,8 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "thiserror", ] @@ -7403,22 +7403,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "sp-session", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -7440,7 +7440,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", ] [[package]] @@ -7458,7 +7458,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "thiserror", ] @@ -7476,9 +7476,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -7520,10 +7520,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "thiserror", "tracing", "tracing-log", @@ -7560,9 +7560,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-tracing 6.0.0", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -7578,7 +7578,7 @@ dependencies = [ "log", "serde", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "thiserror", ] @@ -8108,11 +8108,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "sp-version", "thiserror", ] @@ -8131,16 +8131,15 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a70f8245ad75c773c43e46d16e81adb62290d37cd07efcde6cef06d93235e5" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-io 6.0.0", + "sp-std 4.0.0", ] [[package]] @@ -8151,24 +8150,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", ] [[package]] name = "sp-arithmetic" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3856b3e912f0a7a1332f1642b5fd3c2e76476e894c656538d32c004698690157" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", "static_assertions", ] @@ -8182,8 +8180,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", "static_assertions", ] @@ -8195,9 +8193,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8208,8 +8206,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8220,8 +8218,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8237,8 +8235,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", "thiserror", ] @@ -8252,11 +8250,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", "sp-version", "thiserror", ] @@ -8270,12 +8268,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-consensus", "sp-consensus-slots", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -8290,15 +8288,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -8310,9 +8308,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-timestamp", ] @@ -8324,16 +8322,15 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] name = "sp-core" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c78530907dbf7949af928d0ce88b485067389201b6d9b468074b1924f209f0" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "array-bytes", "base58", @@ -8361,12 +8358,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core-hashing 4.0.0", + "sp-debug-derive 4.0.0", + "sp-externalities 0.12.0", + "sp-runtime-interface 6.0.0", + "sp-std 4.0.0", + "sp-storage 6.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -8406,12 +8403,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core-hashing 5.0.0", + "sp-debug-derive 5.0.0", + "sp-externalities 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -8422,16 +8419,15 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "blake2 0.10.5", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0", "twox-hash", ] @@ -8445,7 +8441,7 @@ dependencies = [ "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", "twox-hash", ] @@ -8456,7 +8452,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core-hashing 5.0.0", "syn", ] @@ -8471,9 +8467,8 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9ba7352773b96a4aa57e903447f841c6bc26e8c798377db6e7eb332346454" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "proc-macro2", "quote", @@ -8492,14 +8487,13 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef739442230f49d88ece41259e5d886d6b8bc0f4197ef7f1585c39c762ce7ef2" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0", + "sp-storage 6.0.0", ] [[package]] @@ -8509,8 +8503,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", + "sp-storage 7.0.0", ] [[package]] @@ -8524,11 +8518,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-core 7.0.0", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8539,17 +8533,16 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-io" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6280bd3643354f7ff0b2abd36c687745455779231a7a86d90945608f0d4924c4" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "bytes", "futures", @@ -8559,15 +8552,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-keystore 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-state-machine 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-externalities 0.12.0", + "sp-keystore 0.12.0", + "sp-runtime-interface 6.0.0", + "sp-state-machine 0.12.0", + "sp-std 4.0.0", + "sp-tracing 5.0.0", + "sp-trie 6.0.0", + "sp-wasm-interface 6.0.0", "tracing", "tracing-core", ] @@ -8586,15 +8579,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-keystore 0.13.0", + "sp-runtime-interface 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-tracing 6.0.0", + "sp-trie 7.0.0", + "sp-wasm-interface 7.0.0", "tracing", "tracing-core", ] @@ -8605,16 +8598,15 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "lazy_static", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "strum", ] [[package]] name = "sp-keystore" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44bec4f0d036b6993c14bbee4216781f21275e5c201e43e45fed4a434bf0e5a" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "async-trait", "futures", @@ -8622,8 +8614,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnorrkel", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-externalities 0.12.0", "thiserror", ] @@ -8639,8 +8631,8 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-externalities 0.13.0", "thiserror", ] @@ -8661,10 +8653,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8673,15 +8665,14 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] name = "sp-panic-handler" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97549ec99cb289db2a9f5c656b6880f7c90097135e1ca6c6ae4fe5694232e526" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "backtrace", "lazy_static", @@ -8705,14 +8696,13 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "rustc-hash", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", ] [[package]] name = "sp-runtime" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfc5c54c2b31d2f0cf904d472a0bff7125c0c2a2e2330507842e56f9a27444" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "either", "hash256-std-hasher", @@ -8724,12 +8714,12 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-weights 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-application-crypto 6.0.0", + "sp-arithmetic 5.0.0", + "sp-core 6.0.0", + "sp-io 6.0.0", + "sp-std 4.0.0", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33)", ] [[package]] @@ -8747,30 +8737,29 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-runtime-interface" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b886a5d34400b0e0c12d389e3bb48b7a93d651cddf7e248124b81fe64c339251" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types 0.12.1", - "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface-proc-macro 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.12.0", + "sp-runtime-interface-proc-macro 5.0.0", + "sp-std 4.0.0", + "sp-storage 6.0.0", + "sp-tracing 5.0.0", + "sp-wasm-interface 6.0.0", "static_assertions", ] @@ -8783,20 +8772,19 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types 0.12.1", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0", + "sp-runtime-interface-proc-macro 6.0.0", + "sp-std 5.0.0", + "sp-storage 7.0.0", + "sp-tracing 6.0.0", + "sp-wasm-interface 7.0.0", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a157f1ce0108b9b87f87e826726049d9b6253318b74410c814be7fc2af416b51" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "Inflector", "proc-macro-crate", @@ -8824,10 +8812,10 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "log", "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-std 5.0.0", + "sp-wasm-interface 7.0.0", "wasmi", ] @@ -8839,10 +8827,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", ] [[package]] @@ -8852,15 +8840,14 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", ] [[package]] name = "sp-state-machine" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5c2d97ad69011d34ca257f0383532b80096d53f889f5894ae2b24a211bec66f" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "hash-db", "log", @@ -8869,11 +8856,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-panic-handler 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-externalities 0.12.0", + "sp-panic-handler 4.0.0", + "sp-std 4.0.0", + "sp-trie 6.0.0", "thiserror", "tracing", "trie-root", @@ -8891,11 +8878,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-externalities 0.13.0", + "sp-panic-handler 5.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "thiserror", "tracing", "trie-root", @@ -8903,9 +8890,8 @@ dependencies = [ [[package]] name = "sp-std" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3fd4c1d304be101e6ebbafd3d4be9a37b320c970ef4e8df188b16873981c93" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" [[package]] name = "sp-std" @@ -8914,16 +8900,15 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 [[package]] name = "sp-storage" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb987ed2e4d7d870170a225083ea962f2a359d75cdf76935d5ed8d91bee912d9" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", ] [[package]] @@ -8935,8 +8920,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", ] [[package]] @@ -8950,19 +8935,18 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "thiserror", ] [[package]] name = "sp-tracing" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e761df87dc940d87720939de8f976d1fc0657e523886ae0d7bf3f7e2e2f0abb6" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -8974,7 +8958,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", "tracing", "tracing-core", "tracing-subscriber", @@ -8986,7 +8970,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", ] [[package]] @@ -8998,18 +8982,17 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", ] [[package]] name = "sp-trie" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4f48c887e90050537e399d2d8b6ee82787ebec0fe46e4880b42cab0c2d5ba6" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "ahash", "hash-db", @@ -9021,8 +9004,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-std 4.0.0", "thiserror", "tracing", "trie-db", @@ -9044,8 +9027,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-std 5.0.0", "thiserror", "tracing", "trie-db", @@ -9063,8 +9046,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "sp-version-proc-macro", "thiserror", ] @@ -9082,14 +9065,13 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f43c40afab6ecac20505907631c929957ed636b7af8795984649bbaa6ff38c3" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 4.0.0", "wasmi", ] @@ -9101,7 +9083,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", "wasmi", "wasmtime", ] @@ -9109,18 +9091,17 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c671673133b30e6ab6d88139b06adcdaec5aa06548abe0e155a0c830b592793b" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 5.0.0", + "sp-core 6.0.0", + "sp-debug-derive 4.0.0", + "sp-std 4.0.0", ] [[package]] @@ -9133,10 +9114,10 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0", + "sp-core 7.0.0", + "sp-debug-derive 5.0.0", + "sp-std 5.0.0", ] [[package]] @@ -9290,8 +9271,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-runtime 7.0.0", ] [[package]] @@ -9319,12 +9300,12 @@ dependencies = [ "sc-rpc-api", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-state-machine 0.13.0", + "sp-std 5.0.0", + "sp-trie 7.0.0", "trie-db", ] @@ -9353,9 +9334,8 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3cbc78fd36035a24883eada29e0205b9b1416172530a7d00a60c07d0337db0c" +version = "0.24.0" +source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" dependencies = [ "bitvec", "derivative", @@ -9371,8 +9351,8 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", + "sp-runtime 6.0.0", "subxt-macro", "subxt-metadata", "thiserror", @@ -9381,9 +9361,8 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7722c31febf55eb300c73d977da5d65cfd6fb443419b1185b9abcdd9925fd7be" +version = "0.24.0" +source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" dependencies = [ "darling", "frame-metadata", @@ -9402,9 +9381,8 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f64826f2c4ba20e3b2a86ec81a6ae8655ca6b6a4c2a6ccc888b6615efc2df14" +version = "0.24.0" +source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" dependencies = [ "darling", "proc-macro-error", @@ -9414,14 +9392,13 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869af75e23513538ad0af046af4a97b8d684e8d202e35ff4127ee061c1110813" +version = "0.24.0" +source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 6.0.0", ] [[package]] @@ -10447,9 +10424,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-keyring", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "subxt", "tokio", "webb-primitives", @@ -10481,10 +10458,10 @@ dependencies = [ "serde", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", + "sp-io 7.0.0", + "sp-runtime 7.0.0", + "sp-std 5.0.0", "webb-proposals", ] @@ -10561,12 +10538,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-finality-grandpa", "sp-inherents", "sp-keyring", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0", + "sp-runtime 7.0.0", "sp-timestamp", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -10648,15 +10625,15 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0", "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0", "sp-npos-elections", "sp-offchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "sp-session", "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0", "sp-transaction-pool", "sp-version", "static_assertions", @@ -10922,7 +10899,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0", "xcm-procedural", ] diff --git a/Cargo.toml b/Cargo.toml index c7f9f4576..dd08f7f4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,4 +22,4 @@ members = [ "pallets/relayer-registry", "pallets/key-storage", "standalone/*", -] +] \ No newline at end of file diff --git a/client/Cargo.toml b/client/Cargo.toml index 7d40fcd45..e77418bf2 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } -subxt = { version = "0.25.0" } +subxt = { git = "https://github.com/paritytech/subxt" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full", "bit-vec"] } [dev-dependencies] diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index 9cffd6251..1620e93aa 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -29,9 +29,9 @@ async fn test_mixer() -> Result<(), Box> { let signer = PairSigner::new(AccountKeyring::Alice.pair()); let pk_bytes = - include_bytes!("../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); + include_bytes!("../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); let vk_bytes = - include_bytes!("../../substrate-fixtures/mixer/bn254/x5/verifying_key_uncompressed.bin"); + include_bytes!("../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key_uncompressed.bin"); let recipient = AccountKeyring::Bob.to_account_id(); let relayer = AccountKeyring::Bob.to_account_id(); let recipient_bytes = truncate_and_pad(&&recipient.encode()); @@ -233,10 +233,10 @@ async fn test_vanchor() -> Result<(), Box> { let api: OnlineClient<_> = OnlineClient::::new().await?; let pk_bytes = include_bytes!( - "../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ); let vk_bytes = include_bytes!( - "../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key_uncompressed.bin" + "../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key_uncompressed.bin" ); let recipient = AccountKeyring::Bob.to_account_id(); diff --git a/pallets/mixer/src/mock.rs b/pallets/mixer/src/mock.rs index 3f20f3288..b453def13 100644 --- a/pallets/mixer/src/mock.rs +++ b/pallets/mixer/src/mock.rs @@ -206,6 +206,7 @@ impl orml_tokens::Config for Test { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type CurrencyHooks = (); } pub type NativeCurrency = NativeCurrencyOf; diff --git a/pallets/mixer/src/tests.rs b/pallets/mixer/src/tests.rs index dd983c047..42f566008 100644 --- a/pallets/mixer/src/tests.rs +++ b/pallets/mixer/src/tests.rs @@ -41,10 +41,10 @@ fn setup_environment(curve: Curve) -> Vec { // 3. Setup the VerifierPallet // but to do so, we need to have a VerifyingKey let pk_bytes = include_bytes!( - "../../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" + "../../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" ); let vk_bytes = - include_bytes!("../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); + include_bytes!("../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); assert_ok!(VerifierPallet::force_set_parameters( RuntimeOrigin::root(), diff --git a/pallets/signature-bridge/src/mock.rs b/pallets/signature-bridge/src/mock.rs index 2b7927d49..68258a03a 100644 --- a/pallets/signature-bridge/src/mock.rs +++ b/pallets/signature-bridge/src/mock.rs @@ -94,6 +94,12 @@ impl Contains for SetResourceProposalFilter { } } +impl Contains for SetResourceProposalFilter { + fn contains(_c: &RuntimeOrigin) -> bool { + false + } +} + pub struct ExecuteAllProposalsFilter; impl Contains for ExecuteAllProposalsFilter { fn contains(c: &RuntimeCall) -> bool { @@ -119,6 +125,7 @@ impl Config for Test { type SetResourceProposalFilter = SetResourceProposalFilter; type ExecuteProposalFilter = ExecuteAllProposalsFilter; type MaintainerNonce = u32; + type Proposal = RuntimeCall; type SignatureVerifier = webb_primitives::signing::SignatureVerifier; type WeightInfo = (); } diff --git a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs index 105665ee3..e04902d8a 100644 --- a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs +++ b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs @@ -123,6 +123,7 @@ impl orml_tokens::Config for Test { type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; } @@ -236,6 +237,7 @@ impl pallet_signature_bridge::Config for Test { type MaintainerNonce = MaintainerNonce; type SignatureVerifier = webb_primitives::signing::SignatureVerifier; type WeightInfo = (); + type Proposal = RuntimeCall; } impl Config for Test { diff --git a/pallets/token-wrapper/src/mock.rs b/pallets/token-wrapper/src/mock.rs index 0d00cddbd..f92748ef6 100644 --- a/pallets/token-wrapper/src/mock.rs +++ b/pallets/token-wrapper/src/mock.rs @@ -116,7 +116,8 @@ impl orml_tokens::Config for Test { type ExistentialDeposits = AssetRegistry; type WeightInfo = (); type MaxLocks = (); - type OnNewTokenAccount = (); + type CurrencyHooks = (); + type MaxReserves = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/vanchor-handler/src/mock_signature_bridge.rs b/pallets/vanchor-handler/src/mock_signature_bridge.rs index 66853ce11..091158abc 100644 --- a/pallets/vanchor-handler/src/mock_signature_bridge.rs +++ b/pallets/vanchor-handler/src/mock_signature_bridge.rs @@ -208,6 +208,8 @@ impl orml_tokens::Config for Test { type WeightInfo = (); type MaxLocks = (); type ReserveIdentifier = [u8; 8]; + type CurrencyHooks = (); + type MaxReserves = (); } pub type NativeCurrency = NativeCurrencyOf; @@ -313,6 +315,7 @@ impl pallet_signature_bridge::Config for Test { type MaintainerNonce = MaintainerNonce; type SignatureVerifier = webb_primitives::signing::SignatureVerifier; type WeightInfo = (); + type Proposal = RuntimeCall; } parameter_types! { diff --git a/pallets/vanchor/src/benchmarking.rs b/pallets/vanchor/src/benchmarking.rs index de5451f87..2e316b73b 100644 --- a/pallets/vanchor/src/benchmarking.rs +++ b/pallets/vanchor/src/benchmarking.rs @@ -65,19 +65,19 @@ where // but to do so, we need to have a VerifyingKey let pk_2_2_bytes = include_bytes!( - "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_2_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") .to_vec(); let pk_2_16_bytes = include_bytes!( - "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" + "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_16_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") .to_vec(); assert_ok!(>::force_set_parameters( diff --git a/pallets/vanchor/src/mock.rs b/pallets/vanchor/src/mock.rs index 20208e9dd..96663f1a4 100644 --- a/pallets/vanchor/src/mock.rs +++ b/pallets/vanchor/src/mock.rs @@ -194,6 +194,7 @@ impl orml_tokens::Config for Test { type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/vanchor/src/tests.rs b/pallets/vanchor/src/tests.rs index b6ee11a91..4ada931d4 100644 --- a/pallets/vanchor/src/tests.rs +++ b/pallets/vanchor/src/tests.rs @@ -50,19 +50,19 @@ fn setup_environment() -> (Vec, Vec, Vec, Vec) { // but to do so, we need to have a VerifyingKey let pk_2_2_bytes = include_bytes!( - "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_2_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") .to_vec(); let pk_2_16_bytes = include_bytes!( - "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" + "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_16_bytes = - include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") + include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") .to_vec(); assert_ok!(VAnchorVerifier::force_set_parameters( diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 6f26c4d11..370c34a59 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -19,7 +19,6 @@ use frame_support::{ }; use frame_system::EnsureSigned; use impls::{Author, CreditToBlockAuthor}; -use orml_tokens::TransferDust; use orml_traits::currency::MutationHooks; use pallet_grandpa::{ fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList, From 41ed6791083ce39f7b9a593b6a73db29bf9bed3b Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 16 Dec 2022 13:33:44 -0500 Subject: [PATCH 06/29] try workaround - wrapper types --- Cargo.lock | 1185 +++++++++++++++-------------- client/Cargo.toml | 2 +- client/tests/integration_tests.rs | 33 +- 3 files changed, 630 insertions(+), 590 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 46f56fd9c..771cb519c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2059,13 +2059,13 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -2105,16 +2105,16 @@ dependencies = [ "serde_nanos", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-externalities 0.13.0", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-trie 7.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tempfile", "thiserror", "thousands", @@ -2141,10 +2141,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -2156,11 +2156,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -2193,16 +2193,16 @@ dependencies = [ "serde", "smallvec", "sp-api", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core-hashing-proc-macro", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tt-call", ] @@ -2253,10 +2253,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -2271,9 +2271,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4374,9 +4374,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4390,8 +4390,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4406,9 +4406,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "xcm", ] @@ -4421,9 +4421,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4456,11 +4456,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "xcm", ] @@ -4477,10 +4477,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4493,8 +4493,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4507,10 +4507,10 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-authority-discovery", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4524,8 +4524,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4542,14 +4542,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4565,11 +4565,11 @@ dependencies = [ "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4583,8 +4583,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4599,10 +4599,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4618,10 +4618,10 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4635,10 +4635,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4653,10 +4653,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4673,12 +4673,12 @@ dependencies = [ "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", "strum", ] @@ -4693,7 +4693,7 @@ dependencies = [ "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4707,11 +4707,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4727,14 +4727,14 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4760,10 +4760,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4778,9 +4778,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4795,12 +4795,12 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4813,11 +4813,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-keyring", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -4833,10 +4833,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4866,10 +4866,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4884,8 +4884,8 @@ dependencies = [ "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "webb-primitives", ] @@ -4897,7 +4897,7 @@ dependencies = [ "pallet-linkable-tree", "parity-scale-codec", "sp-api", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4932,10 +4932,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4959,10 +4959,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -4977,8 +4977,8 @@ dependencies = [ "sc-rpc", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "webb-primitives", ] @@ -5003,9 +5003,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5018,11 +5018,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5037,9 +5037,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5053,10 +5053,10 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5069,9 +5069,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5084,8 +5084,8 @@ dependencies = [ "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5102,10 +5102,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5120,9 +5120,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5137,13 +5137,13 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5162,11 +5162,11 @@ dependencies = [ "pallet-vanchor-handler", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5185,11 +5185,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5212,9 +5212,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5229,9 +5229,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] @@ -5250,11 +5250,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5276,11 +5276,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "webb-proposals", ] @@ -5295,10 +5295,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5311,9 +5311,9 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -5325,7 +5325,7 @@ dependencies = [ "pallet-transaction-payment", "parity-scale-codec", "sp-api", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] @@ -5342,8 +5342,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5356,10 +5356,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -5397,10 +5397,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5433,11 +5433,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", "webb-proposals", ] @@ -5456,10 +5456,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -5477,10 +5477,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-primitives", ] @@ -6541,8 +6541,8 @@ version = "4.1.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "log", - "sp-core 7.0.0", - "sp-wasm-interface 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -6566,9 +6566,9 @@ dependencies = [ "sp-api", "sp-authority-discovery", "sp-blockchain", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6590,9 +6590,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] @@ -6606,10 +6606,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -6625,8 +6625,8 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -6669,11 +6669,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-keyring", - "sp-keystore 0.13.0", - "sp-panic-handler 5.0.0", - "sp-runtime 7.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", "tiny-bip39", @@ -6697,14 +6697,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-storage 7.0.0", - "sp-trie 7.0.0", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] @@ -6724,13 +6724,13 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 6.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-database", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-trie 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -6750,9 +6750,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6781,18 +6781,18 @@ dependencies = [ "schnorrkel", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-io 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "substrate-prometheus-endpoint", "thiserror", @@ -6810,13 +6810,13 @@ dependencies = [ "sc-rpc-api", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -6830,7 +6830,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -6846,14 +6846,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 6.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -6864,7 +6864,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -6881,15 +6881,15 @@ dependencies = [ "sc-executor-wasmi", "sc-executor-wasmtime", "sp-api", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core-hashing-proc-macro", - "sp-externalities 0.13.0", - "sp-io 7.0.0", - "sp-panic-handler 5.0.0", - "sp-runtime-interface 7.0.0", - "sp-trie 7.0.0", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", "wasmi", ] @@ -6904,7 +6904,7 @@ dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-sandbox", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "wasm-instrument", "wasmi", @@ -6919,9 +6919,9 @@ dependencies = [ "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-sandbox", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "wasmi", ] @@ -6939,9 +6939,9 @@ dependencies = [ "rustix 0.35.13", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-sandbox", - "sp-wasm-interface 7.0.0", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "wasmtime", ] @@ -6974,14 +6974,14 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -7002,8 +7002,8 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7021,7 +7021,7 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -7033,9 +7033,9 @@ dependencies = [ "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-keystore 0.13.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7075,11 +7075,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 6.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -7100,7 +7100,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "unsigned-varint", "void", @@ -7127,7 +7127,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "thiserror", ] @@ -7145,7 +7145,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", "tracing", ] @@ -7166,8 +7166,8 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7193,12 +7193,12 @@ dependencies = [ "sc-peerset", "sc-utils", "smallvec", - "sp-arithmetic 6.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7217,7 +7217,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "substrate-prometheus-endpoint", ] @@ -7244,9 +7244,9 @@ dependencies = [ "sc-peerset", "sc-utils", "sp-api", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-offchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "threadpool", "tracing", ] @@ -7294,11 +7294,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-keystore 0.13.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-offchain", "sp-rpc", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-version", ] @@ -7318,10 +7318,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -7353,8 +7353,8 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7403,22 +7403,22 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", - "sp-state-machine 0.13.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 7.0.0", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -7440,7 +7440,7 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -7458,7 +7458,7 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -7476,9 +7476,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -7520,10 +7520,10 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-rpc", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", "tracing-log", @@ -7560,9 +7560,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-tracing 6.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -7578,7 +7578,7 @@ dependencies = [ "log", "serde", "sp-blockchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -8108,11 +8108,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-api-proc-macro", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -8131,15 +8131,16 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a70f8245ad75c773c43e46d16e81adb62290d37cd07efcde6cef06d93235e5" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0", - "sp-io 6.0.0", - "sp-std 4.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -8150,23 +8151,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3856b3e912f0a7a1332f1642b5fd3c2e76476e894c656538d32c004698690157" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0", - "sp-std 4.0.0", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", ] @@ -8180,8 +8182,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", ] @@ -8193,9 +8195,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8206,8 +8208,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8218,8 +8220,8 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8235,8 +8237,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -8250,11 +8252,11 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version", "thiserror", ] @@ -8268,12 +8270,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus", "sp-consensus-slots", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] @@ -8288,15 +8290,15 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] @@ -8308,9 +8310,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", ] @@ -8322,15 +8324,16 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c78530907dbf7949af928d0ce88b485067389201b6d9b468074b1924f209f0" dependencies = [ "array-bytes", "base58", @@ -8358,12 +8361,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0", - "sp-debug-derive 4.0.0", - "sp-externalities 0.12.0", - "sp-runtime-interface 6.0.0", - "sp-std 4.0.0", - "sp-storage 6.0.0", + "sp-core-hashing 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ss58-registry", "substrate-bip39", "thiserror", @@ -8403,12 +8406,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 5.0.0", - "sp-debug-derive 5.0.0", - "sp-externalities 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "ss58-registry", "substrate-bip39", "thiserror", @@ -8419,15 +8422,16 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a" dependencies = [ "blake2 0.10.5", "byteorder", "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", - "sp-std 4.0.0", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "twox-hash", ] @@ -8441,7 +8445,7 @@ dependencies = [ "digest 0.10.6", "sha2 0.10.6", "sha3 0.10.6", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "twox-hash", ] @@ -8452,7 +8456,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 5.0.0", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "syn", ] @@ -8467,8 +8471,9 @@ dependencies = [ [[package]] name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9ba7352773b96a4aa57e903447f841c6bc26e8c798377db6e7eb332346454" dependencies = [ "proc-macro2", "quote", @@ -8487,13 +8492,14 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef739442230f49d88ece41259e5d886d6b8bc0f4197ef7f1585c39c762ce7ef2" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0", - "sp-storage 6.0.0", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -8503,8 +8509,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "environmental", "parity-scale-codec", - "sp-std 5.0.0", - "sp-storage 7.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8518,11 +8524,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 7.0.0", - "sp-core 7.0.0", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8533,16 +8539,17 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6280bd3643354f7ff0b2abd36c687745455779231a7a86d90945608f0d4924c4" dependencies = [ "bytes", "futures", @@ -8552,15 +8559,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core 6.0.0", - "sp-externalities 0.12.0", - "sp-keystore 0.12.0", - "sp-runtime-interface 6.0.0", - "sp-state-machine 0.12.0", - "sp-std 4.0.0", - "sp-tracing 5.0.0", - "sp-trie 6.0.0", - "sp-wasm-interface 6.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-keystore 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-state-machine 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", ] @@ -8579,15 +8586,15 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "secp256k1", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-keystore 0.13.0", - "sp-runtime-interface 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-tracing 6.0.0", - "sp-trie 7.0.0", - "sp-wasm-interface 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", "tracing-core", ] @@ -8598,15 +8605,16 @@ version = "7.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "lazy_static", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "strum", ] [[package]] name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44bec4f0d036b6993c14bbee4216781f21275e5c201e43e45fed4a434bf0e5a" dependencies = [ "async-trait", "futures", @@ -8614,8 +8622,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnorrkel", - "sp-core 6.0.0", - "sp-externalities 0.12.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] @@ -8631,8 +8639,8 @@ dependencies = [ "parking_lot 0.12.1", "schnorrkel", "serde", - "sp-core 7.0.0", - "sp-externalities 0.13.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] @@ -8653,10 +8661,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8665,14 +8673,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97549ec99cb289db2a9f5c656b6880f7c90097135e1ca6c6ae4fe5694232e526" dependencies = [ "backtrace", "lazy_static", @@ -8696,13 +8705,14 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "rustc-hash", "serde", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0edfc5c54c2b31d2f0cf904d472a0bff7125c0c2a2e2330507842e56f9a27444" dependencies = [ "either", "hash256-std-hasher", @@ -8714,12 +8724,12 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0", - "sp-arithmetic 5.0.0", - "sp-core 6.0.0", - "sp-io 6.0.0", - "sp-std 4.0.0", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33)", + "sp-application-crypto 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-io 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-weights 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -8737,29 +8747,30 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 7.0.0", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b886a5d34400b0e0c12d389e3bb48b7a93d651cddf7e248124b81fe64c339251" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types 0.12.1", - "sp-externalities 0.12.0", - "sp-runtime-interface-proc-macro 5.0.0", - "sp-std 4.0.0", - "sp-storage 6.0.0", - "sp-tracing 5.0.0", - "sp-wasm-interface 6.0.0", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime-interface-proc-macro 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", ] @@ -8772,19 +8783,20 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types 0.12.1", - "sp-externalities 0.13.0", - "sp-runtime-interface-proc-macro 6.0.0", - "sp-std 5.0.0", - "sp-storage 7.0.0", - "sp-tracing 6.0.0", - "sp-wasm-interface 7.0.0", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a157f1ce0108b9b87f87e826726049d9b6253318b74410c814be7fc2af416b51" dependencies = [ "Inflector", "proc-macro-crate", @@ -8812,10 +8824,10 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "log", "parity-scale-codec", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-std 5.0.0", - "sp-wasm-interface 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "wasmi", ] @@ -8827,10 +8839,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8840,14 +8852,15 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5c2d97ad69011d34ca257f0383532b80096d53f889f5894ae2b24a211bec66f" dependencies = [ "hash-db", "log", @@ -8856,11 +8869,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 6.0.0", - "sp-externalities 0.12.0", - "sp-panic-handler 4.0.0", - "sp-std 4.0.0", - "sp-trie 6.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-panic-handler 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tracing", "trie-root", @@ -8878,11 +8891,11 @@ dependencies = [ "parking_lot 0.12.1", "rand 0.7.3", "smallvec", - "sp-core 7.0.0", - "sp-externalities 0.13.0", - "sp-panic-handler 5.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", "trie-root", @@ -8890,8 +8903,9 @@ dependencies = [ [[package]] name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3fd4c1d304be101e6ebbafd3d4be9a37b320c970ef4e8df188b16873981c93" [[package]] name = "sp-std" @@ -8900,15 +8914,16 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 [[package]] name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb987ed2e4d7d870170a225083ea962f2a359d75cdf76935d5ed8d91bee912d9" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0", - "sp-std 4.0.0", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -8920,8 +8935,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8935,18 +8950,19 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] [[package]] name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e761df87dc940d87720939de8f976d1fc0657e523886ae0d7bf3f7e2e2f0abb6" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tracing", "tracing-core", "tracing-subscriber", @@ -8958,7 +8974,7 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "parity-scale-codec", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "tracing", "tracing-core", "tracing-subscriber", @@ -8970,7 +8986,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ "sp-api", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -8982,17 +8998,18 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-runtime 7.0.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4f48c887e90050537e399d2d8b6ee82787ebec0fe46e4880b42cab0c2d5ba6" dependencies = [ "ahash", "hash-db", @@ -9004,8 +9021,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 6.0.0", - "sp-std 4.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tracing", "trie-db", @@ -9027,8 +9044,8 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "scale-info", - "sp-core 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", "tracing", "trie-db", @@ -9046,8 +9063,8 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-version-proc-macro", "thiserror", ] @@ -9065,13 +9082,14 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f43c40afab6ecac20505907631c929957ed636b7af8795984649bbaa6ff38c3" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 4.0.0", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi", ] @@ -9083,7 +9101,7 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "wasmi", "wasmtime", ] @@ -9091,17 +9109,18 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.33#2dff067e9f7f6f3cc4dbfdaaa97753eccc407689" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c671673133b30e6ab6d88139b06adcdaec5aa06548abe0e155a0c830b592793b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 5.0.0", - "sp-core 6.0.0", - "sp-debug-derive 4.0.0", - "sp-std 4.0.0", + "sp-arithmetic 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -9114,10 +9133,10 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 6.0.0", - "sp-core 7.0.0", - "sp-debug-derive 5.0.0", - "sp-std 5.0.0", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -9271,8 +9290,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0", - "sp-runtime 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] [[package]] @@ -9300,12 +9319,12 @@ dependencies = [ "sc-rpc-api", "scale-info", "serde", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-state-machine 0.13.0", - "sp-std 5.0.0", - "sp-trie 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "trie-db", ] @@ -9334,8 +9353,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subxt" -version = "0.24.0" -source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3cbc78fd36035a24883eada29e0205b9b1416172530a7d00a60c07d0337db0c" dependencies = [ "bitvec", "derivative", @@ -9351,8 +9371,8 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 6.0.0", - "sp-runtime 6.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "subxt-macro", "subxt-metadata", "thiserror", @@ -9361,8 +9381,9 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.24.0" -source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7722c31febf55eb300c73d977da5d65cfd6fb443419b1185b9abcdd9925fd7be" dependencies = [ "darling", "frame-metadata", @@ -9381,8 +9402,9 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.24.0" -source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f64826f2c4ba20e3b2a86ec81a6ae8655ca6b6a4c2a6ccc888b6615efc2df14" dependencies = [ "darling", "proc-macro-error", @@ -9392,13 +9414,14 @@ dependencies = [ [[package]] name = "subxt-metadata" -version = "0.24.0" -source = "git+https://github.com/paritytech/subxt?branch=polkadot-v0.9.33#e34eb41879ea349b735a7512608e8dc82e90a5f4" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "869af75e23513538ad0af046af4a97b8d684e8d202e35ff4127ee061c1110813" dependencies = [ "frame-metadata", "parity-scale-codec", "scale-info", - "sp-core 6.0.0", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -10424,9 +10447,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-keyring", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "subxt", "tokio", "webb-primitives", @@ -10458,10 +10481,10 @@ dependencies = [ "serde", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 7.0.0", - "sp-io 7.0.0", - "sp-runtime 7.0.0", - "sp-std 5.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "webb-proposals", ] @@ -10538,12 +10561,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-finality-grandpa", "sp-inherents", "sp-keyring", - "sp-keystore 0.13.0", - "sp-runtime 7.0.0", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-timestamp", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -10625,15 +10648,15 @@ dependencies = [ "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 7.0.0", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-inherents", - "sp-io 7.0.0", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-npos-elections", "sp-offchain", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-session", "sp-staking", - "sp-std 5.0.0", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-transaction-pool", "sp-version", "static_assertions", @@ -10899,7 +10922,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "xcm-procedural", ] diff --git a/client/Cargo.toml b/client/Cargo.toml index e77418bf2..7d40fcd45 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] async-std = { version = "1.9.0", features = ["attributes", "tokio1"] } -subxt = { git = "https://github.com/paritytech/subxt" } +subxt = { version = "0.25.0" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full", "bit-vec"] } [dev-dependencies] diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index 1620e93aa..fb52328c8 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -26,7 +26,7 @@ use ark_ff::{BigInteger, PrimeField}; #[tokio::test] async fn test_mixer() -> Result<(), Box> { let api: OnlineClient<_> = OnlineClient::::new().await?; - let signer = PairSigner::new(AccountKeyring::Alice.pair()); + let signer = PairSigner::new(CustomKeyring(AccountKeyring::Alice.pair())); let pk_bytes = include_bytes!("../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); @@ -123,8 +123,8 @@ async fn test_mixer() -> Result<(), Box> { proof_bytes, root.into(), nullifier_hash.into(), - recipient, - relayer, + >::as_ref(&recipient).try_into().unwrap(), + >::as_ref(&relayer).try_into().unwrap(), fee, refund, ); @@ -141,6 +141,23 @@ async fn test_mixer() -> Result<(), Box> { Ok(()) } +#[derive(Clone)] +struct CustomKeyring(sp_core::sr25519::Pair); + + +impl subxt::ext::sp_runtime::CryptoType for CustomKeyring { + type Pair = CustomKeyring; +} + +impl subxt::ext::sp_core::Pair for CustomKeyring { + type Public = subxt::ext::sp_core::sr25519::Public; + type Seed = [u8; 32]; + type Signature = subxt::ext::sp_core::sr25519::Signature; + type DeriveError = (); + + +} + async fn make_vanchor_tx( pk_bytes: &[u8], vk_bytes: &[u8], @@ -153,7 +170,7 @@ async fn make_vanchor_tx( out_utxos: [Utxo; 2], ) -> Result<(), Box> { let api = OnlineClient::::new().await?; - let signer = PairSigner::new(AccountKeyring::Alice.pair()); + let signer = PairSigner::new(CustomKeyring(AccountKeyring::Alice.pair())); let chain_type = [2, 0]; let chain_id = compute_chain_id_type(1080u32, chain_type); @@ -264,8 +281,8 @@ async fn test_vanchor() -> Result<(), Box> { make_vanchor_tx( pk_bytes, vk_bytes, - &recipient, - &relayer, + &(*AsRef::<[u8; 32]>::as_ref(&recipient)).into(), + &(*AsRef::<[u8; 32]>::as_ref(&relayer)).into(), public_amount, custom_roots, leaves, @@ -309,8 +326,8 @@ async fn test_vanchor() -> Result<(), Box> { make_vanchor_tx( pk_bytes, vk_bytes, - &recipient, - &relayer, + &(*AsRef::<[u8; 32]>::as_ref(&recipient)).into(), + &(*AsRef::<[u8; 32]>::as_ref(&relayer)).into(), public_amount, None, leaves.clone(), From e8a78f975807fd727000c94b59898405f1c156a1 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 23 Dec 2022 08:11:25 -0500 Subject: [PATCH 07/29] update to 0.9.36 - wip --- Cargo.lock | 2284 +++++++++++------ pallets/asset-registry/Cargo.toml | 22 +- pallets/hasher/Cargo.toml | 18 +- pallets/key-storage/Cargo.toml | 20 +- pallets/linkable-tree/Cargo.toml | 20 +- pallets/linkable-tree/rpc/Cargo.toml | 10 +- .../linkable-tree/rpc/runtime-api/Cargo.toml | 4 +- pallets/mixer/Cargo.toml | 20 +- pallets/mt/Cargo.toml | 20 +- pallets/mt/rpc/Cargo.toml | 10 +- pallets/mt/rpc/runtime-api/Cargo.toml | 2 +- pallets/relayer-registry/Cargo.toml | 22 +- pallets/signature-bridge/Cargo.toml | 20 +- pallets/token-wrapper-handler/Cargo.toml | 20 +- pallets/token-wrapper/Cargo.toml | 20 +- pallets/vanchor-handler/Cargo.toml | 26 +- pallets/vanchor-verifier/Cargo.toml | 20 +- pallets/vanchor/Cargo.toml | 24 +- pallets/verifier/Cargo.toml | 20 +- pallets/xanchor/Cargo.toml | 46 +- primitives/Cargo.toml | 16 +- standalone/node/Cargo.toml | 96 +- standalone/runtime/Cargo.toml | 110 +- 23 files changed, 1730 insertions(+), 1140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 771cb519c..1d3bb2e70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -111,9 +111,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" [[package]] name = "approx" @@ -567,9 +567,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364" +checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" dependencies = [ "proc-macro2", "quote", @@ -725,9 +725,9 @@ dependencies = [ [[package]] name = "blake2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e5fd123190ce1c2e559308a94c9bacad77907d4c6005d9e58fe1a0689e55e" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ "digest 0.10.6", ] @@ -918,7 +918,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.14", + "semver 1.0.16", "serde", "serde_json", ] @@ -1037,9 +1037,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39" dependencies = [ "bitflags", "clap_derive", @@ -1422,9 +1422,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" dependencies = [ "cc", "cxxbridge-flags", @@ -1434,9 +1434,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" dependencies = [ "cc", "codespan-reporting", @@ -1449,15 +1449,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" dependencies = [ "proc-macro2", "quote", @@ -1657,9 +1657,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dtoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6eee2d5d0d113f015688310da018bd1d864d86bd567c8fca9c266889e1bfa" +checksum = "c00704156a7de8df8da0911424e30c2049957b0a714542a44e05fe693dd85313" [[package]] name = "dyn-clonable" @@ -1684,9 +1684,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" +checksum = "c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60" [[package]] name = "ecdsa" @@ -2025,7 +2025,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", ] @@ -2048,30 +2048,30 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "linregress", "log", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "Inflector", "array-bytes", @@ -2079,8 +2079,8 @@ dependencies = [ "clap", "comfy-table", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "gethostname", "handlebars", "hash-db", @@ -2089,7 +2089,7 @@ dependencies = [ "lazy_static", "linked-hash-map", "log", - "memory-db", + "memory-db 0.31.0", "parity-scale-codec", "rand 0.8.5", "rand_pcg 0.3.1", @@ -2103,18 +2103,18 @@ dependencies = [ "serde", "serde_json", "serde_nanos", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-database", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "tempfile", "thiserror", "thousands", @@ -2123,7 +2123,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2134,33 +2134,34 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-election-provider-solution-type", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -2182,7 +2183,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "impl-trait-for-tuples", "k256", "log", @@ -2192,14 +2193,14 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core-hashing-proc-macro", - "sp-inherents", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", @@ -2207,6 +2208,38 @@ dependencies = [ "tt-call", ] +[[package]] +name = "frame-support" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "bitflags", + "frame-metadata", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "impl-trait-for-tuples", + "k256", + "log", + "once_cell", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "smallvec", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "tt-call", +] + [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -2214,7 +2247,21 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "Inflector", + "cfg-expr", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "itertools", "proc-macro2", "quote", @@ -2226,7 +2273,19 @@ name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "proc-macro-crate", "proc-macro2", "quote", @@ -2243,12 +2302,22 @@ dependencies = [ "syn", ] +[[package]] +name = "frame-support-procedural-tools-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "log", "parity-scale-codec", "scale-info", @@ -2257,32 +2326,50 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "frame-system" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -2583,9 +2670,9 @@ dependencies = [ [[package]] name = "handlebars" -version = "4.3.5" +version = "4.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e4ab33f1213cdc25b5fa45c76881240cfe79284cf2b395e8b9e312a30a2fd" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" dependencies = [ "log", "pest", @@ -2756,6 +2843,12 @@ dependencies = [ "pin-project-lite 0.2.9", ] +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" version = "1.8.0" @@ -2993,9 +3086,9 @@ checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes 1.0.3", @@ -3014,9 +3107,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "jobserver" @@ -3059,10 +3152,8 @@ checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" dependencies = [ "jsonrpsee-core 0.15.1", "jsonrpsee-http-server", - "jsonrpsee-proc-macros", "jsonrpsee-types 0.15.1", "jsonrpsee-ws-server", - "tracing", ] [[package]] @@ -3074,7 +3165,10 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core 0.16.2", "jsonrpsee-http-client", + "jsonrpsee-proc-macros", + "jsonrpsee-server", "jsonrpsee-types 0.16.2", + "tracing", ] [[package]] @@ -3134,17 +3228,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" dependencies = [ "anyhow", + "arrayvec 0.7.2", "async-lock", "async-trait", "beef", "futures-channel", "futures-timer", "futures-util", + "globset", "hyper", "jsonrpsee-types 0.16.2", + "parking_lot 0.12.1", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", + "soketto", "thiserror", "tokio", "tracing", @@ -3189,16 +3288,39 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.15.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3" +checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" dependencies = [ + "heck", "proc-macro-crate", "proc-macro2", "quote", "syn", ] +[[package]] +name = "jsonrpsee-server" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +dependencies = [ + "futures-channel", + "futures-util", + "http", + "hyper", + "jsonrpsee-core 0.16.2", + "jsonrpsee-types 0.16.2", + "serde", + "serde_json", + "soketto", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tracing", +] + [[package]] name = "jsonrpsee-types" version = "0.15.1" @@ -3279,35 +3401,31 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585089ceadba0197ffe9af6740ab350b325e3c1f5fccfbc3522e0250c750409b" +checksum = "e7d770dcb02bf6835887c3a979b5107a04ff4bbde97a5f0928d27404a155add9" dependencies = [ - "parity-util-mem", "smallvec", ] [[package]] name = "kvdb-memorydb" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d109c87bfb7759edd2a49b2649c1afe25af785d930ad6a38479b4dc70dd873" +checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parity-util-mem", "parking_lot 0.12.1", ] [[package]] name = "kvdb-rocksdb" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c076cc2cdbac89b9910c853a36c957d3862a779f31c2661174222cefb49ee597" +checksum = "2182b8219fee6bd83aacaab7344e840179ae079d5216aa4e249b4d704646a844" dependencies = [ "kvdb", - "log", "num_cpus", - "parity-util-mem", "parking_lot 0.12.1", "regex", "rocksdb", @@ -3328,9 +3446,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -3762,9 +3880,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -3956,6 +4074,16 @@ dependencies = [ "parity-util-mem", ] +[[package]] +name = "memory-db" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e0c7cba9ce19ac7ffd2053ac9f49843bbd3f4318feedfd74e85c19d5fb0ba66" +dependencies = [ + "hash-db", + "hashbrown 0.12.3", +] + [[package]] name = "memory_units" version = "0.4.0" @@ -4309,11 +4437,11 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] @@ -4367,8 +4495,8 @@ name = "orml-currencies" version = "0.4.1-dev" source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "orml-traits", "orml-utilities", "parity-scale-codec", @@ -4384,8 +4512,8 @@ name = "orml-tokens" version = "0.4.1-dev" source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "orml-traits", "parity-scale-codec", "scale-info", @@ -4399,7 +4527,7 @@ name = "orml-traits" version = "0.4.1-dev" source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "impl-trait-for-tuples", "num-traits", "orml-utilities", @@ -4409,7 +4537,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "xcm", + "xcm 0.9.34", ] [[package]] @@ -4417,7 +4545,7 @@ name = "orml-utilities" version = "0.4.1-dev" source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "parity-scale-codec", "scale-info", "serde", @@ -4447,238 +4575,239 @@ name = "pallet-asset-registry" version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "orml-traits", "parity-scale-codec", "primitive-types 0.8.0", "scale-info", "serde", - "sp-api", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", - "xcm", + "xcm 0.9.36", ] [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "pallet-transaction-payment", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-authority-discovery", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "sp-authorship", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-authorship", "pallet-session", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus-babe", "sp-consensus-vrf", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-balances", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-bounties", "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", "rand 0.7.3", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "static_assertions", "strum", ] @@ -4686,55 +4815,55 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-npos-elections", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -4752,72 +4881,72 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "hex", "hex-literal 0.2.2", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keyring", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -4825,18 +4954,18 @@ name = "pallet-key-storage" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4853,8 +4982,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "orml-currencies", "orml-tokens", @@ -4866,10 +4995,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4882,10 +5011,10 @@ dependencies = [ "pallet-linkable-tree-rpc-runtime-api", "parity-scale-codec", "sc-rpc", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "webb-primitives", ] @@ -4896,8 +5025,8 @@ version = "1.0.0" dependencies = [ "pallet-linkable-tree", "parity-scale-codec", - "sp-api", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4916,8 +5045,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "hex", "log", @@ -4932,10 +5061,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4949,8 +5078,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "hex", "hex-literal 0.2.2", @@ -4959,10 +5088,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4975,10 +5104,10 @@ dependencies = [ "pallet-mt-rpc-runtime-api", "parity-scale-codec", "sc-rpc", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "webb-primitives", ] @@ -4988,104 +5117,104 @@ name = "pallet-mt-rpc-runtime-api" version = "1.0.0" dependencies = [ "pallet-mt", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "safe-mix", "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -5093,8 +5222,8 @@ name = "pallet-relayer-registry" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "log", "pallet-balances", @@ -5102,48 +5231,49 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "impl-trait-for-tuples", "log", "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -5151,8 +5281,8 @@ name = "pallet-signature-bridge" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "hex-literal 0.3.4", "impl-trait-for-tuples", @@ -5162,40 +5292,40 @@ dependencies = [ "pallet-vanchor-handler", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "pallet-authorship", "pallet-session", "parity-scale-codec", "scale-info", "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5206,32 +5336,32 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", ] @@ -5240,8 +5370,8 @@ name = "pallet-token-wrapper" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "orml-currencies", "orml-tokens", "orml-traits", @@ -5250,11 +5380,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -5263,8 +5393,8 @@ name = "pallet-token-wrapper-handler" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "hex-literal 0.3.4", "orml-currencies", "orml-tokens", @@ -5276,11 +5406,11 @@ dependencies = [ "pallet-treasury", "parity-scale-codec", "scale-info", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", "webb-proposals", ] @@ -5288,78 +5418,78 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -5378,8 +5508,8 @@ dependencies = [ "arkworks-native-gadgets", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "orml-currencies", "orml-tokens", @@ -5397,10 +5527,10 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -5412,8 +5542,8 @@ dependencies = [ "ark-crypto-primitives", "arkworks-setups", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "hex-literal 0.3.4", "orml-currencies", @@ -5433,11 +5563,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", "webb-proposals", ] @@ -5448,18 +5578,18 @@ version = "1.0.0" dependencies = [ "ark-crypto-primitives", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -5469,18 +5599,18 @@ version = "1.0.0" dependencies = [ "ark-crypto-primitives", "frame-benchmarking", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -5490,7 +5620,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a7511a0bec4a336b5929999d02b560d2439c993cccf98c26481484e811adc43" dependencies = [ - "blake2 0.10.5", + "blake2 0.10.6", "crc32fast", "fs2", "hex", @@ -5548,7 +5678,6 @@ dependencies = [ "parity-util-mem-derive", "parking_lot 0.12.1", "primitive-types 0.12.1", - "smallvec", "winapi", ] @@ -5625,9 +5754,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] name = "pbkdf2" @@ -5854,9 +5983,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51" +checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" dependencies = [ "proc-macro2", "syn", @@ -5932,15 +6061,15 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -5984,9 +6113,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0" +checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592" dependencies = [ "bytes", "prost-derive", @@ -5994,9 +6123,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94" +checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" dependencies = [ "bytes", "heck", @@ -6029,9 +6158,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306" +checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720" dependencies = [ "anyhow", "itertools", @@ -6042,9 +6171,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a" +checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091" dependencies = [ "bytes", "prost", @@ -6078,9 +6207,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -6241,18 +6370,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" +checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" +checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f" dependencies = [ "proc-macro2", "quote", @@ -6430,7 +6559,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver 1.0.16", ] [[package]] @@ -6496,9 +6625,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rw-stream-sink" @@ -6513,9 +6642,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "safe-mix" @@ -6538,18 +6667,18 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -6563,12 +6692,12 @@ dependencies = [ "rand 0.7.3", "sc-client-api", "sc-network-common", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-authority-discovery", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6576,7 +6705,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "futures-timer", @@ -6587,35 +6716,35 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -6625,14 +6754,14 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6643,7 +6772,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "chrono", @@ -6669,12 +6798,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keyring", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "tiny-bip39", "tokio", @@ -6683,7 +6812,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "fnv", "futures", @@ -6694,24 +6823,24 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-database", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "hash-db", "kvdb", @@ -6724,35 +6853,36 @@ dependencies = [ "parking_lot 0.12.1", "sc-client-api", "sc-state-db", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-database", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6760,7 +6890,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "fork-tree", @@ -6780,20 +6910,20 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6801,42 +6931,42 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "fork-tree", "parity-scale-codec", "sc-client-api", "sc-consensus", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -6846,50 +6976,48 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "sc-client-api", "sp-authorship", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "lazy_static", "lru", "parity-scale-codec", "parking_lot 0.12.1", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core-hashing-proc-macro", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "tracing", "wasmi", ] @@ -6897,14 +7025,11 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "environmental", - "parity-scale-codec", "sc-allocator", "sp-maybe-compressed-blob", - "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "wasm-instrument", "wasmi", @@ -6913,42 +7038,37 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", - "parity-scale-codec", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "wasmi", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "cfg-if", "libc", "log", "once_cell", - "parity-scale-codec", - "parity-wasm", "rustix 0.35.13", "sc-allocator", "sc-executor-common", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-sandbox", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "wasmtime", ] [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "array-bytes", @@ -6973,15 +7093,15 @@ dependencies = [ "sc-telemetry", "sc-utils", "serde_json", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", ] @@ -6989,11 +7109,11 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "futures", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", @@ -7002,47 +7122,46 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "futures", "futures-timer", "log", - "parity-util-mem", "sc-client-api", "sc-network-common", "sc-transaction-pool-api", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -7075,11 +7194,11 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", "unsigned-varint", @@ -7089,7 +7208,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "cid", "futures", @@ -7100,7 +7219,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "unsigned-varint", "void", @@ -7109,7 +7228,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "bitflags", @@ -7127,7 +7246,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-finality-grandpa", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "thiserror", ] @@ -7135,7 +7254,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ahash", "futures", @@ -7145,7 +7264,7 @@ dependencies = [ "lru", "sc-network-common", "sc-peerset", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", "tracing", ] @@ -7153,7 +7272,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "futures", @@ -7166,15 +7285,15 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "async-trait", @@ -7193,19 +7312,20 @@ dependencies = [ "sc-peerset", "sc-utils", "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "futures", @@ -7217,14 +7337,14 @@ dependencies = [ "sc-network-common", "sc-peerset", "sp-consensus", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", ] [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "array-bytes", "bytes", @@ -7243,10 +7363,10 @@ dependencies = [ "sc-network-common", "sc-peerset", "sc-utils", - "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-offchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "threadpool", "tracing", ] @@ -7254,7 +7374,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "libp2p", @@ -7267,7 +7387,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7276,11 +7396,11 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "hash-db", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7292,24 +7412,24 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-offchain", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7318,50 +7438,53 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", - "jsonrpsee 0.15.1", + "http", + "jsonrpsee 0.16.2", "log", "serde_json", "substrate-prometheus-endpoint", "tokio", + "tower", + "tower-http", ] [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "hex", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "directories", @@ -7369,10 +7492,9 @@ dependencies = [ "futures", "futures-timer", "hash-db", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "pin-project", "rand 0.7.3", @@ -7402,24 +7524,24 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", "sp-consensus", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "static_init", "substrate-prometheus-endpoint", "tempfile", @@ -7432,23 +7554,21 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "log", "parity-scale-codec", - "parity-util-mem", - "parity-util-mem-derive", "parking_lot 0.12.1", "sc-client-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -7458,14 +7578,14 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "libc", @@ -7476,15 +7596,15 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "chrono", "futures", @@ -7502,7 +7622,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "atty", @@ -7518,12 +7638,12 @@ dependencies = [ "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-rpc", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", "tracing", "tracing-log", @@ -7533,7 +7653,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7544,7 +7664,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", @@ -7552,17 +7672,16 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parity-util-mem", "parking_lot 0.12.1", "sc-client-api", "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -7571,21 +7690,21 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", "log", "serde", "sp-blockchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "futures-timer", @@ -7721,9 +7840,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" [[package]] name = "sct" @@ -7828,9 +7947,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" dependencies = [ "serde", ] @@ -7852,18 +7971,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.150" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" dependencies = [ "proc-macro2", "quote", @@ -7883,9 +8002,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -8063,7 +8182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774d05a3edae07ce6d68ea6984f3c05e9bba8927e3dd591e3b479e5b03213d0d" dependencies = [ "aes-gcm", - "blake2 0.10.5", + "blake2 0.10.6", "chacha20poly1305", "curve25519-dalek 4.0.0-pre.5", "rand_core 0.6.4", @@ -8093,6 +8212,7 @@ dependencies = [ "bytes", "flate2", "futures", + "http", "httparse", "log", "rand 0.8.5", @@ -8107,13 +8227,31 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] @@ -8122,7 +8260,19 @@ name = "sp-api-proc-macro" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "blake2 0.10.5", + "blake2 0.10.6", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sp-api-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "blake2 0.10.6", "proc-macro-crate", "proc-macro2", "quote", @@ -8156,6 +8306,19 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-application-crypto" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "sp-arithmetic" version = "6.0.0" @@ -8187,146 +8350,161 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "sp-arithmetic" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "static_assertions", +] + [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", "log", "lru", "parity-scale-codec", "parking_lot 0.12.1", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus", "sp-database", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures", "futures-timer", "log", "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus", "sp-consensus-slots", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", ] [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "merlin", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", ] [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", ] [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -8338,7 +8516,7 @@ dependencies = [ "array-bytes", "base58", "bitflags", - "blake2 0.10.5", + "blake2 0.10.6", "byteorder", "dyn-clonable", "ed25519-zebra", @@ -8383,7 +8561,7 @@ dependencies = [ "array-bytes", "base58", "bitflags", - "blake2 0.10.5", + "blake2 0.10.6", "byteorder", "dyn-clonable", "ed25519-zebra", @@ -8420,13 +8598,58 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2 0.10.6", + "byteorder", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "num-traits", + "parity-scale-codec", + "parking_lot 0.12.1", + "primitive-types 0.12.1", + "rand 0.7.3", + "regex", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "wasmi", + "zeroize", +] + [[package]] name = "sp-core-hashing" version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b9d1daa6aebfc144729b630885e91df92ff00560490ec065a56cb538e8895a" dependencies = [ - "blake2 0.10.5", + "blake2 0.10.6", "byteorder", "digest 0.10.6", "sha2 0.10.6", @@ -8440,7 +8663,7 @@ name = "sp-core-hashing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" dependencies = [ - "blake2 0.10.5", + "blake2 0.10.6", "byteorder", "digest 0.10.6", "sha2 0.10.6", @@ -8449,6 +8672,20 @@ dependencies = [ "twox-hash", ] +[[package]] +name = "sp-core-hashing" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "blake2 0.10.6", + "byteorder", + "digest 0.10.6", + "sha2 0.10.6", + "sha3 0.10.6", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "twox-hash", +] + [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" @@ -8460,10 +8697,21 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-core-hashing-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "syn", +] + [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8490,6 +8738,16 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-debug-derive" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-externalities" version = "0.13.0" @@ -8513,22 +8771,33 @@ dependencies = [ "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-externalities" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "finality-grandpa", "log", "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -8545,6 +8814,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "thiserror", +] + [[package]] name = "sp-io" version = "7.0.0" @@ -8599,6 +8882,33 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "sp-io" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "bytes", + "ed25519-dalek", + "futures", + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "secp256k1", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "tracing", + "tracing-core", +] + [[package]] name = "sp-keyring" version = "7.0.0" @@ -8610,6 +8920,17 @@ dependencies = [ "strum", ] +[[package]] +name = "sp-keyring" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "lazy_static", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "strum", +] + [[package]] name = "sp-keystore" version = "0.13.0" @@ -8638,16 +8959,32 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnorrkel", - "serde", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "thiserror", ] +[[package]] +name = "sp-keystore" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "async-trait", + "futures", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "schnorrkel", + "serde", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "thiserror", +] + [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "thiserror", "zstd", @@ -8656,25 +8993,25 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -8698,14 +9035,24 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "rustc-hash", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -8755,6 +9102,28 @@ dependencies = [ "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-runtime" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "sp-runtime-interface" version = "7.0.0" @@ -8792,6 +9161,24 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "sp-runtime-interface" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types 0.12.1", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "static_assertions", +] + [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" @@ -8818,31 +9205,29 @@ dependencies = [ ] [[package]] -name = "sp-sandbox" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +name = "sp-runtime-interface-proc-macro" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "log", - "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "wasmi", + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -8856,6 +9241,18 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-staking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "sp-state-machine" version = "0.13.0" @@ -8901,6 +9298,28 @@ dependencies = [ "trie-root", ] +[[package]] +name = "sp-state-machine" +version = "0.13.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "hash-db", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.7.3", + "smallvec", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "thiserror", + "tracing", + "trie-root", +] + [[package]] name = "sp-std" version = "5.0.0" @@ -8912,6 +9331,11 @@ name = "sp-std" version = "5.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +[[package]] +name = "sp-std" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" + [[package]] name = "sp-storage" version = "7.0.0" @@ -8939,19 +9363,32 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-storage" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] @@ -8980,29 +9417,41 @@ dependencies = [ "tracing-subscriber", ] +[[package]] +name = "sp-tracing" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "parity-scale-codec", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "sp-api", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "async-trait", "log", "parity-scale-codec", "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -9016,7 +9465,7 @@ dependencies = [ "hashbrown 0.12.3", "lazy_static", "lru", - "memory-db", + "memory-db 0.30.0", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", @@ -9039,7 +9488,7 @@ dependencies = [ "hashbrown 0.12.3", "lazy_static", "lru", - "memory-db", + "memory-db 0.30.0", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", @@ -9052,6 +9501,29 @@ dependencies = [ "trie-root", ] +[[package]] +name = "sp-trie" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "ahash", + "hash-db", + "hashbrown 0.12.3", + "lazy_static", + "lru", + "memory-db 0.31.0", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + [[package]] name = "sp-version" version = "5.0.0" @@ -9062,10 +9534,27 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version-proc-macro", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", ] @@ -9080,6 +9569,17 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-version-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-wasm-interface" version = "7.0.0" @@ -9106,6 +9606,19 @@ dependencies = [ "wasmtime", ] +[[package]] +name = "sp-wasm-interface" +version = "7.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "wasmi", + "wasmtime", +] + [[package]] name = "sp-weights" version = "4.0.0" @@ -9139,6 +9652,22 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", ] +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "spin" version = "0.5.2" @@ -9276,28 +9805,28 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", "serde_json", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures-util", "hyper", @@ -9310,28 +9839,28 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "log", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "trie-db", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "ansi_term", "build-helper", @@ -9426,9 +9955,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -9511,18 +10040,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -9695,6 +10224,41 @@ dependencies = [ "serde", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite 0.2.9", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + [[package]] name = "tower-service" version = "0.3.2" @@ -9708,6 +10272,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", @@ -9863,9 +10428,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "twox-hash" @@ -9931,9 +10496,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-normalization" @@ -10448,7 +11013,7 @@ dependencies = [ "scale-info", "serde", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keyring", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", "subxt", "tokio", @@ -10473,18 +11038,18 @@ dependencies = [ "blake2 0.9.2", "digest 0.9.0", "ethabi", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "hex-literal 0.3.4", "parity-scale-codec", "scale-info", "serde", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-proposals", ] @@ -10513,7 +11078,7 @@ dependencies = [ "clap", "frame-benchmarking", "frame-benchmarking-cli", - "frame-system", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-rpc-runtime-api", "futures", "itertools", @@ -10554,19 +11119,19 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-authority-discovery", "sp-authorship", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", - "sp-inherents", - "sp-keyring", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", "sp-transaction-storage-proof", "substrate-build-script-utils", @@ -10583,8 +11148,8 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support", - "frame-system", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal 0.3.4", @@ -10644,21 +11209,21 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-npos-elections", "sp-offchain", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-transaction-pool", - "sp-version", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "static_assertions", "substrate-wasm-builder", "webb-primitives", @@ -10923,7 +11488,21 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "xcm-procedural", + "xcm-procedural 0.9.34", +] + +[[package]] +name = "xcm" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" +dependencies = [ + "derivative", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "xcm-procedural 0.9.36", ] [[package]] @@ -10937,6 +11516,17 @@ dependencies = [ "syn", ] +[[package]] +name = "xcm-procedural" +version = "0.9.36" +source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.36#dc25abc712e42b9b51d87ad1168e453a42b5f0bc" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "yamux" version = "0.10.2" diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 20e0919f5..6af818a2b 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -22,20 +22,20 @@ webb-primitives = { path = "../../primitives", default-features = false } orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } # Substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] -polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +polkadot-xcm = { package = "xcm", git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallets/hasher/Cargo.toml b/pallets/hasher/Cargo.toml index e83a69a05..10f6b34e9 100644 --- a/pallets/hasher/Cargo.toml +++ b/pallets/hasher/Cargo.toml @@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../primitives", default-features = false } #Optional dependencies -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] hex-literal = "0.2.1" hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false } ark-ec = { version = "^0.3.0", default-features = false } diff --git a/pallets/key-storage/Cargo.toml b/pallets/key-storage/Cargo.toml index b1ed4fb18..556882ecb 100644 --- a/pallets/key-storage/Cargo.toml +++ b/pallets/key-storage/Cargo.toml @@ -15,20 +15,20 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallets/linkable-tree/Cargo.toml b/pallets/linkable-tree/Cargo.toml index 58de0a161..673e7474b 100644 --- a/pallets/linkable-tree/Cargo.toml +++ b/pallets/linkable-tree/Cargo.toml @@ -13,26 +13,26 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } pallet-mt = { path = "../mt", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } serde = { version = "1.0.119", optional = true } [dev-dependencies] -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } rand = "0.8.4" diff --git a/pallets/linkable-tree/rpc/Cargo.toml b/pallets/linkable-tree/rpc/Cargo.toml index c862da4cc..31688e922 100644 --- a/pallets/linkable-tree/rpc/Cargo.toml +++ b/pallets/linkable-tree/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] jsonrpsee = { version = "0.15.0", features = ["server"] } thiserror = "1.0" -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../../primitives", default-features = false } pallet-linkable-tree = { path = "../", default-features = false } diff --git a/pallets/linkable-tree/rpc/runtime-api/Cargo.toml b/pallets/linkable-tree/rpc/runtime-api/Cargo.toml index 30a22de40..ac11c5f8a 100644 --- a/pallets/linkable-tree/rpc/runtime-api/Cargo.toml +++ b/pallets/linkable-tree/rpc/runtime-api/Cargo.toml @@ -12,8 +12,8 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-linkable-tree = { default-features = false, path = "../../" } webb-primitives = { path = "../../../../primitives", default-features = false } diff --git a/pallets/mixer/Cargo.toml b/pallets/mixer/Cargo.toml index 83f91d709..39a9f4ba7 100644 --- a/pallets/mixer/Cargo.toml +++ b/pallets/mixer/Cargo.toml @@ -14,8 +14,8 @@ codec = {package = "parity-scale-codec", version = "3", default-features = false scale-info = { version = "2.1.1", default-features = false, features = ["derive"]} log = "0.4" webb-primitives = {path = "../../primitives", features = ["verifying"], default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } @@ -23,11 +23,11 @@ pallet-asset-registry = {path = "../asset-registry", default-features = false} pallet-hasher = {path = "../hasher", default-features = false} pallet-mt = {path = "../mt", default-features = false} pallet-verifier = {path = "../verifier", default-features = false} -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-system-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-system-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] ark-bls12-377 = { version = "^0.3.0", default-features = false, features = ["curve", "r1cs"]} @@ -42,13 +42,13 @@ ark-std = { version = "^0.3.0", default-features = false} arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } serde = { version = "1.0.119"} hex = "0.4" -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallets/mt/Cargo.toml b/pallets/mt/Cargo.toml index bace7d432..b117cb497 100644 --- a/pallets/mt/Cargo.toml +++ b/pallets/mt/Cargo.toml @@ -13,15 +13,15 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } @@ -29,10 +29,10 @@ ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" hex-literal = "0.2.1" hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false } ark-std = { version = "^0.3.0", default-features = false } diff --git a/pallets/mt/rpc/Cargo.toml b/pallets/mt/rpc/Cargo.toml index 760124656..3920ecdc8 100644 --- a/pallets/mt/rpc/Cargo.toml +++ b/pallets/mt/rpc/Cargo.toml @@ -7,13 +7,13 @@ edition = "2018" [dependencies] jsonrpsee = { version = "0.15.0", features = ["server"] } thiserror = "1.0" -sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../../primitives", default-features = false } pallet-mt = { path = "../", default-features = false } diff --git a/pallets/mt/rpc/runtime-api/Cargo.toml b/pallets/mt/rpc/runtime-api/Cargo.toml index 1dd44e317..633ba3dac 100644 --- a/pallets/mt/rpc/runtime-api/Cargo.toml +++ b/pallets/mt/rpc/runtime-api/Cargo.toml @@ -11,7 +11,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-api = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-mt = { default-features = false, path = "../../" } webb-primitives = { path = "../../../../primitives", default-features = false } diff --git a/pallets/relayer-registry/Cargo.toml b/pallets/relayer-registry/Cargo.toml index 0cc9e1d90..9419ffe57 100644 --- a/pallets/relayer-registry/Cargo.toml +++ b/pallets/relayer-registry/Cargo.toml @@ -15,23 +15,23 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-identity = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-identity = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallets/signature-bridge/Cargo.toml b/pallets/signature-bridge/Cargo.toml index 1729e33ce..8d3c3282d 100644 --- a/pallets/signature-bridge/Cargo.toml +++ b/pallets/signature-bridge/Cargo.toml @@ -16,19 +16,19 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } # frame dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-token-wrapper-handler = { path = "../token-wrapper-handler", default-features = false } pallet-vanchor-handler = { path = "../vanchor-handler", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } webb-primitives = { path = "../../primitives", default-features = false } libsecp256k1 = { version = "0.7.0", default-features = false, optional = true } @@ -37,7 +37,7 @@ impl-trait-for-tuples = "0.2.2" [dev-dependencies] libsecp256k1 = "0.7.0" -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } [features] default = ["std"] diff --git a/pallets/token-wrapper-handler/Cargo.toml b/pallets/token-wrapper-handler/Cargo.toml index add351357..29ca81707 100644 --- a/pallets/token-wrapper-handler/Cargo.toml +++ b/pallets/token-wrapper-handler/Cargo.toml @@ -16,27 +16,27 @@ codec = {package = "parity-scale-codec", version = "3", default-features = false scale-info = { version = "2.1.1", default-features = false, features = ["derive"]} asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", default-features = false} webb-primitives = {path = "../../primitives", default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } -sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } hex-literal = "0.3.4" #Optional dependencies -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } [features] diff --git a/pallets/token-wrapper/Cargo.toml b/pallets/token-wrapper/Cargo.toml index b4b14829f..6a7dbd874 100644 --- a/pallets/token-wrapper/Cargo.toml +++ b/pallets/token-wrapper/Cargo.toml @@ -17,24 +17,24 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", default-features = false} webb-primitives = {path = "../../primitives", default-features = false} -frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } #Optional dependencies -frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } [features] default = ["std"] diff --git a/pallets/vanchor-handler/Cargo.toml b/pallets/vanchor-handler/Cargo.toml index 4721251a0..5e49e98e5 100644 --- a/pallets/vanchor-handler/Cargo.toml +++ b/pallets/vanchor-handler/Cargo.toml @@ -18,13 +18,13 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals # frame dependencies scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-arithmetic = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } @@ -32,18 +32,18 @@ orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } hex-literal = "0.3.4" [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } pallet-mixer = { path = "../mixer", default-features = false } pallet-mt = { path = "../mt", default-features = false } diff --git a/pallets/vanchor-verifier/Cargo.toml b/pallets/vanchor-verifier/Cargo.toml index 6d740f45d..efde40bc3 100644 --- a/pallets/vanchor-verifier/Cargo.toml +++ b/pallets/vanchor-verifier/Cargo.toml @@ -15,21 +15,21 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } [features] diff --git a/pallets/vanchor/Cargo.toml b/pallets/vanchor/Cargo.toml index dd6a0f8de..ae44d2e5c 100644 --- a/pallets/vanchor/Cargo.toml +++ b/pallets/vanchor/Cargo.toml @@ -13,11 +13,11 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-mt = { path = "../mt", default-features = false } @@ -26,8 +26,8 @@ webb-primitives = { path = "../../primitives", default-features = false, feature orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } arkworks-native-gadgets = { version = "1.2.0", default-features = false } @@ -38,11 +38,11 @@ orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-lib [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-key-storage = {path = "../key-storage"} orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } diff --git a/pallets/verifier/Cargo.toml b/pallets/verifier/Cargo.toml index 28bfe06c4..ceb181d4a 100644 --- a/pallets/verifier/Cargo.toml +++ b/pallets/verifier/Cargo.toml @@ -15,21 +15,21 @@ targets = ["x86_64-unknown-linux-gnu"] codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } log = { version = "0.4.14", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../primitives", default-features = false, features = ["verifying"] } -frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } +frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } [features] diff --git a/pallets/xanchor/Cargo.toml b/pallets/xanchor/Cargo.toml index 2ea3334f0..d2c4eefb2 100644 --- a/pallets/xanchor/Cargo.toml +++ b/pallets/xanchor/Cargo.toml @@ -8,11 +8,11 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } serde = { version = "1.0", optional = true, features = ["derive"] } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", optional = true } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } pallet-verifier = { path = "../verifier", default-features = false } @@ -25,20 +25,20 @@ pallet-asset-registry = { path = "../asset-registry", default-features = false } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } # XCM dependencies -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.34", default-features = false } -cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.34", default-features = false } -xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36", default-features = false } +cumulus-pallet-xcm = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.36", default-features = false } +xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } rand = "0.8.4" @@ -56,13 +56,13 @@ arkworks-native-gadgets = { version = "1.2.0", default-features = false } webb-primitives = { path = "../../primitives" } -pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } -polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.34", default-features = false } +pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +xcm-simulator = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } +polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.36", default-features = false } [features] default = ["std"] diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index c698888be..6ed50e438 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -10,14 +10,14 @@ edition = "2018" serde = { version = "1.0.119", optional = true, features = ["derive"] } codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-consensus-babe = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-consensus-aura = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } # Arkworks ark-ff = { version = "^0.3.0", default-features = false } diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index d6d20515d..29cba9543 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -44,59 +44,59 @@ webb-runtime = { package = "webb-standalone-runtime", path = "../runtime", versi webb-primitives = { path = "../../primitives", version = "0.1.0" } # Substrate dependencies -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sc-finality-grandpa-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-network-common = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-rpc-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-uncles = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-epochs = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-transaction-storage-proof = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-consensus-babe-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sync-state-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } # RPC related dependencies jsonrpc-core = "18.0.0" -sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } -sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index ed6f738f2..0a3a413cf 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -11,7 +11,7 @@ version = "0.1.0" targets = ["x86_64-unknown-linux-gnu"] [build-dependencies] -substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } [dependencies] codec = {package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"]} @@ -45,67 +45,67 @@ pallet-relayer-registry = {path = "../../pallets/relayer-registry", default-feat pallet-key-storage = {path = "../../pallets/key-storage", default-features = false} # Substrate dependencies -sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +sp-version = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.34", default-features = false } -frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.34", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.36", default-features = false } +frame-election-provider-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-executive = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", optional = true, branch = "polkadot-v0.9.36", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-bags-list = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-child-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } -pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-collective = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-im-online = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-offences = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-nomination-pools = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } -pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } -pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34", default-features = false } +pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } +pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", default-features = false } -pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false, features = [ +pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false, features = [ "historical", ]} -pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.34", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36", default-features = false } [features] default = ["std"] From 468e03319b439fa6cb4ddfd79b958b88c53fb80c Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Fri, 23 Dec 2022 17:07:36 -0500 Subject: [PATCH 08/29] wip --- .dvc/config | 4 + Cargo.lock | 994 ++++++----------------- client/Cargo.toml | 6 +- client/tests/integration_tests.rs | 8 +- pallets/asset-registry/Cargo.toml | 2 +- pallets/linkable-tree/Cargo.toml | 6 +- pallets/linkable-tree/rpc/Cargo.toml | 2 +- pallets/linkable-tree/rpc/src/lib.rs | 32 +- pallets/mixer/Cargo.toml | 6 +- pallets/mt/rpc/Cargo.toml | 2 +- pallets/token-wrapper-handler/Cargo.toml | 6 +- pallets/token-wrapper/Cargo.toml | 6 +- pallets/vanchor-handler/Cargo.toml | 6 +- pallets/vanchor/Cargo.toml | 10 +- pallets/xanchor/Cargo.toml | 6 +- standalone/runtime/Cargo.toml | 6 +- 16 files changed, 288 insertions(+), 814 deletions(-) diff --git a/.dvc/config b/.dvc/config index e69de29bb..516646fc2 100644 --- a/.dvc/config +++ b/.dvc/config @@ -0,0 +1,4 @@ +[core] + remote = origin +['remote "origin"'] + url = https://github.com/webb-tools/substrate-fixtures diff --git a/Cargo.lock b/Cargo.lock index 1d3bb2e70..2d4b17b77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2050,15 +2050,15 @@ name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "linregress", "log", "parity-scale-codec", "paste", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2079,8 +2079,8 @@ dependencies = [ "clap", "comfy-table", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "gethostname", "handlebars", "hash-db", @@ -2103,12 +2103,12 @@ dependencies = [ "serde", "serde_json", "serde_nanos", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-database", "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2137,8 +2137,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-election-provider-solution-type", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2153,8 +2153,8 @@ name = "frame-executive" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2176,38 +2176,6 @@ dependencies = [ "serde", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "impl-trait-for-tuples", - "k256", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "tt-call", -] - [[package]] name = "frame-support" version = "4.0.0-dev" @@ -2215,7 +2183,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -2225,14 +2193,14 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core-hashing-proc-macro", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2240,20 +2208,6 @@ dependencies = [ "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "Inflector", - "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -2261,47 +2215,25 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support-procedural-tools", "itertools", "proc-macro2", "quote", "syn", ] -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", "syn", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -2312,30 +2244,12 @@ dependencies = [ "syn", ] -[[package]] -name = "frame-system" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", "log", "parity-scale-codec", "scale-info", @@ -2344,7 +2258,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -2354,8 +2268,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -2369,7 +2283,7 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", ] [[package]] @@ -4493,65 +4407,65 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-support", + "frame-system", "orml-traits", "orml-utilities", "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-support", + "frame-system", "orml-traits", "parity-scale-codec", "scale-info", "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-support", "impl-trait-for-tuples", "num-traits", "orml-utilities", "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "xcm 0.9.34", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "xcm", ] [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/wangjj9219/open-runtime-module-library.git?branch=upgrade-polkadot-v0.9.34#4f8f35bed7d616acda1e2cdac79e809c18a24123" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "frame-support", "parity-scale-codec", "scale-info", "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] [[package]] @@ -4575,22 +4489,22 @@ name = "pallet-asset-registry" version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "orml-traits", "parity-scale-codec", "primitive-types 0.8.0", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", - "xcm 0.9.36", + "xcm", ] [[package]] @@ -4599,8 +4513,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "pallet-transaction-payment", "parity-scale-codec", "scale-info", @@ -4617,8 +4531,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -4631,8 +4545,8 @@ name = "pallet-authority-discovery" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "pallet-session", "parity-scale-codec", "scale-info", @@ -4647,8 +4561,8 @@ name = "pallet-authorship" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", @@ -4663,8 +4577,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -4677,7 +4591,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -4688,8 +4602,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", @@ -4707,8 +4621,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -4722,8 +4636,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-treasury", "parity-scale-codec", @@ -4740,8 +4654,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-bounties", "pallet-treasury", @@ -4759,8 +4673,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -4776,8 +4690,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -4795,8 +4709,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-election-provider-support-benchmarking", "parity-scale-codec", @@ -4819,7 +4733,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system", "parity-scale-codec", "sp-npos-elections", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -4831,8 +4745,8 @@ version = "5.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -4849,8 +4763,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -4862,7 +4776,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -4881,8 +4795,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "hex", "hex-literal 0.2.2", "pallet-balances", @@ -4903,8 +4817,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "enumflags2", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -4918,8 +4832,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-authorship", "parity-scale-codec", @@ -4928,7 +4842,7 @@ dependencies = [ "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -4938,13 +4852,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -4954,8 +4868,8 @@ name = "pallet-key-storage" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "log", "pallet-balances", @@ -4982,8 +4896,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "orml-currencies", "orml-tokens", @@ -5006,12 +4920,12 @@ dependencies = [ name = "pallet-linkable-tree-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "pallet-linkable-tree", "pallet-linkable-tree-rpc-runtime-api", "parity-scale-codec", "sc-rpc", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5025,7 +4939,7 @@ version = "1.0.0" dependencies = [ "pallet-linkable-tree", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -5045,8 +4959,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "hex", "log", @@ -5078,8 +4992,8 @@ dependencies = [ "ark-std", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "hex", "hex-literal 0.2.2", @@ -5099,12 +5013,12 @@ dependencies = [ name = "pallet-mt-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee 0.15.1", + "jsonrpsee 0.16.2", "pallet-mt", "pallet-mt-rpc-runtime-api", "parity-scale-codec", "sc-rpc", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5117,7 +5031,7 @@ name = "pallet-mt-rpc-runtime-api" version = "1.0.0" dependencies = [ "pallet-mt", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "webb-primitives", ] @@ -5127,8 +5041,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -5142,15 +5056,15 @@ name = "pallet-nomination-pools" version = "1.0.0" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -5159,15 +5073,15 @@ name = "pallet-offences" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -5177,8 +5091,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -5194,8 +5108,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5208,8 +5122,8 @@ name = "pallet-randomness-collective-flip" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "safe-mix", "scale-info", @@ -5222,8 +5136,8 @@ name = "pallet-relayer-registry" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "log", "pallet-balances", @@ -5244,8 +5158,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", @@ -5260,8 +5174,8 @@ name = "pallet-session" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "log", "pallet-timestamp", @@ -5271,7 +5185,7 @@ dependencies = [ "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -5281,8 +5195,8 @@ name = "pallet-signature-bridge" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "hex-literal 0.3.4", "impl-trait-for-tuples", @@ -5307,8 +5221,8 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "pallet-authorship", "pallet-session", @@ -5318,7 +5232,7 @@ dependencies = [ "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -5338,8 +5252,8 @@ name = "pallet-sudo" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5353,12 +5267,12 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5370,8 +5284,8 @@ name = "pallet-token-wrapper" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "orml-currencies", "orml-tokens", "orml-traits", @@ -5393,8 +5307,8 @@ name = "pallet-token-wrapper-handler" version = "1.0.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "hex-literal 0.3.4", "orml-currencies", "orml-tokens", @@ -5420,8 +5334,8 @@ name = "pallet-transaction-payment" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "serde", @@ -5439,7 +5353,7 @@ dependencies = [ "jsonrpsee 0.16.2", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-rpc", @@ -5454,7 +5368,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -5465,8 +5379,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", @@ -5482,8 +5396,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -5508,8 +5422,8 @@ dependencies = [ "arkworks-native-gadgets", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "orml-currencies", "orml-tokens", @@ -5542,8 +5456,8 @@ dependencies = [ "ark-crypto-primitives", "arkworks-setups", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "hex-literal 0.3.4", "orml-currencies", @@ -5578,8 +5492,8 @@ version = "1.0.0" dependencies = [ "ark-crypto-primitives", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "log", "pallet-balances", @@ -5599,8 +5513,8 @@ version = "1.0.0" dependencies = [ "ark-crypto-primitives", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "log", "pallet-balances", @@ -5790,9 +5704,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pest" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" +checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4" dependencies = [ "thiserror", "ucd-trie", @@ -5800,9 +5714,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344" +checksum = "96504449aa860c8dcde14f9fba5c58dc6658688ca1fe363589d6327b8662c603" dependencies = [ "pest", "pest_generator", @@ -5810,9 +5724,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c" +checksum = "798e0220d1111ae63d66cb66a5dcb3fc2d986d520b98e49e1852bfdb11d7c5e7" dependencies = [ "pest", "pest_meta", @@ -5823,9 +5737,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20" +checksum = "984298b75898e30a843e278a9f2452c31e349a073a0ce6fd950a12a74464e065" dependencies = [ "once_cell", "pest", @@ -6692,7 +6606,7 @@ dependencies = [ "rand 0.7.3", "sc-client-api", "sc-network-common", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-authority-discovery", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -6716,11 +6630,11 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "substrate-prometheus-endpoint", ] @@ -6732,11 +6646,11 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "parity-scale-codec", "sc-client-api", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -6799,11 +6713,11 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "thiserror", "tiny-bip39", "tokio", @@ -6823,7 +6737,7 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -6877,7 +6791,7 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -6910,7 +6824,7 @@ dependencies = [ "sc-telemetry", "schnorrkel", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", @@ -6919,11 +6833,11 @@ dependencies = [ "sp-consensus-slots", "sp-consensus-vrf", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "substrate-prometheus-endpoint", "thiserror", ] @@ -6939,7 +6853,7 @@ dependencies = [ "sc-consensus-epochs", "sc-rpc-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", "sp-consensus", @@ -6981,7 +6895,7 @@ dependencies = [ "sp-consensus", "sp-consensus-slots", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", @@ -7009,14 +6923,14 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "tracing", "wasmi", @@ -7093,7 +7007,7 @@ dependencies = [ "sc-telemetry", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-blockchain", @@ -7363,7 +7277,7 @@ dependencies = [ "sc-network-common", "sc-peerset", "sc-utils", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-offchain", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -7412,7 +7326,7 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -7420,7 +7334,7 @@ dependencies = [ "sp-rpc", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", ] [[package]] @@ -7442,7 +7356,7 @@ dependencies = [ "sp-rpc", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "thiserror", ] @@ -7474,7 +7388,7 @@ dependencies = [ "sc-chain-spec", "sc-transaction-pool-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -7524,14 +7438,14 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", @@ -7541,7 +7455,7 @@ dependencies = [ "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "static_init", "substrate-prometheus-endpoint", "tempfile", @@ -7638,7 +7552,7 @@ dependencies = [ "sc-rpc-server", "sc-tracing-proc-macro", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-rpc", @@ -7677,7 +7591,7 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -8219,24 +8133,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", -] - [[package]] name = "sp-api" version = "4.0.0-dev" @@ -8245,28 +8141,16 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api-proc-macro", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "blake2 0.10.6", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" @@ -8293,19 +8177,6 @@ dependencies = [ "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-application-crypto" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-application-crypto" version = "7.0.0" @@ -8335,21 +8206,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-arithmetic" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "static_assertions", -] - [[package]] name = "sp-arithmetic" version = "6.0.0" @@ -8372,7 +8228,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -8385,7 +8241,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "async-trait", "parity-scale-codec", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -8396,8 +8252,8 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -8412,7 +8268,7 @@ dependencies = [ "lru", "parity-scale-codec", "parking_lot 0.12.1", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-consensus", "sp-database", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -8431,11 +8287,11 @@ dependencies = [ "log", "parity-scale-codec", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "thiserror", ] @@ -8447,11 +8303,11 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus", "sp-consensus-slots", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", @@ -8467,13 +8323,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-consensus", "sp-consensus-slots", "sp-consensus-vrf", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -8553,51 +8409,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "array-bytes", - "base58", - "bitflags", - "blake2 0.10.6", - "byteorder", - "dyn-clonable", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "num-traits", - "parity-scale-codec", - "parking_lot 0.12.1", - "primitive-types 0.12.1", - "rand 0.7.3", - "regex", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "wasmi", - "zeroize", -] - [[package]] name = "sp-core" version = "7.0.0" @@ -8658,20 +8469,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "sp-core-hashing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "blake2 0.10.6", - "byteorder", - "digest 0.10.6", - "sha2 0.10.6", - "sha3 0.10.6", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "5.0.0" @@ -8686,17 +8483,6 @@ dependencies = [ "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "syn", -] - [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" @@ -8728,16 +8514,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-debug-derive" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-debug-derive" version = "5.0.0" @@ -8760,17 +8536,6 @@ dependencies = [ "sp-storage 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-externalities" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-externalities" version = "0.13.0" @@ -8792,7 +8557,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -8800,20 +8565,6 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", -] - [[package]] name = "sp-inherents" version = "4.0.0-dev" @@ -8855,33 +8606,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-io" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "bytes", - "ed25519-dalek", - "futures", - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot 0.12.1", - "secp256k1", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-state-machine 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "7.0.0" @@ -8909,17 +8633,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-keyring" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "lazy_static", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "strum", -] - [[package]] name = "sp-keyring" version = "7.0.0" @@ -8948,22 +8661,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "sp-keystore" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "async-trait", - "futures", - "merlin", - "parity-scale-codec", - "parking_lot 0.12.1", - "schnorrkel", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.13.0" @@ -9009,7 +8706,7 @@ name = "sp-offchain" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -9025,16 +8722,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-panic-handler" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-panic-handler" version = "5.0.0" @@ -9079,29 +8766,6 @@ dependencies = [ "sp-weights 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-runtime" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "scale-info", - "serde", - "sp-application-crypto 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-weights 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-runtime" version = "7.0.0" @@ -9143,24 +8807,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-runtime-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types 0.12.1", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime-interface-proc-macro 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-storage 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-tracing 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-wasm-interface 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "7.0.0" @@ -9192,18 +8838,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" @@ -9223,24 +8857,13 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-staking" version = "4.0.0-dev" @@ -9276,28 +8899,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-state-machine" -version = "0.13.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.7.3", - "smallvec", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-externalities 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", - "tracing", - "trie-root", -] - [[package]] name = "sp-state-machine" version = "0.13.0" @@ -9326,11 +8927,6 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf3fd4c1d304be101e6ebbafd3d4be9a37b320c970ef4e8df188b16873981c93" -[[package]] -name = "sp-std" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" - [[package]] name = "sp-std" version = "5.0.0" @@ -9350,19 +8946,6 @@ dependencies = [ "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-storage" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-storage" version = "7.0.0" @@ -9385,8 +8968,8 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "thiserror", @@ -9405,18 +8988,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "sp-tracing" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-tracing" version = "6.0.0" @@ -9434,7 +9005,7 @@ name = "sp-transaction-pool" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -9448,7 +9019,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-trie 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -9478,29 +9049,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-trie" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "ahash", - "hash-db", - "hashbrown 0.12.3", - "lazy_static", - "lru", - "memory-db 0.30.0", - "nohash-hasher", - "parity-scale-codec", - "parking_lot 0.12.1", - "scale-info", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-trie" version = "7.0.0" @@ -9524,23 +9072,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "thiserror", -] - [[package]] name = "sp-version" version = "5.0.0" @@ -9551,24 +9082,13 @@ dependencies = [ "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-core-hashing-proc-macro", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version-proc-macro", "thiserror", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" @@ -9593,19 +9113,6 @@ dependencies = [ "wasmi", ] -[[package]] -name = "sp-wasm-interface" -version = "7.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "wasmi", - "wasmtime", -] - [[package]] name = "sp-wasm-interface" version = "7.0.0" @@ -9636,22 +9143,6 @@ dependencies = [ "sp-std 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sp-weights" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34#1cc97dd30537997ff4c9827beb2ef0cac9c49063" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-debug-derive 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", -] - [[package]] name = "sp-weights" version = "4.0.0" @@ -9816,7 +9307,7 @@ dependencies = [ "sc-rpc-api", "sc-transaction-pool-api", "serde_json", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-block-builder", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -11012,9 +10503,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-keyring", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "subxt", "tokio", "webb-primitives", @@ -11038,8 +10529,8 @@ dependencies = [ "blake2 0.9.2", "digest 0.9.0", "ethabi", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "hex-literal 0.3.4", "parity-scale-codec", "scale-info", @@ -11078,7 +10569,7 @@ dependencies = [ "clap", "frame-benchmarking", "frame-benchmarking-cli", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-system", "frame-system-rpc-runtime-api", "futures", "itertools", @@ -11119,7 +10610,7 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-authority-discovery", "sp-authorship", "sp-block-builder", @@ -11128,8 +10619,8 @@ dependencies = [ "sp-consensus-babe", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", + "sp-keyring", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", @@ -11148,8 +10639,8 @@ dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-executive", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "frame-system 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "frame-support", + "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "hex-literal 0.3.4", @@ -11209,21 +10700,21 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-api", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-inherents", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-npos-elections", "sp-offchain", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-session", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-staking", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-transaction-pool", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-version", "static_assertions", "substrate-wasm-builder", "webb-primitives", @@ -11477,20 +10968,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "xcm" -version = "0.9.34" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" -dependencies = [ - "derivative", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.34)", - "xcm-procedural 0.9.34", -] - [[package]] name = "xcm" version = "0.9.36" @@ -11502,18 +10979,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "xcm-procedural 0.9.36", -] - -[[package]] -name = "xcm-procedural" -version = "0.9.34" -source = "git+https://github.com/paritytech/polkadot?branch=release-v0.9.34#6b7a7bd1e306064de663076ddb25d02e371a4970" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn", + "xcm-procedural", ] [[package]] diff --git a/client/Cargo.toml b/client/Cargo.toml index 7d40fcd45..a78370aa0 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -13,10 +13,10 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals [dev-dependencies] hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } -sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } tokio = { version = "1.17.0", features = ["full"] } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.34" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } # arkworks related deps diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index fb52328c8..80afca4e3 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -29,9 +29,9 @@ async fn test_mixer() -> Result<(), Box> { let signer = PairSigner::new(CustomKeyring(AccountKeyring::Alice.pair())); let pk_bytes = - include_bytes!("../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); + include_bytes!("../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); let vk_bytes = - include_bytes!("../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key_uncompressed.bin"); + include_bytes!("../../substrate-fixtures/mixer/bn254/x5/verifying_key_uncompressed.bin"); let recipient = AccountKeyring::Bob.to_account_id(); let relayer = AccountKeyring::Bob.to_account_id(); let recipient_bytes = truncate_and_pad(&&recipient.encode()); @@ -250,10 +250,10 @@ async fn test_vanchor() -> Result<(), Box> { let api: OnlineClient<_> = OnlineClient::::new().await?; let pk_bytes = include_bytes!( - "../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ); let vk_bytes = include_bytes!( - "../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key_uncompressed.bin" + "../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key_uncompressed.bin" ); let recipient = AccountKeyring::Bob.to_account_id(); diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 6af818a2b..c1e4e7672 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -19,7 +19,7 @@ serde = { features = ["derive"], optional = true, version = "1.0.101" } webb-primitives = { path = "../../primitives", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } # Substrate dependencies frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/linkable-tree/Cargo.toml b/pallets/linkable-tree/Cargo.toml index 673e7474b..d75c4b48b 100644 --- a/pallets/linkable-tree/Cargo.toml +++ b/pallets/linkable-tree/Cargo.toml @@ -20,7 +20,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr pallet-hasher = { path = "../hasher", default-features = false } pallet-mt = { path = "../mt", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } @@ -33,8 +33,8 @@ serde = { version = "1.0.119", optional = true } sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } diff --git a/pallets/linkable-tree/rpc/Cargo.toml b/pallets/linkable-tree/rpc/Cargo.toml index 31688e922..58e9fb851 100644 --- a/pallets/linkable-tree/rpc/Cargo.toml +++ b/pallets/linkable-tree/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Webb Tools"] edition = "2018" [dependencies] -jsonrpsee = { version = "0.15.0", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } thiserror = "1.0" sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/linkable-tree/rpc/src/lib.rs b/pallets/linkable-tree/rpc/src/lib.rs index 862807487..a29a8fd40 100644 --- a/pallets/linkable-tree/rpc/src/lib.rs +++ b/pallets/linkable-tree/rpc/src/lib.rs @@ -24,7 +24,7 @@ use std::sync::Arc; use codec::{Decode, Encode}; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use sc_rpc::DenyUnsafe; -use sp_api::ProvideRuntimeApi; +use sp_api::{ProvideRuntimeApi, ApiError}; use sp_blockchain::HeaderBackend; use sp_runtime::{generic::BlockId, traits::Block as BlockT}; @@ -66,41 +66,45 @@ impl LinkableTreeClient { } } -impl LinkableTreeRpcApiServer<::Hash, E, CID, L> +impl LinkableTreeApi<::Hash, E, CID, L> for LinkableTreeClient where B: BlockT, E: ElementTrait, - CID: Encode + Decode, + CID: Encode + Decode + webb_primitives::ElementTrait, L: Encode + Decode, C: HeaderBackend + ProvideRuntimeApi + Send + Sync + 'static, - C::Api: LinkableTreeApi, + C::Api: LinkableTreeApi, + ::Hash: BlockT, + Self: sp_api::Core<::Hash> { fn get_neighbor_roots( &self, + at: &BlockId<::Hash>, tree_id: u32, - at: Option<::Hash>, - ) -> RpcResult> { - self.deny_unsafe.check_if_safe()?; + ) -> Result, ApiError> { + self.deny_unsafe.check_if_safe() + .map_err(|err| ApiError::Application(Box::new(err)))?; let api = self.client.runtime_api(); - let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + //let at = BlockId::hash(at.hash()); api.get_neighbor_roots(&at, tree_id) .map_err(|_| error::Error::RootsRequestFailure) - .map_err(Into::into) + .map_err(|err| ApiError::Application(Box::new(err))) } fn get_neighbor_edges( &self, + at: &BlockId<::Hash>, tree_id: u32, - at: Option<::Hash>, - ) -> RpcResult>> { - self.deny_unsafe.check_if_safe()?; + ) -> Result>, ApiError> { + self.deny_unsafe.check_if_safe() + .map_err(|err| ApiError::Application(Box::new(err)))?; let api = self.client.runtime_api(); - let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); + //let at = sp_api::BlockT::hash(at); api.get_neighbor_edges(&at, tree_id) .map_err(|_| error::Error::EdgesRequestFailure) - .map_err(Into::into) + .map_err(|err| ApiError::Application(Box::new(err))) } } diff --git a/pallets/mixer/Cargo.toml b/pallets/mixer/Cargo.toml index 39a9f4ba7..36fcb3b59 100644 --- a/pallets/mixer/Cargo.toml +++ b/pallets/mixer/Cargo.toml @@ -16,9 +16,9 @@ log = "0.4" webb-primitives = {path = "../../primitives", features = ["verifying"], default-features = false} frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-asset-registry = {path = "../asset-registry", default-features = false} pallet-hasher = {path = "../hasher", default-features = false} pallet-mt = {path = "../mt", default-features = false} diff --git a/pallets/mt/rpc/Cargo.toml b/pallets/mt/rpc/Cargo.toml index 3920ecdc8..6430819b4 100644 --- a/pallets/mt/rpc/Cargo.toml +++ b/pallets/mt/rpc/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Webb Tools"] edition = "2018" [dependencies] -jsonrpsee = { version = "0.15.0", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } thiserror = "1.0" sc-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/token-wrapper-handler/Cargo.toml b/pallets/token-wrapper-handler/Cargo.toml index 29ca81707..ee1bb9c3b 100644 --- a/pallets/token-wrapper-handler/Cargo.toml +++ b/pallets/token-wrapper-handler/Cargo.toml @@ -18,7 +18,7 @@ asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", webb-primitives = {path = "../../primitives", default-features = false} frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } @@ -31,8 +31,8 @@ frame-benchmarking = {default-features = false, git = "https://github.com/parity [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/token-wrapper/Cargo.toml b/pallets/token-wrapper/Cargo.toml index 6a7dbd874..241eeaed2 100644 --- a/pallets/token-wrapper/Cargo.toml +++ b/pallets/token-wrapper/Cargo.toml @@ -23,14 +23,14 @@ sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/ sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } #Optional dependencies frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/vanchor-handler/Cargo.toml b/pallets/vanchor-handler/Cargo.toml index 5e49e98e5..cf4d70f01 100644 --- a/pallets/vanchor-handler/Cargo.toml +++ b/pallets/vanchor-handler/Cargo.toml @@ -28,7 +28,7 @@ sp-arithmetic = { default-features = false, git = "https://github.com/paritytech pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } @@ -53,8 +53,8 @@ pallet-token-wrapper = { path = "../token-wrapper", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-key-storage = {path = "../key-storage"} ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = ["curve"] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } diff --git a/pallets/vanchor/Cargo.toml b/pallets/vanchor/Cargo.toml index ae44d2e5c..b11e495c5 100644 --- a/pallets/vanchor/Cargo.toml +++ b/pallets/vanchor/Cargo.toml @@ -23,7 +23,7 @@ pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-vanchor-verifier = { path = "../vanchor-verifier", default-features = false } webb-primitives = { path = "../../primitives", default-features = false, features = ["hashing", "verifying", "field_ops"] } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } @@ -33,8 +33,8 @@ arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = f arkworks-native-gadgets = { version = "1.2.0", default-features = false } ark-std = { version = "^0.3.0", default-features = false } ark-ff = { version = "^0.3.0", default-features = false} -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } @@ -44,8 +44,8 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-key-storage = {path = "../key-storage"} -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false} diff --git a/pallets/xanchor/Cargo.toml b/pallets/xanchor/Cargo.toml index d2c4eefb2..e63b0d0b0 100644 --- a/pallets/xanchor/Cargo.toml +++ b/pallets/xanchor/Cargo.toml @@ -19,7 +19,7 @@ pallet-verifier = { path = "../verifier", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } @@ -39,8 +39,8 @@ pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 0a3a413cf..824bcb793 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -24,9 +24,9 @@ static_assertions = "1.1.0" # local dependencies webb-primitives = {path = "../../primitives", default-features = false, features = ["hashing"]} -orml-currencies = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-tokens = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } -orml-traits = { git = "https://github.com/wangjj9219/open-runtime-module-library.git", branch = "upgrade-polkadot-v0.9.34", default-features = false } +orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-vanchor = {path = "../../pallets/vanchor", default-features = false } pallet-vanchor-handler = {path = "../../pallets/vanchor-handler", default-features = false } pallet-asset-registry = {path = "../../pallets/asset-registry", default-features = false } From e5467be352e3c3158c6ecc0f84ffb36e86b266af Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Tue, 27 Dec 2022 11:43:31 -0500 Subject: [PATCH 09/29] compiling with cargo check --tests --- Cargo.lock | 196 ++++++++------------------- client/Cargo.toml | 2 +- client/tests/integration_tests.rs | 24 +--- pallets/linkable-tree/rpc/src/lib.rs | 34 ++--- pallets/mixer/src/tests.rs | 4 +- pallets/vanchor/src/benchmarking.rs | 8 +- pallets/vanchor/src/tests.rs | 8 +- standalone/node/Cargo.toml | 2 +- standalone/node/src/chain_spec.rs | 6 +- standalone/runtime/src/constants.rs | 4 +- 10 files changed, 89 insertions(+), 199 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d4b17b77..2a2db8735 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3006,7 +3006,7 @@ checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" dependencies = [ "hermit-abi 0.2.6", "io-lifetimes 1.0.3", - "rustix 0.36.5", + "rustix 0.36.6", "windows-sys 0.42.0", ] @@ -3058,18 +3058,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "jsonrpsee" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a" -dependencies = [ - "jsonrpsee-core 0.15.1", - "jsonrpsee-http-server", - "jsonrpsee-types 0.15.1", - "jsonrpsee-ws-server", -] - [[package]] name = "jsonrpsee" version = "0.16.2" @@ -3077,11 +3065,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" dependencies = [ "jsonrpsee-client-transport", - "jsonrpsee-core 0.16.2", + "jsonrpsee-core", "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", - "jsonrpsee-types 0.16.2", + "jsonrpsee-types", "tracing", ] @@ -3093,8 +3081,8 @@ checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" dependencies = [ "futures-util", "http", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project", "rustls-native-certs", "soketto", @@ -3106,35 +3094,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "jsonrpsee-core" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca" -dependencies = [ - "anyhow", - "arrayvec 0.7.2", - "async-trait", - "beef", - "futures-channel", - "futures-util", - "globset", - "http", - "hyper", - "jsonrpsee-types 0.15.1", - "lazy_static", - "parking_lot 0.12.1", - "rand 0.8.5", - "rustc-hash", - "serde", - "serde_json", - "soketto", - "thiserror", - "tokio", - "tracing", - "unicase", -] - [[package]] name = "jsonrpsee-core" version = "0.16.2" @@ -3151,7 +3110,7 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types 0.16.2", + "jsonrpsee-types", "parking_lot 0.12.1", "rand 0.8.5", "rustc-hash", @@ -3172,8 +3131,8 @@ dependencies = [ "async-trait", "hyper", "hyper-rustls", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", + "jsonrpsee-core", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", @@ -3182,24 +3141,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-http-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117" -dependencies = [ - "futures-channel", - "futures-util", - "hyper", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-futures", -] - [[package]] name = "jsonrpsee-proc-macros" version = "0.16.2" @@ -3223,8 +3164,8 @@ dependencies = [ "futures-util", "http", "hyper", - "jsonrpsee-core 0.16.2", - "jsonrpsee-types 0.16.2", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", "soketto", @@ -3235,20 +3176,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", - "tracing", -] - [[package]] name = "jsonrpsee-types" version = "0.16.2" @@ -3263,26 +3190,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-ws-server" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325" -dependencies = [ - "futures-channel", - "futures-util", - "http", - "jsonrpsee-core 0.15.1", - "jsonrpsee-types 0.15.1", - "serde_json", - "soketto", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", - "tracing-futures", -] - [[package]] name = "k256" version = "0.11.6" @@ -3947,7 +3854,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" dependencies = [ - "rustix 0.36.5", + "rustix 0.36.6", ] [[package]] @@ -4407,7 +4314,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-currencies" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" dependencies = [ "frame-support", "frame-system", @@ -4424,7 +4331,7 @@ dependencies = [ [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" dependencies = [ "frame-support", "frame-system", @@ -4439,7 +4346,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4457,7 +4364,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#2231f35edc0bbbd3374fc7c8536d44e4c88933c2" +source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" dependencies = [ "frame-support", "parity-scale-codec", @@ -4858,7 +4765,7 @@ dependencies = [ "scale-info", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] @@ -4920,7 +4827,7 @@ dependencies = [ name = "pallet-linkable-tree-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee 0.16.2", + "jsonrpsee", "pallet-linkable-tree", "pallet-linkable-tree-rpc-runtime-api", "parity-scale-codec", @@ -5013,7 +4920,7 @@ dependencies = [ name = "pallet-mt-rpc" version = "0.1.0" dependencies = [ - "jsonrpsee 0.16.2", + "jsonrpsee", "pallet-mt", "pallet-mt-rpc-runtime-api", "parity-scale-codec", @@ -5350,7 +5257,7 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.16.2", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", "sp-api", @@ -6492,9 +6399,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549" dependencies = [ "bitflags", "errno", @@ -6713,7 +6620,7 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-panic-handler 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", @@ -6848,7 +6755,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", - "jsonrpsee 0.16.2", + "jsonrpsee", "sc-consensus-babe", "sc-consensus-epochs", "sc-rpc-api", @@ -7027,7 +6934,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "finality-grandpa", "futures", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", @@ -7314,7 +7221,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "futures", "hash-db", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7343,7 +7250,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ "futures", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7367,7 +7274,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "futures", "http", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", @@ -7383,7 +7290,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "futures", "hex", - "jsonrpsee 0.16.2", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-transaction-pool-api", @@ -7406,7 +7313,7 @@ dependencies = [ "futures", "futures-timer", "hash-db", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -7482,7 +7389,7 @@ name = "sc-sync-state-rpc" version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.16.2", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-client-api", @@ -7885,18 +7792,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.151" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.151" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -8633,6 +8540,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "sp-keyring" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff57c546679fb7e1e7d65d5242ba1d4fbe4e174581ec6218efc711de79419559" +dependencies = [ + "lazy_static", + "sp-core 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-runtime 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strum", +] + [[package]] name = "sp-keyring" version = "7.0.0" @@ -9300,7 +9219,7 @@ source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.3 dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", @@ -9332,7 +9251,7 @@ name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36#cb4f2491b00af7d7817f3a54209c26b20faa1f51" dependencies = [ - "jsonrpsee 0.16.2", + "jsonrpsee", "log", "parity-scale-codec", "sc-client-api", @@ -9383,7 +9302,7 @@ dependencies = [ "futures", "getrandom 0.2.8", "hex", - "jsonrpsee 0.16.2", + "jsonrpsee", "parity-scale-codec", "parking_lot 0.12.1", "scale-decode", @@ -9409,7 +9328,7 @@ dependencies = [ "frame-metadata", "heck", "hex", - "jsonrpsee 0.16.2", + "jsonrpsee", "parity-scale-codec", "proc-macro-error", "proc-macro2", @@ -9970,15 +9889,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.8" @@ -10504,7 +10414,7 @@ dependencies = [ "scale-info", "serde", "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-keyring", + "sp-keyring 7.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "subxt", "tokio", @@ -10574,7 +10484,7 @@ dependencies = [ "futures", "itertools", "jsonrpc-core", - "jsonrpsee 0.15.1", + "jsonrpsee", "log", "pallet-asset-tx-payment", "pallet-im-online", @@ -10620,7 +10530,7 @@ dependencies = [ "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-finality-grandpa", "sp-inherents", - "sp-keyring", + "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", diff --git a/client/Cargo.toml b/client/Cargo.toml index a78370aa0..edbebe01e 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,7 +14,7 @@ codec = { package = "parity-scale-codec", version = "3", default-features = fals hex = "0.4" serde = { version = "1.0.119" } sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -sp-keyring = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-keyring = { default-features = false, version = "7.0.0" } tokio = { version = "1.17.0", features = ["full"] } sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } scale-info = { version = "2.1.1", default-features = false, features = ["derive"] } diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index 80afca4e3..662fd02c1 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -26,7 +26,7 @@ use ark_ff::{BigInteger, PrimeField}; #[tokio::test] async fn test_mixer() -> Result<(), Box> { let api: OnlineClient<_> = OnlineClient::::new().await?; - let signer = PairSigner::new(CustomKeyring(AccountKeyring::Alice.pair())); + let signer = PairSigner::new(AccountKeyring::Alice.pair()); let pk_bytes = include_bytes!("../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin"); @@ -123,8 +123,8 @@ async fn test_mixer() -> Result<(), Box> { proof_bytes, root.into(), nullifier_hash.into(), - >::as_ref(&recipient).try_into().unwrap(), - >::as_ref(&relayer).try_into().unwrap(), + (*>::as_ref(&recipient)).into(), + (*>::as_ref(&relayer)).into(), fee, refund, ); @@ -141,22 +141,6 @@ async fn test_mixer() -> Result<(), Box> { Ok(()) } -#[derive(Clone)] -struct CustomKeyring(sp_core::sr25519::Pair); - - -impl subxt::ext::sp_runtime::CryptoType for CustomKeyring { - type Pair = CustomKeyring; -} - -impl subxt::ext::sp_core::Pair for CustomKeyring { - type Public = subxt::ext::sp_core::sr25519::Public; - type Seed = [u8; 32]; - type Signature = subxt::ext::sp_core::sr25519::Signature; - type DeriveError = (); - - -} async fn make_vanchor_tx( pk_bytes: &[u8], @@ -170,7 +154,7 @@ async fn make_vanchor_tx( out_utxos: [Utxo; 2], ) -> Result<(), Box> { let api = OnlineClient::::new().await?; - let signer = PairSigner::new(CustomKeyring(AccountKeyring::Alice.pair())); + let signer = PairSigner::new(AccountKeyring::Alice.pair()); let chain_type = [2, 0]; let chain_id = compute_chain_id_type(1080u32, chain_type); diff --git a/pallets/linkable-tree/rpc/src/lib.rs b/pallets/linkable-tree/rpc/src/lib.rs index a29a8fd40..04b0a38f7 100644 --- a/pallets/linkable-tree/rpc/src/lib.rs +++ b/pallets/linkable-tree/rpc/src/lib.rs @@ -24,7 +24,7 @@ use std::sync::Arc; use codec::{Decode, Encode}; use jsonrpsee::{core::RpcResult, proc_macros::rpc}; use sc_rpc::DenyUnsafe; -use sp_api::{ProvideRuntimeApi, ApiError}; +use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; use sp_runtime::{generic::BlockId, traits::Block as BlockT}; @@ -66,45 +66,41 @@ impl LinkableTreeClient { } } -impl LinkableTreeApi<::Hash, E, CID, L> +impl LinkableTreeRpcApiServer<::Hash, E, CID, L> for LinkableTreeClient where B: BlockT, E: ElementTrait, - CID: Encode + Decode + webb_primitives::ElementTrait, + CID: Encode + Decode, L: Encode + Decode, C: HeaderBackend + ProvideRuntimeApi + Send + Sync + 'static, - C::Api: LinkableTreeApi, - ::Hash: BlockT, - Self: sp_api::Core<::Hash> + C::Api: LinkableTreeApi, { fn get_neighbor_roots( &self, - at: &BlockId<::Hash>, tree_id: u32, - ) -> Result, ApiError> { - self.deny_unsafe.check_if_safe() - .map_err(|err| ApiError::Application(Box::new(err)))?; + at: Option<::Hash>, + ) -> RpcResult> { + self.deny_unsafe.check_if_safe()?; let api = self.client.runtime_api(); - //let at = BlockId::hash(at.hash()); + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); api.get_neighbor_roots(&at, tree_id) .map_err(|_| error::Error::RootsRequestFailure) - .map_err(|err| ApiError::Application(Box::new(err))) + .map_err(Into::into) } fn get_neighbor_edges( &self, - at: &BlockId<::Hash>, tree_id: u32, - ) -> Result>, ApiError> { - self.deny_unsafe.check_if_safe() - .map_err(|err| ApiError::Application(Box::new(err)))?; + at: Option<::Hash>, + ) -> RpcResult>> { + self.deny_unsafe.check_if_safe()?; let api = self.client.runtime_api(); - //let at = sp_api::BlockT::hash(at); + let at = BlockId::hash(at.unwrap_or_else(|| self.client.info().best_hash)); api.get_neighbor_edges(&at, tree_id) .map_err(|_| error::Error::EdgesRequestFailure) - .map_err(|err| ApiError::Application(Box::new(err))) + .map_err(Into::into) } -} +} \ No newline at end of file diff --git a/pallets/mixer/src/tests.rs b/pallets/mixer/src/tests.rs index 42f566008..dd983c047 100644 --- a/pallets/mixer/src/tests.rs +++ b/pallets/mixer/src/tests.rs @@ -41,10 +41,10 @@ fn setup_environment(curve: Curve) -> Vec { // 3. Setup the VerifierPallet // but to do so, we need to have a VerifyingKey let pk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" + "../../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" ); let vk_bytes = - include_bytes!("../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); + include_bytes!("../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); assert_ok!(VerifierPallet::force_set_parameters( RuntimeOrigin::root(), diff --git a/pallets/vanchor/src/benchmarking.rs b/pallets/vanchor/src/benchmarking.rs index 2e316b73b..de5451f87 100644 --- a/pallets/vanchor/src/benchmarking.rs +++ b/pallets/vanchor/src/benchmarking.rs @@ -65,19 +65,19 @@ where // but to do so, we need to have a VerifyingKey let pk_2_2_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_2_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") .to_vec(); let pk_2_16_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_16_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") .to_vec(); assert_ok!(>::force_set_parameters( diff --git a/pallets/vanchor/src/tests.rs b/pallets/vanchor/src/tests.rs index 4ada931d4..b6ee11a91 100644 --- a/pallets/vanchor/src/tests.rs +++ b/pallets/vanchor/src/tests.rs @@ -50,19 +50,19 @@ fn setup_environment() -> (Vec, Vec, Vec, Vec) { // but to do so, we need to have a VerifyingKey let pk_2_2_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_2_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin") .to_vec(); let pk_2_16_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_2_16_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin") .to_vec(); assert_ok!(VAnchorVerifier::force_set_parameters( diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index 29cba9543..2dffa9837 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -29,7 +29,7 @@ array-bytes = "4.1" clap = { version = "4.0.9", features = ["derive"], optional = true } codec = { package = "parity-scale-codec", version = "3.0.0" } serde = { version = "1.0.136", features = ["derive"] } -jsonrpsee = { version = "0.15.1", features = ["server"] } +jsonrpsee = { version = "0.16.2", features = ["server"] } futures = "0.3.21" log = "0.4.17" rand = "0.8" diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index e54ec120e..15778ca4a 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -200,19 +200,19 @@ fn testnet_genesis( log::info!("Verifier params for mixer"); let mixer_verifier_bn254_params = { let vk_bytes = - include_bytes!("../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); + include_bytes!("../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin"); vk_bytes.to_vec() }; log::info!("Verifier params for vanchor"); let vanchor_verifier_2_2_bn254_params = { let vk_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"); + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"); vk_bytes.to_vec() }; let vanchor_verifier_2_16_bn254_params = { let vk_bytes = - include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"); + include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"); vk_bytes.to_vec() }; diff --git a/standalone/runtime/src/constants.rs b/standalone/runtime/src/constants.rs index 46e3ca0d8..2afe24dd8 100644 --- a/standalone/runtime/src/constants.rs +++ b/standalone/runtime/src/constants.rs @@ -34,7 +34,7 @@ pub mod currency { /// Other constants pub mod constants { - use frame_support::weights::{constants::WEIGHT_PER_SECOND, Weight}; + use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}; use sp_runtime::Perbill; /// We assume that ~5% of the block weight is consumed by `on_initialize` /// handlers. This is used to limit the maximal weight of a single @@ -45,7 +45,7 @@ pub mod constants { pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 0.5 seconds of compute with a 6 second average block time. - pub const MAXIMUM_BLOCK_WEIGHT: Weight = WEIGHT_PER_SECOND.saturating_div(2); + pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(2)); } /// Fee-related. From cb68766ac436bf907eef19a445ff76f1f184cfb3 Mon Sep 17 00:00:00 2001 From: Thomas Braun Date: Wed, 28 Dec 2022 09:16:55 -0500 Subject: [PATCH 10/29] update dep --- pallets/mt/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/mt/Cargo.toml b/pallets/mt/Cargo.toml index b117cb497..edebb9a85 100644 --- a/pallets/mt/Cargo.toml +++ b/pallets/mt/Cargo.toml @@ -22,7 +22,7 @@ webb-primitives = { path = "../../primitives", default-features = false } frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } -arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } +arkworks-setups = { version = "1.2.1", default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } [dev-dependencies] From 84acbabfc541ae1e770c07bb75e8a94d0f2295a2 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 20:36:08 +0400 Subject: [PATCH 11/29] cargo fmt --- client/tests/integration_tests.rs | 1 - pallets/linkable-tree/rpc/src/lib.rs | 2 +- rust-toolchain.toml | 2 +- standalone/node/src/benchmarking.rs | 4 ++-- standalone/node/src/service.rs | 8 +++----- standalone/runtime/src/constants.rs | 3 ++- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index 662fd02c1..449e230ee 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -141,7 +141,6 @@ async fn test_mixer() -> Result<(), Box> { Ok(()) } - async fn make_vanchor_tx( pk_bytes: &[u8], vk_bytes: &[u8], diff --git a/pallets/linkable-tree/rpc/src/lib.rs b/pallets/linkable-tree/rpc/src/lib.rs index 04b0a38f7..862807487 100644 --- a/pallets/linkable-tree/rpc/src/lib.rs +++ b/pallets/linkable-tree/rpc/src/lib.rs @@ -103,4 +103,4 @@ where .map_err(|_| error::Error::EdgesRequestFailure) .map_err(Into::into) } -} \ No newline at end of file +} diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a202f88e7..f3e5947e7 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2022-10-22" +channel = "nightly-2022-12-26" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index 5893f00e2..dcd6f549b 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -20,12 +20,12 @@ //! //! Should only be used for benchmarking as it may break in other contexts. use crate::service::{create_extrinsic, FullClient}; -use webb_runtime::{BalancesCall, SystemCall}; -use webb_primitives::{AccountId, Balance}; use sc_cli::Result; use sp_inherents::{InherentData, InherentDataProvider}; use sp_keyring::Sr25519Keyring; use sp_runtime::OpaqueExtrinsic; +use webb_primitives::{AccountId, Balance}; +use webb_runtime::{BalancesCall, SystemCall}; use std::{sync::Arc, time::Duration}; diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs index 56d0fb1d7..0ad037ecd 100644 --- a/standalone/node/src/service.rs +++ b/standalone/node/src/service.rs @@ -33,9 +33,9 @@ use std::sync::Arc; use webb_primitives::opaque::Block; use webb_runtime::RuntimeApi; -use sp_runtime::SaturatedConversion; -use sp_core::{Pair, Encode}; use sp_api::ProvideRuntimeApi; +use sp_core::{Encode, Pair}; +use sp_runtime::SaturatedConversion; use substrate_frame_rpc_system::AccountNonceApi; // Declare an instance of the native executor named `ExecutorDispatch`. Include the wasm binary as @@ -541,9 +541,7 @@ pub fn create_extrinsic( )), frame_system::CheckNonce::::from(nonce), frame_system::CheckWeight::::new(), - pallet_asset_tx_payment::ChargeAssetTxPayment::::from( - tip, None, - ), + pallet_asset_tx_payment::ChargeAssetTxPayment::::from(tip, None), ); let raw_payload = webb_runtime::SignedPayload::from_raw( diff --git a/standalone/runtime/src/constants.rs b/standalone/runtime/src/constants.rs index 2afe24dd8..aa2c58ca7 100644 --- a/standalone/runtime/src/constants.rs +++ b/standalone/runtime/src/constants.rs @@ -45,7 +45,8 @@ pub mod constants { pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75); /// We allow for 0.5 seconds of compute with a 6 second average block time. - pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(2)); + pub const MAXIMUM_BLOCK_WEIGHT: Weight = + Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND.saturating_div(2)); } /// Fee-related. From 1f12f2469138258304d91cbb9648d6bc2f5ab6eb Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 20:38:31 +0400 Subject: [PATCH 12/29] cargo clippy fix --- client/tests/integration_tests.rs | 30 ++++++++--------- client/tests/utils.rs | 50 ++++++++++++++--------------- pallets/asset-registry/src/lib.rs | 6 ++-- pallets/key-storage/src/lib.rs | 2 +- pallets/mt/src/tests.rs | 2 +- pallets/signature-bridge/src/lib.rs | 8 ++--- pallets/token-wrapper/src/lib.rs | 2 +- pallets/token-wrapper/src/tests.rs | 4 +-- pallets/vanchor-handler/src/lib.rs | 4 +-- pallets/vanchor/src/tests.rs | 4 +-- standalone/node/src/benchmarking.rs | 4 +-- standalone/node/src/chain_spec.rs | 4 +-- standalone/node/src/service.rs | 4 +-- standalone/runtime/src/lib.rs | 10 +++--- 14 files changed, 67 insertions(+), 67 deletions(-) diff --git a/client/tests/integration_tests.rs b/client/tests/integration_tests.rs index 449e230ee..dae7ede48 100644 --- a/client/tests/integration_tests.rs +++ b/client/tests/integration_tests.rs @@ -34,7 +34,7 @@ async fn test_mixer() -> Result<(), Box> { include_bytes!("../../substrate-fixtures/mixer/bn254/x5/verifying_key_uncompressed.bin"); let recipient = AccountKeyring::Bob.to_account_id(); let relayer = AccountKeyring::Bob.to_account_id(); - let recipient_bytes = truncate_and_pad(&&recipient.encode()); + let recipient_bytes = truncate_and_pad(&recipient.encode()); let relayer_bytes = truncate_and_pad(&relayer.encode()); let fee = 0; let refund = 0; @@ -58,19 +58,19 @@ async fn test_mixer() -> Result<(), Box> { >(&mut deposit_res) .await?; - let tree_metadata_storage_key = mt_storage.trees(&tree_id); + let tree_metadata_storage_key = mt_storage.trees(tree_id); let tree_metadata_res = api.storage().fetch(&tree_metadata_storage_key, None).await?; let leaf_count = tree_metadata_res.unwrap().leaf_count; let mut leaves = Vec::new(); for i in 0..leaf_count { - let leaf_storage_key = mt_storage.leaves(&tree_id, &i); + let leaf_storage_key = mt_storage.leaves(tree_id, i); let leaf = api.storage().fetch(&leaf_storage_key, None).await?.unwrap(); leaves.push(leaf.0.to_vec()); } println!("Number of leaves in the tree: {:?}", leaves.len()); - println!("Leaf count: {:?}", leaf_count); + println!("Leaf count: {leaf_count:?}"); let mut rng = OsRng {}; let (proof_bytes, root) = create_mixer_proof( @@ -87,7 +87,7 @@ async fn test_mixer() -> Result<(), Box> { ); // Fetch the root from chain storage and check if it equals the local root - let tree_metadata_storage_key = mt_storage.trees(&0); + let tree_metadata_storage_key = mt_storage.trees(0); let tree_metadata_res = api.storage().fetch(&tree_metadata_storage_key, None).await?; if let Some(tree_metadata) = tree_metadata_res { let chain_root = tree_metadata.root; @@ -195,12 +195,12 @@ async fn make_vanchor_tx( let (_chain_id, public_amount, root_set, nullifiers, commitments, ext_data_hash) = deconstruct_vanchor_pi_el(&public_inputs); - println!("chain id {:?}", chain_id); - println!("public amount {:?}", public_amount); - println!("root set {:?}", root_set); - println!("nullifiers {:?}", nullifiers); - println!("commitments {:?}", commitments); - println!("ext data hash {:?}", ext_data_hash); + println!("chain id {chain_id:?}"); + println!("public amount {public_amount:?}"); + println!("root set {root_set:?}"); + println!("nullifiers {nullifiers:?}"); + println!("commitments {commitments:?}"); + println!("ext data hash {ext_data_hash:?}"); // Constructing proof data let proof_data = @@ -278,7 +278,7 @@ async fn test_vanchor() -> Result<(), Box> { let mt_storage = webb_runtime::storage().merkle_tree_bn254(); let tree_id = 6; - let tree_metadata_storage_key = mt_storage.trees(&tree_id); + let tree_metadata_storage_key = mt_storage.trees(tree_id); let tree_metadata_res = api.storage().fetch(&tree_metadata_storage_key, None).await?; let tree_metadata = tree_metadata_res.unwrap(); let leaf_count = tree_metadata.leaf_count; @@ -286,7 +286,7 @@ async fn test_vanchor() -> Result<(), Box> { let mut leaves = Vec::new(); for i in 0..leaf_count { - let leaf_storage_key = mt_storage.leaves(&tree_id, &i); + let leaf_storage_key = mt_storage.leaves(tree_id, i); let leaf = api.storage().fetch(&leaf_storage_key, None).await?.unwrap(); leaves.push(leaf.0.to_vec()); } @@ -320,8 +320,8 @@ async fn test_vanchor() -> Result<(), Box> { .await?; println!("Number of leaves in the tree: {:?}", leaves.len()); - println!("Leaf count: {:?}", leaf_count); - println!("Chain root {:?}", chain_root); + println!("Leaf count: {leaf_count:?}"); + println!("Chain root {chain_root:?}"); Ok(()) } diff --git a/client/tests/utils.rs b/client/tests/utils.rs index 8ea97d4ae..5c5de1f41 100644 --- a/client/tests/utils.rs +++ b/client/tests/utils.rs @@ -51,9 +51,9 @@ impl ElementTrait for Element { } } -impl Into for Element { - fn into(self) -> WebbElement { - WebbElement(self.0) +impl From for WebbElement { + fn from(val: Element) -> Self { + WebbElement(val.0) } } @@ -80,15 +80,15 @@ impl ProofData { } } -impl Into> for ProofData { - fn into(self) -> WebbProofData { +impl From> for WebbProofData { + fn from(val: ProofData) -> Self { WebbProofData { - proof: self.proof, - public_amount: self.public_amount.into(), - roots: self.roots.iter().map(|x| (*x).into()).collect(), - input_nullifiers: self.input_nullifiers.iter().map(|x| (*x).into()).collect(), - output_commitments: self.output_commitments.iter().map(|x| (*x).into()).collect(), - ext_data_hash: self.ext_data_hash.into(), + proof: val.proof, + public_amount: val.public_amount.into(), + roots: val.roots.iter().map(|x| (*x).into()).collect(), + input_nullifiers: val.input_nullifiers.iter().map(|x| (*x).into()).collect(), + output_commitments: val.output_commitments.iter().map(|x| (*x).into()).collect(), + ext_data_hash: val.ext_data_hash.into(), } } } @@ -152,17 +152,17 @@ impl IntoAbiToken for ExtData> for ExtData { - fn into(self) -> WebbExtData { +impl From> for WebbExtData { + fn from(val: ExtData) -> Self { WebbExtData { - recipient: self.recipient.clone(), - relayer: self.relayer.clone(), - ext_amount: self.ext_amount, - fee: self.fee, - refund: self.refund, - token: self.token, - encrypted_output1: self.encrypted_output1, - encrypted_output2: self.encrypted_output2, + recipient: val.recipient.clone(), + relayer: val.relayer.clone(), + ext_amount: val.ext_amount, + fee: val.fee, + refund: val.refund, + token: val.token, + encrypted_output1: val.encrypted_output1, + encrypted_output2: val.encrypted_output2, } } } @@ -391,7 +391,7 @@ pub async fn expect_event println!("Ready"); }, Broadcast(details) => { - println!("Broadcasted: {:?}", details); + println!("Broadcasted: {details:?}"); }, InBlock(details) => { println!( @@ -427,13 +427,13 @@ pub async fn expect_event println!("Future"); }, Retracted(details) => { - println!("Retracted: {:?}", details); + println!("Retracted: {details:?}"); }, FinalityTimeout(details) => { - println!("FinalityTimeout: {:?}", details); + println!("FinalityTimeout: {details:?}"); }, Usurped(details) => { - println!("Usurped: {:?}", details); + println!("Usurped: {details:?}"); }, Dropped => { println!("Dropped"); diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index 3de829a85..4ab10157a 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -505,7 +505,7 @@ impl Pallet { AssetType::Token => return Err(Error::::AssetNotFound.into()), AssetType::PoolShare(pool) => if !pool.contains(&asset_id) { - if Self::assets(&asset_id).is_some() { + if Self::assets(asset_id).is_some() { let mut pool_clone = pool.clone(); pool_clone.push(asset_id); AssetType::PoolShare(pool_clone) @@ -597,12 +597,12 @@ impl } fn exists(asset_id: T::AssetId) -> bool { - Assets::::contains_key(&asset_id) || asset_id == T::NativeAssetId::get() + Assets::::contains_key(asset_id) || asset_id == T::NativeAssetId::get() } fn retrieve_asset(name: &Vec) -> Result { let bounded_name = Self::to_bounded_name(name.clone())?; - if let Some(asset_id) = AssetIds::::get(&bounded_name) { + if let Some(asset_id) = AssetIds::::get(bounded_name) { Ok(asset_id) } else { Err(Error::::AssetNotFound.into()) diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index 108835fc0..35dbf43b6 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -115,7 +115,7 @@ impl, I: 'static> KeyStorageInterface for Pallet::InvalidPermissions ); // set the new maintainer nonce - MaintainerNonce::::put(&nonce); + MaintainerNonce::::put(nonce); // set the new maintainer Maintainer::::try_mutate(|maintainer| { *maintainer = message[4..].to_vec(); @@ -473,12 +473,12 @@ impl, I: 'static> Pallet { /// Asserts if a resource is registered pub fn resource_exists(id: ResourceId) -> bool { - Self::resources(id) != None + Self::resources(id).is_some() } /// Checks if a chain exists as a whitelisted destination pub fn chain_whitelisted(id: T::ChainId) -> bool { - Self::chains(id) != None + Self::chains(id).is_some() } pub fn parse_r_id_from_proposal_data( @@ -533,7 +533,7 @@ impl, I: 'static> Pallet { pub fn whitelist(id: T::ChainId) -> DispatchResultWithPostInfo { // Cannot whitelist with an existing entry ensure!(!Self::chain_whitelisted(id), Error::::ChainAlreadyWhitelisted); - ChainNonces::::insert(&id, T::ProposalNonce::from(0u32)); + ChainNonces::::insert(id, T::ProposalNonce::from(0u32)); Self::deposit_event(Event::ChainWhitelisted { chain_id: id }); Ok(().into()) } diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 79c393506..381fa0cbc 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -547,7 +547,7 @@ impl TokenWrapperInterface, T: DispatchError, >>::get_by_id(from_pool_share_id)?; // Nonce should be greater than the proposal nonce in storage - Self::validate_and_set_nonce(&asset_details.name.clone(), nonce)?; + Self::validate_and_set_nonce(&asset_details.name, nonce)?; // One which receives wrapping cost fees for provided asset let fee_recipient = Self::get_fee_recipient(&asset_details.name); let from_currency_id = Self::to_currency_id(asset_id)?; diff --git a/pallets/token-wrapper/src/tests.rs b/pallets/token-wrapper/src/tests.rs index cb16cb590..7f836c08e 100644 --- a/pallets/token-wrapper/src/tests.rs +++ b/pallets/token-wrapper/src/tests.rs @@ -58,7 +58,7 @@ fn should_wrap_token() { assert_ok!(TokenWrapper::set_wrapping_fee( RuntimeOrigin::root(), 5, - pool_share_id.into(), + pool_share_id, nonce )); @@ -605,7 +605,7 @@ fn should_rescue_all_tokens() { assert_ok!(TokenWrapper::set_wrapping_fee( RuntimeOrigin::root(), 5, - pool_share_id.into(), + pool_share_id, nonce )); diff --git a/pallets/vanchor-handler/src/lib.rs b/pallets/vanchor-handler/src/lib.rs index 9f1cc009d..663cc8e66 100644 --- a/pallets/vanchor-handler/src/lib.rs +++ b/pallets/vanchor-handler/src/lib.rs @@ -273,7 +273,7 @@ impl, I: 'static> Pallet { max_deposit_limit: VAnchorBalanceOf, nonce: T::ProposalNonce, ) -> DispatchResultWithPostInfo { - T::VAnchor::set_max_deposit_amount(max_deposit_limit.into(), nonce)?; + T::VAnchor::set_max_deposit_amount(max_deposit_limit, nonce)?; Self::deposit_event(Event::AnchorEdgeAdded); Ok(().into()) } @@ -282,7 +282,7 @@ impl, I: 'static> Pallet { min_withdraw_limit: VAnchorBalanceOf, nonce: T::ProposalNonce, ) -> DispatchResultWithPostInfo { - T::VAnchor::set_min_withdraw_amount(min_withdraw_limit.into(), nonce)?; + T::VAnchor::set_min_withdraw_amount(min_withdraw_limit, nonce)?; Self::deposit_event(Event::AnchorEdgeAdded); Ok(().into()) } diff --git a/pallets/vanchor/src/tests.rs b/pallets/vanchor/src/tests.rs index b6ee11a91..a0e0e08d0 100644 --- a/pallets/vanchor/src/tests.rs +++ b/pallets/vanchor/src/tests.rs @@ -468,7 +468,7 @@ fn should_complete_2x2_transaction_with_withdraw_unwrap_and_refund_native_token( use arkworks_setups::common::verify; match verify::(&public_inputs, &verifying_key_2x2_bytes, &proof) { - Ok(res) => println!("Proof verification result: {}", res), + Ok(res) => println!("Proof verification result: {res}"), Err(e) => panic!("Proof verification failed: {:?}", e), } @@ -1436,7 +1436,7 @@ fn should_not_be_able_to_exceed_max_deposit() { let more_than_max_balance = 20; let ext_amount: Amount = more_than_max_balance as i128; - let public_amount = ext_amount as i128; + let public_amount = ext_amount; let fee: Balance = 0; let chain_type = [2, 0]; diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index dcd6f549b..323e1f07a 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -98,7 +98,7 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { acc, BalancesCall::transfer_keep_alive { dest: self.dest.clone().into(), - value: self.value.into(), + value: self.value, }, Some(nonce), ) @@ -115,6 +115,6 @@ pub fn inherent_benchmark_data() -> Result { let timestamp = sp_timestamp::InherentDataProvider::new(d.into()); futures::executor::block_on(timestamp.provide_inherent_data(&mut inherent_data)) - .map_err(|e| format!("creating inherent data: {:?}", e))?; + .map_err(|e| format!("creating inherent data: {e:?}"))?; Ok(inherent_data) } diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 15778ca4a..2c6f564c4 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -43,7 +43,7 @@ type AccountPublic = ::Signer; /// Helper function to generate a crypto pair from seed pub fn get_from_seed(seed: &str) -> ::Public { - TPublic::Pair::from_string(&format!("//{}", seed), None) + TPublic::Pair::from_string(&format!("//{seed}"), None) .expect("static values are valid; qed") .public() } @@ -61,7 +61,7 @@ pub fn authority_keys_from_seed( seed: &str, ) -> (AccountId, AccountId, GrandpaId, BabeId, ImOnlineId, AuthorityDiscoveryId) { ( - get_account_id_from_seed::(&format!("{}//stash", seed)), + get_account_id_from_seed::(&format!("{seed}//stash")), get_account_id_from_seed::(seed), get_from_seed::(seed), get_from_seed::(seed), diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs index 0ad037ecd..381466868 100644 --- a/standalone/node/src/service.rs +++ b/standalone/node/src/service.rs @@ -261,7 +261,7 @@ pub fn new_full_base( ) -> Result { let hwbench = if !disable_hardware_benchmarks { config.database.path().map(|database_path| { - let _ = std::fs::create_dir_all(&database_path); + let _ = std::fs::create_dir_all(database_path); sc_sysinfo::gather_hwbench(Some(database_path)) }) } else { @@ -528,7 +528,7 @@ pub fn create_extrinsic( let period = webb_runtime::BlockHashCount::get() .checked_next_power_of_two() .map(|c| c / 2) - .unwrap_or(2) as u64; + .unwrap_or(2); let tip = 0; let extra: webb_runtime::SignedExtra = ( frame_system::CheckNonZeroSender::::new(), diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 370c34a59..fed54d8d6 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -303,9 +303,9 @@ parameter_types! { parameter_types! { pub const PreimageMaxSize: u32 = 4096 * 1024; - pub const PreimageBaseDeposit: Balance = 1 * DOLLARS; + pub const PreimageBaseDeposit: Balance = DOLLARS; // One cent: $10,000 / MB - pub const PreimageByteDeposit: Balance = 1 * CENTS; + pub const PreimageByteDeposit: Balance = CENTS; } impl pallet_preimage::Config for Runtime { @@ -981,10 +981,10 @@ impl pallet_proxy::Config for Runtime { parameter_types! { pub const AssetDeposit: Balance = 100 * DOLLARS; - pub const ApprovalDeposit: Balance = 1 * DOLLARS; + pub const ApprovalDeposit: Balance = DOLLARS; pub const StringLimit: u32 = 50; pub const MetadataDepositBase: Balance = 10 * DOLLARS; - pub const MetadataDepositPerByte: Balance = 1 * DOLLARS; + pub const MetadataDepositPerByte: Balance = DOLLARS; } impl pallet_assets::Config for Runtime { @@ -1037,7 +1037,7 @@ where let tip = 0; // take the biggest period possible. let period = - BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2) as u64; + BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2); let current_block = System::block_number() .saturated_into::() // The `System::block_number` is initialized with `n+1`, From 41fff0e6e163da244b6e45afcd083a602f42a5ae Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 20:39:20 +0400 Subject: [PATCH 13/29] remove unused files --- .vscode/settings.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0b6af746a..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "git.ignoredRepositories": [ - "open-runtime-module-library" - ], - "rust-analyzer.updates.channel": "stable", - "cargo.automaticCheck": false, - "rust-analyzer.checkOnSave.enable": false -} \ No newline at end of file From e5b2655b13867b08ca525e76444848044af9911c Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 20:57:32 +0400 Subject: [PATCH 14/29] cargo fmt --- pallets/token-wrapper/src/tests.rs | 14 ++------------ standalone/node/src/benchmarking.rs | 5 +---- standalone/runtime/src/lib.rs | 3 +-- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pallets/token-wrapper/src/tests.rs b/pallets/token-wrapper/src/tests.rs index 7f836c08e..ceb875c9e 100644 --- a/pallets/token-wrapper/src/tests.rs +++ b/pallets/token-wrapper/src/tests.rs @@ -55,12 +55,7 @@ fn should_wrap_token() { // increment nonce let nonce = nonce + 1; - assert_ok!(TokenWrapper::set_wrapping_fee( - RuntimeOrigin::root(), - 5, - pool_share_id, - nonce - )); + assert_ok!(TokenWrapper::set_wrapping_fee(RuntimeOrigin::root(), 5, pool_share_id, nonce)); assert_ok!(TokenWrapper::wrap( RuntimeOrigin::signed(recipient), @@ -602,12 +597,7 @@ fn should_rescue_all_tokens() { // increment nonce let nonce = nonce + 1; - assert_ok!(TokenWrapper::set_wrapping_fee( - RuntimeOrigin::root(), - 5, - pool_share_id, - nonce - )); + assert_ok!(TokenWrapper::set_wrapping_fee(RuntimeOrigin::root(), 5, pool_share_id, nonce)); assert_ok!(TokenWrapper::wrap( RuntimeOrigin::signed(recipient), diff --git a/standalone/node/src/benchmarking.rs b/standalone/node/src/benchmarking.rs index 323e1f07a..46a0db120 100644 --- a/standalone/node/src/benchmarking.rs +++ b/standalone/node/src/benchmarking.rs @@ -96,10 +96,7 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder { let extrinsic: OpaqueExtrinsic = create_extrinsic( self.client.as_ref(), acc, - BalancesCall::transfer_keep_alive { - dest: self.dest.clone().into(), - value: self.value, - }, + BalancesCall::transfer_keep_alive { dest: self.dest.clone().into(), value: self.value }, Some(nonce), ) .into(); diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index fed54d8d6..babae48c4 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -1036,8 +1036,7 @@ where ) -> Option<(RuntimeCall, ::SignaturePayload)> { let tip = 0; // take the biggest period possible. - let period = - BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2); + let period = BlockHashCount::get().checked_next_power_of_two().map(|c| c / 2).unwrap_or(2); let current_block = System::block_number() .saturated_into::() // The `System::block_number` is initialized with `n+1`, From a00307f83bec81da45bc4c039cb3a2fc7cdd3e6f Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 21:09:08 +0400 Subject: [PATCH 15/29] fix missing pallet --- Cargo.lock | 130 +++++++++++++++++++++------- pallets/anonymity-mining/Cargo.toml | 26 +++--- pallets/anonymity-mining/src/lib.rs | 31 ++++--- 3 files changed, 125 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c5bd5a31..f5318e3bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4311,6 +4311,23 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "orml-currencies" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36#4f5a3f34d8cbd98b7bc2e295219a3e7b99b9ecaf" +dependencies = [ + "frame-support", + "frame-system", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "orml-currencies" version = "0.4.1-dev" @@ -4318,8 +4335,8 @@ source = "git+https://github.com/webb-tools/open-runtime-module-library.git?bran dependencies = [ "frame-support", "frame-system", - "orml-traits", - "orml-utilities", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-utilities 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", "serde", @@ -4328,6 +4345,21 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] +[[package]] +name = "orml-tokens" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36#4f5a3f34d8cbd98b7bc2e295219a3e7b99b9ecaf" +dependencies = [ + "frame-support", + "frame-system", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "orml-tokens" version = "0.4.1-dev" @@ -4335,12 +4367,30 @@ source = "git+https://github.com/webb-tools/open-runtime-module-library.git?bran dependencies = [ "frame-support", "frame-system", - "orml-traits", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "parity-scale-codec", + "scale-info", + "serde", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + +[[package]] +name = "orml-traits" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36#4f5a3f34d8cbd98b7bc2e295219a3e7b99b9ecaf" +dependencies = [ + "frame-support", + "impl-trait-for-tuples", + "num-traits", + "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", "serde", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "xcm", ] [[package]] @@ -4351,7 +4401,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities", + "orml-utilities 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "scale-info", "serde", @@ -4361,6 +4411,20 @@ dependencies = [ "xcm", ] +[[package]] +name = "orml-utilities" +version = "0.4.1-dev" +source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36#4f5a3f34d8cbd98b7bc2e295219a3e7b99b9ecaf" +dependencies = [ + "frame-support", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", +] + [[package]] name = "orml-utilities" version = "0.4.1-dev" @@ -4410,9 +4474,9 @@ dependencies = [ "frame-system", "hex", "hex-literal 0.2.2", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -4427,10 +4491,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.30)", + "sp-core 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "webb-primitives", ] @@ -4442,7 +4506,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-traits", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "parity-scale-codec", "primitive-types 0.8.0", "scale-info", @@ -4849,9 +4913,9 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-balances", "pallet-hasher", "pallet-mt", @@ -4914,9 +4978,9 @@ dependencies = [ "frame-system-benchmarking", "hex", "log", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -5236,9 +5300,9 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-treasury", @@ -5260,9 +5324,9 @@ dependencies = [ "frame-support", "frame-system", "hex-literal 0.3.4", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-signature-bridge", @@ -5375,9 +5439,9 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -5410,9 +5474,9 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "hex-literal 0.3.4", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -10598,9 +10662,9 @@ dependencies = [ "frame-system-rpc-runtime-api", "hex-literal 0.3.4", "log", - "orml-currencies", - "orml-tokens", - "orml-traits", + "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", "pallet-asset-registry", "pallet-asset-tx-payment", "pallet-assets", diff --git a/pallets/anonymity-mining/Cargo.toml b/pallets/anonymity-mining/Cargo.toml index 645f0569e..4e4365c74 100644 --- a/pallets/anonymity-mining/Cargo.toml +++ b/pallets/anonymity-mining/Cargo.toml @@ -17,7 +17,7 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive" pallet-vanchor = { path = "../vanchor", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } -pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-hasher = { path = "../hasher", default-features = false } pallet-mixer = { path = "../mixer", default-features = false } pallet-mt = { path = "../mt", default-features = false } @@ -25,27 +25,27 @@ pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor-verifier = { path = "../vanchor-verifier", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } pallet-key-storage = {path = "../key-storage"} -pallet-timestamp = { default-features = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } -orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.30", default-features = false } +pallet-timestamp = { default-features = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } webb-primitives = { path = "../../primitives", default-features = false } # Optional dependencies -frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30", optional = true } +frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] hex-literal = "0.2.1" hex = "0.4" serde = { version = "1.0.119" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false } ark-ec = { version = "^0.3.0", default-features = false } diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index ccdca0252..c69336fbb 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -30,20 +30,19 @@ pub mod mock; mod tests; use frame_support::{ - pallet_prelude::{ensure, DispatchError}, + pallet_prelude::{DispatchError}, sp_runtime::{ - traits::{AccountIdConversion, One, Saturating, Zero}, - FixedI64, FixedPointNumber, FixedPointOperand, SaturatedConversion, + traits::{AccountIdConversion, Saturating}, + FixedI64, FixedPointNumber, SaturatedConversion, }, traits::{Get, Time}, PalletId, }; -use orml_traits::{currency::transactional, MultiCurrency}; +use orml_traits::{MultiCurrency}; use pallet_vanchor::VAnchorConfigration; use sp_std::{convert::TryInto, prelude::*, vec}; use webb_primitives::{ traits::vanchor::{VAnchorInspector, VAnchorInterface}, - types::runtime::Moment, }; pub use pallet::*; @@ -211,21 +210,21 @@ impl, I: 'static> Pallet { pub fn set_pool_weight(new_pool_weight: u64) -> Result<(), DispatchError> { PoolWeight::::set(new_pool_weight); Self::deposit_event(Event::UpdatedPoolWeight { pool_weight: new_pool_weight }); - Ok(().into()) + Ok(()) } // Set tokens sold pub fn set_tokens_sold(new_tokens_sold: u64) -> Result<(), DispatchError> { TokensSold::::set(new_tokens_sold); Self::deposit_event(Event::UpdatedTokensSold { tokens_sold: new_tokens_sold }); - Ok(().into()) + Ok(()) } // Get current timestamp pub fn get_current_timestamp() -> u64 { let current_timestamp = T::Time::now(); - let current_timestamp_u64 = current_timestamp.saturated_into::(); - return current_timestamp_u64 + + current_timestamp.saturated_into::() } /// Get expected number of tokens to swap @@ -250,11 +249,11 @@ impl, I: 'static> Pallet { let final_new_balance_i64 = final_new_balance_f64.round(); let final_new_balance_u64 = final_new_balance_i64 as u64; - let final_balance_new = + let _final_balance_new = old_balance.saturating_sub(final_new_balance_u64.saturated_into::>()); let final_balance_new_u64 = old_balance_u64 - final_new_balance_u64; - let final_balance = final_balance_new_u64.saturated_into::>(); - return final_balance + + final_balance_new_u64.saturated_into::>() } /// Calculate balance to use @@ -269,16 +268,16 @@ impl, I: 'static> Pallet { let liquidity_u64 = T::Liquidity::get().saturated_into::(); let tokens_sold = Self::get_tokens_sold(); if elapsed_u64 <= >::Duration::get() { - let liquidity = T::Liquidity::get(); + let _liquidity = T::Liquidity::get(); let duration = T::Duration::get(); let amount = T::InitialLiquidity::get() + (liquidity_u64 * elapsed_u64) / duration - tokens_sold; let modified_reward_balance = amount.saturated_into::>(); //let elapsed_balance = elapsed.saturated_into::>(); - let elapsed_balance = (elapsed_u64).saturated_into::>(); - return modified_reward_balance + let _elapsed_balance = (elapsed_u64).saturated_into::>(); + modified_reward_balance } else { - return reward_balance + reward_balance } } } From ba991c249572b2041700de83c06aa8f4df8e60a6 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 21:13:20 +0400 Subject: [PATCH 16/29] more fixes --- pallets/anonymity-mining/src/lib.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index c69336fbb..20b69c015 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -30,7 +30,7 @@ pub mod mock; mod tests; use frame_support::{ - pallet_prelude::{DispatchError}, + pallet_prelude::DispatchError, sp_runtime::{ traits::{AccountIdConversion, Saturating}, FixedI64, FixedPointNumber, SaturatedConversion, @@ -38,12 +38,10 @@ use frame_support::{ traits::{Get, Time}, PalletId, }; -use orml_traits::{MultiCurrency}; +use orml_traits::MultiCurrency; use pallet_vanchor::VAnchorConfigration; use sp_std::{convert::TryInto, prelude::*, vec}; -use webb_primitives::{ - traits::vanchor::{VAnchorInspector, VAnchorInterface}, -}; +use webb_primitives::traits::vanchor::{VAnchorInspector, VAnchorInterface}; pub use pallet::*; @@ -223,7 +221,7 @@ impl, I: 'static> Pallet { // Get current timestamp pub fn get_current_timestamp() -> u64 { let current_timestamp = T::Time::now(); - + current_timestamp.saturated_into::() } @@ -252,7 +250,7 @@ impl, I: 'static> Pallet { let _final_balance_new = old_balance.saturating_sub(final_new_balance_u64.saturated_into::>()); let final_balance_new_u64 = old_balance_u64 - final_new_balance_u64; - + final_balance_new_u64.saturated_into::>() } From e8b5a2abb41742e8f29b76e01007478ec4f51e90 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 22:39:46 +0400 Subject: [PATCH 17/29] fix failing tests --- Cargo.lock | 226 ++++++++--------------- pallets/anonymity-mining/Cargo.toml | 4 +- pallets/anonymity-mining/src/mock.rs | 10 +- pallets/anonymity-mining/src/tests.rs | 40 ++-- pallets/asset-registry/Cargo.toml | 2 +- pallets/linkable-tree/Cargo.toml | 6 +- pallets/mixer/Cargo.toml | 6 +- pallets/token-wrapper-handler/Cargo.toml | 6 +- pallets/token-wrapper/Cargo.toml | 6 +- pallets/vanchor-handler/Cargo.toml | 6 +- pallets/vanchor/Cargo.toml | 10 +- pallets/xanchor/Cargo.toml | 6 +- standalone/runtime/Cargo.toml | 6 +- 13 files changed, 132 insertions(+), 202 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f5318e3bf..c43655793 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -567,9 +567,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" +checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" dependencies = [ "proc-macro2", "quote", @@ -623,7 +623,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.30.0", + "object 0.30.1", "rustc-demangle", ] @@ -835,11 +835,12 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bstr" -version = "0.2.17" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" dependencies = [ "memchr", + "serde", ] [[package]] @@ -894,9 +895,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" +checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" dependencies = [ "serde", ] @@ -1084,9 +1085,9 @@ dependencies = [ [[package]] name = "comfy-table" -version = "6.1.3" +version = "6.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" dependencies = [ "strum", "strum_macros", @@ -1422,9 +1423,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -1434,9 +1435,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", @@ -1449,15 +1450,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", @@ -1796,12 +1797,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -1931,9 +1932,9 @@ checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90" [[package]] name = "file-per-thread-logger" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e16290574b39ee41c71aeb90ae960c504ebaf1e2a1c87bd52aa56ed6e1a02f" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ "env_logger", "log", @@ -1953,9 +1954,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" +checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" dependencies = [ "either", "futures", @@ -2523,15 +2524,15 @@ checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", "bstr", @@ -2994,9 +2995,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-terminal" @@ -4180,9 +4181,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" dependencies = [ "memchr", "minimal-lexical", @@ -4280,18 +4281,18 @@ dependencies = [ [[package]] name = "object" -version = "0.30.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb" +checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "opaque-debug" @@ -4318,25 +4319,8 @@ source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git dependencies = [ "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", -] - -[[package]] -name = "orml-currencies" -version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" -dependencies = [ - "frame-support", - "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-utilities 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits", + "orml-utilities", "parity-scale-codec", "scale-info", "serde", @@ -4352,22 +4336,7 @@ source = "git+https://github.com/open-web3-stack/open-runtime-module-library.git dependencies = [ "frame-support", "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", -] - -[[package]] -name = "orml-tokens" -version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" -dependencies = [ - "frame-support", - "frame-system", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits", "parity-scale-codec", "scale-info", "serde", @@ -4383,25 +4352,7 @@ dependencies = [ "frame-support", "impl-trait-for-tuples", "num-traits", - "orml-utilities 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "xcm", -] - -[[package]] -name = "orml-traits" -version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" -dependencies = [ - "frame-support", - "impl-trait-for-tuples", - "num-traits", - "orml-utilities 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-utilities", "parity-scale-codec", "scale-info", "serde", @@ -4425,20 +4376,6 @@ dependencies = [ "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", ] -[[package]] -name = "orml-utilities" -version = "0.4.1-dev" -source = "git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36#94465d1964f2ee9f895cbe837dd7e39171c794ca" -dependencies = [ - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", - "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", -] - [[package]] name = "os_str_bytes" version = "6.4.1" @@ -4474,9 +4411,9 @@ dependencies = [ "frame-system", "hex", "hex-literal 0.2.2", - "orml-currencies 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/open-web3-stack/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -4506,7 +4443,7 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-traits", "parity-scale-codec", "primitive-types 0.8.0", "scale-info", @@ -4913,9 +4850,9 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-balances", "pallet-hasher", "pallet-mt", @@ -4978,9 +4915,9 @@ dependencies = [ "frame-system-benchmarking", "hex", "log", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -5300,9 +5237,9 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-treasury", @@ -5324,9 +5261,9 @@ dependencies = [ "frame-support", "frame-system", "hex-literal 0.3.4", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-signature-bridge", @@ -5439,9 +5376,9 @@ dependencies = [ "frame-support", "frame-system", "frame-system-benchmarking", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -5474,9 +5411,9 @@ dependencies = [ "frame-system", "frame-system-benchmarking", "hex-literal 0.3.4", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-balances", "pallet-hasher", @@ -5881,9 +5818,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.4" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", @@ -5911,9 +5848,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" dependencies = [ "proc-macro2", "syn", @@ -6330,9 +6267,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -7710,12 +7647,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -9203,9 +9139,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "d44528162f980c0e03c71e005d334332c8da0aec9f2b0b4bdc557ed4a9f24776" dependencies = [ "Inflector", "num-format", @@ -9666,9 +9602,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.23.0" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" dependencies = [ "autocfg", "bytes", @@ -9939,9 +9875,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tt-call" @@ -10662,9 +10598,9 @@ dependencies = [ "frame-system-rpc-runtime-api", "hex-literal 0.3.4", "log", - "orml-currencies 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-tokens 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", - "orml-traits 0.4.1-dev (git+https://github.com/webb-tools/open-runtime-module-library.git?branch=polkadot-v0.9.36)", + "orml-currencies", + "orml-tokens", + "orml-traits", "pallet-asset-registry", "pallet-asset-tx-payment", "pallet-assets", diff --git a/pallets/anonymity-mining/Cargo.toml b/pallets/anonymity-mining/Cargo.toml index 4e4365c74..118978d97 100644 --- a/pallets/anonymity-mining/Cargo.toml +++ b/pallets/anonymity-mining/Cargo.toml @@ -26,8 +26,6 @@ pallet-vanchor-verifier = { path = "../vanchor-verifier", default-features = fal pallet-token-wrapper = { path = "../token-wrapper", default-features = false } pallet-key-storage = {path = "../key-storage"} pallet-timestamp = { default-features = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } -orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } @@ -56,6 +54,8 @@ ark-bls12-381 = { version = "^0.3.0", default-features = false, features = [ "cu ark-bls12-377 = { version = "^0.3.0", default-features = false, features = [ "curve", "r1cs" ] } ark-bn254 = { version = "^0.3.0", default-features = false, features = [ "curve" ] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } [features] default = ["std"] diff --git a/pallets/anonymity-mining/src/mock.rs b/pallets/anonymity-mining/src/mock.rs index 411c064b0..17c72a221 100644 --- a/pallets/anonymity-mining/src/mock.rs +++ b/pallets/anonymity-mining/src/mock.rs @@ -18,13 +18,12 @@ pub use webb_primitives::{ hasher::{HasherModule, InstanceHasher}, hashing::ethereum::Keccak256HasherBn254, types::runtime::Moment, - ElementTrait, + AccountId, ElementTrait, }; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; -pub type AccountId = u64; pub type Balance = u128; pub type BlockNumber = u64; pub type CurrencyId = u32; @@ -116,15 +115,10 @@ impl orml_tokens::Config for Test { type DustRemovalWhitelist = Nothing; type RuntimeEvent = RuntimeEvent; type ExistentialDeposits = AssetRegistry; - type OnDust = (); type WeightInfo = (); type MaxLocks = (); type MaxReserves = (); - type OnSlash = (); - type OnDeposit = (); - type OnTransfer = (); - type OnNewTokenAccount = (); - type OnKilledTokenAccount = (); + type CurrencyHooks = (); type ReserveIdentifier = [u8; 8]; } diff --git a/pallets/anonymity-mining/src/tests.rs b/pallets/anonymity-mining/src/tests.rs index 4c1589756..9fb0e7a33 100644 --- a/pallets/anonymity-mining/src/tests.rs +++ b/pallets/anonymity-mining/src/tests.rs @@ -1,12 +1,12 @@ use super::*; use crate::mock::*; -use ark_ff::prelude::*; -use arkworks_setups::{common::setup_params, Curve}; + + use frame_benchmarking::account; -use frame_support::{assert_err, assert_ok}; -use hex_literal::hex; -use sp_core::bytes; -use sp_runtime::traits::{One, Zero}; +use frame_support::{assert_ok}; + + +use sp_runtime::traits::{Zero}; const SEED: u32 = 0; const START_TIMESTAMP: u64 = 0; @@ -36,7 +36,7 @@ fn setup_environment() { #[test] fn test_basic_set_pool_weight() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 800 assert_ok!(AnonymityMining::set_pool_weight(800)); @@ -52,9 +52,9 @@ fn test_basic_set_pool_weight() { #[test] fn test_basic_timestamp_change() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); - let start_timestamp = AnonymityMining::get_current_timestamp(); + let _start_timestamp = AnonymityMining::get_current_timestamp(); Timestamp::set_timestamp(1); let curr_timestamp = AnonymityMining::get_current_timestamp(); assert_eq!(curr_timestamp, 1); @@ -65,7 +65,7 @@ fn test_basic_timestamp_change() { #[test] fn test_basic_get_virtual_reward_balance() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 800 assert_ok!(AnonymityMining::set_pool_weight(800)); @@ -76,7 +76,7 @@ fn test_basic_get_virtual_reward_balance() { AnonymityMining::get_virtual_balance(&AnonymityMining::account_id()); // Starting virtual balance is at INITIAL_LIQUIDITY - let starting_virtual_balance = assert_eq!(prev_virtual_balance, INITIAL_LIQUIDITY); + assert_eq!(prev_virtual_balance, INITIAL_LIQUIDITY); // add reward balance to pallet let new_reward_balance = INITIAL_TOTAL_REWARDS_BALANCE; @@ -125,7 +125,7 @@ fn test_basic_get_virtual_reward_balance() { #[test] fn test_basic_get_expected_return_varying_timestamp() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 10000 assert_ok!(AnonymityMining::set_pool_weight(10000)); @@ -176,7 +176,7 @@ fn test_basic_get_expected_return_varying_timestamp() { #[test] fn test_basic_get_expected_return_varying_pool_weights() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 10000 assert_ok!(AnonymityMining::set_pool_weight(10000)); @@ -224,7 +224,7 @@ fn test_basic_get_expected_return_varying_pool_weights() { #[test] fn test_basic_get_expected_return_varying_amounts() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 10000 assert_ok!(AnonymityMining::set_pool_weight(10000)); @@ -272,7 +272,7 @@ fn test_basic_get_expected_return_varying_amounts() { #[test] fn test_basic_swap() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 10000 assert_ok!(AnonymityMining::set_pool_weight(10000)); @@ -341,7 +341,7 @@ fn test_basic_swap() { // conduct swap assert_ok!(AnonymityMining::swap( RuntimeOrigin::signed(sender_account_id.clone()), - sender_account_id, + sender_account_id.clone(), amount )); @@ -369,7 +369,7 @@ fn test_basic_swap() { #[test] fn test_basic_two_swaps() { new_test_ext().execute_with(|| { - let _ = setup_environment(); + setup_environment(); // Set pool weight to 800 assert_ok!(AnonymityMining::set_pool_weight(10000)); @@ -428,7 +428,7 @@ fn test_basic_two_swaps() { // conduct swap assert_ok!(AnonymityMining::swap( RuntimeOrigin::signed(sender_one_account_id.clone()), - sender_one_account_id, + sender_one_account_id.clone(), amount )); @@ -473,7 +473,7 @@ fn test_basic_two_swaps() { // conduct swap assert_ok!(AnonymityMining::swap( RuntimeOrigin::signed(sender_two_account_id.clone()), - sender_two_account_id, + sender_two_account_id.clone(), amount )); @@ -526,7 +526,7 @@ fn test_basic_two_swaps() { // conduct swap assert_ok!(AnonymityMining::swap( RuntimeOrigin::signed(sender_one_account_id.clone()), - sender_one_account_id, + sender_one_account_id.clone(), amount )); diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index c1e4e7672..a37718cfc 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -19,7 +19,7 @@ serde = { features = ["derive"], optional = true, version = "1.0.101" } webb-primitives = { path = "../../primitives", default-features = false } # ORML dependencies -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } # Substrate dependencies frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/linkable-tree/Cargo.toml b/pallets/linkable-tree/Cargo.toml index d75c4b48b..72cbcbfd8 100644 --- a/pallets/linkable-tree/Cargo.toml +++ b/pallets/linkable-tree/Cargo.toml @@ -20,7 +20,7 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr pallet-hasher = { path = "../hasher", default-features = false } pallet-mt = { path = "../mt", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } @@ -33,8 +33,8 @@ serde = { version = "1.0.119", optional = true } sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } diff --git a/pallets/mixer/Cargo.toml b/pallets/mixer/Cargo.toml index 36fcb3b59..d0d461aa2 100644 --- a/pallets/mixer/Cargo.toml +++ b/pallets/mixer/Cargo.toml @@ -16,9 +16,9 @@ log = "0.4" webb-primitives = {path = "../../primitives", features = ["verifying"], default-features = false} frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-asset-registry = {path = "../asset-registry", default-features = false} pallet-hasher = {path = "../hasher", default-features = false} pallet-mt = {path = "../mt", default-features = false} diff --git a/pallets/token-wrapper-handler/Cargo.toml b/pallets/token-wrapper-handler/Cargo.toml index ee1bb9c3b..e9242499e 100644 --- a/pallets/token-wrapper-handler/Cargo.toml +++ b/pallets/token-wrapper-handler/Cargo.toml @@ -18,7 +18,7 @@ asset-registry = {package = "pallet-asset-registry", path = "../asset-registry", webb-primitives = {path = "../../primitives", default-features = false} frame-support = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } frame-system = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } @@ -31,8 +31,8 @@ frame-benchmarking = {default-features = false, git = "https://github.com/parity [dev-dependencies] pallet-signature-bridge = { path = "../signature-bridge", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/token-wrapper/Cargo.toml b/pallets/token-wrapper/Cargo.toml index 241eeaed2..9a3353083 100644 --- a/pallets/token-wrapper/Cargo.toml +++ b/pallets/token-wrapper/Cargo.toml @@ -23,14 +23,14 @@ sp-arithmetic = {default-features = false, git = "https://github.com/paritytech/ sp-runtime = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-std = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } #Optional dependencies frame-benchmarking = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } [dev-dependencies] -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-core = {default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } diff --git a/pallets/vanchor-handler/Cargo.toml b/pallets/vanchor-handler/Cargo.toml index cf4d70f01..ef7324930 100644 --- a/pallets/vanchor-handler/Cargo.toml +++ b/pallets/vanchor-handler/Cargo.toml @@ -28,7 +28,7 @@ sp-arithmetic = { default-features = false, git = "https://github.com/paritytech pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } @@ -53,8 +53,8 @@ pallet-token-wrapper = { path = "../token-wrapper", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-key-storage = {path = "../key-storage"} ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } ark-bn254 = { version = "^0.3.0", default-features = false, features = ["curve"] } arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = false } diff --git a/pallets/vanchor/Cargo.toml b/pallets/vanchor/Cargo.toml index b11e495c5..a63d30970 100644 --- a/pallets/vanchor/Cargo.toml +++ b/pallets/vanchor/Cargo.toml @@ -23,7 +23,7 @@ pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-vanchor-verifier = { path = "../vanchor-verifier", default-features = false } webb-primitives = { path = "../../primitives", default-features = false, features = ["hashing", "verifying", "field_ops"] } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } pallet-token-wrapper = { path = "../token-wrapper", default-features = false } frame-system-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36", optional = true } @@ -33,8 +33,8 @@ arkworks-setups = { version = "1.2.1", features = ["r1cs"], default-features = f arkworks-native-gadgets = { version = "1.2.0", default-features = false } ark-std = { version = "^0.3.0", default-features = false } ark-ff = { version = "^0.3.0", default-features = false} -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } [dev-dependencies] serde = { version = "1.0.119" } @@ -44,8 +44,8 @@ sp-runtime = { default-features = false, git = "https://github.com/paritytech/su pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-key-storage = {path = "../key-storage"} -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } ark-ff = { version = "^0.3.0", default-features = false} diff --git a/pallets/xanchor/Cargo.toml b/pallets/xanchor/Cargo.toml index e63b0d0b0..1df3097d9 100644 --- a/pallets/xanchor/Cargo.toml +++ b/pallets/xanchor/Cargo.toml @@ -19,7 +19,7 @@ pallet-verifier = { path = "../verifier", default-features = false } pallet-mt = { path = "../mt", default-features = false } pallet-linkable-tree = { path = "../linkable-tree", default-features = false } pallet-vanchor = { path = "../vanchor", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } webb-primitives = { path = "../../primitives", default-features = false } pallet-asset-registry = { path = "../asset-registry", default-features = false } webb-proposals = { version = "0.5.4", default-features = false, features = ["scale", "substrate"] } @@ -39,8 +39,8 @@ pallet-democracy = { git = "https://github.com/paritytech/substrate.git", branch pallet-preimage = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } rand = "0.8.4" ark-crypto-primitives = { version = "^0.3.0", features = ["r1cs"], default-features = false } diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml index 824bcb793..cb2c015ab 100644 --- a/standalone/runtime/Cargo.toml +++ b/standalone/runtime/Cargo.toml @@ -24,9 +24,9 @@ static_assertions = "1.1.0" # local dependencies webb-primitives = {path = "../../primitives", default-features = false, features = ["hashing"]} -orml-currencies = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-tokens = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } -orml-traits = { git = "https://github.com/webb-tools/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } +orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library.git", branch = "polkadot-v0.9.36", default-features = false } pallet-vanchor = {path = "../../pallets/vanchor", default-features = false } pallet-vanchor-handler = {path = "../../pallets/vanchor-handler", default-features = false } pallet-asset-registry = {path = "../../pallets/asset-registry", default-features = false } From ee595549144eb493beab731f78dc59ce91a71807 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Mon, 9 Jan 2023 23:58:04 +0400 Subject: [PATCH 18/29] remove without_storage_info --- pallets/anonymity-mining/src/lib.rs | 2 +- pallets/anonymity-mining/src/mock.rs | 1 + pallets/anonymity-mining/src/tests.rs | 6 ++-- pallets/asset-registry/src/lib.rs | 38 +++++++++++++------------ pallets/hasher/src/lib.rs | 11 ++++--- pallets/hasher/src/mock.rs | 3 +- pallets/key-storage/src/lib.rs | 41 +++++++++++++++++++++------ pallets/key-storage/src/mock.rs | 4 ++- pallets/linkable-tree/src/lib.rs | 2 +- pallets/mixer/src/lib.rs | 2 +- pallets/mt/src/lib.rs | 2 +- pallets/signature-bridge/src/lib.rs | 2 +- pallets/token-wrapper/src/lib.rs | 2 +- pallets/vanchor-handler/src/lib.rs | 2 +- pallets/vanchor-verifier/src/lib.rs | 11 ++++--- pallets/vanchor-verifier/src/mock.rs | 3 +- pallets/vanchor/src/lib.rs | 2 +- pallets/verifier/src/lib.rs | 11 ++++--- pallets/verifier/src/mock.rs | 3 +- pallets/xanchor/src/lib.rs | 2 +- pallets/xanchor/src/mock/parachain.rs | 2 +- 21 files changed, 95 insertions(+), 57 deletions(-) diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index 20b69c015..2e5e29668 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -61,7 +61,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/anonymity-mining/src/mock.rs b/pallets/anonymity-mining/src/mock.rs index 17c72a221..24696dbec 100644 --- a/pallets/anonymity-mining/src/mock.rs +++ b/pallets/anonymity-mining/src/mock.rs @@ -233,6 +233,7 @@ impl pallet_vanchor_verifier::Config for Test { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLegth = ConstU32<100>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } diff --git a/pallets/anonymity-mining/src/tests.rs b/pallets/anonymity-mining/src/tests.rs index 9fb0e7a33..93ebe6639 100644 --- a/pallets/anonymity-mining/src/tests.rs +++ b/pallets/anonymity-mining/src/tests.rs @@ -1,12 +1,10 @@ use super::*; use crate::mock::*; - use frame_benchmarking::account; -use frame_support::{assert_ok}; - +use frame_support::assert_ok; -use sp_runtime::traits::{Zero}; +use sp_runtime::traits::Zero; const SEED: u32 = 0; const START_TIMESTAMP: u64 = 0; diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index 4ab10157a..0f04998b4 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -95,7 +95,7 @@ pub mod pallet { } #[pallet::pallet] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::hooks] @@ -172,8 +172,8 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig { - pub asset_names: Vec<(Vec, T::Balance)>, - pub native_asset_name: Vec, + pub asset_names: Vec<(BoundedVec, T::Balance)>, + pub native_asset_name: BoundedVec, pub native_existential_deposit: T::Balance, } @@ -259,7 +259,7 @@ pub mod pallet { #[transactional] pub fn register( origin: OriginFor, - name: Vec, + name: BoundedVec, asset_type: AssetType, existential_deposit: T::Balance, ) -> DispatchResult { @@ -287,7 +287,7 @@ pub mod pallet { pub fn update( origin: OriginFor, asset_id: T::AssetId, - name: Vec, + name: BoundedVec, asset_type: AssetType, existential_deposit: Option, ) -> DispatchResult { @@ -333,7 +333,7 @@ pub mod pallet { pub fn set_metadata( origin: OriginFor, asset_id: T::AssetId, - symbol: Vec, + symbol: BoundedVec, decimals: u8, ) -> DispatchResult { T::RegistryOrigin::ensure_origin(origin)?; @@ -385,7 +385,7 @@ pub mod pallet { #[pallet::weight(0)] pub fn add_asset_to_pool( origin: OriginFor, - pool: Vec, + pool: BoundedVec, asset_id: T::AssetId, ) -> DispatchResult { ensure_root(origin)?; @@ -401,7 +401,7 @@ pub mod pallet { #[pallet::weight(0)] pub fn delete_asset_from_pool( origin: OriginFor, - pool: Vec, + pool: BoundedVec, asset_id: T::AssetId, ) -> DispatchResult { ensure_root(origin)?; @@ -416,9 +416,11 @@ pub mod pallet { } impl Pallet { - /// Convert Vec to BoundedVec so it respects the max set limit, + /// Convert BoundedVec to BoundedVec so it respects the max set limit, /// otherwise return TooLong error - fn to_bounded_name(name: Vec) -> Result, Error> { + fn to_bounded_name( + name: BoundedVec, + ) -> Result, Error> { name.try_into().map_err(|_| Error::::TooLong) } @@ -467,7 +469,7 @@ impl Pallet { /// Create asset for given name or return existing AssetId if such asset /// already exists. pub fn get_or_create_asset( - name: Vec, + name: BoundedVec, asset_type: AssetType, existential_deposit: T::Balance, ) -> Result { @@ -572,7 +574,7 @@ impl Pallet { pub fn contains_asset(pool_share_id: T::AssetId, asset_id: T::AssetId) -> bool { , + BoundedVec, T::Balance, BoundedVec, DispatchError, @@ -583,7 +585,7 @@ impl Pallet { impl Registry< T::AssetId, - Vec, + BoundedVec, T::Balance, BoundedVec::StringLimit>, DispatchError, @@ -600,7 +602,7 @@ impl Assets::::contains_key(asset_id) || asset_id == T::NativeAssetId::get() } - fn retrieve_asset(name: &Vec) -> Result { + fn retrieve_asset(name: &BoundedVec) -> Result { let bounded_name = Self::to_bounded_name(name.clone())?; if let Some(asset_id) = AssetIds::::get(bounded_name) { Ok(asset_id) @@ -610,7 +612,7 @@ impl } fn create_asset( - name: &Vec, + name: &BoundedVec, existential_deposit: T::Balance, ) -> Result { Self::get_or_create_asset(name.clone(), AssetType::Token, existential_deposit) @@ -620,21 +622,21 @@ impl impl ShareTokenRegistry< T::AssetId, - Vec, + BoundedVec, T::Balance, BoundedVec::StringLimit>, DispatchError, > for Pallet { fn retrieve_shared_asset( - name: &Vec, + name: &BoundedVec, _assets: &[T::AssetId], ) -> Result { Self::retrieve_asset(name) } fn create_shared_asset( - name: &Vec, + name: &BoundedVec, assets: &[T::AssetId], existential_deposit: T::Balance, ) -> Result { diff --git a/pallets/hasher/src/lib.rs b/pallets/hasher/src/lib.rs index 00d9ce4c8..cde1d91ea 100644 --- a/pallets/hasher/src/lib.rs +++ b/pallets/hasher/src/lib.rs @@ -60,7 +60,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] @@ -77,6 +77,9 @@ pub mod pallet { /// privileged attributes. type ForceOrigin: EnsureOrigin; + /// The max parameter length accepted by the hasher + type MaxParameterLegth: Get; + /// Weightinfo for pallet. type WeightInfo: WeightInfo; } @@ -84,7 +87,7 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), - pub parameters: Option>, + pub parameters: Option>, } #[cfg(feature = "std")] @@ -107,7 +110,7 @@ pub mod pallet { #[pallet::getter(fn parameters)] /// Details of the module's parameters pub(super) type Parameters, I: 'static = ()> = - StorageValue<_, Vec, ValueQuery>; + StorageValue<_, BoundedVec, ValueQuery>; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -128,7 +131,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] pub fn force_set_parameters( origin: OriginFor, - parameters: Vec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(|params| { diff --git a/pallets/hasher/src/mock.rs b/pallets/hasher/src/mock.rs index 1d13d651b..26e71d467 100644 --- a/pallets/hasher/src/mock.rs +++ b/pallets/hasher/src/mock.rs @@ -6,7 +6,7 @@ use frame_system as system; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; pub use webb_primitives::hasher::{HasherModule, InstanceHasher}; @@ -87,6 +87,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; + type MaxParameterLegth = ConstU32<100>; type WeightInfo = (); } diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index 35dbf43b6..dd47870cf 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -28,8 +28,9 @@ mod mock; pub mod tests; pub mod weights; -use frame_support::pallet_prelude::DispatchError; +use frame_support::{pallet_prelude::DispatchError, BoundedVec}; use sp_std::{convert::TryInto, prelude::*}; +use std::convert::TryFrom; use webb_primitives::traits::key_storage::*; pub use pallet::*; @@ -43,7 +44,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] @@ -53,6 +54,12 @@ pub mod pallet { type RuntimeEvent: From> + IsType<::RuntimeEvent>; + /// The max length accepted for Pubkey + type MaxPubkeyLength: Get; + + /// The max number of pubkey owneres we can store + type MaxPubKeyOwners: Get; + /// Weightinfo for pallet. type WeightInfo: WeightInfo; } @@ -77,18 +84,27 @@ pub mod pallet { /// The map of owners to public keys #[pallet::storage] #[pallet::getter(fn public_key_owners)] - pub type PublicKeyOwners, I: 'static = ()> = - StorageValue<_, Vec<(T::AccountId, Vec)>, ValueQuery>; + pub type PublicKeyOwners, I: 'static = ()> = StorageValue< + _, + BoundedVec<(T::AccountId, BoundedVec), T::MaxPubKeyOwners>, + ValueQuery, + >; #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event, I: 'static = ()> { /// Public key registration - PublicKeyRegistration { owner: T::AccountId, public_key: Vec }, + PublicKeyRegistration { + owner: T::AccountId, + public_key: BoundedVec, + }, } #[pallet::error] - pub enum Error {} + pub enum Error { + PubKeyOutOfBounds, + MaxPubkeyOwnersExceeded, + } #[pallet::hooks] impl, I: 'static> Hooks> for Pallet {} @@ -99,10 +115,13 @@ pub mod pallet { pub fn register( origin: OriginFor, owner: T::AccountId, - public_key: Vec, + public_key: BoundedVec, ) -> DispatchResultWithPostInfo { ensure_signed(origin)?; - >::register(owner.clone(), public_key.clone())?; + >::register( + owner.clone(), + public_key.clone().into_inner(), + )?; Self::deposit_event(Event::PublicKeyRegistration { owner, public_key }); Ok(().into()) } @@ -111,8 +130,12 @@ pub mod pallet { impl, I: 'static> KeyStorageInterface for Pallet { fn register(owner: T::AccountId, public_key: Vec) -> Result<(), DispatchError> { + let bounded_public_key = BoundedVec::::try_from(public_key.clone()) + .map_err(|e| Error::::PubKeyOutOfBounds)?; let mut public_key_owners = >::get(); - public_key_owners.push((owner.clone(), public_key.clone())); + public_key_owners + .try_push((owner.clone(), bounded_public_key)) + .map_err(|e| Error::::MaxPubkeyOwnersExceeded)?; #[cfg(feature = "std")] { println!("Registered public key with owner: {owner:?}, {public_key:?}"); diff --git a/pallets/key-storage/src/mock.rs b/pallets/key-storage/src/mock.rs index 5296fc94e..6d2b3c666 100644 --- a/pallets/key-storage/src/mock.rs +++ b/pallets/key-storage/src/mock.rs @@ -6,7 +6,7 @@ use frame_system as system; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; use webb_primitives::AccountId; @@ -71,6 +71,8 @@ parameter_types! { impl pallet_key_storage::Config for Test { type RuntimeEvent = RuntimeEvent; + type MaxPubkeyLength = ConstU32<100>; + type MaxPubKeyOwners = ConstU32<100>; type WeightInfo = (); } diff --git a/pallets/linkable-tree/src/lib.rs b/pallets/linkable-tree/src/lib.rs index 2478650bf..e1abae490 100644 --- a/pallets/linkable-tree/src/lib.rs +++ b/pallets/linkable-tree/src/lib.rs @@ -100,7 +100,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/mixer/src/lib.rs b/pallets/mixer/src/lib.rs index c80451067..83cab253f 100644 --- a/pallets/mixer/src/lib.rs +++ b/pallets/mixer/src/lib.rs @@ -101,7 +101,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/mt/src/lib.rs b/pallets/mt/src/lib.rs index 411770980..07dcb9e1f 100644 --- a/pallets/mt/src/lib.rs +++ b/pallets/mt/src/lib.rs @@ -86,7 +86,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/signature-bridge/src/lib.rs b/pallets/signature-bridge/src/lib.rs index 806d8245f..6fc19890f 100644 --- a/pallets/signature-bridge/src/lib.rs +++ b/pallets/signature-bridge/src/lib.rs @@ -89,7 +89,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 381fa0cbc..c3614c6e6 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -89,7 +89,7 @@ pub mod pallet { use frame_system::{ensure_signed, pallet_prelude::*}; #[pallet::pallet] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/vanchor-handler/src/lib.rs b/pallets/vanchor-handler/src/lib.rs index 663cc8e66..1f1cf5809 100644 --- a/pallets/vanchor-handler/src/lib.rs +++ b/pallets/vanchor-handler/src/lib.rs @@ -68,7 +68,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/vanchor-verifier/src/lib.rs b/pallets/vanchor-verifier/src/lib.rs index ea586db5a..264cb0c7d 100644 --- a/pallets/vanchor-verifier/src/lib.rs +++ b/pallets/vanchor-verifier/src/lib.rs @@ -82,7 +82,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] @@ -99,6 +99,9 @@ pub mod pallet { /// privileged attributes. type ForceOrigin: EnsureOrigin; + /// The max parameter length accepted by the vanchor-verifier + type MaxParameterLegth: Get; + /// WeightInfo for pallet type WeightInfo: WeightInfo; } @@ -107,7 +110,7 @@ pub mod pallet { pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), /// Optional vec of parameters (max edges, num_inputs, parameters) - pub parameters: Option)>>, + pub parameters: Option)>>, } #[cfg(feature = "std")] @@ -132,7 +135,7 @@ pub mod pallet { #[pallet::getter(fn parameters)] /// Details of the module's parameters for different vanchor configurations pub(super) type Parameters, I: 'static = ()> = - StorageMap<_, Blake2_128Concat, (u8, u8), Vec, ValueQuery>; + StorageMap<_, Blake2_128Concat, (u8, u8), BoundedVec, ValueQuery>; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -154,7 +157,7 @@ pub mod pallet { pub fn force_set_parameters( origin: OriginFor, configuration: (u8, u8), - parameters: Vec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(configuration, |params| { diff --git a/pallets/vanchor-verifier/src/mock.rs b/pallets/vanchor-verifier/src/mock.rs index 1b838f862..8cb46545c 100644 --- a/pallets/vanchor-verifier/src/mock.rs +++ b/pallets/vanchor-verifier/src/mock.rs @@ -6,7 +6,7 @@ use frame_system as system; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, AccountId32, }; use sp_std::convert::{TryFrom, TryInto}; @@ -91,6 +91,7 @@ impl pallet_vanchor_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Verifier = ArkworksVerifierBn254; + type MaxParameterLegth = ConstU32<100>; type WeightInfo = (); } diff --git a/pallets/vanchor/src/lib.rs b/pallets/vanchor/src/lib.rs index b858efe14..fa8b82c61 100644 --- a/pallets/vanchor/src/lib.rs +++ b/pallets/vanchor/src/lib.rs @@ -104,7 +104,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] diff --git a/pallets/verifier/src/lib.rs b/pallets/verifier/src/lib.rs index deb6bf795..95861fdf7 100644 --- a/pallets/verifier/src/lib.rs +++ b/pallets/verifier/src/lib.rs @@ -79,7 +79,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::config] @@ -96,6 +96,9 @@ pub mod pallet { /// privileged attributes. type ForceOrigin: EnsureOrigin; + /// The max parameter length accepted by the verifier + type MaxParameterLegth: Get; + /// WeightInfo for pallet type WeightInfo: WeightInfo; } @@ -103,7 +106,7 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), - pub parameters: Option>, + pub parameters: Option>, } #[cfg(feature = "std")] @@ -126,7 +129,7 @@ pub mod pallet { #[pallet::getter(fn parameters)] /// Details of the module's parameters pub(super) type Parameters, I: 'static = ()> = - StorageValue<_, Vec, ValueQuery>; + StorageValue<_, BoundedVec, ValueQuery>; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -147,7 +150,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] pub fn force_set_parameters( origin: OriginFor, - parameters: Vec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(|params| { diff --git a/pallets/verifier/src/mock.rs b/pallets/verifier/src/mock.rs index 2ff729467..181e50c89 100644 --- a/pallets/verifier/src/mock.rs +++ b/pallets/verifier/src/mock.rs @@ -6,7 +6,7 @@ use frame_system as system; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, AccountId32, }; use sp_std::convert::{TryFrom, TryInto}; @@ -90,6 +90,7 @@ parameter_types! { impl pallet_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLegth = ConstU32<100>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } diff --git a/pallets/xanchor/src/lib.rs b/pallets/xanchor/src/lib.rs index 431bad3dc..0942228db 100644 --- a/pallets/xanchor/src/lib.rs +++ b/pallets/xanchor/src/lib.rs @@ -117,7 +117,7 @@ pub mod pallet { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); /// The module configuration trait. diff --git a/pallets/xanchor/src/mock/parachain.rs b/pallets/xanchor/src/mock/parachain.rs index 444fdb89a..831cc3985 100644 --- a/pallets/xanchor/src/mock/parachain.rs +++ b/pallets/xanchor/src/mock/parachain.rs @@ -184,7 +184,7 @@ pub mod mock_msg_queue { #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] - #[pallet::without_storage_info] + pub struct Pallet(_); #[pallet::storage] From 9c693d79aefedca70940b6ddea093387ae2d9a59 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Tue, 10 Jan 2023 08:56:54 +0400 Subject: [PATCH 19/29] fix asset registry --- pallets/asset-registry/src/lib.rs | 100 +++++++++++++++------------ pallets/asset-registry/src/traits.rs | 25 +++++-- pallets/asset-registry/src/types.rs | 21 +++--- 3 files changed, 91 insertions(+), 55 deletions(-) diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index 0f04998b4..a37dcef52 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -34,6 +34,7 @@ mod benchmarking; mod traits; mod types; pub mod weights; +use std::convert::TryFrom; use weights::WeightInfo; @@ -48,14 +49,17 @@ pub use traits::{Registry, ShareTokenRegistry}; #[frame_support::pallet] pub mod pallet { use super::*; - use frame_support::sp_runtime::traits::AtLeast32BitUnsigned; + use frame_support::{dispatch::fmt::Debug, sp_runtime::traits::AtLeast32BitUnsigned}; pub type AssetDetailsT = AssetDetails< ::AssetId, ::Balance, BoundedVec::StringLimit>, + ::MaxAssetIdInPool, >; + pub type AssetTypeOf = AssetType<::AssetId, ::MaxAssetIdInPool>; + #[pallet::config] pub trait Config: frame_system::Config { type RuntimeEvent: From> + IsType<::RuntimeEvent>; @@ -78,14 +82,18 @@ pub mod pallet { + AtLeast32BitUnsigned + Default + Copy - + MaybeSerializeDeserialize; + + MaybeSerializeDeserialize + + MaxEncodedLen; /// Asset location type - type AssetNativeLocation: Parameter + Member + Default; + type AssetNativeLocation: Parameter + Member + Default + MaxEncodedLen; /// The maximum length of a name or symbol stored on-chain. type StringLimit: Get; + /// The maximum number of assets in a pool + type MaxAssetIdInPool: Get + Clone + Debug + TypeInfo + Eq + PartialEq; + /// Native Asset Id #[pallet::constant] type NativeAssetId: Get; @@ -95,7 +103,6 @@ pub mod pallet { } #[pallet::pallet] - pub struct Pallet(_); #[pallet::hooks] @@ -127,6 +134,9 @@ pub mod pallet { /// Asset not found in pool AssetNotFoundInPool, + + /// Max number of assets in pool is reached + MaxAssetIdInPoolReached, } #[pallet::storage] @@ -182,7 +192,7 @@ pub mod pallet { fn default() -> Self { GenesisConfig:: { asset_names: vec![], - native_asset_name: b"WEBB".to_vec(), + native_asset_name: b"WEBB".to_vec().try_into().unwrap(), native_existential_deposit: Default::default(), } } @@ -224,14 +234,14 @@ pub mod pallet { Registered { asset_id: T::AssetId, name: BoundedVec, - asset_type: AssetType, + asset_type: AssetTypeOf, }, /// Asset was updated. Updated { asset_id: T::AssetId, name: BoundedVec, - asset_type: AssetType, + asset_type: AssetTypeOf, }, /// Metadata set for an asset. @@ -260,16 +270,14 @@ pub mod pallet { pub fn register( origin: OriginFor, name: BoundedVec, - asset_type: AssetType, + asset_type: AssetTypeOf, existential_deposit: T::Balance, ) -> DispatchResult { T::RegistryOrigin::ensure_origin(origin)?; - let bounded_name = Self::to_bounded_name(name)?; + ensure!(Self::asset_ids(&name).is_none(), Error::::AssetAlreadyRegistered); - ensure!(Self::asset_ids(&bounded_name).is_none(), Error::::AssetAlreadyRegistered); - - Self::register_asset(bounded_name, asset_type, existential_deposit)?; + Self::register_asset(name, asset_type, existential_deposit)?; Ok(()) } @@ -287,8 +295,8 @@ pub mod pallet { pub fn update( origin: OriginFor, asset_id: T::AssetId, - name: BoundedVec, - asset_type: AssetType, + bounded_name: BoundedVec, + asset_type: AssetTypeOf, existential_deposit: Option, ) -> DispatchResult { T::RegistryOrigin::ensure_origin(origin)?; @@ -296,8 +304,6 @@ pub mod pallet { Assets::::try_mutate(asset_id, |maybe_detail| -> DispatchResult { let mut detail = maybe_detail.as_mut().ok_or(Error::::AssetNotFound)?; - let bounded_name = Self::to_bounded_name(name)?; - if bounded_name != detail.name { // Make sure that there is no such name already registered ensure!( @@ -340,16 +346,14 @@ pub mod pallet { ensure!(Self::assets(asset_id).is_some(), Error::::AssetNotFound); - let b_symbol = Self::to_bounded_name(symbol)?; - let metadata = AssetMetadata::> { - symbol: b_symbol.clone(), + symbol: symbol.clone(), decimals, }; AssetMetadataMap::::insert(asset_id, metadata); - Self::deposit_event(Event::MetadataSet { asset_id, symbol: b_symbol, decimals }); + Self::deposit_event(Event::MetadataSet { asset_id, symbol, decimals }); Ok(()) } @@ -418,9 +422,7 @@ pub mod pallet { impl Pallet { /// Convert BoundedVec to BoundedVec so it respects the max set limit, /// otherwise return TooLong error - fn to_bounded_name( - name: BoundedVec, - ) -> Result, Error> { + fn to_bounded_name(name: Vec) -> Result, Error> { name.try_into().map_err(|_| Error::::TooLong) } @@ -430,7 +432,7 @@ impl Pallet { /// exists. This has to be prior to calling this function. pub fn register_asset( name: BoundedVec, - asset_type: AssetType, + asset_type: AssetTypeOf, existential_deposit: T::Balance, ) -> Result { NextAssetId::::mutate(|value| -> Result { @@ -470,15 +472,13 @@ impl Pallet { /// already exists. pub fn get_or_create_asset( name: BoundedVec, - asset_type: AssetType, + asset_type: AssetTypeOf, existential_deposit: T::Balance, ) -> Result { - let bounded_name: BoundedVec = Self::to_bounded_name(name)?; - - if let Some(asset_id) = AssetIds::::get(&bounded_name) { + if let Some(asset_id) = AssetIds::::get(&name) { Ok(asset_id) } else { - Self::register_asset(bounded_name, asset_type, existential_deposit) + Self::register_asset(name, asset_type, existential_deposit) } } @@ -509,7 +509,9 @@ impl Pallet { if !pool.contains(&asset_id) { if Self::assets(asset_id).is_some() { let mut pool_clone = pool.clone(); - pool_clone.push(asset_id); + pool_clone + .try_push(asset_id) + .map_err(|_| Error::::MaxAssetIdInPoolReached)?; AssetType::PoolShare(pool_clone) } else { return Err(Error::::AssetNotRegistered.into()) @@ -552,7 +554,12 @@ impl Pallet { .filter(|id| **id != asset_id) .copied() .collect::>(); - AssetType::PoolShare(filtered_pool) + let bounded_pool = + BoundedVec::::try_from( + filtered_pool, + ) + .map_err(|_| Error::::MaxAssetIdInPoolReached)?; + AssetType::PoolShare(bounded_pool) } else { return Err(Error::::AssetNotFoundInPool.into()) }, @@ -574,9 +581,10 @@ impl Pallet { pub fn contains_asset(pool_share_id: T::AssetId, asset_id: T::AssetId) -> bool { , + Vec, T::Balance, BoundedVec, + ::MaxAssetIdInPool, DispatchError, >>::contains_asset(pool_share_id, asset_id) } @@ -585,9 +593,10 @@ impl Pallet { impl Registry< T::AssetId, - BoundedVec, + Vec, T::Balance, - BoundedVec::StringLimit>, + BoundedVec, + ::MaxAssetIdInPool, DispatchError, > for Pallet { @@ -602,7 +611,7 @@ impl Assets::::contains_key(asset_id) || asset_id == T::NativeAssetId::get() } - fn retrieve_asset(name: &BoundedVec) -> Result { + fn retrieve_asset(name: &Vec) -> Result { let bounded_name = Self::to_bounded_name(name.clone())?; if let Some(asset_id) = AssetIds::::get(bounded_name) { Ok(asset_id) @@ -612,37 +621,42 @@ impl } fn create_asset( - name: &BoundedVec, + name: &Vec, existential_deposit: T::Balance, ) -> Result { - Self::get_or_create_asset(name.clone(), AssetType::Token, existential_deposit) + let bounded_name = Self::to_bounded_name(name.clone())?; + Self::get_or_create_asset(bounded_name.clone(), AssetType::Token, existential_deposit) } } impl ShareTokenRegistry< T::AssetId, - BoundedVec, + Vec, T::Balance, - BoundedVec::StringLimit>, + BoundedVec, + ::MaxAssetIdInPool, DispatchError, > for Pallet { fn retrieve_shared_asset( - name: &BoundedVec, + name: &Vec, _assets: &[T::AssetId], ) -> Result { Self::retrieve_asset(name) } fn create_shared_asset( - name: &BoundedVec, + name: &Vec, assets: &[T::AssetId], existential_deposit: T::Balance, ) -> Result { + let bounded_name = Self::to_bounded_name(name.clone())?; + let bounded_pool = BoundedVec::::try_from(assets.to_vec()) + .map_err(|_| Error::::MaxAssetIdInPoolReached)?; Self::get_or_create_asset( - name.clone(), - AssetType::PoolShare(assets.to_vec()), + bounded_name, + AssetType::PoolShare(bounded_pool), existential_deposit, ) } diff --git a/pallets/asset-registry/src/traits.rs b/pallets/asset-registry/src/traits.rs index 880303777..3499c21e5 100644 --- a/pallets/asset-registry/src/traits.rs +++ b/pallets/asset-registry/src/traits.rs @@ -1,7 +1,18 @@ use crate::*; +use frame_support::dispatch::fmt::Debug; -pub trait Registry { - fn get_by_id(id: AssetId) -> Result, Error>; +pub trait Registry< + AssetId, + AssetName, + Balance, + BoundedString, + MaxAssetIdInPool: Get + Clone + Debug + Eq + PartialEq, + Error, +> +{ + fn get_by_id( + id: AssetId, + ) -> Result, Error>; fn exists(name: AssetId) -> bool; @@ -21,8 +32,14 @@ pub trait Registry { } } -pub trait ShareTokenRegistry: - Registry +pub trait ShareTokenRegistry< + AssetId, + AssetName, + Balance, + BoundedString, + MaxAssetIdInPool: Get + Clone + Debug + Eq + PartialEq, + Error, +>: Registry { fn retrieve_shared_asset(name: &AssetName, assets: &[AssetId]) -> Result; diff --git a/pallets/asset-registry/src/types.rs b/pallets/asset-registry/src/types.rs index ae10b26da..3dc7f94c4 100644 --- a/pallets/asset-registry/src/types.rs +++ b/pallets/asset-registry/src/types.rs @@ -1,31 +1,36 @@ -use frame_support::pallet_prelude::*; +use frame_support::{dispatch::fmt::Debug, pallet_prelude::*, BoundedVec}; use scale_info::TypeInfo; use sp_std::vec::Vec; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; -#[derive(Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, TypeInfo)] +#[derive(Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -pub enum AssetType { +pub enum AssetType + Clone + Debug + Eq + PartialEq> { Token, - PoolShare(Vec), + PoolShare(BoundedVec), } -#[derive(Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, TypeInfo)] +#[derive(Encode, Decode, Eq, PartialEq, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] -pub struct AssetDetails { +pub struct AssetDetails< + AssetId, + Balance, + BoundedString, + MaxAssetIdInPool: Get + Clone + Debug + Eq + PartialEq, +> { /// The name of this asset. Limited in length by `StringLimit`. pub name: BoundedString, - pub asset_type: AssetType, + pub asset_type: AssetType, pub existential_deposit: Balance, pub locked: bool, } -#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, TypeInfo)] +#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)] pub struct AssetMetadata { /// The ticker symbol for this asset. Limited in length by `StringLimit`. pub symbol: BoundedString, From 21e3c0bfbb5f636794cb47fdeb4074e6d4cba38c Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Tue, 10 Jan 2023 09:37:29 +0400 Subject: [PATCH 20/29] fix pallet-mt --- pallets/mt/src/lib.rs | 48 ++++++++++++++++++++++++------------- pallets/mt/src/mock.rs | 19 ++++++++++++--- pallets/mt/src/tests.rs | 4 +++- pallets/mt/src/types.rs | 9 +++---- primitives/src/types/mod.rs | 4 ++-- 5 files changed, 58 insertions(+), 26 deletions(-) diff --git a/pallets/mt/src/lib.rs b/pallets/mt/src/lib.rs index 07dcb9e1f..75def5e21 100644 --- a/pallets/mt/src/lib.rs +++ b/pallets/mt/src/lib.rs @@ -58,12 +58,15 @@ pub mod weights; pub mod types; use codec::{Decode, Encode}; use frame_support::{ensure, pallet_prelude::DispatchError}; -use sp_std::convert::TryInto; +use sp_std::convert::{TryFrom, TryInto}; use types::TreeMetadata; pub use weights::WeightInfo; -use frame_support::traits::{Currency, Get, ReservableCurrency}; +use frame_support::{ + traits::{Currency, Get, ReservableCurrency}, + BoundedVec, +}; use frame_system::Config as SystemConfig; use sp_runtime::traits::{AtLeast32Bit, One, Saturating, Zero}; use sp_std::prelude::*; @@ -72,7 +75,6 @@ use webb_primitives::{ traits::merkle_tree::{TreeInspector, TreeInterface}, types::{DepositDetails, ElementTrait}, }; - type DepositBalanceOf = <>::Currency as Currency<::AccountId>>::Balance; @@ -81,7 +83,7 @@ pub use pallet::*; #[frame_support::pallet] pub mod pallet { use super::*; - use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*}; + use frame_support::{dispatch::DispatchResultWithPostInfo, pallet_prelude::*, BoundedVec}; use frame_system::pallet_prelude::*; #[pallet::pallet] @@ -97,16 +99,16 @@ pub mod pallet { + IsType<::RuntimeEvent>; /// The overarching tree ID type - type TreeId: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy; + type TreeId: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy + MaxEncodedLen; /// The overarching leaf index type - type LeafIndex: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy; + type LeafIndex: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy + MaxEncodedLen; /// The overarching leaf index type - type RootIndex: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy; + type RootIndex: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy + MaxEncodedLen; /// the leaf type - type Element: ElementTrait; + type Element: ElementTrait + MaxEncodedLen; /// the default zero element type DefaultZeroElement: Get; @@ -143,6 +145,12 @@ pub mod pallet { /// The maximum length of a name or symbol stored on-chain. type StringLimit: Get; + /// The maximum count of edges nodes to be stored for a tree detail + type MaxEdges: Get + TypeInfo; + + /// The maximum count of default hashes to store + type MaxDefaultHashes: Get + TypeInfo; + /// WeightInfo for pallet type WeightInfo: WeightInfo; } @@ -166,7 +174,7 @@ pub mod pallet { _, Blake2_128Concat, T::TreeId, - TreeMetadata, + TreeMetadata, OptionQuery, >; @@ -174,7 +182,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn default_hashes)] pub(super) type DefaultHashes, I: 'static = ()> = - StorageValue<_, Vec, ValueQuery>; + StorageValue<_, BoundedVec, ValueQuery>; /// The map of (tree_id, index) to the leaf commitment #[pallet::storage] @@ -237,6 +245,8 @@ pub mod pallet { TreeDoesntExist, /// Invalid length for default hashes ExceedsMaxDefaultHashes, + /// Invalid length for edges + ExceedsMaxEdges, } #[pallet::hooks] @@ -253,7 +263,7 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig, I: 'static = ()> { pub phantom: PhantomData, - pub default_hashes: Option>, + pub default_hashes: Option>, } #[cfg(feature = "std")] @@ -321,7 +331,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_default_hashes(default_hashes.len() as u32))] pub fn force_set_default_hashes( origin: OriginFor, - default_hashes: Vec, + default_hashes: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; let len_of_hashes = default_hashes.len(); @@ -335,7 +345,8 @@ pub mod pallet { } } - pub fn generate_default_hashes, I: 'static>() -> Vec { + pub fn generate_default_hashes, I: 'static>( + ) -> BoundedVec { let mut temp_hashes: Vec = Vec::with_capacity(T::MaxTreeDepth::get() as usize); let default_zero = T::DefaultZeroElement::get(); temp_hashes.push(default_zero); @@ -349,7 +360,8 @@ pub mod pallet { panic!("Default hashes length is not equal to max tree depth"); } - temp_hashes + BoundedVec::::try_from(temp_hashes) + .expect("Default hashes bound exceeded. This should never happen!") } } @@ -371,7 +383,7 @@ impl, I: 'static> Pallet { #[allow(clippy::type_complexity)] fn get_tree( tree_id: T::TreeId, - ) -> Result, DispatchError> { + ) -> Result, DispatchError> { let tree = Trees::::get(tree_id); ensure!(tree.is_some(), Error::::TreeDoesntExist); Ok(tree.unwrap()) @@ -394,6 +406,10 @@ impl, I: 'static> TreeInterface = Self::default_hashes().into_iter().take(num_of_zero_nodes as _).collect(); + + let bounded_edge_nodes = + BoundedVec::::try_from(default_edge_nodes.clone()) + .map_err(|e| Error::::ExceedsMaxEdges)?; // Setting up the tree let tree_metadata = TreeMetadata { creator, @@ -402,7 +418,7 @@ impl, I: 'static> TreeInterface::insert(tree_id, tree_metadata); diff --git a/pallets/mt/src/mock.rs b/pallets/mt/src/mock.rs index 51b3a6ba1..bd7dd15cd 100644 --- a/pallets/mt/src/mock.rs +++ b/pallets/mt/src/mock.rs @@ -5,12 +5,14 @@ use crate as pallet_mt; use sp_core::H256; use arkworks_setups::{common::setup_params, Curve}; +use codec::MaxEncodedLen; use frame_support::{parameter_types, traits::GenesisBuild}; use frame_system as system; +use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; pub use webb_primitives::hasher::{HasherModule, InstanceHasher}; @@ -90,6 +92,7 @@ parameter_types! { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLegth = ConstU32<10000>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } @@ -120,6 +123,7 @@ parameter_types! { scale_info::TypeInfo, Deserialize, Serialize, + MaxEncodedLen, )] pub struct Element([u8; 32]); @@ -135,6 +139,13 @@ impl ElementTrait for Element { } } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; @@ -151,14 +162,16 @@ impl Config for Test { type StringLimit = StringLimit; type TreeDeposit = TreeDeposit; type TreeId = u32; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type Two = Two; type WeightInfo = (); } -pub fn hasher_params() -> Vec { +pub fn hasher_params() -> BoundedVec> { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - params.to_bytes() + BoundedVec::>::try_from(params.to_bytes()).unwrap() } #[derive(Default)] diff --git a/pallets/mt/src/tests.rs b/pallets/mt/src/tests.rs index 1ab50689e..d923b8975 100644 --- a/pallets/mt/src/tests.rs +++ b/pallets/mt/src/tests.rs @@ -43,6 +43,8 @@ fn should_fail_in_case_when_max_default_hashes_is_exceeded() { ::DefaultZeroElement::get(); (max_default_hashes + 1) as usize ] + .try_into() + .unwrap() ), crate::Error::::ExceedsMaxDefaultHashes ); @@ -54,7 +56,7 @@ fn should_successfully_set_default_hashes_to_match_solidity() { new_test_ext().execute_with(|| { assert_ok!(HasherPallet::force_set_parameters(RuntimeOrigin::root(), hasher_params())); assert_ok!(MerkleTree::create(RuntimeOrigin::signed(1), 32)); - let default_hashes: Vec = MerkleTree::default_hashes(); + let default_hashes: Vec = MerkleTree::default_hashes().into_inner(); let solidity_merkle_tree_hashes: Vec = vec![ Element::from_bytes(&hex!( "2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c" diff --git a/pallets/mt/src/types.rs b/pallets/mt/src/types.rs index d36424531..910deee4c 100644 --- a/pallets/mt/src/types.rs +++ b/pallets/mt/src/types.rs @@ -1,10 +1,11 @@ //! All the traits exposed to be used in other custom pallets use crate::*; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; +use frame_support::BoundedVec; use scale_info::TypeInfo; -#[derive(Default, Clone, Encode, Decode, TypeInfo)] -pub struct TreeMetadata { +#[derive(Default, Clone, Encode, Decode, TypeInfo, MaxEncodedLen)] +pub struct TreeMetadata> { /// Creator account pub creator: Option, /// Is paused @@ -18,5 +19,5 @@ pub struct TreeMetadata { /// The root hash of the tree pub root: Element, /// Edge nodes of tree, used to compute roots on the fly - pub edge_nodes: Vec, + pub edge_nodes: BoundedVec, } diff --git a/primitives/src/types/mod.rs b/primitives/src/types/mod.rs index 9c49f4579..33e5e72cf 100644 --- a/primitives/src/types/mod.rs +++ b/primitives/src/types/mod.rs @@ -1,7 +1,7 @@ pub mod runtime; pub mod vanchor; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; pub use ethabi::{encode, Token}; use frame_support::pallet_prelude::*; use scale_info::TypeInfo; @@ -11,7 +11,7 @@ use sp_std::vec::Vec; // Deposit details used in hasher / verifier pallets for // tracking the reserved deposits of maintainers of various // parameters -#[derive(Clone, Default, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo)] +#[derive(Clone, Default, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)] pub struct DepositDetails { pub depositor: AccountId, pub deposit: Balance, From 669437820b5e51ff4a11ae2d60a2c9e39776ba11 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Tue, 10 Jan 2023 19:18:49 +0400 Subject: [PATCH 21/29] fix linkable tree --- pallets/linkable-tree/src/lib.rs | 5 +++-- pallets/linkable-tree/src/mock.rs | 15 ++++++++++++++- pallets/linkable-tree/src/tests.rs | 4 ++-- pallets/linkable-tree/src/types.rs | 4 ++-- pallets/token-wrapper/src/lib.rs | 2 ++ 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/pallets/linkable-tree/src/lib.rs b/pallets/linkable-tree/src/lib.rs index e1abae490..f6ba01707 100644 --- a/pallets/linkable-tree/src/lib.rs +++ b/pallets/linkable-tree/src/lib.rs @@ -77,7 +77,7 @@ mod benchmarking; use sp_std::convert::TryInto; pub mod types; pub mod weights; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{ensure, pallet_prelude::DispatchError, traits::Get}; use sp_runtime::traits::{AtLeast32Bit, One, Saturating, Zero}; use sp_std::prelude::*; @@ -118,7 +118,8 @@ pub mod pallet { + Default + Copy + From - + From; + + From + + MaxEncodedLen; /// ChainID type for this chain #[pallet::constant] diff --git a/pallets/linkable-tree/src/mock.rs b/pallets/linkable-tree/src/mock.rs index 137f688b6..4a761e63e 100644 --- a/pallets/linkable-tree/src/mock.rs +++ b/pallets/linkable-tree/src/mock.rs @@ -10,7 +10,7 @@ use frame_system as system; use serde::{Deserialize, Serialize}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, IdentityLookup, ConstU32}, }; use sp_std::convert::{TryFrom, TryInto}; pub use webb_primitives::{ @@ -18,6 +18,8 @@ pub use webb_primitives::{ types::ElementTrait, AccountId, }; +use scale_info::TypeInfo; +use codec::MaxEncodedLen; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; @@ -106,6 +108,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; + type MaxParameterLegth = ConstU32<1000>; type WeightInfo = (); } @@ -135,6 +138,7 @@ parameter_types! { scale_info::TypeInfo, Serialize, Deserialize, + MaxEncodedLen )] pub struct Element([u8; 32]); @@ -150,12 +154,21 @@ impl ElementTrait for Element { } } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl pallet_mt::Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; type DataDepositPerByte = LeafDepositPerByte; type DefaultZeroElement = DefaultZeroElement; type Element = Element; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = HasherPallet; diff --git a/pallets/linkable-tree/src/tests.rs b/pallets/linkable-tree/src/tests.rs index 5bfead12f..404970c01 100644 --- a/pallets/linkable-tree/src/tests.rs +++ b/pallets/linkable-tree/src/tests.rs @@ -18,7 +18,7 @@ fn should_create_new_linkable_tree() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes().try_into().unwrap()); let max_edges = M as _; let depth = TREE_DEPTH as u8; @@ -58,7 +58,7 @@ fn should_be_able_to_add_neighbors_and_check_history() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes().try_into().unwrap()); let max_edges = M as _; let depth = TREE_DEPTH as u8; diff --git a/pallets/linkable-tree/src/types.rs b/pallets/linkable-tree/src/types.rs index 4054f2ac7..2a94590b1 100644 --- a/pallets/linkable-tree/src/types.rs +++ b/pallets/linkable-tree/src/types.rs @@ -1,13 +1,13 @@ //! All the traits exposed to be used in other custom pallets use crate::*; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use webb_primitives::webb_proposals::ResourceId; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; -#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, Debug, TypeInfo)] +#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, Debug, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "std", derive(Serialize, Deserialize))] pub struct EdgeMetadata { /// chain id diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index c3614c6e6..953f7d62a 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -113,12 +113,14 @@ pub mod pallet { Vec, Self::Balance, BoundedVec, + Self::MaxAssetIdInPool, DispatchError, > + ShareTokenRegistry< Self::AssetId, Vec, Self::Balance, BoundedVec, + Self::MaxAssetIdInPool, DispatchError, >; From 1b2c5a4be06ceb6c49545079a2809cbe53541cbf Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Tue, 10 Jan 2023 23:45:56 +0400 Subject: [PATCH 22/29] fix token-wrapper --- pallets/asset-registry/src/lib.rs | 3 +- pallets/asset-registry/src/mock.rs | 25 ++++-- pallets/asset-registry/src/tests.rs | 119 ++++++++++++++++++---------- pallets/key-storage/src/lib.rs | 3 +- pallets/linkable-tree/src/mock.rs | 8 +- pallets/linkable-tree/src/tests.rs | 10 ++- pallets/token-wrapper/src/lib.rs | 32 ++++++-- pallets/token-wrapper/src/mock.rs | 7 ++ pallets/token-wrapper/src/tests.rs | 20 ++--- 9 files changed, 152 insertions(+), 75 deletions(-) diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index a37dcef52..8d7f30019 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -22,7 +22,7 @@ use frame_support::{ }; use frame_system::pallet_prelude::*; use sp_arithmetic::traits::BaseArithmetic; -use sp_std::{convert::TryInto, vec::Vec}; +use sp_std::{convert::{TryInto,TryFrom}, vec::Vec}; #[cfg(test)] mod mock; @@ -34,7 +34,6 @@ mod benchmarking; mod traits; mod types; pub mod weights; -use std::convert::TryFrom; use weights::WeightInfo; diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs index b40573190..c35f4da12 100644 --- a/pallets/asset-registry/src/mock.rs +++ b/pallets/asset-registry/src/mock.rs @@ -21,7 +21,7 @@ use frame_support::{ traits::{Everything, GenesisBuild}, }; use frame_system as system; -use polkadot_xcm::v0::MultiLocation; +use polkadot_xcm::v1::MultiLocation; use scale_info::TypeInfo; use sp_core::H256; use sp_runtime::{ @@ -31,7 +31,7 @@ use sp_runtime::{ use sp_std::convert::{TryFrom, TryInto}; use webb_primitives::{AssetId, Balance}; -use crate::{self as asset_registry, Config}; +use crate::{self as asset_registry, BoundedVec, Config}; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; @@ -84,21 +84,27 @@ impl system::Config for Test { use codec::{Decode, Encode}; -#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)] +#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, codec::MaxEncodedLen)] pub struct AssetLocation(pub MultiLocation); impl Default for AssetLocation { fn default() -> Self { - AssetLocation(MultiLocation::Null) + AssetLocation(MultiLocation::default()) } } +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl Config for Test { type AssetId = u32; type AssetNativeLocation = AssetLocation; type Balance = Balance; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeAssetId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -107,13 +113,18 @@ pub type AssetRegistryPallet = crate::Pallet; #[derive(Default)] pub struct ExtBuilder { - assets: Vec<(Vec, Balance)>, + assets: Vec<(BoundedVec, Balance)>, native_asset_name: Option>, } impl ExtBuilder { pub fn with_assets(mut self, assets: Vec<(Vec, Balance)>) -> Self { - self.assets = assets; + let bounded_assets: Vec<(BoundedVec, Balance)> = + Default::default(); + for asset in assets { + bounded_assets.push((asset.0.try_into().unwrap(), asset.1)); + } + self.assets = bounded_assets; self } @@ -128,7 +139,7 @@ impl ExtBuilder { if let Some(name) = self.native_asset_name { crate::GenesisConfig:: { asset_names: self.assets, - native_asset_name: name, + native_asset_name: name.try_into().unwrap(), native_existential_deposit: 1_000_000u128, } } else { diff --git a/pallets/asset-registry/src/tests.rs b/pallets/asset-registry/src/tests.rs index a18a0a378..e55bf6908 100644 --- a/pallets/asset-registry/src/tests.rs +++ b/pallets/asset-registry/src/tests.rs @@ -23,7 +23,7 @@ use crate::{ }; use codec::Encode; use frame_support::{assert_noop, assert_ok, BoundedVec}; -use polkadot_xcm::v0::{Junction::*, MultiLocation::*}; +use polkadot_xcm::v1::{Junction::*, MultiLocation}; use sp_runtime::DispatchError; use sp_std::convert::TryInto; use webb_primitives::{AssetId, Balance}; @@ -38,7 +38,7 @@ fn register_asset_works() { assert_noop!( AssetRegistryPallet::register( RuntimeOrigin::root(), - too_long.to_vec(), + too_long.to_vec().try_into().unwrap(), AssetType::Token, ed ), @@ -49,7 +49,7 @@ fn register_asset_works() { assert_ok!(AssetRegistryPallet::register( RuntimeOrigin::root(), - name.clone(), + name.clone().try_into().unwrap(), AssetType::Token, ed )); @@ -68,7 +68,12 @@ fn register_asset_works() { ); assert_noop!( - AssetRegistryPallet::register(RuntimeOrigin::root(), name, AssetType::Token, ed), + AssetRegistryPallet::register( + RuntimeOrigin::root(), + name.try_into().unwrap(), + AssetType::Token, + ed + ), Error::::AssetAlreadyRegistered ); }); @@ -79,20 +84,35 @@ fn create_asset() { new_test_ext().execute_with(|| { let ed = 1_000_000u128; - assert_ok!(AssetRegistryPallet::get_or_create_asset(b"HDX".to_vec(), AssetType::Token, ed)); + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"HDX".to_vec().try_into().unwrap(), + AssetType::Token, + ed + )); - let dot_asset = - AssetRegistryPallet::get_or_create_asset(b"DOT".to_vec(), AssetType::Token, ed); + let dot_asset = AssetRegistryPallet::get_or_create_asset( + b"DOT".to_vec().try_into().unwrap(), + AssetType::Token, + ed, + ); assert_ok!(dot_asset); let dot_asset_id = dot_asset.ok().unwrap(); - assert_ok!(AssetRegistryPallet::get_or_create_asset(b"BTC".to_vec(), AssetType::Token, ed)); + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"BTC".to_vec().try_into().unwrap(), + AssetType::Token, + ed + )); let current_asset_id = AssetRegistryPallet::next_asset_id(); // Existing asset should return previously created one. assert_ok!( - AssetRegistryPallet::get_or_create_asset(b"DOT".to_vec(), AssetType::Token, ed), + AssetRegistryPallet::get_or_create_asset( + b"DOT".to_vec().try_into().unwrap(), + AssetType::Token, + ed + ), dot_asset_id ); @@ -112,18 +132,25 @@ fn create_asset() { #[test] fn location_mapping_works() { new_test_ext().execute_with(|| { - let bn = AssetRegistryPallet::to_bounded_name(b"HDX".to_vec()).unwrap(); + let bn = AssetRegistryPallet::to_bounded_name(b"HDX".to_vec().try_into().unwrap()).unwrap(); let ed = 1_000_000u128; - assert_ok!(AssetRegistryPallet::get_or_create_asset(b"HDX".to_vec(), AssetType::Token, ed)); - let asset_id: AssetId = - AssetRegistryPallet::get_or_create_asset(b"HDX".to_vec(), AssetType::Token, ed) - .unwrap(); + assert_ok!(AssetRegistryPallet::get_or_create_asset( + b"HDX".to_vec().try_into().unwrap(), + AssetType::Token, + ed + )); + let asset_id: AssetId = AssetRegistryPallet::get_or_create_asset( + b"HDX".to_vec().try_into().unwrap(), + AssetType::Token, + ed, + ) + .unwrap(); crate::Assets::::insert( asset_id, - AssetDetails::> { + AssetDetails::, MaxAssetIdInPool> { name: bn, asset_type: AssetType::Token, existential_deposit: ed, @@ -131,7 +158,7 @@ fn location_mapping_works() { }, ); - let asset_location = AssetLocation(X3( + let asset_location = AssetLocation(MultiLocation::X3( Parent, Parachain(200), GeneralKey(asset_id.encode().try_into().unwrap()), @@ -151,7 +178,7 @@ fn location_mapping_works() { #[test] fn genesis_config_works() { ExtBuilder::default() - .with_native_asset_name(b"NATIVE".to_vec()) + .with_native_asset_name(b"NATIVE".to_vec().try_into().unwrap()) .build() .execute_with(|| { let native: BoundedVec::StringLimit> = @@ -159,7 +186,7 @@ fn genesis_config_works() { assert_eq!(AssetRegistryPallet::asset_ids(native).unwrap(), 0u32); }); ExtBuilder::default() - .with_assets(vec![(b"ONE".to_vec(), 1_000u128)]) + .with_assets(vec![(b"ONE".to_vec().try_into().unwrap(), 1_000u128)]) .build() .execute_with(|| { let native: BoundedVec::StringLimit> = @@ -200,7 +227,7 @@ fn set_metadata_works() { assert_ok!(AssetRegistryPallet::set_metadata( RuntimeOrigin::root(), dot_id, - b"xDOT".to_vec(), + b"xDOT".to_vec().try_into().unwrap(), 12u8 )); @@ -212,7 +239,7 @@ fn set_metadata_works() { assert_ok!(AssetRegistryPallet::set_metadata( RuntimeOrigin::root(), dot_id, - b"xDOT".to_vec(), + b"xDOT".to_vec().try_into().unwrap(), 30u8 )); @@ -225,7 +252,7 @@ fn set_metadata_works() { AssetRegistryPallet::set_metadata( RuntimeOrigin::root(), dot_id, - b"JUST_TOO_LONG".to_vec(), + b"JUST_TOO_LONG".to_vec().try_into().unwrap(), 30u8 ), Error::::TooLong @@ -235,7 +262,7 @@ fn set_metadata_works() { AssetRegistryPallet::set_metadata( RuntimeOrigin::root(), 100, - b"NONE".to_vec(), + b"NONE".to_vec().try_into().unwrap(), 30u8 ), Error::::AssetNotFound @@ -248,12 +275,18 @@ fn update_asset() { new_test_ext().execute_with(|| { let ed = 1_000_000u128; - let btc_asset_id: AssetId = - AssetRegistryPallet::get_or_create_asset(b"BTC".to_vec(), AssetType::Token, ed) - .unwrap(); - let usd_asset_id: AssetId = - AssetRegistryPallet::get_or_create_asset(b"USD".to_vec(), AssetType::Token, ed) - .unwrap(); + let btc_asset_id: AssetId = AssetRegistryPallet::get_or_create_asset( + b"BTC".to_vec().try_into().unwrap(), + AssetType::Token, + ed, + ) + .unwrap(); + let usd_asset_id: AssetId = AssetRegistryPallet::get_or_create_asset( + b"USD".to_vec().try_into().unwrap(), + AssetType::Token, + ed, + ) + .unwrap(); let next_asset_id = AssetRegistryPallet::next_asset_id(); @@ -261,7 +294,7 @@ fn update_asset() { assert_ok!(AssetRegistryPallet::update( RuntimeOrigin::root(), btc_asset_id, - b"superBTC".to_vec(), + b"superBTC".to_vec().try_into().unwrap(), AssetType::Token, None )); @@ -286,7 +319,7 @@ fn update_asset() { (AssetRegistryPallet::update( RuntimeOrigin::root(), usd_asset_id, - b"superBTC".to_vec(), + b"superBTC".to_vec().try_into().unwrap(), AssetType::Token, None )), @@ -298,7 +331,7 @@ fn update_asset() { (AssetRegistryPallet::update( RuntimeOrigin::root(), next_asset_id, - b"VOID".to_vec(), + b"VOID".to_vec().try_into().unwrap(), AssetType::Token, None )), @@ -310,8 +343,8 @@ fn update_asset() { assert_ok!(AssetRegistryPallet::update( RuntimeOrigin::root(), btc_asset_id, - b"BTCUSD".to_vec(), - AssetType::PoolShare(vec![btc_asset_id, usd_asset_id]), + b"BTCUSD".to_vec().try_into().unwrap(), + AssetType::PoolShare(vec![btc_asset_id, usd_asset_id].try_into().unwrap()), None )); @@ -319,8 +352,8 @@ fn update_asset() { assert_ok!(AssetRegistryPallet::update( RuntimeOrigin::root(), btc_asset_id, - b"BTCUSD".to_vec(), - AssetType::PoolShare(vec![btc_asset_id, usd_asset_id]), + b"BTCUSD".to_vec().try_into().unwrap(), + AssetType::PoolShare(vec![btc_asset_id, usd_asset_id].try_into().unwrap()), Some(1_234_567u128) )); @@ -330,7 +363,9 @@ fn update_asset() { AssetRegistryPallet::assets(btc_asset_id).unwrap(), AssetDetails { name: btcusd, - asset_type: AssetType::PoolShare(vec![btc_asset_id, usd_asset_id]), + asset_type: AssetType::PoolShare( + vec![btc_asset_id, usd_asset_id].try_into().unwrap() + ), existential_deposit: 1_234_567u128, locked: false } @@ -341,7 +376,7 @@ fn update_asset() { assert_ok!(AssetRegistryPallet::update( RuntimeOrigin::root(), btc_asset_id, - b"superBTC".to_vec(), + b"superBTC".to_vec().try_into().unwrap(), AssetType::Token, None )); @@ -380,14 +415,14 @@ fn add_asset_to_pool() { let pool_share_id = Registry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![first_token_id]), + AssetType::PoolShare(vec![first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); assert_ok!(Registry::add_asset_to_pool( RuntimeOrigin::root(), - b"meme".to_vec(), + b"meme".to_vec().try_into().unwrap(), second_token_id )); @@ -396,6 +431,7 @@ fn add_asset_to_pool() { Vec, ::Balance, BoundedVec::StringLimit>, + MaxAssetIdInPool, DispatchError, >>::contains_asset(pool_share_id, second_token_id)) }) @@ -420,14 +456,14 @@ fn delete_asset_from_pool() { let pool_share_id = Registry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![first_token_id, second_token_id]), + AssetType::PoolShare(vec![first_token_id, second_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); assert_ok!(Registry::delete_asset_from_pool( RuntimeOrigin::root(), - b"meme".to_vec(), + b"meme".to_vec().try_into().unwrap(), second_token_id )); @@ -436,6 +472,7 @@ fn delete_asset_from_pool() { Vec, ::Balance, BoundedVec::StringLimit>, + MaxAssetIdInPool, DispatchError, >>::contains_asset(pool_share_id, second_token_id),) }) diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index dd47870cf..a4ab18294 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -29,8 +29,7 @@ pub mod tests; pub mod weights; use frame_support::{pallet_prelude::DispatchError, BoundedVec}; -use sp_std::{convert::TryInto, prelude::*}; -use std::convert::TryFrom; +use sp_std::{convert::{TryInto,TryFrom}, prelude::*}; use webb_primitives::traits::key_storage::*; pub use pallet::*; diff --git a/pallets/linkable-tree/src/mock.rs b/pallets/linkable-tree/src/mock.rs index 4a761e63e..f3f298381 100644 --- a/pallets/linkable-tree/src/mock.rs +++ b/pallets/linkable-tree/src/mock.rs @@ -5,12 +5,14 @@ use crate as pallet_linkable_tree; use codec::{Decode, Encode}; use sp_core::H256; +use codec::MaxEncodedLen; use frame_support::parameter_types; use frame_system as system; +use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup, ConstU32}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; pub use webb_primitives::{ @@ -18,8 +20,6 @@ pub use webb_primitives::{ types::ElementTrait, AccountId, }; -use scale_info::TypeInfo; -use codec::MaxEncodedLen; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; @@ -138,7 +138,7 @@ parameter_types! { scale_info::TypeInfo, Serialize, Deserialize, - MaxEncodedLen + MaxEncodedLen, )] pub struct Element([u8; 32]); diff --git a/pallets/linkable-tree/src/tests.rs b/pallets/linkable-tree/src/tests.rs index 404970c01..99aa9958e 100644 --- a/pallets/linkable-tree/src/tests.rs +++ b/pallets/linkable-tree/src/tests.rs @@ -18,7 +18,10 @@ fn should_create_new_linkable_tree() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes().try_into().unwrap()); + let _res = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); let max_edges = M as _; let depth = TREE_DEPTH as u8; @@ -58,7 +61,10 @@ fn should_be_able_to_add_neighbors_and_check_history() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _res = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes().try_into().unwrap()); + let _res = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); let max_edges = M as _; let depth = TREE_DEPTH as u8; diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 953f7d62a..3ed63ce68 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -71,6 +71,7 @@ use orml_traits::MultiCurrency; use sp_arithmetic::traits::Saturating; use sp_runtime::traits::AtLeast32Bit; use sp_std::convert::TryInto; +use std::convert::TryFrom; use traits::TokenWrapperInterface; use weights::WeightInfo; @@ -148,12 +149,14 @@ pub mod pallet { /// Fee recipient, account which will be receiving wrapping cost fee. #[pallet::storage] #[pallet::getter(fn fee_recipient)] - pub type FeeRecipient = StorageMap<_, Blake2_128Concat, Vec, T::AccountId>; + pub type FeeRecipient = + StorageMap<_, Blake2_128Concat, BoundedVec, T::AccountId>; /// The proposal nonce used to prevent replay attacks on execute_proposal #[pallet::storage] #[pallet::getter(fn proposal_nonce)] - pub type ProposalNonce = StorageMap<_, Blake2_128Concat, Vec, T::ProposalNonce>; + pub type ProposalNonce = + StorageMap<_, Blake2_128Concat, BoundedVec, T::ProposalNonce>; #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] @@ -200,6 +203,8 @@ pub mod pallet { NoWrappingFeePercentFound, /// Invalid nonce InvalidNonce, + /// Name exceeds maximum limit + NameExceedsMaximumLimit, } #[pallet::call] @@ -307,7 +312,7 @@ impl Pallet { T::TreasuryId::get().into_account_truncating() } - pub fn get_fee_recipient(name: &Vec) -> T::AccountId { + pub fn get_fee_recipient(name: &BoundedVec) -> T::AccountId { FeeRecipient::::get(name).unwrap_or(Self::treasury_id()) } @@ -351,7 +356,7 @@ impl Pallet { } pub fn validate_and_set_nonce( - name: &Vec, + name: &BoundedVec, nonce: T::ProposalNonce, ) -> Result<(), DispatchError> { // Nonce should be greater than the proposal nonce in storage @@ -389,6 +394,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::exists(from_asset_id), Error::::UnregisteredAssetId @@ -400,6 +406,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::contains_asset(into_pool_share_id, from_asset_id), Error::::NotFoundInPool @@ -418,6 +425,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::get_by_id(into_pool_share_id)?; @@ -456,6 +464,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::exists(into_asset_id), Error::::UnregisteredAssetId @@ -467,6 +476,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::contains_asset(from_pool_share_id, into_asset_id), Error::::NotFoundInPool @@ -498,6 +508,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::get_by_id(into_pool_share_id)?; // Nonce should be greater than the proposal nonce in storage @@ -522,6 +533,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::get_by_id(pool_share_id)?; // nonce should be greater than the proposal nonce in storage @@ -546,6 +558,7 @@ impl TokenWrapperInterface, T: Vec, T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::get_by_id(from_pool_share_id)?; // Nonce should be greater than the proposal nonce in storage @@ -577,12 +590,15 @@ impl TokenWrapperInterface, T: nonce: T::ProposalNonce, ) -> Result { // Nonce should be greater than the proposal nonce in storage - Self::validate_and_set_nonce(name, nonce)?; + let bounded_name = BoundedVec::::try_from(name.clone()) + .map_err(|e| Error::::NameExceedsMaximumLimit)?; + Self::validate_and_set_nonce(&bounded_name, nonce)?; , T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::add_asset_to_existing_pool(name, asset_id) } @@ -593,13 +609,15 @@ impl TokenWrapperInterface, T: nonce: T::ProposalNonce, ) -> Result { // Nonce should be greater than the proposal nonce in storage - Self::validate_and_set_nonce(name, nonce)?; - + let bounded_name = BoundedVec::::try_from(name.clone()) + .map_err(|e| Error::::NameExceedsMaximumLimit)?; + Self::validate_and_set_nonce(&bounded_name, nonce)?; , T::Balance, BoundedVec, + T::MaxAssetIdInPool, DispatchError, >>::delete_asset_from_existing_pool(name, asset_id) } diff --git a/pallets/token-wrapper/src/mock.rs b/pallets/token-wrapper/src/mock.rs index f92748ef6..868d0ca9c 100644 --- a/pallets/token-wrapper/src/mock.rs +++ b/pallets/token-wrapper/src/mock.rs @@ -6,6 +6,7 @@ use crate as pallet_token_wrapper; use frame_support::{pallet_prelude::GenesisBuild, parameter_types, traits::Nothing, PalletId}; use frame_system as system; use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; +use scale_info::TypeInfo; use sp_core::H256; use sp_runtime::{ testing::Header, @@ -79,12 +80,18 @@ pub type Amount = i128; /// Unsigned version of Balance pub type Balance = u128; +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl asset_registry::Config for Test { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = (); type Balance = u128; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeAssetId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); diff --git a/pallets/token-wrapper/src/tests.rs b/pallets/token-wrapper/src/tests.rs index ceb875c9e..939220be3 100644 --- a/pallets/token-wrapper/src/tests.rs +++ b/pallets/token-wrapper/src/tests.rs @@ -25,7 +25,7 @@ fn should_wrap_token() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -101,7 +101,7 @@ fn should_unwrap_token() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -175,7 +175,7 @@ fn wrapping_should_fail_if_asset_is_not_in_pool() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id]), + AssetType::PoolShare(vec![second_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -224,7 +224,7 @@ fn only_root_should_update_wrapping_fee() { .unwrap(); let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -257,7 +257,7 @@ fn should_not_unwrap_if_no_liquidity_exists_for_selected_assets() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -327,7 +327,7 @@ fn should_unwrap_when_liquidity_exists_for_selected_asset() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -407,7 +407,7 @@ fn should_not_wrap_invalid_amount() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -457,7 +457,7 @@ fn test_two_different_pool_shares() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -477,7 +477,7 @@ fn test_two_different_pool_shares() { let second_pool_share_id = AssetRegistry::register_asset( b"real".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![third_token_id, fourth_token_id]), + AssetType::PoolShare(vec![third_token_id, fourth_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -568,7 +568,7 @@ fn should_rescue_all_tokens() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![second_token_id, first_token_id]), + AssetType::PoolShare(vec![second_token_id, first_token_id].try_into().unwrap()), existential_balance.into(), ) .unwrap(); From 9d7c094eb8a4550ed4507fb203ac61ba66b1873d Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Tue, 10 Jan 2023 23:46:31 +0400 Subject: [PATCH 23/29] fix token-wrapper --- pallets/mixer/src/types.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pallets/mixer/src/types.rs b/pallets/mixer/src/types.rs index 61f0163cc..14fe68fff 100644 --- a/pallets/mixer/src/types.rs +++ b/pallets/mixer/src/types.rs @@ -1,9 +1,9 @@ //! All the traits exposed to be used in other custom pallets use crate::*; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; -#[derive(Clone, Encode, Decode, TypeInfo)] +#[derive(Clone, Encode, Decode, TypeInfo, MaxEncodedLen)] pub struct MixerMetadata { /// Balance size of deposit pub deposit_size: Balance, From fdba6c8a75163e4304feccf7a509a4fe11e148f0 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Wed, 11 Jan 2023 00:05:58 +0400 Subject: [PATCH 24/29] fix signature bridge --- pallets/asset-registry/src/lib.rs | 5 ++- pallets/key-storage/src/lib.rs | 5 ++- pallets/signature-bridge/src/lib.rs | 52 +++++++++++++++++++-------- pallets/signature-bridge/src/mock.rs | 3 +- pallets/signature-bridge/src/tests.rs | 33 ++++++++++------- pallets/token-wrapper/src/lib.rs | 3 +- primitives/src/types/vanchor.rs | 4 +-- 7 files changed, 71 insertions(+), 34 deletions(-) diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index 8d7f30019..ffeba8ae2 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -22,7 +22,10 @@ use frame_support::{ }; use frame_system::pallet_prelude::*; use sp_arithmetic::traits::BaseArithmetic; -use sp_std::{convert::{TryInto,TryFrom}, vec::Vec}; +use sp_std::{ + convert::{TryFrom, TryInto}, + vec::Vec, +}; #[cfg(test)] mod mock; diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index a4ab18294..1d17bed3e 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -29,7 +29,10 @@ pub mod tests; pub mod weights; use frame_support::{pallet_prelude::DispatchError, BoundedVec}; -use sp_std::{convert::{TryInto,TryFrom}, prelude::*}; +use sp_std::{ + convert::{TryFrom, TryInto}, + prelude::*, +}; use webb_primitives::traits::key_storage::*; pub use pallet::*; diff --git a/pallets/signature-bridge/src/lib.rs b/pallets/signature-bridge/src/lib.rs index 6fc19890f..90561fbd2 100644 --- a/pallets/signature-bridge/src/lib.rs +++ b/pallets/signature-bridge/src/lib.rs @@ -57,7 +57,7 @@ mod tests; mod benchmarking; mod weights; -use codec::{self, Decode, Encode, EncodeLike}; +use codec::{self, Decode, Encode, EncodeLike, MaxEncodedLen}; use frame_support::{ pallet_prelude::{ensure, DispatchResultWithPostInfo}, traits::{EnsureOrigin, Get}, @@ -117,11 +117,24 @@ pub mod pallet { + Default + Copy + From - + From; + + From + + MaxEncodedLen; /// Proposal nonce type - type ProposalNonce: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy; + type ProposalNonce: Encode + + Decode + + Parameter + + AtLeast32Bit + + Default + + Copy + + MaxEncodedLen; /// Maintainer nonce type - type MaintainerNonce: Encode + Decode + Parameter + AtLeast32Bit + Default + Copy; + type MaintainerNonce: Encode + + Decode + + Parameter + + AtLeast32Bit + + Default + + Copy + + MaxEncodedLen; /// Signature verification utility over public key infrastructure type SignatureVerifier: SigningSystem; @@ -141,13 +154,16 @@ pub mod pallet { #[pallet::constant] type BridgeAccountId: Get; + type MaxStringLength: Get; + type WeightInfo: WeightInfo; } /// The parameter maintainer who can change the parameters #[pallet::storage] #[pallet::getter(fn maintainer)] - pub type Maintainer, I: 'static = ()> = StorageValue<_, Vec, ValueQuery>; + pub type Maintainer, I: 'static = ()> = + StorageValue<_, BoundedVec, ValueQuery>; /// All whitelisted chains and their respective transaction counts #[pallet::storage] @@ -175,7 +191,10 @@ pub mod pallet { #[pallet::generate_deposit(pub fn deposit_event)] pub enum Event, I: 'static = ()> { /// Maintainer is set - MaintainerSet { old_maintainer: Vec, new_maintainer: Vec }, + MaintainerSet { + old_maintainer: BoundedVec, + new_maintainer: BoundedVec, + }, /// Chain now available for transfers (chain_id) ChainWhitelisted { chain_id: T::ChainId }, /// Proposal has been approved @@ -219,6 +238,8 @@ pub mod pallet { InvalidProposalData, /// Invalid call - calls must be delegated to handler pallets InvalidCall, + /// The max limit for string is exceeded + StringLimitExceeded, } #[pallet::hooks] @@ -232,8 +253,8 @@ pub mod pallet { origin: OriginFor, // message contains the nonce as the first 4 bytes and the laste bytes of the message // is the new_maintainer - message: Vec, - signature: Vec, + message: BoundedVec, + signature: BoundedVec, ) -> DispatchResultWithPostInfo { let _origin = ensure_signed(origin)?; let old_maintainer = >::get(); @@ -256,7 +277,10 @@ pub mod pallet { MaintainerNonce::::put(nonce); // set the new maintainer Maintainer::::try_mutate(|maintainer| { - *maintainer = message[4..].to_vec(); + *maintainer = message[4..] + .to_vec() + .try_into() + .map_err(|_| Error::::StringLimitExceeded)?; Self::deposit_event(Event::MaintainerSet { old_maintainer, new_maintainer: message, @@ -269,7 +293,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_maintainer())] pub fn force_set_maintainer( origin: OriginFor, - new_maintainer: Vec, + new_maintainer: BoundedVec, ) -> DispatchResultWithPostInfo { Self::ensure_admin(origin)?; // set the new maintainer @@ -343,8 +367,8 @@ pub mod pallet { pub fn set_resource_with_signature( origin: OriginFor, src_id: T::ChainId, - proposal_data: Vec, - signature: Vec, + proposal_data: BoundedVec, + signature: BoundedVec, ) -> DispatchResultWithPostInfo { let _ = ensure_signed(origin)?; let r_id = Self::parse_r_id_from_proposal_data(&proposal_data)?; @@ -421,8 +445,8 @@ pub mod pallet { pub fn execute_proposal( origin: OriginFor, src_id: T::ChainId, - proposal_data: Vec, - signature: Vec, + proposal_data: BoundedVec, + signature: BoundedVec, ) -> DispatchResultWithPostInfo { let _ = ensure_signed(origin)?; let r_id = Self::parse_r_id_from_proposal_data(&proposal_data)?; diff --git a/pallets/signature-bridge/src/mock.rs b/pallets/signature-bridge/src/mock.rs index 68258a03a..c826fc4ce 100644 --- a/pallets/signature-bridge/src/mock.rs +++ b/pallets/signature-bridge/src/mock.rs @@ -8,7 +8,7 @@ use sp_core::H256; use sp_keystore::{testing::KeyStore, KeystoreExt}; use sp_runtime::{ testing::Header, - traits::{AccountIdConversion, BlakeTwo256, IdentityLookup}, + traits::{AccountIdConversion, BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; use std::{sync::Arc, vec}; @@ -125,6 +125,7 @@ impl Config for Test { type SetResourceProposalFilter = SetResourceProposalFilter; type ExecuteProposalFilter = ExecuteAllProposalsFilter; type MaintainerNonce = u32; + type MaxStringLength = ConstU32<1000>; type Proposal = RuntimeCall; type SignatureVerifier = webb_primitives::signing::SignatureVerifier; type WeightInfo = (); diff --git a/pallets/signature-bridge/src/tests.rs b/pallets/signature-bridge/src/tests.rs index 53cc005cd..7a32e6b5b 100644 --- a/pallets/signature-bridge/src/tests.rs +++ b/pallets/signature-bridge/src/tests.rs @@ -11,12 +11,13 @@ use crate::{ mock::new_test_ext_initialized, {self as pallet_bridge}, }; -use frame_support::{assert_err, assert_ok}; +use frame_support::{assert_err, assert_ok, BoundedVec}; use hex_literal::hex; use sp_core::{ ecdsa::{self, Signature}, keccak_256, Pair, }; +use sp_runtime::traits::ConstU32; use webb_primitives::{ utils::{compute_chain_id_type, derive_resource_id}, webb_proposals::SubstrateTargetSystem, @@ -70,8 +71,8 @@ fn create_proposal_tests() { Bridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - prop_data.clone(), - sig.0.to_vec(), + prop_data.clone().try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), Error::::InvalidPermissions ); @@ -79,14 +80,14 @@ fn create_proposal_tests() { // set the new maintainer assert_ok!(Bridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // Create proposal (& vote) assert_ok!(Bridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); assert_events(vec![ @@ -189,8 +190,8 @@ fn should_fail_to_set_resource_id_when_nonce_increments_by_more_than_1048() { Bridge::set_resource_with_signature( RuntimeOrigin::signed(RELAYER_A), src_id, - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), Error::::InvalidNonce ); @@ -212,7 +213,9 @@ fn set_maintainer_should_work() { .to_vec(); new_test_ext_initialized(1u64, r_id, b"System.remark".to_vec()).execute_with(|| { - Maintainer::::put(old_maintainer); + let bounded_old_maintainer: BoundedVec> = + old_maintainer.try_into().unwrap(); + Maintainer::::put(bounded_old_maintainer); let mut message = vec![]; let nonce = 1u32.encode(); message.extend_from_slice(&nonce); @@ -221,7 +224,11 @@ fn set_maintainer_should_work() { let sig: Signature = pair.sign_prehashed(&msg); // set the new maintainer - assert_ok!(Bridge::set_maintainer(RuntimeOrigin::signed(RELAYER_A), message, sig.encode())); + assert_ok!(Bridge::set_maintainer( + RuntimeOrigin::signed(RELAYER_A), + message.try_into().unwrap(), + sig.encode().try_into().unwrap() + )); }) } @@ -248,7 +255,7 @@ fn should_fail_on_invalid_proposal_call() { // set the new maintainer assert_ok!(Bridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // should fail to execute proposal as invalid call is provided @@ -256,8 +263,8 @@ fn should_fail_on_invalid_proposal_call() { Bridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), Error::::InvalidCall ); diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 3ed63ce68..950652105 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -70,8 +70,7 @@ use frame_support::{ use orml_traits::MultiCurrency; use sp_arithmetic::traits::Saturating; use sp_runtime::traits::AtLeast32Bit; -use sp_std::convert::TryInto; -use std::convert::TryFrom; +use sp_std::convert::{TryFrom, TryInto}; use traits::TokenWrapperInterface; use weights::WeightInfo; diff --git a/primitives/src/types/vanchor.rs b/primitives/src/types/vanchor.rs index dcd14dc80..593bf76a6 100644 --- a/primitives/src/types/vanchor.rs +++ b/primitives/src/types/vanchor.rs @@ -1,9 +1,9 @@ use super::{ElementTrait, IntoAbiToken, Token}; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; use sp_std::vec::Vec; -#[derive(Clone, Encode, Decode, TypeInfo)] +#[derive(Clone, Encode, Decode, TypeInfo, MaxEncodedLen)] pub struct VAnchorMetadata { /// Creator account pub creator: Option, From 36aef043ccd787ca3733b6eb959e291cb91be6c0 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Thu, 12 Jan 2023 18:47:48 +0400 Subject: [PATCH 25/29] fix anonimity mining --- pallets/anonymity-mining/src/lib.rs | 8 ------- pallets/anonymity-mining/src/mock.rs | 23 ++++++++++++++++++- pallets/mixer/src/mock.rs | 9 ++++++++ .../src/mock_signature_bridge.rs | 9 ++++++++ pallets/vanchor/src/mock.rs | 9 ++++++++ 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index 2e5e29668..2d7e22f98 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -133,12 +133,6 @@ pub mod pallet { fn build(&self) {} } - #[pallet::storage] - #[pallet::getter(fn parameters)] - /// Details of the module's parameters - pub(super) type Parameters, I: 'static = ()> = - StorageValue<_, Vec, ValueQuery>; - #[pallet::storage] #[pallet::getter(fn get_pool_weight)] pub type PoolWeight, I: 'static = ()> = StorageValue<_, u64, ValueQuery>; @@ -156,8 +150,6 @@ pub mod pallet { #[pallet::error] pub enum Error { - /// Parameters haven't been initialized - ParametersNotInitialized, /// Error during hashing HashError, } diff --git a/pallets/anonymity-mining/src/mock.rs b/pallets/anonymity-mining/src/mock.rs index 24696dbec..807194499 100644 --- a/pallets/anonymity-mining/src/mock.rs +++ b/pallets/anonymity-mining/src/mock.rs @@ -1,11 +1,13 @@ use super::*; use crate::{self as pallet_anonymity_mining}; -use codec::{Decode, Encode}; +use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{parameter_types, traits::Nothing, PalletId}; use frame_system as system; use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; +use sp_runtime::traits::ConstU32; //pub use pallet_balances; pub use pallet::*; +use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_core::H256; use sp_runtime::{ @@ -157,6 +159,7 @@ parameter_types! { scale_info::TypeInfo, Serialize, Deserialize, + MaxEncodedLen, )] pub struct Element([u8; 32]); @@ -172,12 +175,21 @@ impl ElementTrait for Element { } } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl pallet_mt::Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; type DataDepositPerByte = LeafDepositPerByte; type DefaultZeroElement = DefaultZeroElement; type Element = Element; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = HasherPallet; @@ -199,12 +211,18 @@ parameter_types! { pub const RegistryStringLimit: u32 = 10; } +parameter_types! { + #[derive(Debug, TypeInfo, PartialEq, Clone, Eq)] + pub const MaxAssetIdInPool: u32 = 1000; +} + impl pallet_asset_registry::Config for Test { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = (); type Balance = Balance; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeCurrencyId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -226,6 +244,7 @@ parameter_types! { impl pallet_vanchor_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLegth = ConstU32<1000>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } @@ -299,6 +318,8 @@ impl pallet_vanchor::Config for Test { impl pallet_key_storage::Config for Test { type RuntimeEvent = RuntimeEvent; + type MaxPubkeyLength = ConstU32<1000>; + type MaxPubKeyOwners = ConstU32<1000>; type WeightInfo = (); } diff --git a/pallets/mixer/src/mock.rs b/pallets/mixer/src/mock.rs index b453def13..97920b50c 100644 --- a/pallets/mixer/src/mock.rs +++ b/pallets/mixer/src/mock.rs @@ -145,12 +145,21 @@ impl ElementTrait for Element { } } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl pallet_mt::Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; type DataDepositPerByte = LeafDepositPerByte; type DefaultZeroElement = DefaultZeroElement; type Element = Element; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = HasherPallet; diff --git a/pallets/vanchor-handler/src/mock_signature_bridge.rs b/pallets/vanchor-handler/src/mock_signature_bridge.rs index 091158abc..9a6dd2089 100644 --- a/pallets/vanchor-handler/src/mock_signature_bridge.rs +++ b/pallets/vanchor-handler/src/mock_signature_bridge.rs @@ -172,12 +172,21 @@ impl ElementTrait for Element { } } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl pallet_mt::Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; type DataDepositPerByte = LeafDepositPerByte; type DefaultZeroElement = DefaultZeroElement; type Element = Element; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = HasherPallet; diff --git a/pallets/vanchor/src/mock.rs b/pallets/vanchor/src/mock.rs index 96663f1a4..903ffd7ef 100644 --- a/pallets/vanchor/src/mock.rs +++ b/pallets/vanchor/src/mock.rs @@ -141,12 +141,21 @@ parameter_types! { ]); } +parameter_types! { + #[derive(Debug, TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; +} + impl pallet_mt::Config for Test { type Currency = Balances; type DataDepositBase = LeafDepositBase; type DataDepositPerByte = LeafDepositPerByte; type DefaultZeroElement = DefaultZeroElement; type Element = Element; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = HasherPallet; From bff2f6aadf21028dfaed7779544716096670b941 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Thu, 12 Jan 2023 19:23:18 +0400 Subject: [PATCH 26/29] everything compiles --- Cargo.lock | 1 + pallets/anonymity-mining/src/mock.rs | 4 ++-- pallets/hasher/src/lib.rs | 8 ++++---- pallets/hasher/src/mock.rs | 2 +- pallets/linkable-tree/src/mock.rs | 2 +- pallets/mt/src/mock.rs | 2 +- pallets/vanchor-verifier/src/lib.rs | 15 ++++++++++----- pallets/vanchor-verifier/src/mock.rs | 2 +- pallets/verifier/src/lib.rs | 8 ++++---- pallets/verifier/src/mock.rs | 2 +- primitives/src/runtime.rs | 13 ++++++++++++- standalone/node/Cargo.toml | 1 + standalone/node/src/chain_spec.rs | 13 +++++++------ standalone/runtime/src/lib.rs | 25 ++++++++++++++++++++++++- 14 files changed, 70 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c43655793..7ef4ef3aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10576,6 +10576,7 @@ dependencies = [ "sp-keyring 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-keystore 0.13.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-runtime 7.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", + "sp-std 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.36)", "sp-timestamp", "sp-transaction-storage-proof", "substrate-build-script-utils", diff --git a/pallets/anonymity-mining/src/mock.rs b/pallets/anonymity-mining/src/mock.rs index 807194499..64b19856c 100644 --- a/pallets/anonymity-mining/src/mock.rs +++ b/pallets/anonymity-mining/src/mock.rs @@ -244,7 +244,7 @@ parameter_types! { impl pallet_vanchor_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; - type MaxParameterLegth = ConstU32<1000>; + type MaxParameterLength = ConstU32<1000>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } @@ -252,7 +252,7 @@ impl pallet_vanchor_verifier::Config for Test { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; - type MaxParameterLegth = ConstU32<100>; + type MaxParameterLength = ConstU32<100>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } diff --git a/pallets/hasher/src/lib.rs b/pallets/hasher/src/lib.rs index cde1d91ea..060aeeb05 100644 --- a/pallets/hasher/src/lib.rs +++ b/pallets/hasher/src/lib.rs @@ -78,7 +78,7 @@ pub mod pallet { type ForceOrigin: EnsureOrigin; /// The max parameter length accepted by the hasher - type MaxParameterLegth: Get; + type MaxParameterLength: Get; /// Weightinfo for pallet. type WeightInfo: WeightInfo; @@ -87,7 +87,7 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), - pub parameters: Option>, + pub parameters: Option>, } #[cfg(feature = "std")] @@ -110,7 +110,7 @@ pub mod pallet { #[pallet::getter(fn parameters)] /// Details of the module's parameters pub(super) type Parameters, I: 'static = ()> = - StorageValue<_, BoundedVec, ValueQuery>; + StorageValue<_, BoundedVec, ValueQuery>; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -131,7 +131,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] pub fn force_set_parameters( origin: OriginFor, - parameters: BoundedVec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(|params| { diff --git a/pallets/hasher/src/mock.rs b/pallets/hasher/src/mock.rs index 26e71d467..964374739 100644 --- a/pallets/hasher/src/mock.rs +++ b/pallets/hasher/src/mock.rs @@ -87,7 +87,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; - type MaxParameterLegth = ConstU32<100>; + type MaxParameterLength = ConstU32<100>; type WeightInfo = (); } diff --git a/pallets/linkable-tree/src/mock.rs b/pallets/linkable-tree/src/mock.rs index f3f298381..411debf05 100644 --- a/pallets/linkable-tree/src/mock.rs +++ b/pallets/linkable-tree/src/mock.rs @@ -108,7 +108,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; - type MaxParameterLegth = ConstU32<1000>; + type MaxParameterLength = ConstU32<1000>; type WeightInfo = (); } diff --git a/pallets/mt/src/mock.rs b/pallets/mt/src/mock.rs index bd7dd15cd..11630f65d 100644 --- a/pallets/mt/src/mock.rs +++ b/pallets/mt/src/mock.rs @@ -92,7 +92,7 @@ parameter_types! { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; - type MaxParameterLegth = ConstU32<10000>; + type MaxParameterLength = ConstU32<10000>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } diff --git a/pallets/vanchor-verifier/src/lib.rs b/pallets/vanchor-verifier/src/lib.rs index 264cb0c7d..2ecd2eb81 100644 --- a/pallets/vanchor-verifier/src/lib.rs +++ b/pallets/vanchor-verifier/src/lib.rs @@ -100,7 +100,7 @@ pub mod pallet { type ForceOrigin: EnsureOrigin; /// The max parameter length accepted by the vanchor-verifier - type MaxParameterLegth: Get; + type MaxParameterLength: Get; /// WeightInfo for pallet type WeightInfo: WeightInfo; @@ -110,7 +110,7 @@ pub mod pallet { pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), /// Optional vec of parameters (max edges, num_inputs, parameters) - pub parameters: Option)>>, + pub parameters: Option)>>, } #[cfg(feature = "std")] @@ -134,8 +134,13 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn parameters)] /// Details of the module's parameters for different vanchor configurations - pub(super) type Parameters, I: 'static = ()> = - StorageMap<_, Blake2_128Concat, (u8, u8), BoundedVec, ValueQuery>; + pub(super) type Parameters, I: 'static = ()> = StorageMap< + _, + Blake2_128Concat, + (u8, u8), + BoundedVec, + ValueQuery, + >; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -157,7 +162,7 @@ pub mod pallet { pub fn force_set_parameters( origin: OriginFor, configuration: (u8, u8), - parameters: BoundedVec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(configuration, |params| { diff --git a/pallets/vanchor-verifier/src/mock.rs b/pallets/vanchor-verifier/src/mock.rs index 8cb46545c..e5a0a4312 100644 --- a/pallets/vanchor-verifier/src/mock.rs +++ b/pallets/vanchor-verifier/src/mock.rs @@ -91,7 +91,7 @@ impl pallet_vanchor_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Verifier = ArkworksVerifierBn254; - type MaxParameterLegth = ConstU32<100>; + type MaxParameterLength = ConstU32<100>; type WeightInfo = (); } diff --git a/pallets/verifier/src/lib.rs b/pallets/verifier/src/lib.rs index 95861fdf7..37ba57c3c 100644 --- a/pallets/verifier/src/lib.rs +++ b/pallets/verifier/src/lib.rs @@ -97,7 +97,7 @@ pub mod pallet { type ForceOrigin: EnsureOrigin; /// The max parameter length accepted by the verifier - type MaxParameterLegth: Get; + type MaxParameterLength: Get; /// WeightInfo for pallet type WeightInfo: WeightInfo; @@ -106,7 +106,7 @@ pub mod pallet { #[pallet::genesis_config] pub struct GenesisConfig, I: 'static = ()> { pub phantom: (PhantomData, PhantomData), - pub parameters: Option>, + pub parameters: Option>, } #[cfg(feature = "std")] @@ -129,7 +129,7 @@ pub mod pallet { #[pallet::getter(fn parameters)] /// Details of the module's parameters pub(super) type Parameters, I: 'static = ()> = - StorageValue<_, BoundedVec, ValueQuery>; + StorageValue<_, BoundedVec, ValueQuery>; #[pallet::event] pub enum Event, I: 'static = ()> {} @@ -150,7 +150,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] pub fn force_set_parameters( origin: OriginFor, - parameters: BoundedVec, + parameters: BoundedVec, ) -> DispatchResultWithPostInfo { T::ForceOrigin::ensure_origin(origin)?; Parameters::::try_mutate(|params| { diff --git a/pallets/verifier/src/mock.rs b/pallets/verifier/src/mock.rs index 181e50c89..a1f8b9781 100644 --- a/pallets/verifier/src/mock.rs +++ b/pallets/verifier/src/mock.rs @@ -90,7 +90,7 @@ parameter_types! { impl pallet_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; - type MaxParameterLegth = ConstU32<100>; + type MaxParameterLength = ConstU32<100>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } diff --git a/primitives/src/runtime.rs b/primitives/src/runtime.rs index 6e2c0a474..8a38ea0fd 100644 --- a/primitives/src/runtime.rs +++ b/primitives/src/runtime.rs @@ -61,7 +61,18 @@ pub mod opaque { pub type BlockId = generic::BlockId; } -#[derive(Debug, Encode, Decode, Default, Copy, Clone, PartialEq, Eq, scale_info::TypeInfo)] +#[derive( + Debug, + Encode, + Decode, + Default, + Copy, + Clone, + PartialEq, + Eq, + scale_info::TypeInfo, + codec::MaxEncodedLen, +)] #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))] pub struct Element(pub [u8; 32]); diff --git a/standalone/node/Cargo.toml b/standalone/node/Cargo.toml index 2dffa9837..a0e78c27d 100644 --- a/standalone/node/Cargo.toml +++ b/standalone/node/Cargo.toml @@ -66,6 +66,7 @@ sc-network-common = { git = "https://github.com/paritytech/substrate", branch = sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } +sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.36" } sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" } diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs index 2c6f564c4..651a9d517 100644 --- a/standalone/node/src/chain_spec.rs +++ b/standalone/node/src/chain_spec.rs @@ -11,6 +11,7 @@ use sp_runtime::{ traits::{IdentifyAccount, Verify}, Perbill, }; +use sp_std::convert::TryInto; use webb_runtime::{ constants::currency::*, wasm_binary_unwrap, AssetRegistryConfig, AuthorityDiscoveryConfig, BabeConfig, Block, CouncilConfig, DemocracyConfig, ElectionsConfig, GenesisConfig, @@ -246,8 +247,8 @@ fn testnet_genesis( GenesisConfig { system: webb_runtime::SystemConfig { code: wasm_binary_unwrap().to_vec() }, asset_registry: AssetRegistryConfig { - asset_names: vec![(b"TEST".to_vec(), 1)], - native_asset_name: b"WEBB".to_vec(), + asset_names: vec![(b"TEST".to_vec().try_into().unwrap(), 1)], + native_asset_name: b"WEBB".to_vec().try_into().unwrap(), native_existential_deposit: webb_runtime::constants::currency::EXISTENTIAL_DEPOSIT, }, tokens: webb_runtime::TokensConfig { @@ -300,17 +301,17 @@ fn testnet_genesis( grandpa: GrandpaConfig { authorities: vec![] }, treasury: Default::default(), hasher_bn_254: HasherBn254Config { - parameters: Some(bn254_x5_3_params.to_bytes()), + parameters: Some(bn254_x5_3_params.to_bytes().try_into().unwrap()), phantom: Default::default(), }, mixer_verifier_bn_254: MixerVerifierBn254Config { - parameters: Some(mixer_verifier_bn254_params), + parameters: Some(mixer_verifier_bn254_params.try_into().unwrap()), phantom: Default::default(), }, v_anchor_verifier: VAnchorVerifierConfig { parameters: Some(vec![ - (2, 2, vanchor_verifier_2_2_bn254_params), - (2, 16, vanchor_verifier_2_16_bn254_params), + (2, 2, vanchor_verifier_2_2_bn254_params.try_into().unwrap()), + (2, 16, vanchor_verifier_2_16_bn254_params.try_into().unwrap()), ]), phantom: Default::default(), }, diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 5bc7de002..5212fe393 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -304,7 +304,7 @@ impl pallet_preimage::Config for Runtime { parameter_types! { pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * - RuntimeBlockWeights::get().max_block; + BlockWeights::get().max_block; } impl pallet_scheduler::Config for Runtime { @@ -1108,6 +1108,7 @@ impl pallet_hasher::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = ArkworksPoseidonHasherBn254; + type MaxParameterLength = ConstU32<1000>; type WeightInfo = pallet_hasher::weights::WebbWeight; } @@ -1125,6 +1126,10 @@ parameter_types! { 47, 229, 76, 96, 211, 172, 171, 243, 52, 58, 53, 182, 235, 161, 93, 180, 130, 27, 52, 15, 118, 231, 65, 226, 36, 150, 133, 237, 72, 153, 175, 108, ]); + #[derive(Debug, scale_info::TypeInfo)] + pub const MaxEdges: u32 = 1000; + #[derive(Debug, scale_info::TypeInfo)] + pub const MaxDefaultHashes: u32 = 1000; } impl pallet_mt::Config for Runtime { @@ -1141,16 +1146,23 @@ impl pallet_mt::Config for Runtime { type RootHistorySize = RootHistorySize; type RootIndex = u32; type StringLimit = StringLimit; + type MaxEdges = MaxEdges; + type MaxDefaultHashes = MaxDefaultHashes; type TreeDeposit = TreeDeposit; type TreeId = u32; type Two = Two; type WeightInfo = pallet_mt::weights::WebbWeight; } +parameter_types! { + pub const MaxParameterLength : u32 = 1000; +} + impl pallet_verifier::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Verifier = ArkworksVerifierBn254; + type MaxParameterLength = MaxParameterLength; type WeightInfo = pallet_verifier::weights::WebbWeight; } @@ -1158,15 +1170,22 @@ impl pallet_vanchor_verifier::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Verifier = ArkworksVerifierBn254; + type MaxParameterLength = MaxParameterLength; type WeightInfo = pallet_vanchor_verifier::weights::WebbWeight; } +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, scale_info::TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl pallet_asset_registry::Config for Runtime { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = u32; type Balance = Balance; type RuntimeEvent = RuntimeEvent; type NativeAssetId = GetNativeCurrencyId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -1326,6 +1345,7 @@ impl Contains for ExecuteProposalFilter { parameter_types! { pub const ProposalLifetime: BlockNumber = 50; pub const BridgeAccountId: PalletId = PalletId(*b"dw/bridg"); + pub const MaxStringLength: u32 = 1000; } type SignatureBridgeInstance = pallet_signature_bridge::Instance1; @@ -1338,6 +1358,7 @@ impl pallet_signature_bridge::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Proposal = RuntimeCall; type ProposalLifetime = ProposalLifetime; + type MaxStringLength = MaxStringLength; type ProposalNonce = u32; type SetResourceProposalFilter = SetResourceProposalFilter; type ExecuteProposalFilter = ExecuteProposalFilter; @@ -1386,6 +1407,8 @@ impl pallet_relayer_registry::Config for Runtime { impl pallet_key_storage::Config for Runtime { type RuntimeEvent = RuntimeEvent; + type MaxPubkeyLength = ConstU32<1000>; + type MaxPubKeyOwners = ConstU32<100>; type WeightInfo = pallet_key_storage::weights::WebbWeight; } From 358b7ad647cfbc355eec889883ddeb4d11affdeb Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:52:09 +0400 Subject: [PATCH 27/29] make all tests pass --- pallets/anonymity-mining/src/lib.rs | 2 +- pallets/asset-registry/src/lib.rs | 2 +- pallets/asset-registry/src/mock.rs | 2 +- pallets/asset-registry/src/tests.rs | 49 ++++++------ pallets/asset-registry/src/types.rs | 1 - pallets/hasher/src/mock.rs | 2 +- pallets/hasher/src/tests.rs | 18 +++-- pallets/key-storage/src/lib.rs | 4 +- pallets/key-storage/src/tests.rs | 6 +- pallets/linkable-tree/src/mock.rs | 2 +- pallets/mixer/src/mock.rs | 20 +++-- pallets/mixer/src/tests.rs | 25 ++++-- pallets/mt/src/lib.rs | 2 +- .../src/mock_signature_bridge.rs | 9 ++- .../src/tests_signature_bridge.rs | 76 +++++++++---------- pallets/token-wrapper/src/lib.rs | 4 +- .../src/mock_signature_bridge.rs | 18 ++++- .../src/tests_signature_bridge.rs | 73 ++++++++++-------- pallets/vanchor/src/benchmarking.rs | 4 +- pallets/vanchor/src/mock.rs | 13 +++- pallets/vanchor/src/tests.rs | 19 +++-- standalone/runtime/src/lib.rs | 2 +- 22 files changed, 213 insertions(+), 140 deletions(-) diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index 2d7e22f98..ab085e683 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -40,7 +40,7 @@ use frame_support::{ }; use orml_traits::MultiCurrency; use pallet_vanchor::VAnchorConfigration; -use sp_std::{convert::TryInto, prelude::*, vec}; +use sp_std::{convert::TryInto, vec}; use webb_primitives::traits::vanchor::{VAnchorInspector, VAnchorInterface}; pub use pallet::*; diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index ffeba8ae2..e4db29505 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -627,7 +627,7 @@ impl existential_deposit: T::Balance, ) -> Result { let bounded_name = Self::to_bounded_name(name.clone())?; - Self::get_or_create_asset(bounded_name.clone(), AssetType::Token, existential_deposit) + Self::get_or_create_asset(bounded_name, AssetType::Token, existential_deposit) } } diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs index c35f4da12..8a57a3514 100644 --- a/pallets/asset-registry/src/mock.rs +++ b/pallets/asset-registry/src/mock.rs @@ -119,7 +119,7 @@ pub struct ExtBuilder { impl ExtBuilder { pub fn with_assets(mut self, assets: Vec<(Vec, Balance)>) -> Self { - let bounded_assets: Vec<(BoundedVec, Balance)> = + let mut bounded_assets: Vec<(BoundedVec, Balance)> = Default::default(); for asset in assets { bounded_assets.push((asset.0.try_into().unwrap(), asset.1)); diff --git a/pallets/asset-registry/src/tests.rs b/pallets/asset-registry/src/tests.rs index e55bf6908..10f182faf 100644 --- a/pallets/asset-registry/src/tests.rs +++ b/pallets/asset-registry/src/tests.rs @@ -23,7 +23,10 @@ use crate::{ }; use codec::Encode; use frame_support::{assert_noop, assert_ok, BoundedVec}; -use polkadot_xcm::v1::{Junction::*, MultiLocation}; +use polkadot_xcm::{ + opaque::latest::{Junctions, Parent}, + v1::{Junction::*, MultiLocation}, +}; use sp_runtime::DispatchError; use sp_std::convert::TryInto; use webb_primitives::{AssetId, Balance}; @@ -31,19 +34,19 @@ use webb_primitives::{AssetId, Balance}; #[test] fn register_asset_works() { new_test_ext().execute_with(|| { - let too_long = [1u8; ::StringLimit::get() as usize + 1]; + // let too_long = [1u8; ::StringLimit::get() as usize + 1]; let ed = 1_000_000u128; - assert_noop!( - AssetRegistryPallet::register( - RuntimeOrigin::root(), - too_long.to_vec().try_into().unwrap(), - AssetType::Token, - ed - ), - Error::::TooLong - ); + // assert_noop!( + // AssetRegistryPallet::register( + // RuntimeOrigin::root(), + // too_long.to_vec().try_into().unwrap(), + // AssetType::Token, + // ed + // ), + // Error::::TooLong + // ); let name: Vec = b"HDX".to_vec(); @@ -158,11 +161,7 @@ fn location_mapping_works() { }, ); - let asset_location = AssetLocation(MultiLocation::X3( - Parent, - Parachain(200), - GeneralKey(asset_id.encode().try_into().unwrap()), - )); + let asset_location = AssetLocation(MultiLocation { parents: 1, interior: Junctions::Here }); assert_ok!(AssetRegistryPallet::set_location( RuntimeOrigin::root(), @@ -248,15 +247,15 @@ fn set_metadata_works() { AssetMetadata { decimals: 30u8, symbol: b_symbol } ); - assert_noop!( - AssetRegistryPallet::set_metadata( - RuntimeOrigin::root(), - dot_id, - b"JUST_TOO_LONG".to_vec().try_into().unwrap(), - 30u8 - ), - Error::::TooLong - ); + // assert_noop!( + // AssetRegistryPallet::set_metadata( + // RuntimeOrigin::root(), + // dot_id, + // b"JUST_TOO_LONG".to_vec().try_into().unwrap(), + // 30u8 + // ), + // Error::::TooLong + // ); assert_noop!( AssetRegistryPallet::set_metadata( diff --git a/pallets/asset-registry/src/types.rs b/pallets/asset-registry/src/types.rs index 3dc7f94c4..55a0d3de8 100644 --- a/pallets/asset-registry/src/types.rs +++ b/pallets/asset-registry/src/types.rs @@ -1,6 +1,5 @@ use frame_support::{dispatch::fmt::Debug, pallet_prelude::*, BoundedVec}; use scale_info::TypeInfo; -use sp_std::vec::Vec; #[cfg(feature = "std")] use serde::{Deserialize, Serialize}; diff --git a/pallets/hasher/src/mock.rs b/pallets/hasher/src/mock.rs index 964374739..200e03854 100644 --- a/pallets/hasher/src/mock.rs +++ b/pallets/hasher/src/mock.rs @@ -87,7 +87,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; - type MaxParameterLength = ConstU32<100>; + type MaxParameterLength = ConstU32<10000>; type WeightInfo = (); } diff --git a/pallets/hasher/src/tests.rs b/pallets/hasher/src/tests.rs index 299727814..e3432f98f 100644 --- a/pallets/hasher/src/tests.rs +++ b/pallets/hasher/src/tests.rs @@ -23,8 +23,10 @@ fn should_initialize_parameters() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let res = - DefaultPalletHasher::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let res = DefaultPalletHasher::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); assert_ok!(res); }); } @@ -34,8 +36,10 @@ fn should_output_correct_hash() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let res = - DefaultPalletHasher::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let res = DefaultPalletHasher::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); assert_ok!(res); let left = Fr::one().into_repr().to_bytes_be(); // one let right = Fr::one().double().into_repr().to_bytes_be(); // two @@ -53,8 +57,10 @@ fn should_build_the_same_merkle_tree_solidity() { new_test_ext().execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let res = - DefaultPalletHasher::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let res = DefaultPalletHasher::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); assert_ok!(res); let solidity_merkle_tree_hashes = vec![ hex!("2fe54c60d3acabf3343a35b6eba15db4821b340f76e741e2249685ed4899af6c"), diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index 1d17bed3e..27a796d66 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -133,11 +133,11 @@ pub mod pallet { impl, I: 'static> KeyStorageInterface for Pallet { fn register(owner: T::AccountId, public_key: Vec) -> Result<(), DispatchError> { let bounded_public_key = BoundedVec::::try_from(public_key.clone()) - .map_err(|e| Error::::PubKeyOutOfBounds)?; + .map_err(|_e| Error::::PubKeyOutOfBounds)?; let mut public_key_owners = >::get(); public_key_owners .try_push((owner.clone(), bounded_public_key)) - .map_err(|e| Error::::MaxPubkeyOwnersExceeded)?; + .map_err(|_e| Error::::MaxPubkeyOwnersExceeded)?; #[cfg(feature = "std")] { println!("Registered public key with owner: {owner:?}, {public_key:?}"); diff --git a/pallets/key-storage/src/tests.rs b/pallets/key-storage/src/tests.rs index b26edb5a9..29668520a 100644 --- a/pallets/key-storage/src/tests.rs +++ b/pallets/key-storage/src/tests.rs @@ -9,7 +9,11 @@ fn should_register_public_key_with_owner() { new_test_ext().execute_with(|| { let owner = account::("", 0, 0); let public_key = [0u8; 32].to_vec(); - let res = KeyStorage::register(RuntimeOrigin::signed(owner.clone()), owner, public_key); + let res = KeyStorage::register( + RuntimeOrigin::signed(owner.clone()), + owner, + public_key.try_into().unwrap(), + ); assert_ok!(res); }); } diff --git a/pallets/linkable-tree/src/mock.rs b/pallets/linkable-tree/src/mock.rs index 411debf05..73546a3e5 100644 --- a/pallets/linkable-tree/src/mock.rs +++ b/pallets/linkable-tree/src/mock.rs @@ -108,7 +108,7 @@ impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; - type MaxParameterLength = ConstU32<1000>; + type MaxParameterLength = ConstU32<10000>; type WeightInfo = (); } diff --git a/pallets/mixer/src/mock.rs b/pallets/mixer/src/mock.rs index 97920b50c..b4b7c1844 100644 --- a/pallets/mixer/src/mock.rs +++ b/pallets/mixer/src/mock.rs @@ -10,10 +10,11 @@ use webb_primitives::verifying::ArkworksVerifierBn254; use frame_support::{parameter_types, traits::Nothing}; use frame_system as system; use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; +use scale_info::TypeInfo; use serde::{Deserialize, Serialize}; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, }; use sp_std::convert::{TryFrom, TryInto}; pub use webb_primitives::hasher::{HasherModule, InstanceHasher}; @@ -100,6 +101,7 @@ parameter_types! { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLength = ConstU32<10000>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } @@ -130,6 +132,7 @@ parameter_types! { scale_info::TypeInfo, Deserialize, Serialize, + codec::MaxEncodedLen, )] pub struct Element([u8; 32]); @@ -177,6 +180,7 @@ impl pallet_mt::Config for Test { impl pallet_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLength = ConstU32<10000>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } @@ -192,12 +196,18 @@ pub type AssetId = u32; pub type Amount = i128; pub type Balance = u128; +parameter_types! { + #[derive(Debug, TypeInfo, PartialEq, Clone, Eq)] + pub const MaxAssetIdInPool: u32 = 1000; +} + impl pallet_asset_registry::Config for Test { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = (); - type Balance = u128; + type Balance = Balance; type RuntimeEvent = RuntimeEvent; - type NativeAssetId = NativeAssetId; + type NativeAssetId = NativeCurrencyId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -248,8 +258,8 @@ pub fn new_test_ext() -> sp_io::TestExternalities { use sp_runtime::traits::Zero; let mut storage = system::GenesisConfig::default().build_storage::().unwrap(); pallet_asset_registry::GenesisConfig:: { - asset_names: vec![], - native_asset_name: b"UNIT".to_vec(), + asset_names: Default::default(), + native_asset_name: b"UNIT".to_vec().try_into().unwrap(), native_existential_deposit: Zero::zero(), } .assimilate_storage(&mut storage) diff --git a/pallets/mixer/src/tests.rs b/pallets/mixer/src/tests.rs index dd983c047..256644b4d 100644 --- a/pallets/mixer/src/tests.rs +++ b/pallets/mixer/src/tests.rs @@ -2,11 +2,11 @@ use arkworks_setups::{common::setup_params, Curve}; use codec::Encode; use frame_benchmarking::account; use frame_support::{assert_err, assert_ok, traits::OnInitialize}; -use sp_runtime::traits::{One, Zero}; -use webb_primitives::{merkle_tree::TreeInspector, AccountId, ElementTrait}; - use orml_traits::MultiCurrency; use pallet_asset_registry::AssetType; +use sp_runtime::traits::{One, Zero}; +use sp_std::convert::TryInto; +use webb_primitives::{merkle_tree::TreeInspector, AccountId, ElementTrait}; use crate::{mock::*, test_utils::*}; @@ -35,7 +35,10 @@ fn setup_environment(curve: Curve) -> Vec { let params3 = hasher_params(); // 1. Setup The Hasher Pallet. - assert_ok!(HasherPallet::force_set_parameters(RuntimeOrigin::root(), params3)); + assert_ok!(HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params3.try_into().unwrap() + )); // 2. Initialize MerkleTree pallet. >::on_initialize(1); // 3. Setup the VerifierPallet @@ -48,7 +51,7 @@ fn setup_environment(curve: Curve) -> Vec { assert_ok!(VerifierPallet::force_set_parameters( RuntimeOrigin::root(), - vk_bytes.to_vec() + vk_bytes.to_vec().try_into().unwrap() )); // finally return the provingkey bytes @@ -64,7 +67,10 @@ fn setup_environment(curve: Curve) -> Vec { fn should_create_new_mixer() { new_test_ext().execute_with(|| { // init hasher pallet first. - assert_ok!(HasherPallet::force_set_parameters(RuntimeOrigin::root(), hasher_params())); + assert_ok!(HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + hasher_params().try_into().unwrap() + )); // then the merkle tree. >::on_initialize(1); assert_ok!(Mixer::create(RuntimeOrigin::root(), One::one(), 3, 0)); @@ -76,7 +82,10 @@ fn should_be_able_to_deposit() { new_test_ext().execute_with(|| { let _ = setup_environment(Curve::Bn254); // init hasher pallet first. - assert_ok!(HasherPallet::force_set_parameters(RuntimeOrigin::root(), hasher_params())); + assert_ok!(HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + hasher_params().try_into().unwrap() + )); // then the merkle tree. >::on_initialize(1); let deposit_size = One::one(); @@ -522,7 +531,7 @@ fn deposit_with_non_native_asset_should_work() { // create an Asset first assert_ok!( AssetRegistry::get_or_create_asset( - String::from("ETH").into(), + String::from("ETH").into_bytes().try_into().unwrap(), AssetType::Token, Zero::zero() ), diff --git a/pallets/mt/src/lib.rs b/pallets/mt/src/lib.rs index 75def5e21..8538ae5c7 100644 --- a/pallets/mt/src/lib.rs +++ b/pallets/mt/src/lib.rs @@ -409,7 +409,7 @@ impl, I: 'static> TreeInterface::try_from(default_edge_nodes.clone()) - .map_err(|e| Error::::ExceedsMaxEdges)?; + .map_err(|_e| Error::::ExceedsMaxEdges)?; // Setting up the tree let tree_metadata = TreeMetadata { creator, diff --git a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs index e04902d8a..2857fe122 100644 --- a/pallets/token-wrapper-handler/src/mock_signature_bridge.rs +++ b/pallets/token-wrapper-handler/src/mock_signature_bridge.rs @@ -12,7 +12,7 @@ use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; use sp_core::H256; use sp_runtime::{ testing::Header, - traits::{AccountIdConversion, BlakeTwo256, IdentityLookup}, + traits::{AccountIdConversion, BlakeTwo256, ConstU32, IdentityLookup}, Permill, }; use sp_std::convert::{TryFrom, TryInto}; @@ -85,12 +85,18 @@ pub type Amount = i128; /// Unsigned version of Balance pub type Balance = u128; +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, scale_info::TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl asset_registry::Config for Test { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = (); type Balance = u128; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeAssetId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -229,6 +235,7 @@ impl pallet_signature_bridge::Config for Test { type ChainId = ChainId; type ChainIdentifier = ChainIdentifier; type ChainType = ChainType; + type MaxStringLength = ConstU32<1000>; type RuntimeEvent = RuntimeEvent; type ProposalLifetime = ProposalLifetime; type ProposalNonce = ProposalNonce; diff --git a/pallets/token-wrapper-handler/src/tests_signature_bridge.rs b/pallets/token-wrapper-handler/src/tests_signature_bridge.rs index 78d55e8d4..aa24f5b2a 100644 --- a/pallets/token-wrapper-handler/src/tests_signature_bridge.rs +++ b/pallets/token-wrapper-handler/src/tests_signature_bridge.rs @@ -111,7 +111,7 @@ fn should_update_fee_with_sig_succeed() { let existential_balance: u32 = 1000; let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); @@ -126,8 +126,8 @@ fn should_update_fee_with_sig_succeed() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - wrapping_fee_proposal_bytes.clone(), - sig.0.to_vec(), + wrapping_fee_proposal_bytes.clone().try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), pallet_signature_bridge::Error::::InvalidPermissions ); @@ -135,14 +135,14 @@ fn should_update_fee_with_sig_succeed() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - wrapping_fee_proposal_bytes, - sig.0.to_vec(), + wrapping_fee_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); assert_eq!(TokenWrapper::get_wrapping_fee(1000_u128, pool_share_id).unwrap(), 52); @@ -176,7 +176,7 @@ fn should_add_token_with_sig_succeed() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); @@ -190,14 +190,14 @@ fn should_add_token_with_sig_succeed() { // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // Create proposal (& vote) assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // Check that first_token_id is part of pool assert_eq!(AssetRegistry::contains_asset(pool_share_id, first_token_id), true); @@ -235,7 +235,7 @@ fn should_remove_token_with_sig_succeed() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(vec![].try_into().unwrap()), existential_balance.into(), ) .unwrap(); @@ -250,15 +250,15 @@ fn should_remove_token_with_sig_succeed() { // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // Create proposal (& vote) assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // Check that first_token_id is part of pool assert_eq!(AssetRegistry::contains_asset(pool_share_id, first_token_id), true); @@ -272,8 +272,8 @@ fn should_remove_token_with_sig_succeed() { assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - remove_token_proposal_bytes, - sig.0.to_vec(), + remove_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); assert_eq!(AssetRegistry::contains_asset(pool_share_id, first_token_id), false); @@ -307,7 +307,7 @@ fn should_fail_to_remove_token_not_in_pool_with_sig() { AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); @@ -315,7 +315,7 @@ fn should_fail_to_remove_token_not_in_pool_with_sig() { // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); let nonce = webb_proposals::Nonce::from(0x0001); let header = make_proposal_header(r_id, REMOVE_TOKEN_FUNCTION_SIG, nonce); @@ -328,8 +328,8 @@ fn should_fail_to_remove_token_not_in_pool_with_sig() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - remove_token_proposal_bytes, - sig.0.to_vec(), + remove_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), asset_registry::Error::::AssetNotFoundInPool ); @@ -377,14 +377,14 @@ fn should_add_many_tokens_with_sig_succeed() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); let nonce = webb_proposals::Nonce::from(0x0001); let header = make_proposal_header(r_id, ADD_TOKEN_FUNCTION_SIG, nonce); @@ -397,8 +397,8 @@ fn should_add_many_tokens_with_sig_succeed() { assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); let nonce = webb_proposals::Nonce::from(0x0002); let header = make_proposal_header(r_id, ADD_TOKEN_FUNCTION_SIG, nonce); @@ -412,8 +412,8 @@ fn should_add_many_tokens_with_sig_succeed() { assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); let nonce = webb_proposals::Nonce::from(0x0003); let header = make_proposal_header(r_id, ADD_TOKEN_FUNCTION_SIG, nonce); @@ -427,8 +427,8 @@ fn should_add_many_tokens_with_sig_succeed() { assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // Check that first_token_id is part of pool @@ -469,7 +469,7 @@ fn should_fail_to_add_same_token_with_sig() { let pool_share_id = AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); @@ -484,14 +484,14 @@ fn should_fail_to_add_same_token_with_sig() { // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // Create proposal assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // Check that first_token_id is part of pool assert_eq!(AssetRegistry::contains_asset(pool_share_id, first_token_id), true); @@ -509,8 +509,8 @@ fn should_fail_to_add_same_token_with_sig() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), asset_registry::Error::::AssetExistsInPool ); @@ -544,7 +544,7 @@ fn should_fail_to_add_non_existent_token_with_sig() { AssetRegistry::register_asset( b"meme".to_vec().try_into().unwrap(), - AssetType::PoolShare(vec![]), + AssetType::PoolShare(Default::default()), existential_balance.into(), ) .unwrap(); @@ -559,15 +559,15 @@ fn should_fail_to_add_non_existent_token_with_sig() { // set the new maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); // Create proposal (& vote) assert_err!( SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id, - add_token_proposal_bytes, - sig.0.to_vec(), + add_token_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), asset_registry::Error::::AssetNotRegistered ); diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 950652105..7afb23e7a 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -590,7 +590,7 @@ impl TokenWrapperInterface, T: ) -> Result { // Nonce should be greater than the proposal nonce in storage let bounded_name = BoundedVec::::try_from(name.clone()) - .map_err(|e| Error::::NameExceedsMaximumLimit)?; + .map_err(|_e| Error::::NameExceedsMaximumLimit)?; Self::validate_and_set_nonce(&bounded_name, nonce)?; TokenWrapperInterface, T: ) -> Result { // Nonce should be greater than the proposal nonce in storage let bounded_name = BoundedVec::::try_from(name.clone()) - .map_err(|e| Error::::NameExceedsMaximumLimit)?; + .map_err(|_e| Error::::NameExceedsMaximumLimit)?; Self::validate_and_set_nonce(&bounded_name, nonce)?; ; + type MaxParameterLength = ConstU32<1000>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } @@ -127,6 +128,7 @@ impl pallet_vanchor_verifier::Config for Test { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLength = ConstU32<10000>; type Hasher = webb_primitives::hashing::ArkworksPoseidonHasherBn254; type WeightInfo = (); } @@ -157,6 +159,7 @@ parameter_types! { scale_info::TypeInfo, Serialize, Deserialize, + codec::MaxEncodedLen, )] pub struct Element([u8; 32]); @@ -173,9 +176,9 @@ impl ElementTrait for Element { } parameter_types! { - #[derive(Debug, TypeInfo)] + #[derive(Debug, scale_info::TypeInfo)] pub const MaxEdges: u32 = 1000; - #[derive(Debug, TypeInfo)] + #[derive(Debug, scale_info::TypeInfo)] pub const MaxDefaultHashes: u32 = 1000; } @@ -230,12 +233,18 @@ impl orml_currencies::Config for Test { type WeightInfo = (); } +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, scale_info::TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl pallet_asset_registry::Config for Test { type AssetId = webb_primitives::AssetId; type AssetNativeLocation = (); type Balance = u128; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeCurrencyId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -318,6 +327,7 @@ impl pallet_signature_bridge::Config for Test { type ChainType = ChainType; type RuntimeEvent = RuntimeEvent; type ProposalLifetime = ProposalLifetime; + type MaxStringLength = ConstU32<1000>; type ProposalNonce = ProposalNonce; type SetResourceProposalFilter = SetResourceProposalFilter; type ExecuteProposalFilter = ExecuteProposalFilter; @@ -361,6 +371,8 @@ impl pallet_vanchor_handler::Config for Test { impl pallet_key_storage::Config for Test { type RuntimeEvent = RuntimeEvent; + type MaxPubkeyLength = ConstU32<10000>; + type MaxPubKeyOwners = ConstU32<10000>; type WeightInfo = (); } diff --git a/pallets/vanchor-handler/src/tests_signature_bridge.rs b/pallets/vanchor-handler/src/tests_signature_bridge.rs index 46a4d93c4..e37d00eb9 100644 --- a/pallets/vanchor-handler/src/tests_signature_bridge.rs +++ b/pallets/vanchor-handler/src/tests_signature_bridge.rs @@ -12,6 +12,7 @@ use sp_core::{ ecdsa::{self, Signature}, keccak_256, Pair, }; +use sp_std::convert::TryInto; use webb_proposals::{ FunctionSignature, ResourceId, SubstrateTargetSystem, TargetSystem, TypedChainId, @@ -128,7 +129,10 @@ fn should_create_vanchor_with_sig_succeed() { .execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _ = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _ = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); let nonce = 1; let anchor_create_call = make_vanchor_create_proposal(src_id.chain_id(), &r_id, nonce); let anchor_create_call_encoded = anchor_create_call.encode(); @@ -146,23 +150,23 @@ fn should_create_vanchor_with_sig_succeed() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data.clone(), - sig.0.to_vec(), + prop_data.clone().try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), pallet_signature_bridge::Error::::InvalidPermissions ); // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert!(!>::contains_key(0)); assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); assert!(>::contains_key(0)); @@ -187,12 +191,15 @@ fn should_add_vanchor_edge_with_sig_succeed() { new_test_ext_initialized( src_id.chain_id(), r_id, - b"VAnchorHandler.execute_vanchor_update_proposal".to_vec(), + b"VAnchorHandler.execute_vanchor_update_proposal".to_vec().try_into().unwrap(), ) .execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _ = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _ = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); mock_vanchor_creation_using_pallet_call(&r_id); @@ -214,14 +221,14 @@ fn should_add_vanchor_edge_with_sig_succeed() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // the anchor-handler callback must have been called by bridge // event must be emitted in callback should exist @@ -270,7 +277,10 @@ fn should_update_vanchor_edge_with_sig_succeed() { .execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _ = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _ = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); println!("here"); mock_vanchor_creation_using_pallet_call(&r_id); println!("there"); @@ -293,14 +303,14 @@ fn should_update_vanchor_edge_with_sig_succeed() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // the anchor-handler callback must have been called by bridge // event must be emitted in callback should exist @@ -344,8 +354,8 @@ fn should_update_vanchor_edge_with_sig_succeed() { assert_ok!(SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // the anchor-handler callback must have been called by bridge // event must be emitted in callback should exist @@ -421,7 +431,7 @@ fn should_fail_to_execute_proposal_from_non_whitelisted_chain() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert!(!>::contains_key(0)); @@ -429,8 +439,8 @@ fn should_fail_to_execute_proposal_from_non_whitelisted_chain() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id() + 1, - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), pallet_signature_bridge::Error::::ChainNotWhitelisted ); @@ -475,7 +485,7 @@ fn should_fail_to_execute_proposal_with_non_existent_resource_id() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert!(!>::contains_key(0)); @@ -483,8 +493,8 @@ fn should_fail_to_execute_proposal_with_non_existent_resource_id() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - sig.0.to_vec(), + prop_data.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), ), pallet_signature_bridge::Error::::ResourceDoesNotExist ); @@ -523,7 +533,7 @@ fn should_fail_to_verify_proposal_with_tampered_signature() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap() )); assert!(!>::contains_key(0)); let mut tampered_sig = sig.0.to_vec(); @@ -535,8 +545,8 @@ fn should_fail_to_verify_proposal_with_tampered_signature() { SignatureBridge::execute_proposal( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - prop_data, - tampered_sig.clone(), + prop_data.try_into().unwrap(), + tampered_sig.clone().try_into().unwrap(), ), pallet_signature_bridge::Error::::InvalidPermissions ); @@ -559,7 +569,10 @@ fn should_add_resource_sig_succeed_using_webb_proposals() { new_test_ext_for_set_resource_proposal_initialized(src_id.chain_id()).execute_with(|| { let curve = Curve::Bn254; let params = setup_params::(curve, 5, 3); - let _ = HasherPallet::force_set_parameters(RuntimeOrigin::root(), params.to_bytes()); + let _ = HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params.to_bytes().try_into().unwrap(), + ); let nonce = webb_proposals::Nonce::from(0x0001); let header = make_proposal_header(resource, SET_RESOURCE_FUNCTION_SIG, nonce); //create anchor @@ -576,14 +589,14 @@ fn should_add_resource_sig_succeed_using_webb_proposals() { // set the maintainer assert_ok!(SignatureBridge::force_set_maintainer( RuntimeOrigin::root(), - public_uncompressed.to_vec() + public_uncompressed.to_vec().try_into().unwrap(), )); assert_ok!(SignatureBridge::set_resource_with_signature( RuntimeOrigin::signed(RELAYER_A), src_id.chain_id(), - set_resource_proposal_bytes, - sig.0.to_vec(), + set_resource_proposal_bytes.try_into().unwrap(), + sig.0.to_vec().try_into().unwrap(), )); // the anchor-handler callback must have been called by bridge diff --git a/pallets/vanchor/src/benchmarking.rs b/pallets/vanchor/src/benchmarking.rs index de5451f87..51f63655c 100644 --- a/pallets/vanchor/src/benchmarking.rs +++ b/pallets/vanchor/src/benchmarking.rs @@ -83,12 +83,12 @@ where assert_ok!(>::force_set_parameters( RawOrigin::Root.into(), (2, 2), - vk_2_2_bytes.clone() + vk_2_2_bytes.clone().try_into().unwrap() )); assert_ok!(>::force_set_parameters( RawOrigin::Root.into(), (2, 16), - vk_2_16_bytes.clone() + vk_2_16_bytes.clone().try_into().unwrap() )); pk_2_2_bytes diff --git a/pallets/vanchor/src/mock.rs b/pallets/vanchor/src/mock.rs index 903ffd7ef..2530a0697 100644 --- a/pallets/vanchor/src/mock.rs +++ b/pallets/vanchor/src/mock.rs @@ -7,9 +7,10 @@ use sp_core::H256; use frame_support::{parameter_types, traits::Nothing, PalletId}; use frame_system as system; use orml_currencies::{BasicCurrencyAdapter, NativeCurrencyOf}; +use scale_info::TypeInfo; use sp_runtime::{ testing::Header, - traits::{BlakeTwo256, IdentityLookup}, + traits::{BlakeTwo256, ConstU32, IdentityLookup}, Permill, }; use sp_std::convert::{TryFrom, TryInto}; @@ -116,6 +117,7 @@ parameter_types! { impl pallet_vanchor_verifier::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLength = ConstU32<10000>; type Verifier = ArkworksVerifierBn254; type WeightInfo = (); } @@ -123,6 +125,7 @@ impl pallet_vanchor_verifier::Config for Test { impl pallet_hasher::Config for Test { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; + type MaxParameterLength = ConstU32<10000>; type Hasher = ArkworksPoseidonHasherBn254; type WeightInfo = (); } @@ -216,12 +219,18 @@ impl orml_currencies::Config for Test { type WeightInfo = (); } +parameter_types! { + #[derive(Copy, Clone, Debug, PartialEq, Eq, scale_info::TypeInfo)] + pub const MaxAssetIdInPool: u32 = 100; +} + impl pallet_asset_registry::Config for Test { type AssetId = AssetId; type AssetNativeLocation = (); type Balance = u128; type RuntimeEvent = RuntimeEvent; type NativeAssetId = NativeCurrencyId; + type MaxAssetIdInPool = MaxAssetIdInPool; type RegistryOrigin = frame_system::EnsureRoot; type StringLimit = RegistryStringLimit; type WeightInfo = (); @@ -303,6 +312,8 @@ impl pallet_vanchor::Config for Test { impl pallet_key_storage::Config for Test { type RuntimeEvent = RuntimeEvent; + type MaxPubkeyLength = ConstU32<1000>; + type MaxPubKeyOwners = ConstU32<1000>; type WeightInfo = (); } diff --git a/pallets/vanchor/src/tests.rs b/pallets/vanchor/src/tests.rs index a0e0e08d0..48dee7896 100644 --- a/pallets/vanchor/src/tests.rs +++ b/pallets/vanchor/src/tests.rs @@ -43,7 +43,10 @@ fn setup_environment() -> (Vec, Vec, Vec, Vec) { let curve = Curve::Bn254; let params3 = setup_params::(curve, 5, 3); // 1. Setup The Hasher Pallet. - assert_ok!(HasherPallet::force_set_parameters(RuntimeOrigin::root(), params3.to_bytes())); + assert_ok!(HasherPallet::force_set_parameters( + RuntimeOrigin::root(), + params3.to_bytes().try_into().unwrap() + )); // 2. Initialize MerkleTree pallet. >::on_initialize(1); // 3. Setup the VerifierPallet @@ -68,12 +71,12 @@ fn setup_environment() -> (Vec, Vec, Vec, Vec) { assert_ok!(VAnchorVerifier::force_set_parameters( RuntimeOrigin::root(), (2, 2), - vk_2_2_bytes.clone() + vk_2_2_bytes.clone().try_into().unwrap() )); assert_ok!(VAnchorVerifier::force_set_parameters( RuntimeOrigin::root(), (2, 16), - vk_2_16_bytes.clone() + vk_2_16_bytes.clone().try_into().unwrap() )); let transactor = account::("", TRANSACTOR_ACCOUNT_ID, SEED); @@ -395,8 +398,8 @@ fn should_complete_2x2_transaction_with_withdraw_unwrap_and_refund_native_token( // Register a new wrapped asset / pool share over native assets assert_ok!(AssetRegistry::register( RuntimeOrigin::root(), - b"webbWEBB".to_vec(), - AssetType::PoolShare(vec![0]), + b"webbWEBB".to_vec().try_into().unwrap(), + AssetType::PoolShare(vec![0].try_into().unwrap()), 0 )); let asset_id = AssetRegistry::next_asset_id() - 1; @@ -576,7 +579,7 @@ fn should_complete_2x2_transaction_with_withdraw_unwrap_and_refund_non_native_to // Register a new asset that will be wrapped assert_ok!(AssetRegistry::register( RuntimeOrigin::root(), - b"temp".to_vec(), + b"temp".to_vec().try_into().unwrap(), AssetType::Token, 0 )); @@ -584,8 +587,8 @@ fn should_complete_2x2_transaction_with_withdraw_unwrap_and_refund_non_native_to assert_ok!(Tokens::set_balance(RuntimeOrigin::root(), alice, first_asset_id, 10_000, 0)); assert_ok!(AssetRegistry::register( RuntimeOrigin::root(), - b"webbTemp".to_vec(), - AssetType::PoolShare(vec![first_asset_id]), + b"webbTemp".to_vec().try_into().unwrap(), + AssetType::PoolShare(vec![first_asset_id].try_into().unwrap()), 0 )); let pooled_asset_id = AssetRegistry::next_asset_id() - 1; diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 5212fe393..5764d5a1b 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -1108,7 +1108,7 @@ impl pallet_hasher::Config for Runtime { type RuntimeEvent = RuntimeEvent; type ForceOrigin = frame_system::EnsureRoot; type Hasher = ArkworksPoseidonHasherBn254; - type MaxParameterLength = ConstU32<1000>; + type MaxParameterLength = ConstU32<10000>; type WeightInfo = pallet_hasher::weights::WebbWeight; } From 1c098ee3316a159c24fab34255bc5d7d3c978396 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Thu, 12 Jan 2023 23:56:38 +0400 Subject: [PATCH 28/29] clippy fix --- pallets/asset-registry/src/mock.rs | 7 ++----- pallets/asset-registry/src/tests.rs | 6 +++--- pallets/relayer-registry/src/lib.rs | 2 ++ standalone/node/src/service.rs | 1 + standalone/runtime/src/lib.rs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs index 8a57a3514..e749a680f 100644 --- a/pallets/asset-registry/src/mock.rs +++ b/pallets/asset-registry/src/mock.rs @@ -85,13 +85,10 @@ impl system::Config for Test { use codec::{Decode, Encode}; #[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, codec::MaxEncodedLen)] +#[derive(Default)] pub struct AssetLocation(pub MultiLocation); -impl Default for AssetLocation { - fn default() -> Self { - AssetLocation(MultiLocation::default()) - } -} + parameter_types! { #[derive(Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] diff --git a/pallets/asset-registry/src/tests.rs b/pallets/asset-registry/src/tests.rs index 10f182faf..6689598c5 100644 --- a/pallets/asset-registry/src/tests.rs +++ b/pallets/asset-registry/src/tests.rs @@ -21,11 +21,11 @@ use crate::{ types::{AssetDetails, AssetMetadata, AssetType}, ShareTokenRegistry, }; -use codec::Encode; + use frame_support::{assert_noop, assert_ok, BoundedVec}; use polkadot_xcm::{ - opaque::latest::{Junctions, Parent}, - v1::{Junction::*, MultiLocation}, + opaque::latest::{Junctions}, + v1::{MultiLocation}, }; use sp_runtime::DispatchError; use sp_std::convert::TryInto; diff --git a/pallets/relayer-registry/src/lib.rs b/pallets/relayer-registry/src/lib.rs index 0aee69a79..640ac9da0 100644 --- a/pallets/relayer-registry/src/lib.rs +++ b/pallets/relayer-registry/src/lib.rs @@ -179,6 +179,7 @@ pub mod pallet { /// /// Emits `ResourceSet` if successful. #[pallet::weight(T::WeightInfo::set_resource())] + #[pallet::call_index(0)] pub fn set_resource( origin: OriginFor, resource_id: ResourceId, @@ -222,6 +223,7 @@ pub mod pallet { /// /// Emits `ResourceCleared` if successful. #[pallet::weight(T::WeightInfo::clear_resource())] + #[pallet::call_index(1)] pub fn clear_resource( origin: OriginFor, resource_id: ResourceId, diff --git a/standalone/node/src/service.rs b/standalone/node/src/service.rs index 381466868..00670cf24 100644 --- a/standalone/node/src/service.rs +++ b/standalone/node/src/service.rs @@ -17,6 +17,7 @@ // along with this program. If not, see . #![warn(unused_extern_crates)] +#![allow(clippy::type_complexity)] //! Service implementation. Specialized wrapper over substrate service. diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs index 5764d5a1b..6b2fe6ba6 100644 --- a/standalone/runtime/src/lib.rs +++ b/standalone/runtime/src/lib.rs @@ -78,7 +78,7 @@ use frame_support::{ KeyOwnerProofSystem, LockIdentifier, OnUnbalanced, U128CurrencyToVote, }, weights::{ - constants::{BlockExecutionWeight, ExtrinsicBaseWeight, WEIGHT_REF_TIME_PER_SECOND}, + constants::{BlockExecutionWeight, WEIGHT_REF_TIME_PER_SECOND}, IdentityFee, Weight, }, PalletId, RuntimeDebug, From 31a77ffbc404b3858df849fb7a39de0223636f44 Mon Sep 17 00:00:00 2001 From: 1xstj <106580853+1xstj@users.noreply.github.com> Date: Fri, 13 Jan 2023 00:09:15 +0400 Subject: [PATCH 29/29] add pallet indices, resolves #286 --- pallets/anonymity-mining/src/lib.rs | 1 + pallets/asset-registry/src/lib.rs | 6 ++++++ pallets/asset-registry/src/mock.rs | 5 +---- pallets/asset-registry/src/tests.rs | 5 +---- pallets/hasher/src/lib.rs | 1 + pallets/key-storage/src/lib.rs | 1 + pallets/linkable-tree/src/lib.rs | 1 + pallets/mixer/src/lib.rs | 3 +++ pallets/mt/src/lib.rs | 3 +++ pallets/signature-bridge/src/lib.rs | 7 +++++++ pallets/token-wrapper-handler/src/lib.rs | 5 +++++ pallets/token-wrapper/src/lib.rs | 5 +++++ pallets/vanchor-handler/src/lib.rs | 5 +++++ pallets/vanchor-verifier/src/lib.rs | 1 + pallets/vanchor/src/lib.rs | 5 +++++ pallets/verifier/src/lib.rs | 1 + pallets/xanchor/src/lib.rs | 11 +++++++++++ 17 files changed, 58 insertions(+), 8 deletions(-) diff --git a/pallets/anonymity-mining/src/lib.rs b/pallets/anonymity-mining/src/lib.rs index ab085e683..166288888 100644 --- a/pallets/anonymity-mining/src/lib.rs +++ b/pallets/anonymity-mining/src/lib.rs @@ -157,6 +157,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(0)] + #[pallet::call_index(0)] pub fn swap( origin: OriginFor, recipient: T::AccountId, diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs index e4db29505..5427e3a2b 100644 --- a/pallets/asset-registry/src/lib.rs +++ b/pallets/asset-registry/src/lib.rs @@ -268,6 +268,7 @@ pub mod pallet { /// /// Emits 'Registered` event when successful. #[pallet::weight(::WeightInfo::register())] + #[pallet::call_index(0)] #[transactional] pub fn register( origin: OriginFor, @@ -293,6 +294,7 @@ pub mod pallet { // TODO: No tests #[pallet::weight(::WeightInfo::update())] + #[pallet::call_index(1)] #[transactional] pub fn update( origin: OriginFor, @@ -337,6 +339,7 @@ pub mod pallet { /// /// Emits `MetadataSet` event when successful. #[pallet::weight(::WeightInfo::set_metadata())] + #[pallet::call_index(2)] #[transactional] pub fn set_metadata( origin: OriginFor, @@ -369,6 +372,7 @@ pub mod pallet { /// /// Emits `LocationSet` event when successful. #[pallet::weight(::WeightInfo::set_location())] + #[pallet::call_index(3)] #[transactional] pub fn set_location( origin: OriginFor, @@ -389,6 +393,7 @@ pub mod pallet { /// Add an asset to an existing pool. #[pallet::weight(0)] + #[pallet::call_index(4)] pub fn add_asset_to_pool( origin: OriginFor, pool: BoundedVec, @@ -405,6 +410,7 @@ pub mod pallet { /// Remove an asset from an existing pool. #[pallet::weight(0)] + #[pallet::call_index(5)] pub fn delete_asset_from_pool( origin: OriginFor, pool: BoundedVec, diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs index e749a680f..74e20e83b 100644 --- a/pallets/asset-registry/src/mock.rs +++ b/pallets/asset-registry/src/mock.rs @@ -84,12 +84,9 @@ impl system::Config for Test { use codec::{Decode, Encode}; -#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, codec::MaxEncodedLen)] -#[derive(Default)] +#[derive(Debug, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, codec::MaxEncodedLen, Default)] pub struct AssetLocation(pub MultiLocation); - - parameter_types! { #[derive(Copy, Clone, Debug, PartialEq, Eq, TypeInfo)] pub const MaxAssetIdInPool: u32 = 100; diff --git a/pallets/asset-registry/src/tests.rs b/pallets/asset-registry/src/tests.rs index 6689598c5..b564b7f4c 100644 --- a/pallets/asset-registry/src/tests.rs +++ b/pallets/asset-registry/src/tests.rs @@ -23,10 +23,7 @@ use crate::{ }; use frame_support::{assert_noop, assert_ok, BoundedVec}; -use polkadot_xcm::{ - opaque::latest::{Junctions}, - v1::{MultiLocation}, -}; +use polkadot_xcm::{opaque::latest::Junctions, v1::MultiLocation}; use sp_runtime::DispatchError; use sp_std::convert::TryInto; use webb_primitives::{AssetId, Balance}; diff --git a/pallets/hasher/src/lib.rs b/pallets/hasher/src/lib.rs index 060aeeb05..3d2b60b38 100644 --- a/pallets/hasher/src/lib.rs +++ b/pallets/hasher/src/lib.rs @@ -129,6 +129,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] + #[pallet::call_index(0)] pub fn force_set_parameters( origin: OriginFor, parameters: BoundedVec, diff --git a/pallets/key-storage/src/lib.rs b/pallets/key-storage/src/lib.rs index 27a796d66..d911c8987 100644 --- a/pallets/key-storage/src/lib.rs +++ b/pallets/key-storage/src/lib.rs @@ -114,6 +114,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(T::WeightInfo::register(public_key.len() as u32))] + #[pallet::call_index(0)] pub fn register( origin: OriginFor, owner: T::AccountId, diff --git a/pallets/linkable-tree/src/lib.rs b/pallets/linkable-tree/src/lib.rs index f6ba01707..650807c8f 100644 --- a/pallets/linkable-tree/src/lib.rs +++ b/pallets/linkable-tree/src/lib.rs @@ -216,6 +216,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(>::WeightInfo::create(*depth as u32, *max_edges))] + #[pallet::call_index(0)] pub fn create( origin: OriginFor, max_edges: u32, diff --git a/pallets/mixer/src/lib.rs b/pallets/mixer/src/lib.rs index 83cab253f..140f2c41e 100644 --- a/pallets/mixer/src/lib.rs +++ b/pallets/mixer/src/lib.rs @@ -228,6 +228,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(>::WeightInfo::create(*depth as u32))] + #[pallet::call_index(0)] pub fn create( origin: OriginFor, deposit_size: BalanceOf, @@ -243,6 +244,7 @@ pub mod pallet { #[transactional] #[pallet::weight(>::WeightInfo::deposit())] + #[pallet::call_index(1)] pub fn deposit( origin: OriginFor, tree_id: T::TreeId, @@ -256,6 +258,7 @@ pub mod pallet { #[transactional] #[pallet::weight(>::WeightInfo::withdraw())] + #[pallet::call_index(2)] pub fn withdraw( origin: OriginFor, id: T::TreeId, diff --git a/pallets/mt/src/lib.rs b/pallets/mt/src/lib.rs index 8538ae5c7..1f61d75f0 100644 --- a/pallets/mt/src/lib.rs +++ b/pallets/mt/src/lib.rs @@ -289,6 +289,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(T::WeightInfo::create(*depth as u32))] + #[pallet::call_index(0)] pub fn create(origin: OriginFor, depth: u8) -> DispatchResultWithPostInfo { let origin = ensure_signed(origin)?; ensure!(depth <= T::MaxTreeDepth::get() && depth > 0, Error::::InvalidTreeDepth); @@ -306,6 +307,7 @@ pub mod pallet { } #[pallet::weight(T::WeightInfo::insert())] + #[pallet::call_index(1)] pub fn insert( origin: OriginFor, tree_id: T::TreeId, @@ -329,6 +331,7 @@ pub mod pallet { } #[pallet::weight(T::WeightInfo::force_set_default_hashes(default_hashes.len() as u32))] + #[pallet::call_index(2)] pub fn force_set_default_hashes( origin: OriginFor, default_hashes: BoundedVec, diff --git a/pallets/signature-bridge/src/lib.rs b/pallets/signature-bridge/src/lib.rs index 90561fbd2..436bea0e4 100644 --- a/pallets/signature-bridge/src/lib.rs +++ b/pallets/signature-bridge/src/lib.rs @@ -249,6 +249,7 @@ pub mod pallet { impl, I: 'static> Pallet { /// Sets the maintainer. #[pallet::weight(T::WeightInfo::set_maintainer())] + #[pallet::call_index(0)] pub fn set_maintainer( origin: OriginFor, // message contains the nonce as the first 4 bytes and the laste bytes of the message @@ -291,6 +292,7 @@ pub mod pallet { // Forcefully set the maintainer. #[pallet::weight(T::WeightInfo::force_set_maintainer())] + #[pallet::call_index(1)] pub fn force_set_maintainer( origin: OriginFor, new_maintainer: BoundedVec, @@ -311,6 +313,7 @@ pub mod pallet { /// - O(1) write /// # #[pallet::weight(T::WeightInfo::set_resource())] + #[pallet::call_index(2)] pub fn set_resource(origin: OriginFor, id: ResourceId) -> DispatchResultWithPostInfo { Self::ensure_admin(origin)?; Self::register_resource(id) @@ -325,6 +328,7 @@ pub mod pallet { /// - O(1) removal /// # #[pallet::weight(T::WeightInfo::remove_resource())] + #[pallet::call_index(3)] pub fn remove_resource(origin: OriginFor, id: ResourceId) -> DispatchResultWithPostInfo { Self::ensure_admin(origin)?; Self::unregister_resource(id) @@ -336,6 +340,7 @@ pub mod pallet { /// - O(1) lookup and insert /// # #[pallet::weight(T::WeightInfo::whitelist_chain())] + #[pallet::call_index(4)] pub fn whitelist_chain(origin: OriginFor, id: T::ChainId) -> DispatchResultWithPostInfo { Self::ensure_admin(origin)?; Self::whitelist(id) @@ -364,6 +369,7 @@ pub mod pallet { /// - weight of proposed call, regardless of whether execution is performed /// # #[pallet::weight((T::WeightInfo::set_resource_with_signature(), Pays::Yes))] + #[pallet::call_index(5)] pub fn set_resource_with_signature( origin: OriginFor, src_id: T::ChainId, @@ -442,6 +448,7 @@ pub mod pallet { /// - weight of proposed call, regardless of whether execution is performed /// # #[pallet::weight((T::WeightInfo::execute_proposal() , Pays::Yes))] + #[pallet::call_index(6)] pub fn execute_proposal( origin: OriginFor, src_id: T::ChainId, diff --git a/pallets/token-wrapper-handler/src/lib.rs b/pallets/token-wrapper-handler/src/lib.rs index db3642a58..4ed6e8140 100644 --- a/pallets/token-wrapper-handler/src/lib.rs +++ b/pallets/token-wrapper-handler/src/lib.rs @@ -106,6 +106,7 @@ pub mod pallet { /// Execute the wrapping fee proposal by calling the update_wrapping_fee /// method. Ensures that only the bridge can call this function. #[pallet::weight(195_000_000)] + #[pallet::call_index(0)] pub fn execute_wrapping_fee_proposal( origin: OriginFor, wrapping_fee_percent: BalanceOf, @@ -119,6 +120,7 @@ pub mod pallet { } #[pallet::weight(195_000_000)] + #[pallet::call_index(1)] pub fn execute_add_token_to_pool_share( origin: OriginFor, name: Vec, @@ -132,6 +134,7 @@ pub mod pallet { } #[pallet::weight(195_000_000)] + #[pallet::call_index(2)] pub fn execute_remove_token_from_pool_share( origin: OriginFor, name: Vec, @@ -147,6 +150,7 @@ pub mod pallet { /// who will be receiving wrapping fee cost for given asset. /// Ensures that only the bridge can call this function. #[pallet::weight(195_000_000)] + #[pallet::call_index(3)] pub fn execute_set_fee_recipient_proposal( origin: OriginFor, pool_share_id: T::AssetId, @@ -162,6 +166,7 @@ pub mod pallet { /// fee recipient to given recipient address from given asset. /// Ensures that only the bridge can call this function. #[pallet::weight(195_000_000)] + #[pallet::call_index(4)] pub fn execute_rescue_tokens_proposal( origin: OriginFor, pool_share_id: T::AssetId, diff --git a/pallets/token-wrapper/src/lib.rs b/pallets/token-wrapper/src/lib.rs index 7afb23e7a..83fa91b1e 100644 --- a/pallets/token-wrapper/src/lib.rs +++ b/pallets/token-wrapper/src/lib.rs @@ -209,6 +209,7 @@ pub mod pallet { #[pallet::call] impl Pallet { #[pallet::weight(::WeightInfo::set_wrapping_fee())] + #[pallet::call_index(0)] pub fn set_wrapping_fee( origin: OriginFor, fee: BalanceOf, @@ -226,6 +227,7 @@ pub mod pallet { } #[pallet::weight(195_000_000)] + #[pallet::call_index(1)] pub fn set_fee_recipient( origin: OriginFor, pool_share_id: T::AssetId, @@ -243,6 +245,7 @@ pub mod pallet { } #[pallet::weight(::WeightInfo::wrap())] + #[pallet::call_index(2)] pub fn wrap( origin: OriginFor, from_asset_id: T::AssetId, @@ -262,6 +265,7 @@ pub mod pallet { } #[pallet::weight(::WeightInfo::unwrap())] + #[pallet::call_index(3)] pub fn unwrap( origin: OriginFor, from_pool_share_id: T::AssetId, @@ -281,6 +285,7 @@ pub mod pallet { } #[pallet::weight(195_000_000)] + #[pallet::call_index(4)] pub fn rescue_tokens( origin: OriginFor, from_pool_share_id: T::AssetId, diff --git a/pallets/vanchor-handler/src/lib.rs b/pallets/vanchor-handler/src/lib.rs index 1f1cf5809..9bbefbbf5 100644 --- a/pallets/vanchor-handler/src/lib.rs +++ b/pallets/vanchor-handler/src/lib.rs @@ -126,6 +126,7 @@ pub mod pallet { /// This will be called by bridge when proposal to create a /// vanchor has been successfully voted on. #[pallet::weight(195_000_000)] + #[pallet::call_index(0)] pub fn execute_vanchor_create_proposal( origin: OriginFor, src_chain_id: T::ChainId, @@ -142,6 +143,7 @@ pub mod pallet { /// This will be called by bridge when proposal to add/update edge of a /// vanchor has been successfully voted on. #[pallet::weight(195_000_000)] + #[pallet::call_index(1)] pub fn execute_vanchor_update_proposal( origin: OriginFor, r_id: ResourceId, @@ -163,6 +165,7 @@ pub mod pallet { /// This will by called by bridge when proposal to set new resource for /// handler has been successfully voted on. #[pallet::weight(195_000_000)] + #[pallet::call_index(2)] pub fn execute_set_resource_proposal( origin: OriginFor, r_id: ResourceId, @@ -179,6 +182,7 @@ pub mod pallet { /// The `MaxDepositLimitProposal` updates the maximum deposit amount allowed on the variable /// anchor system. #[pallet::weight(195_000_000)] + #[pallet::call_index(3)] pub fn execute_set_max_deposit_limit_proposal( origin: OriginFor, max_deposit_limit: VAnchorBalanceOf, @@ -193,6 +197,7 @@ pub mod pallet { /// The `MinWithdrawalLimitProposal` updates the minimum withdrawal amount allowed on the /// variable anchor system. #[pallet::weight(195_000_000)] + #[pallet::call_index(4)] pub fn execute_set_minx_withdrawal_limit_proposal( origin: OriginFor, min_withdraw_limit: VAnchorBalanceOf, diff --git a/pallets/vanchor-verifier/src/lib.rs b/pallets/vanchor-verifier/src/lib.rs index 2ecd2eb81..7e9c58d97 100644 --- a/pallets/vanchor-verifier/src/lib.rs +++ b/pallets/vanchor-verifier/src/lib.rs @@ -159,6 +159,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] + #[pallet::call_index(0)] pub fn force_set_parameters( origin: OriginFor, configuration: (u8, u8), diff --git a/pallets/vanchor/src/lib.rs b/pallets/vanchor/src/lib.rs index fa8b82c61..ca3b8b65d 100644 --- a/pallets/vanchor/src/lib.rs +++ b/pallets/vanchor/src/lib.rs @@ -323,6 +323,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(>::WeightInfo::create(*depth as u32))] + #[pallet::call_index(0)] pub fn create( origin: OriginFor, max_edges: u32, @@ -343,6 +344,7 @@ pub mod pallet { #[transactional] #[pallet::weight(>::WeightInfo::transact())] + #[pallet::call_index(1)] pub fn transact( origin: OriginFor, id: T::TreeId, @@ -356,6 +358,7 @@ pub mod pallet { #[transactional] #[pallet::weight(>::WeightInfo::register_and_transact())] + #[pallet::call_index(2)] pub fn register_and_transact( origin: OriginFor, owner: T::AccountId, @@ -372,6 +375,7 @@ pub mod pallet { } #[pallet::weight(>::WeightInfo::set_max_deposit_amount())] + #[pallet::call_index(3)] pub fn set_max_deposit_amount( origin: OriginFor, max_deposit_amount: BalanceOf, @@ -383,6 +387,7 @@ pub mod pallet { } #[pallet::weight(>::WeightInfo::set_min_withdraw_amount())] + #[pallet::call_index(4)] pub fn set_min_withdraw_amount( origin: OriginFor, min_withdraw_amount: BalanceOf, diff --git a/pallets/verifier/src/lib.rs b/pallets/verifier/src/lib.rs index 37ba57c3c..64a78c7dc 100644 --- a/pallets/verifier/src/lib.rs +++ b/pallets/verifier/src/lib.rs @@ -148,6 +148,7 @@ pub mod pallet { #[pallet::call] impl, I: 'static> Pallet { #[pallet::weight(T::WeightInfo::force_set_parameters(parameters.len() as u32))] + #[pallet::call_index(0)] pub fn force_set_parameters( origin: OriginFor, parameters: BoundedVec, diff --git a/pallets/xanchor/src/lib.rs b/pallets/xanchor/src/lib.rs index 0942228db..fb89d34e7 100644 --- a/pallets/xanchor/src/lib.rs +++ b/pallets/xanchor/src/lib.rs @@ -223,6 +223,7 @@ pub mod pallet { /// /// TODO: Add a bond (a payment that gets locked up) when calling this xt. #[pallet::weight(0)] + #[pallet::call_index(0)] pub fn propose_to_link_anchor( origin: OriginFor, payload: LinkProposalOf, @@ -274,6 +275,7 @@ pub mod pallet { /// **Note**: This method requires the `origin` to be /// [T::DemocracyOrigin]. #[pallet::weight(0)] + #[pallet::call_index(1)] pub fn send_link_anchor_message( origin: OriginFor, payload: LinkProposalOf, @@ -318,6 +320,7 @@ pub mod pallet { /// parachain. #[transactional] #[pallet::weight(0)] + #[pallet::call_index(2)] pub fn save_link_proposal( origin: OriginFor, payload: LinkProposalOf, @@ -354,6 +357,7 @@ pub mod pallet { /// It also signals back to the caller chain with the proposal /// hash, so the caller chain knows that the link process is complete. #[pallet::weight(0)] + #[pallet::call_index(2)] pub fn handle_link_anchor_message( origin: OriginFor, payload: LinkProposalOf, @@ -384,6 +388,7 @@ pub mod pallet { /// **Note**: This method requires the `origin` to be the democracy. #[pallet::weight(0)] + #[pallet::call_index(3)] pub fn link_anchors( origin: OriginFor, payload: LinkProposalOf, @@ -427,6 +432,7 @@ pub mod pallet { /// Handles the signal back from the other parachain, if the link /// process is there is done to complete the link process here too. #[pallet::weight(0)] + #[pallet::call_index(4)] pub fn handle_link_anchors( origin: OriginFor, payload: LinkProposalOf, @@ -466,6 +472,7 @@ pub mod pallet { /// /// **Note**: Only could be called by [T::DemocracyOrigin]. #[pallet::weight(0)] + #[pallet::call_index(5)] pub fn register_resource_id( origin: OriginFor, r_id: ResourceId, @@ -479,6 +486,7 @@ pub mod pallet { /// A Forced version of [Self::register_resource_id] which can be only /// called by the Root. #[pallet::weight(0)] + #[pallet::call_index(6)] pub fn force_register_resource_id( origin: OriginFor, r_id: ResourceId, @@ -490,6 +498,7 @@ pub mod pallet { } #[pallet::weight(0)] + #[pallet::call_index(7)] pub fn update( origin: OriginFor, anchor_update_proposal_bytes: Vec, @@ -536,6 +545,7 @@ pub mod pallet { } #[pallet::weight(0)] + #[pallet::call_index(8)] pub fn force_update( origin: OriginFor, r_id: ResourceId, @@ -553,6 +563,7 @@ pub mod pallet { /// Sync All the Anchors in this chain to the other chains that are /// already linked. #[pallet::weight(0)] + #[pallet::call_index(9)] pub fn sync_anchors(origin: OriginFor) -> DispatchResultWithPostInfo { ensure_signed(origin)?; let vanchors = pallet_vanchor::Anchors::::iter_keys();