diff --git a/.github/workflows/staking-miner-playground.yml b/.github/workflows/staking-miner-playground.yml index 8b5886d31..a2638995e 100644 --- a/.github/workflows/staking-miner-playground.yml +++ b/.github/workflows/staking-miner-playground.yml @@ -44,4 +44,4 @@ jobs: - name: Check staking-miner-playground run: | ${{ env.RUST_INFO }} - cargo check --manifest-path staking-miner-playground/Cargo.toml + SKIP_WASM_BUILD=1 cargo check --manifest-path staking-miner-playground/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 21202a68b..ffa898177 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1555,12 +1555,12 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "34.0.0" +version = "35.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130b79108bca3d8850e850c276f1012058593d6a2a8774132e72766245bbcacc" +checksum = "ad6366773db71a556710652c0560300dc938252e009d4d2c1eb9d6e5b38e0860" dependencies = [ - "frame-support 34.0.0", - "frame-support-procedural 29.0.1", + "frame-support", + "frame-support-procedural", "frame-system", "linregress", "log", @@ -1568,12 +1568,12 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api 32.0.0", - "sp-application-crypto 36.0.0", - "sp-core 33.0.1", - "sp-io 36.0.0", - "sp-runtime 37.0.0", - "sp-runtime-interface 27.0.0", + "sp-api", + "sp-application-crypto 37.0.0", + "sp-core 34.0.0", + "sp-io 37.0.0", + "sp-runtime 38.0.0", + "sp-runtime-interface 28.0.0", "sp-std", "sp-storage 21.0.0", "static_assertions", @@ -1581,9 +1581,9 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c3bff645e46577c69c272733c53fa3a77d1ee6e40dfb66157bc94b0740b8fc" +checksum = "1388eb632484a1208a5b51d7d822a7df995f37bb10878b2a88f4ec89cbe5e6b2" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -1593,19 +1593,19 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "34.0.0" +version = "35.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e498d8b21ba927024302645e0f4d0d0136c9620808d8425bb309fb8a92d3ff" +checksum = "b3c089c16a066dfb5042cadc27c01738d93258e8f5f7ef7a83b4c8661616d1ac" dependencies = [ "frame-election-provider-solution-type", - "frame-support 34.0.0", + "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-arithmetic 26.0.0", - "sp-core 33.0.1", + "sp-core 34.0.0", "sp-npos-elections", - "sp-runtime 37.0.0", + "sp-runtime 38.0.0", "sp-std", ] @@ -1632,48 +1632,6 @@ dependencies = [ "serde", ] -[[package]] -name = "frame-support" -version = "34.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c177377726d7bb598dd942e38168c1eb6872d53810a6bf810f0a428f9a46be8" -dependencies = [ - "aquamarine", - "array-bytes", - "bitflags 1.3.2", - "docify", - "environmental", - "frame-metadata 16.0.0", - "frame-support-procedural 29.0.1", - "impl-trait-for-tuples", - "k256", - "log", - "macro_magic", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "serde_json", - "smallvec", - "sp-api 32.0.0", - "sp-arithmetic 26.0.0", - "sp-core 33.0.1", - "sp-crypto-hashing-proc-macro", - "sp-debug-derive", - "sp-genesis-builder 0.13.0", - "sp-inherents 32.0.0", - "sp-io 36.0.0", - "sp-metadata-ir", - "sp-runtime 37.0.0", - "sp-staking 32.0.0", - "sp-state-machine 0.41.0", - "sp-std", - "sp-tracing 17.0.0", - "sp-weights 31.0.0", - "static_assertions", - "tt-call", -] - [[package]] name = "frame-support" version = "35.0.0" @@ -1686,7 +1644,7 @@ dependencies = [ "docify", "environmental", "frame-metadata 16.0.0", - "frame-support-procedural 30.0.0", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -1697,17 +1655,17 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api 33.0.0", + "sp-api", "sp-arithmetic 26.0.0", "sp-core 34.0.0", "sp-crypto-hashing-proc-macro", "sp-debug-derive", - "sp-genesis-builder 0.14.0", - "sp-inherents 33.0.0", + "sp-genesis-builder", + "sp-inherents", "sp-io 37.0.0", "sp-metadata-ir", "sp-runtime 38.0.0", - "sp-staking 33.0.0", + "sp-staking", "sp-state-machine 0.42.0", "sp-std", "sp-tracing 17.0.0", @@ -1716,26 +1674,6 @@ dependencies = [ "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "29.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f822826825d810d0e096e70493cbc1032ff3ccf1324d861040865635112b6aa" -dependencies = [ - "Inflector", - "cfg-expr", - "derive-syn-parse 0.2.0", - "expander", - "frame-support-procedural-tools 12.0.0", - "itertools 0.11.0", - "macro_magic", - "proc-macro-warning", - "proc-macro2", - "quote", - "sp-crypto-hashing", - "syn 2.0.58", -] - [[package]] name = "frame-support-procedural" version = "30.0.0" @@ -1746,7 +1684,7 @@ dependencies = [ "cfg-expr", "derive-syn-parse 0.2.0", "expander", - "frame-support-procedural-tools 13.0.0", + "frame-support-procedural-tools", "itertools 0.11.0", "macro_magic", "proc-macro-warning", @@ -1756,19 +1694,6 @@ dependencies = [ "syn 2.0.58", ] -[[package]] -name = "frame-support-procedural-tools" -version = "12.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b5cc8526c9aad01cdf46dcee6cbefd6f6c78e022607ff4cf76094919b6462" -dependencies = [ - "frame-support-procedural-tools-derive", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "frame-support-procedural-tools" version = "13.0.0" @@ -1795,22 +1720,22 @@ dependencies = [ [[package]] name = "frame-system" -version = "34.0.1" +version = "35.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85777d5cb78d8f244aa4e92a06d13c234f7980dd7095b1baeefc23a5945cad6c" +checksum = "6baa2218d90c5a23db08dd0188cfe6aa0af7d36fb9b0fc2f73bc5c4abe4dd812" dependencies = [ "cfg-if", "docify", - "frame-support 34.0.0", + "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 33.0.1", - "sp-io 36.0.0", - "sp-runtime 37.0.0", + "sp-core 34.0.0", + "sp-io 37.0.0", + "sp-runtime 38.0.0", "sp-std", - "sp-version 35.0.0", + "sp-version", "sp-weights 31.0.0", ] @@ -2959,13 +2884,13 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-election-provider-multi-phase" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbfdd85dd5d5979067a47d4148f529da937ee017a846e98d4778764b3acfe43" +checksum = "f9cae34d714e3410bcdd932ce0dc927997125e1eaa083dacdeb700439f22b67b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", - "frame-support 34.0.0", + "frame-support", "frame-system", "log", "pallet-election-provider-support-benchmarking", @@ -2973,26 +2898,26 @@ dependencies = [ "rand", "scale-info", "sp-arithmetic 26.0.0", - "sp-core 33.0.1", - "sp-io 36.0.0", + "sp-core 34.0.0", + "sp-io 37.0.0", "sp-npos-elections", - "sp-runtime 37.0.0", + "sp-runtime 38.0.0", "sp-std", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "33.0.0" +version = "34.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef65188f4db678f5b5098d74f67e35ea5a1c2eac3c57e628e8371bf013e5f7ff" +checksum = "a5153f459dd839fceb81e1d1df9413cc55f83b55fa110485fdb05f442015fb57" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-system", "parity-scale-codec", "sp-npos-elections", - "sp-runtime 37.0.0", + "sp-runtime 38.0.0", "sp-std", ] @@ -3171,7 +3096,7 @@ dependencies = [ "assert_cmd", "clap", "frame-election-provider-support", - "frame-support 35.0.0", + "frame-support", "futures", "hyper", "jsonrpsee", @@ -4377,29 +4302,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "sp-api" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84f09c4b928e814e07dede0ece91f1f6eae1bff946a0e5e4a76bed19a095f1" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro 19.0.0", - "sp-core 33.0.1", - "sp-externalities 0.28.0", - "sp-metadata-ir", - "sp-runtime 37.0.0", - "sp-runtime-interface 27.0.0", - "sp-state-machine 0.41.0", - "sp-std", - "sp-trie 35.0.0", - "sp-version 35.0.0", - "thiserror", -] - [[package]] name = "sp-api" version = "33.0.0" @@ -4410,7 +4312,7 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro 20.0.0", + "sp-api-proc-macro", "sp-core 34.0.0", "sp-externalities 0.29.0", "sp-metadata-ir", @@ -4419,25 +4321,10 @@ dependencies = [ "sp-state-machine 0.42.0", "sp-std", "sp-trie 36.0.0", - "sp-version 36.0.0", + "sp-version", "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "19.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213a4bec1b18bd0750e7b81d11d8276c24f68b53cde83950b00b178ecc9ab24a" -dependencies = [ - "Inflector", - "blake2", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - [[package]] name = "sp-api-proc-macro" version = "20.0.0" @@ -4467,20 +4354,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-application-crypto" -version = "36.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "296282f718f15d4d812664415942665302a484d3495cf8d2e2ab3192b32d2c73" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 33.0.1", - "sp-io 36.0.0", - "sp-std", -] - [[package]] name = "sp-application-crypto" version = "37.0.0" @@ -4573,53 +4446,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core" -version = "33.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3368e32f6fda6e20b8af51f94308d033ab70a021e87f6abbd3fed5aca942b745" -dependencies = [ - "array-bytes", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58", - "dyn-clonable", - "ed25519-zebra 4.0.3", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.11.0", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot", - "paste", - "primitive-types", - "rand", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-crypto-hashing", - "sp-debug-derive", - "sp-externalities 0.28.0", - "sp-runtime-interface 27.0.0", - "sp-std", - "sp-storage 21.0.0", - "ss58-registry", - "substrate-bip39 0.6.0", - "thiserror", - "tracing", - "w3f-bls", - "zeroize", -] - [[package]] name = "sp-core" version = "34.0.0" @@ -4715,17 +4541,6 @@ dependencies = [ "sp-storage 20.0.0", ] -[[package]] -name = "sp-externalities" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33abaec4be69b1613796bbf430decbbcaaf978756379e2016e683a4d6379cd02" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 21.0.0", -] - [[package]] name = "sp-externalities" version = "0.29.0" @@ -4737,19 +4552,6 @@ dependencies = [ "sp-storage 21.0.0", ] -[[package]] -name = "sp-genesis-builder" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb26e3653f6a2feac2bcb2749b5fb080e4211b882cafbdba86e4304c03c72c8" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde_json", - "sp-api 32.0.0", - "sp-runtime 37.0.0", -] - [[package]] name = "sp-genesis-builder" version = "0.14.0" @@ -4759,24 +4561,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde_json", - "sp-api 33.0.0", + "sp-api", "sp-runtime 38.0.0", ] -[[package]] -name = "sp-inherents" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6766db70e0c371d43bfbf7a8950d2cb10cff6b76c8a2c5bd1336e7566b46a0cf" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "sp-runtime 37.0.0", - "thiserror", -] - [[package]] name = "sp-inherents" version = "33.0.0" @@ -4818,33 +4606,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "sp-io" -version = "36.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a31ce27358b73656a09b4933f09a700019d63afa15ede966f7c9893c1d4db5" -dependencies = [ - "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "rustversion", - "secp256k1", - "sp-core 33.0.1", - "sp-crypto-hashing", - "sp-externalities 0.28.0", - "sp-keystore 0.39.0", - "sp-runtime-interface 27.0.0", - "sp-state-machine 0.41.0", - "sp-std", - "sp-tracing 17.0.0", - "sp-trie 35.0.0", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "37.0.0" @@ -4884,18 +4645,6 @@ dependencies = [ "sp-externalities 0.27.0", ] -[[package]] -name = "sp-keystore" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a909528663a80829b95d582a20dd4c9acd6e575650dee2bcaf56f4740b305e" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 33.0.1", - "sp-externalities 0.28.0", -] - [[package]] name = "sp-keystore" version = "0.40.0" @@ -4921,16 +4670,16 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "32.0.0" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643b08058800b3a1bd0ad7155291e75e14c936974837c074ae3cfdc5d1fa294e" +checksum = "0b0c51a7b60cd663f2661e6949069eb316b092f22c239691d5272a4d0cfca0fb" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-arithmetic 26.0.0", - "sp-core 33.0.1", - "sp-runtime 37.0.0", + "sp-core 34.0.0", + "sp-runtime 38.0.0", ] [[package]] @@ -4969,32 +4718,6 @@ dependencies = [ "sp-weights 30.0.0", ] -[[package]] -name = "sp-runtime" -version = "37.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c2a6148bf0ba74999ecfea9b4c1ade544f0663e0baba19630bb7761b2142b19" -dependencies = [ - "docify", - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "num-traits", - "parity-scale-codec", - "paste", - "rand", - "scale-info", - "serde", - "simple-mermaid", - "sp-application-crypto 36.0.0", - "sp-arithmetic 26.0.0", - "sp-core 33.0.1", - "sp-io 36.0.0", - "sp-std", - "sp-weights 31.0.0", -] - [[package]] name = "sp-runtime" version = "38.0.0" @@ -5041,26 +4764,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "sp-runtime-interface" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647db5e1dc481686628b41554e832df6ab400c4b43a6a54e54d3b0a71ca404aa" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "primitive-types", - "sp-externalities 0.28.0", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.0", - "sp-wasm-interface 21.0.0", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "28.0.0" @@ -5095,20 +4798,6 @@ dependencies = [ "syn 2.0.58", ] -[[package]] -name = "sp-staking" -version = "32.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817c02b55a84c0fac32fdd8b3f0b959888bad0726009ed62433f4046f4b4b752" -dependencies = [ - "impl-trait-for-tuples", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 33.0.1", - "sp-runtime 37.0.0", -] - [[package]] name = "sp-staking" version = "33.0.0" @@ -5145,27 +4834,6 @@ dependencies = [ "trie-db 0.28.0", ] -[[package]] -name = "sp-state-machine" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6ac196ea92c4d0613c071e1a050765dbfa30107a990224a4aba02c7dbcd063" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand", - "smallvec", - "sp-core 33.0.1", - "sp-externalities 0.28.0", - "sp-panic-handler", - "sp-trie 35.0.0", - "thiserror", - "tracing", - "trie-db 0.29.1", -] - [[package]] name = "sp-state-machine" version = "0.42.0" @@ -5270,30 +4938,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-trie" -version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61ab0c3e003f457203702e4753aa5fe9e762380543fada44650b1217e4aa5a5" -dependencies = [ - "ahash 0.8.11", - "hash-db", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "rand", - "scale-info", - "schnellru", - "sp-core 33.0.1", - "sp-externalities 0.28.0", - "thiserror", - "tracing", - "trie-db 0.29.1", - "trie-root", -] - [[package]] name = "sp-trie" version = "36.0.0" @@ -5318,24 +4962,6 @@ dependencies = [ "trie-root", ] -[[package]] -name = "sp-version" -version = "35.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff74bf12b4f7d29387eb1caeec5553209a505f90a2511d2831143b970f89659" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-crypto-hashing-proc-macro", - "sp-runtime 37.0.0", - "sp-std", - "sp-version-proc-macro", - "thiserror", -] - [[package]] name = "sp-version" version = "36.0.0" diff --git a/Cargo.toml b/Cargo.toml index 33aa5eb57..67907ed3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,9 +28,9 @@ scale-value = "0.16.0" subxt = { version = "0.37.0", features = ["substrate-compat"] } # polkadot-sdk -frame-election-provider-support = "34.0.0" -pallet-election-provider-multi-phase = "33.0.0" -sp-npos-elections = "32.0.0" +frame-election-provider-support = "35.0.0" +pallet-election-provider-multi-phase = "34.0.0" +sp-npos-elections = "33.0.0" frame-support = "35.0.0" sp-runtime = "38.0.0"