From aacf5a4edc5c61329aa5e79773967e0f6f0b24e3 Mon Sep 17 00:00:00 2001 From: Keith Date: Tue, 8 Oct 2024 14:49:08 +0800 Subject: [PATCH] Upgrade `polkadot-sdk` to stable2409 (#1504) * Upgrade Polkadot to v1.16.0 * cargo fmt * Remove duplicated attribute * Fix clippy * Update to polkadot-stable2409 * Use branch instead of tag --- Cargo.lock | 560 +++++++++---------- Cargo.toml | 145 ++--- client/cli/src/frontier_db_cmd/tests.rs | 6 +- client/cli/src/frontier_db_cmd/utils.rs | 4 - client/consensus/src/lib.rs | 5 +- client/db/src/kv/upgrade.rs | 2 +- client/mapping-sync/src/kv/worker.rs | 4 +- client/mapping-sync/src/sql/mod.rs | 20 +- client/rpc/src/eth/client.rs | 3 +- client/rpc/src/eth_pubsub.rs | 37 +- client/rpc/src/lib.rs | 10 +- frame/evm/precompile/bls12377/Cargo.toml | 1 + frame/evm/precompile/dispatch/src/tests.rs | 3 - frame/evm/src/benchmarking.rs | 3 - frame/evm/src/tests.rs | 3 - frame/hotfix-sufficients/src/benchmarking.rs | 3 - precompiles/macro/src/precompile/attr.rs | 4 +- rust-toolchain.toml | 2 +- template/node/Cargo.toml | 1 - template/node/src/rpc/mod.rs | 6 +- template/node/src/service.rs | 28 +- 21 files changed, 418 insertions(+), 432 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 28fc2639b2..337a4ce174 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,11 +23,11 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.27.3", + "gimli 0.28.1", ] [[package]] @@ -149,15 +149,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.11" @@ -589,16 +580,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ - "addr2line 0.20.0", + "addr2line 0.21.0", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.31.1", + "object 0.32.2", "rustc-demangle", ] @@ -647,15 +638,6 @@ dependencies = [ "serde", ] -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" -dependencies = [ - "serde", -] - [[package]] name = "bincode" version = "1.3.3" @@ -681,7 +663,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.65", ] @@ -749,13 +731,13 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.2.6", + "constant_time_eq 0.3.0", ] [[package]] @@ -820,9 +802,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] @@ -944,9 +926,9 @@ checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c" [[package]] name = "cc" -version = "1.0.82" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" dependencies = [ "jobserver", "libc", @@ -1859,7 +1841,7 @@ dependencies = [ "regex", "syn 2.0.65", "termcolor", - "toml 0.8.10", + "toml 0.8.12", "walkdir", ] @@ -2588,7 +2570,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", ] @@ -2716,8 +2698,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "frame-support-procedural", @@ -2740,8 +2722,8 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "42.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "43.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "Inflector", "array-bytes", @@ -2790,8 +2772,8 @@ dependencies = [ [[package]] name = "frame-executive" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "aquamarine", "frame-support", @@ -2820,8 +2802,8 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.5.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.6.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "docify", @@ -2835,8 +2817,8 @@ dependencies = [ [[package]] name = "frame-support" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "aquamarine", "array-bytes", @@ -2876,12 +2858,13 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "30.0.2" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "30.0.3" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", + "docify", "expander", "frame-support-procedural-tools", "itertools 0.11.0", @@ -2896,7 +2879,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -2908,7 +2891,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "12.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "proc-macro2", "quote", @@ -2917,8 +2900,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "cfg-if", "docify", @@ -2937,8 +2920,8 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-benchmarking", "frame-support", @@ -2952,7 +2935,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "parity-scale-codec", @@ -2961,8 +2944,8 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "parity-scale-codec", @@ -3014,7 +2997,6 @@ dependencies = [ "sc-network-sync", "sc-offchain", "sc-rpc", - "sc-rpc-api", "sc-service", "sc-telemetry", "sc-transaction-pool", @@ -3526,9 +3508,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -4022,9 +4004,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.23.2" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" +checksum = "8fd1ead9fb95614e8dc5556d12a8681c2f6d352d0c1d3efc8708c7ccbba47bc6" dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", @@ -4036,13 +4018,11 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.23.2" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" +checksum = "ff79651479f69ada7bda604ef2acf3f1aa50755d97cc36d25ff04c2664f9d96f" dependencies = [ - "anyhow", "async-trait", - "beef", "bytes", "futures-util", "http 1.1.0", @@ -4051,7 +4031,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot 0.12.3", "rand", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "thiserror", @@ -4061,9 +4041,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.23.2" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" +checksum = "a0d4c6bec4909c966f59f52db3655c0e9d4685faae8b49185973d9d7389bb884" dependencies = [ "heck 0.5.0", "proc-macro-crate 3.1.0", @@ -4074,11 +4054,10 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.23.2" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" +checksum = "ebe2198e5fd96cf2153ecc123364f699b6e2151317ea09c7bf799c43c2fe1415" dependencies = [ - "anyhow", "futures-util", "http 1.1.0", "http-body 1.0.1", @@ -4102,11 +4081,10 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.23.2" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" +checksum = "531e386460425e49679587871a056f2895a47dade21457324ad1262cd78ef6d9" dependencies = [ - "beef", "http 1.1.0", "serde", "serde_json", @@ -4342,11 +4320,11 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "ed25519-dalek", "hkdf", "multihash 0.19.1", @@ -5646,15 +5624,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - [[package]] name = "object" version = "0.32.2" @@ -5768,8 +5737,8 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-aura" -version = "36.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "frame-system", @@ -5784,8 +5753,8 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "frame-system", @@ -5797,8 +5766,8 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-benchmarking", "frame-support", @@ -5820,8 +5789,8 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "frame-benchmarking", @@ -5946,6 +5915,7 @@ dependencies = [ "ark-std", "fp-evm", "pallet-evm-test-vector-support", + "paste", ] [[package]] @@ -6078,8 +6048,8 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-benchmarking", "frame-support", @@ -6115,8 +6085,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "frame-system", @@ -6136,8 +6106,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "frame-benchmarking", @@ -6151,8 +6121,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "36.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "37.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "frame-benchmarking", @@ -6170,8 +6140,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-support", "frame-system", @@ -6185,8 +6155,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "40.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "41.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6201,8 +6171,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6213,8 +6183,8 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-benchmarking", "frame-support", @@ -6366,9 +6336,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -7088,7 +7058,7 @@ dependencies = [ "pin-project-lite", "quinn-proto 0.9.5", "quinn-udp 0.3.2", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.20.8", "thiserror", "tokio", @@ -7107,7 +7077,7 @@ dependencies = [ "pin-project-lite", "quinn-proto 0.10.6", "quinn-udp 0.4.1", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.21.7", "thiserror", "tokio", @@ -7123,7 +7093,7 @@ dependencies = [ "bytes", "rand", "ring 0.16.20", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.20.8", "slab", "thiserror", @@ -7141,7 +7111,7 @@ dependencies = [ "bytes", "rand", "ring 0.16.20", - "rustc-hash", + "rustc-hash 1.1.0", "rustls 0.21.7", "slab", "thiserror", @@ -7177,9 +7147,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -7328,18 +7298,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ef7e18e8841942ddb1cf845054f8008410030a3997875d9e49b7a363063df1" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfaf0c85b766276c797f3791f5bc6d5bd116b41d53049af2789666b0c0bc9fa" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", @@ -7366,7 +7336,7 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6" dependencies = [ "hashbrown 0.13.2", "log", - "rustc-hash", + "rustc-hash 1.1.0", "slice-group-by", "smallvec", ] @@ -7559,6 +7529,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" @@ -7666,9 +7642,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rw-stream-sink" @@ -7708,7 +7684,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "log", "sp-core", @@ -7718,8 +7694,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "futures", "futures-timer", @@ -7741,7 +7717,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.42.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "sp-api", @@ -7755,8 +7731,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "docify", @@ -7783,7 +7759,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "12.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -7793,8 +7769,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.46.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.47.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "chrono", @@ -7835,7 +7811,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "fnv", "futures", @@ -7861,8 +7837,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "hash-db", "kvdb", @@ -7887,8 +7863,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -7911,8 +7887,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -7940,8 +7916,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "fork-tree", @@ -7976,8 +7952,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7989,8 +7965,8 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.30.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "ahash", "array-bytes", @@ -8033,8 +8009,8 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.45.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.46.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "assert_matches", "async-trait", @@ -8068,8 +8044,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -8091,8 +8067,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.40.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -8115,7 +8091,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "polkavm", "sc-allocator", @@ -8128,7 +8104,7 @@ dependencies = [ [[package]] name = "sc-executor-polkavm" version = "0.32.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "log", "polkavm", @@ -8139,7 +8115,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "anyhow", "cfg-if", @@ -8156,10 +8132,10 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ - "ansi_term", + "console", "futures", "futures-timer", "log", @@ -8174,7 +8150,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "33.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "parking_lot 0.12.3", @@ -8187,8 +8163,8 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.14.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.15.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "arrayvec", @@ -8216,8 +8192,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "async-channel", @@ -8267,8 +8243,8 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -8285,8 +8261,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "ahash", "futures", @@ -8304,8 +8280,8 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "async-channel", @@ -8325,8 +8301,8 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "async-channel", @@ -8362,8 +8338,8 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "futures", @@ -8382,9 +8358,9 @@ dependencies = [ [[package]] name = "sc-network-types" version = "0.12.1" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ - "bs58 0.5.0", + "bs58 0.5.1", "ed25519-dalek", "libp2p-identity", "litep2p", @@ -8398,8 +8374,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "39.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "40.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "bytes", @@ -8433,7 +8409,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.18.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8441,8 +8417,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "39.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "40.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "futures", "jsonrpsee", @@ -8473,8 +8449,8 @@ dependencies = [ [[package]] name = "sc-rpc-api" -version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.44.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8493,9 +8469,10 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "16.0.2" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "17.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ + "dyn-clone", "forwarded-header-value", "futures", "governor", @@ -8505,6 +8482,7 @@ dependencies = [ "ip_network", "jsonrpsee", "log", + "sc-rpc-api", "serde", "serde_json", "substrate-prometheus-endpoint", @@ -8515,8 +8493,8 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.44.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.45.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "futures", @@ -8547,8 +8525,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.45.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.46.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "directories", @@ -8612,7 +8590,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.36.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "log", "parity-scale-codec", @@ -8622,8 +8600,8 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "38.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "derive_more", "futures", @@ -8643,8 +8621,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "25.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "chrono", "futures", @@ -8663,19 +8641,18 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "37.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ - "ansi_term", "chrono", + "console", "is-terminal", "lazy_static", "libc", "log", "parity-scale-codec", "parking_lot 0.12.3", - "regex", - "rustc-hash", + "rustc-hash 1.1.0", "sc-client-api", "sc-tracing-proc-macro", "serde", @@ -8694,7 +8671,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -8705,7 +8682,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -8732,7 +8709,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -8748,7 +8725,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-channel", "futures", @@ -9017,11 +8994,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -9282,7 +9260,7 @@ dependencies = [ [[package]] name = "sp-api" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "hash-db", @@ -9304,7 +9282,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "Inflector", "blake2 0.10.6", @@ -9318,7 +9296,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "scale-info", @@ -9330,7 +9308,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "integer-sqrt", @@ -9344,7 +9322,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "sp-api", "sp-inherents", @@ -9353,8 +9331,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "37.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "futures", "parity-scale-codec", @@ -9373,7 +9351,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "futures", @@ -9388,7 +9366,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "parity-scale-codec", @@ -9404,7 +9382,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "parity-scale-codec", @@ -9422,7 +9400,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "finality-grandpa", "log", @@ -9438,8 +9416,8 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.40.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "scale-info", @@ -9450,13 +9428,13 @@ dependencies = [ [[package]] name = "sp-core" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", - "bs58 0.5.0", + "bs58 0.5.1", "dyn-clonable", "ed25519-zebra", "futures", @@ -9496,7 +9474,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "blake2b_simd", "byteorder", @@ -9509,7 +9487,7 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "quote", "sp-crypto-hashing", @@ -9519,7 +9497,7 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "kvdb", "parking_lot 0.12.3", @@ -9528,7 +9506,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "proc-macro2", "quote", @@ -9538,7 +9516,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.29.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "environmental", "parity-scale-codec", @@ -9547,8 +9525,8 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.15.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "0.15.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "scale-info", @@ -9560,7 +9538,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9573,7 +9551,7 @@ dependencies = [ [[package]] name = "sp-io" version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "bytes", "docify", @@ -9599,7 +9577,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "39.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "sp-core", "sp-runtime", @@ -9609,7 +9587,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.40.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", @@ -9620,7 +9598,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "thiserror", "zstd 0.12.4", @@ -9629,7 +9607,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.7.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -9639,7 +9617,7 @@ dependencies = [ [[package]] name = "sp-mixnet" version = "0.12.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "scale-info", @@ -9650,7 +9628,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "sp-api", "sp-core", @@ -9660,7 +9638,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "backtrace", "lazy_static", @@ -9670,17 +9648,17 @@ dependencies = [ [[package]] name = "sp-rpc" version = "32.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", "serde", "sp-core", ] [[package]] name = "sp-runtime" -version = "39.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "39.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "either", @@ -9706,7 +9684,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -9725,7 +9703,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "18.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "Inflector", "expander", @@ -9737,8 +9715,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "35.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "scale-info", @@ -9751,8 +9729,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "36.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9765,7 +9743,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.43.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "hash-db", "log", @@ -9785,7 +9763,7 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "18.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "aes-gcm 0.10.2", "curve25519-dalek", @@ -9809,12 +9787,12 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" [[package]] name = "sp-storage" version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9826,7 +9804,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "parity-scale-codec", @@ -9837,8 +9815,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "17.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "tracing", @@ -9849,7 +9827,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "sp-api", "sp-runtime", @@ -9858,7 +9836,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "34.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "async-trait", "parity-scale-codec", @@ -9872,7 +9850,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "ahash", "hash-db", @@ -9895,7 +9873,7 @@ dependencies = [ [[package]] name = "sp-version" version = "37.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9912,7 +9890,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9922,8 +9900,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "21.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "21.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -9935,7 +9913,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "31.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -10124,8 +10102,8 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-xcm" -version = "14.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "14.2.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "bounded-collections", @@ -10136,6 +10114,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-runtime", "sp-weights", "xcm-procedural", ] @@ -10244,7 +10223,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -10269,12 +10248,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" [[package]] name = "substrate-frame-rpc-system" -version = "38.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "39.0.0" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "docify", "frame-system-rpc-runtime-api", @@ -10294,7 +10273,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "http-body-util", "hyper 1.4.1", @@ -10308,7 +10287,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "async-trait", @@ -10335,7 +10314,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "frame-executive", @@ -10379,7 +10358,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "futures", "sc-block-builder", @@ -10396,8 +10375,8 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +version = "24.0.1" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "array-bytes", "build-helper", @@ -10405,6 +10384,7 @@ dependencies = [ "console", "filetime", "frame-metadata", + "jobserver", "merkleized-metadata", "parity-scale-codec", "parity-wasm", @@ -10417,7 +10397,7 @@ dependencies = [ "sp-version", "strum 0.26.2", "tempfile", - "toml 0.8.10", + "toml 0.8.12", "walkdir", "wasm-opt", ] @@ -10747,14 +10727,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.4", + "toml_edit 0.22.12", ] [[package]] @@ -10774,20 +10754,20 @@ checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap 2.0.0", "toml_datetime", - "winnow", + "winnow 0.5.7", ] [[package]] name = "toml_edit" -version = "0.22.4" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.18", ] [[package]] @@ -10902,6 +10882,7 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", + "time", "tracing", "tracing-core", "tracing-log", @@ -11017,7 +10998,7 @@ dependencies = [ "serde_derive", "serde_json", "termcolor", - "toml 0.8.10", + "toml 0.8.12", ] [[package]] @@ -11266,9 +11247,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -11958,6 +11939,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" @@ -12026,7 +12016,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "10.1.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2407#743dc632fd6115b408376a6e4efe815bd804cd52" +source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2409#660da7a8f53e4d9bf3a509c427627a5ef8ccafba" dependencies = [ "Inflector", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 767ae49ac2..6c60b0a9e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,14 +63,15 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } hex-literal = "0.4.1" impl-serde = { version = "0.4.0", default-features = false } impl-trait-for-tuples = "0.2.1" -jsonrpsee = { version = "0.23.2" } -jsonrpsee-core = { version = "0.23.2" } +jsonrpsee = { version = "0.24.4" } +jsonrpsee-core = { version = "0.24.4" } kvdb-rocksdb = "0.19.0" libsecp256k1 = { version = "0.7.1", default-features = false } log = { version = "0.4.22", default-features = false } num_enum = { version = "0.7.2", default-features = false } parity-db = "0.4.13" parking_lot = "0.12.3" +quote = "1.0.37" rlp = { version = "0.5.2", default-features = false } scale-codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] } scale-info = { version = "2.11.3", default-features = false, features = ["derive"] } @@ -82,81 +83,81 @@ thiserror = "1.0" tokio = "1.40.0" # Substrate Client -sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } +sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } # Substrate Primitive -sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-database = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-database = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # Substrate FRAME -frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } -pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # Substrate Utility -frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -substrate-test-runtime-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } -substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" } +frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +substrate-test-runtime-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } # XCM -xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false } +xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # Arkworks ark-bls12-377 = { version = "0.4.0", default-features = false, features = ["curve"] } diff --git a/client/cli/src/frontier_db_cmd/tests.rs b/client/cli/src/frontier_db_cmd/tests.rs index e02c33a1bd..0baa7ed7d0 100644 --- a/client/cli/src/frontier_db_cmd/tests.rs +++ b/client/cli/src/frontier_db_cmd/tests.rs @@ -537,7 +537,7 @@ fn commitment_create() { // Test client. let (c, _) = TestClientBuilder::new().build_with_native_executor::(None); - let mut client = Arc::new(c); + let client = Arc::new(c); // Get some transaction status. let t1 = fp_rpc::TransactionStatus::default(); @@ -612,7 +612,7 @@ fn commitment_update() { // Test client. let (c, _) = TestClientBuilder::new().build_with_native_executor::(None); - let mut client = Arc::new(c); + let client = Arc::new(c); // Get some transaction status. let t1 = fp_rpc::TransactionStatus::default(); @@ -748,7 +748,7 @@ fn mapping_read_works() { // Test client. let (c, _) = TestClientBuilder::new().build_with_native_executor::(None); - let mut client = Arc::new(c); + let client = Arc::new(c); // Get some transaction status. let t1 = fp_rpc::TransactionStatus::default(); diff --git a/client/cli/src/frontier_db_cmd/utils.rs b/client/cli/src/frontier_db_cmd/utils.rs index d5fdf01bf0..21ef8deae2 100644 --- a/client/cli/src/frontier_db_cmd/utils.rs +++ b/client/cli/src/frontier_db_cmd/utils.rs @@ -91,10 +91,6 @@ pub trait FrontierDbMessage { format!("Operation not allowed for non-empty Key `{:?}`", key).into() } - fn one_to_many_error(&self) -> sc_cli::Error { - "One-to-many operation not allowed".into() - } - #[cfg(not(test))] fn confirmation_prompt( &self, diff --git a/client/consensus/src/lib.rs b/client/consensus/src/lib.rs index f8dcaed608..2cca033617 100644 --- a/client/consensus/src/lib.rs +++ b/client/consensus/src/lib.rs @@ -109,10 +109,7 @@ where self.inner.check_block(block).await.map_err(Into::into) } - async fn import_block( - &mut self, - block: BlockImportParams, - ) -> Result { + async fn import_block(&self, block: BlockImportParams) -> Result { // We validate that there are only one frontier log. No other // actions are needed and mapping syncing is delegated to a separate // worker. diff --git a/client/db/src/kv/upgrade.rs b/client/db/src/kv/upgrade.rs index 3eb1af4775..63cf899c8a 100644 --- a/client/db/src/kv/upgrade.rs +++ b/client/db/src/kv/upgrade.rs @@ -385,7 +385,7 @@ mod tests { .build_with_native_executor::( None, ); - let mut client = Arc::new(client); + let client = Arc::new(client); // Genesis block let chain_info = client.chain_info(); diff --git a/client/mapping-sync/src/kv/worker.rs b/client/mapping-sync/src/kv/worker.rs index 7beccd0f0f..d7cb5968ad 100644 --- a/client/mapping-sync/src/kv/worker.rs +++ b/client/mapping-sync/src/kv/worker.rs @@ -246,7 +246,7 @@ mod tests { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); @@ -388,7 +388,7 @@ mod tests { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); diff --git a/client/mapping-sync/src/sql/mod.rs b/client/mapping-sync/src/sql/mod.rs index 72cb065fc6..31588c8ad9 100644 --- a/client/mapping-sync/src/sql/mod.rs +++ b/client/mapping-sync/src/sql/mod.rs @@ -547,7 +547,7 @@ mod test { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); // Indexer backend @@ -750,7 +750,7 @@ mod test { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); // Indexer backend @@ -954,7 +954,7 @@ mod test { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); // Indexer backend @@ -1120,7 +1120,7 @@ mod test { // Client let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); // Overrides let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); // Indexer backend @@ -1266,7 +1266,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { @@ -1367,7 +1367,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { @@ -1482,7 +1482,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { @@ -1583,7 +1583,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { @@ -1698,7 +1698,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { @@ -1799,7 +1799,7 @@ mod test { let backend = builder.backend(); let (client, _) = builder.build_with_native_executor::(None); - let mut client = Arc::new(client); + let client = Arc::new(client); let storage_override = Arc::new(SchemaV3StorageOverride::new(client.clone())); let indexer_backend = fc_db::sql::Backend::new( fc_db::sql::BackendConfig::Sqlite(fc_db::sql::SqliteBackendConfig { diff --git a/client/rpc/src/eth/client.rs b/client/rpc/src/eth/client.rs index c25f6d7631..97a64d2e68 100644 --- a/client/rpc/src/eth/client.rs +++ b/client/rpc/src/eth/client.rs @@ -49,9 +49,10 @@ where let current_number = self.client.info().best_number; let highest_number = self .sync - .best_seen_block() + .status() .await .map_err(|_| internal_err("fetch best_seen_block failed"))? + .best_seen_block .unwrap_or(current_number); let current_number = UniqueSaturatedInto::::unique_saturated_into(current_number); diff --git a/client/rpc/src/eth_pubsub.rs b/client/rpc/src/eth_pubsub.rs index a0feb56182..c8fdf022d6 100644 --- a/client/rpc/src/eth_pubsub.rs +++ b/client/rpc/src/eth_pubsub.rs @@ -28,9 +28,10 @@ use sc_client_api::{ }; use sc_network_sync::SyncingService; use sc_rpc::{ - utils::{pipe_from_stream, to_sub_message}, + utils::{BoundedVecDeque, PendingSubscription, Subscription}, SubscriptionTaskExecutor, }; +use sc_service::config::RpcSubscriptionIdProvider; use sc_transaction_pool_api::{InPoolTransaction, TransactionPool, TxHash}; use sp_api::{ApiExt, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; @@ -48,13 +49,14 @@ use fc_rpc_core::{ use fc_storage::StorageOverride; use fp_rpc::EthereumRuntimeRPCApi; -#[derive(Debug)] +#[derive(Clone, Debug)] pub struct EthereumSubIdProvider; impl IdProvider for EthereumSubIdProvider { fn next_id(&self) -> jsonrpsee::types::SubscriptionId<'static> { format!("0x{}", hex::encode(rand::random::().to_le_bytes())).into() } } +impl RpcSubscriptionIdProvider for EthereumSubIdProvider {} /// Eth pub-sub API implementation. pub struct EthPubSub { @@ -197,7 +199,12 @@ where // Best imported block. let current_number = self.client.info().best_number; // Get the target block to sync. - let highest_number = self.sync.best_seen_block().await.ok().flatten(); + let highest_number = self + .sync + .status() + .await + .ok() + .and_then(|status| status.best_seen_block); PubSubSyncing::Syncing(SyncingStatus { starting_block: self.starting_block, @@ -238,7 +245,9 @@ where Kind::NewHeads => { let stream = block_notification_stream .filter_map(move |notification| pubsub.notify_header(notification)); - pipe_from_stream(pending, stream).await + PendingSubscription::from(pending) + .pipe_from_stream(stream, BoundedVecDeque::new(16)) + .await } Kind::Logs => { let stream = block_notification_stream @@ -246,14 +255,18 @@ where pubsub.notify_logs(notification, &filtered_params) }) .flat_map(futures::stream::iter); - pipe_from_stream(pending, stream).await + PendingSubscription::from(pending) + .pipe_from_stream(stream, BoundedVecDeque::new(16)) + .await } Kind::NewPendingTransactions => { let pool = pubsub.pool.clone(); let stream = pool .import_notification_stream() .filter_map(move |hash| pubsub.pending_transaction(&hash)); - pipe_from_stream(pending, stream).await; + PendingSubscription::from(pending) + .pipe_from_stream(stream, BoundedVecDeque::new(16)) + .await; } Kind::Syncing => { let Ok(sink) = pending.accept().await else { @@ -263,8 +276,10 @@ where // Because import notifications are only emitted when the node is synced or // in case of reorg, the first event is emitted right away. let syncing_status = pubsub.syncing_status().await; - let msg = to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); - let _ = sink.send(msg).await; + let subscription = Subscription::from(sink); + let _ = subscription + .send(&PubSubResult::SyncingStatus(syncing_status)) + .await; // When the node is not under a major syncing (i.e. from genesis), react // normally to import notifications. @@ -276,9 +291,9 @@ where let syncing_status = pubsub.sync.is_major_syncing(); if syncing_status != last_syncing_status { let syncing_status = pubsub.syncing_status().await; - let msg = - to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); - let _ = sink.send(msg).await; + let _ = subscription + .send(&PubSubResult::SyncingStatus(syncing_status)) + .await; } last_syncing_status = syncing_status; } diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 28b8ed8a8a..7f1c19f657 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -187,7 +187,7 @@ pub mod frontier_backend_client { } } - pub async fn native_block_id( + pub async fn native_block_id( client: &C, backend: &dyn fc_api::Backend, number: Option, @@ -219,7 +219,7 @@ pub mod frontier_backend_client { }) } - pub async fn load_hash( + pub async fn load_hash( client: &C, backend: &dyn fc_api::Backend, hash: H256, @@ -243,7 +243,7 @@ pub mod frontier_backend_client { Ok(None) } - pub fn is_canon(client: &C, target_hash: B::Hash) -> bool + pub fn is_canon(client: &C, target_hash: B::Hash) -> bool where B: BlockT, C: HeaderBackend + 'static, @@ -256,7 +256,7 @@ pub mod frontier_backend_client { false } - pub async fn load_transactions( + pub async fn load_transactions( client: &C, backend: &dyn fc_api::Backend, transaction_hash: H256, @@ -389,7 +389,7 @@ mod tests { None, ); - let mut client = Arc::new(client); + let client = Arc::new(client); // Create a temporary frontier secondary DB. let backend = open_frontier_backend::(client.clone(), tmp.into_path()) diff --git a/frame/evm/precompile/bls12377/Cargo.toml b/frame/evm/precompile/bls12377/Cargo.toml index eb1f135edb..4207e4ed43 100644 --- a/frame/evm/precompile/bls12377/Cargo.toml +++ b/frame/evm/precompile/bls12377/Cargo.toml @@ -14,6 +14,7 @@ ark-std = { workspace = true } # Frontier fp-evm = { workspace = true } +paste = "1.0.15" [dev-dependencies] # Frontier diff --git a/frame/evm/precompile/dispatch/src/tests.rs b/frame/evm/precompile/dispatch/src/tests.rs index 6073c20531..55b7692262 100644 --- a/frame/evm/precompile/dispatch/src/tests.rs +++ b/frame/evm/precompile/dispatch/src/tests.rs @@ -14,9 +14,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -#![cfg(test)] - use super::*; use crate::mock::*; diff --git a/frame/evm/src/benchmarking.rs b/frame/evm/src/benchmarking.rs index a5e282dc6f..e497d4db30 100644 --- a/frame/evm/src/benchmarking.rs +++ b/frame/evm/src/benchmarking.rs @@ -14,9 +14,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -#![cfg(feature = "runtime-benchmarks")] - use super::*; use frame_benchmarking::benchmarks; diff --git a/frame/evm/src/tests.rs b/frame/evm/src/tests.rs index a8c2405264..f2379c19d5 100644 --- a/frame/evm/src/tests.rs +++ b/frame/evm/src/tests.rs @@ -14,9 +14,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -#![cfg(test)] - use super::*; use crate::mock::*; diff --git a/frame/hotfix-sufficients/src/benchmarking.rs b/frame/hotfix-sufficients/src/benchmarking.rs index 6074140ce0..ed2dd1c506 100644 --- a/frame/hotfix-sufficients/src/benchmarking.rs +++ b/frame/hotfix-sufficients/src/benchmarking.rs @@ -14,9 +14,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. - -#![cfg(feature = "runtime-benchmarks")] - use frame_benchmarking::{benchmarks, impl_benchmark_test_suite}; use super::*; diff --git a/precompiles/macro/src/precompile/attr.rs b/precompiles/macro/src/precompile/attr.rs index d8a1a300d4..bd366bc5e1 100644 --- a/precompiles/macro/src/precompile/attr.rs +++ b/precompiles/macro/src/precompile/attr.rs @@ -53,7 +53,8 @@ pub mod keyword { syn::custom_keyword!(pre_check); } -/// Attributes for methods. +/// Attributes for methods +#[allow(dead_code)] pub enum MethodAttr { Public(Span, syn::LitStr), Fallback(Span), @@ -106,6 +107,7 @@ impl syn::parse::Parse for MethodAttr { } /// Attributes for the main impl Block. +#[allow(dead_code)] pub enum ImplAttr { PrecompileSet(Span), TestConcreteTypes(Span, Vec), diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 79def24465..18e88df68c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Stable -channel = "1.77.0" # rustc 1.77.0 (aedd173a2 2024-03-21) +channel = "1.79.0" # rustc 1.79.0 (129f3b996 2024-06-10) # Nightly #channel = "nightly-2024-02-05" # rustc 1.78.0-nightly (f067fd608 2024-02-05) components = ["cargo", "clippy", "rustc", "rustfmt", "rust-src", "rust-docs"] diff --git a/template/node/Cargo.toml b/template/node/Cargo.toml index 70016bf93c..9fb3591e2d 100644 --- a/template/node/Cargo.toml +++ b/template/node/Cargo.toml @@ -37,7 +37,6 @@ sc-network = { workspace = true } sc-network-sync = { workspace = true } sc-offchain = { workspace = true } sc-rpc = { workspace = true } -sc-rpc-api = { workspace = true } sc-service = { workspace = true } sc-telemetry = { workspace = true } sc-transaction-pool = { workspace = true } diff --git a/template/node/src/rpc/mod.rs b/template/node/src/rpc/mod.rs index 1aec2f7f8e..7202d997a8 100644 --- a/template/node/src/rpc/mod.rs +++ b/template/node/src/rpc/mod.rs @@ -12,7 +12,6 @@ use sc_client_api::{ }; use sc_consensus_manual_seal::rpc::EngineCommand; use sc_rpc::SubscriptionTaskExecutor; -use sc_rpc_api::DenyUnsafe; use sc_service::TransactionPool; use sc_transaction_pool::ChainApi; use sp_api::{CallApiAt, ProvideRuntimeApi}; @@ -32,8 +31,6 @@ pub struct FullDeps { pub client: Arc, /// Transaction pool instance. pub pool: Arc

, - /// Whether to deny unsafe calls - pub deny_unsafe: DenyUnsafe, /// Manual seal command sink pub command_sink: Option>>, /// Ethereum-compatibility specific dependencies. @@ -88,12 +85,11 @@ where let FullDeps { client, pool, - deny_unsafe, command_sink, eth, } = deps; - io.merge(System::new(client.clone(), pool, deny_unsafe).into_rpc())?; + io.merge(System::new(client.clone(), pool).into_rpc())?; io.merge(TransactionPayment::new(client).into_rpc())?; if let Some(command_sink) = command_sink { diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 8749729863..93bfa96101 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -9,7 +9,7 @@ use sc_client_api::{Backend as BackendT, BlockBackend}; use sc_consensus::{BasicQueue, BoxBlockImport}; use sc_consensus_grandpa::BlockNumberOps; use sc_executor::HostFunctions as HostFunctionsT; -use sc_network_sync::strategy::warp::{WarpSyncParams, WarpSyncProvider}; +use sc_network_sync::strategy::warp::{WarpSyncConfig, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool::FullPool; @@ -103,7 +103,7 @@ where }) .transpose()?; - let executor = sc_service::new_wasm_executor(config); + let executor = sc_service::new_wasm_executor(&config.executor); let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::( config, @@ -310,12 +310,13 @@ where fee_history_cache_limit, } = new_frontier_partial(ð_config)?; - let mut net_config = - sc_network::config::FullNetworkConfiguration::<_, _, NB>::new(&config.network); - let peer_store_handle = net_config.peer_store_handle(); - let metrics = NB::register_notification_metrics( - config.prometheus_config.as_ref().map(|cfg| &cfg.registry), + let maybe_registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry); + let mut net_config = sc_network::config::FullNetworkConfiguration::<_, _, NB>::new( + &config.network, + maybe_registry.cloned(), ); + let peer_store_handle = net_config.peer_store_handle(); + let metrics = NB::register_notification_metrics(maybe_registry); let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name( &client @@ -331,7 +332,7 @@ where peer_store_handle, ); - let warp_sync_params = if sealing.is_some() { + let warp_sync_config = if sealing.is_some() { None } else { net_config.add_notification_protocol(grandpa_protocol_config); @@ -341,7 +342,7 @@ where grandpa_link.shared_authority_set().clone(), Vec::new(), )); - Some(WarpSyncParams::WithProvider(warp_sync)) + Some(WarpSyncConfig::WithProvider(warp_sync)) }; let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = @@ -353,7 +354,7 @@ where spawn_handle: task_manager.spawn_handle(), import_queue, block_announce_validator_builder: None, - warp_sync_params, + warp_sync_config, block_relay: None, metrics, })?; @@ -379,7 +380,7 @@ where ); } - let role = config.role.clone(); + let role = config.role; let force_authoring = config.force_authoring; let name = config.network.node_name.clone(); let frontier_backend = Arc::new(frontier_backend); @@ -399,7 +400,7 @@ where let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks); // for ethereum-compatibility rpc. - config.rpc_id_provider = Some(Box::new(fc_rpc::EthereumSubIdProvider)); + config.rpc.id_provider = Some(Box::new(fc_rpc::EthereumSubIdProvider)); let rpc_builder = { let client = client.clone(); @@ -438,7 +439,7 @@ where Ok((slot, timestamp, dynamic_fee)) }; - Box::new(move |deny_unsafe, subscription_task_executor| { + Box::new(move |subscription_task_executor| { let eth_deps = crate::rpc::EthDeps { client: client.clone(), pool: pool.clone(), @@ -465,7 +466,6 @@ where let deps = crate::rpc::FullDeps { client: client.clone(), pool: pool.clone(), - deny_unsafe, command_sink: if sealing.is_some() { Some(command_sink.clone()) } else {