diff --git a/Cargo.lock b/Cargo.lock index d4236e699..afeb2a262 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli 0.27.3", -] - [[package]] name = "addr2line" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.1", + "gimli", ] [[package]] @@ -114,15 +105,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.4" @@ -186,6 +168,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "arbitrary" version = "1.3.2" @@ -251,13 +247,15 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite 0.2.13", ] [[package]] @@ -286,7 +284,7 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" dependencies = [ - "event-listener 4.0.0", + "event-listener", "event-listener-strategy", "pin-project-lite 0.2.13", ] @@ -361,15 +359,19 @@ version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object", "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.3" + [[package]] name = "base-x" version = "0.2.11" @@ -446,7 +448,7 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.15", + "prettyplease", "proc-macro2", "quote", "regex", @@ -455,6 +457,19 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes 0.11.0", + "rand", + "rand_core", + "serde", + "unicode-normalization", +] + [[package]] name = "bitcoin" version = "0.31.0" @@ -463,7 +478,7 @@ checksum = "5973a027b341b462105675962214dfe3c938ad9afd395d84b28602608bdcec7b" dependencies = [ "bech32", "bitcoin-internals", - "bitcoin_hashes", + "bitcoin_hashes 0.13.0", "core2 0.3.3", "hex-conservative", "hex_lit", @@ -500,6 +515,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitcoin_hashes" version = "0.13.0" @@ -705,25 +726,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "build-helper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdce191bf3fa4995ce948c8c83b4640a1745457a149e73c6db75b4ffe36aad5f" -dependencies = [ - "semver 0.6.0", -] - [[package]] name = "bumpalo" version = "3.14.0" @@ -788,13 +790,13 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.20", + "semver", "serde", "serde_json", "thiserror", @@ -879,19 +881,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "cid" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" -dependencies = [ - "core2 0.4.0", - "multibase", - "multihash 0.18.1", - "serde", - "unsigned-varint", -] - [[package]] name = "cipher" version = "0.4.4" @@ -957,6 +946,7 @@ dependencies = [ "anstyle", "clap_lex", "strsim", + "terminal_size", ] [[package]] @@ -993,6 +983,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "common-path" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" + [[package]] name = "concurrent-queue" version = "2.3.0" @@ -1046,6 +1042,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "core-foundation" version = "0.9.3" @@ -1080,15 +1082,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpufeatures" version = "0.2.11" @@ -1100,18 +1093,18 @@ dependencies = [ [[package]] name = "cranelift-bforest" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a91a1ccf6fb772808742db2f51e2179f25b1ec559cbe39ea080c72ff61caf8f" +checksum = "76eb38f2af690b5a4411d9a8782b6d77dabff3ca939e0518453ab9f9a4392d41" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "169db1a457791bff4fd1fc585bb5cc515609647e0420a7d5c98d7700c59c2d00" +checksum = "39526c036b92912417e8931f52c1e235796688068d3efdbbd8b164f299d19156" dependencies = [ "bumpalo", "cranelift-bforest", @@ -1120,8 +1113,8 @@ dependencies = [ "cranelift-control", "cranelift-entity", "cranelift-isle", - "gimli 0.27.3", - "hashbrown 0.13.2", + "gimli", + "hashbrown 0.14.3", "log", "regalloc2", "smallvec", @@ -1130,42 +1123,43 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3486b93751ef19e6d6eef66d2c0e83ed3d2ba01da1919ed2747f2f7bd8ba3419" +checksum = "fdb0deedc9fccf2db53a5a3c9c9d0163e44143b0d004dca9bf6ab6a0024cd79a" dependencies = [ "cranelift-codegen-shared", ] [[package]] name = "cranelift-codegen-shared" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86a1205ab18e7cd25dc4eca5246e56b506ced3feb8d95a8d776195e48d2cd4ef" +checksum = "cea2d1b274e45aa8e61e9103efa1ba82d4b5a19d12bd1fd10744c3b7380ba3ff" [[package]] name = "cranelift-control" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b108cae0f724ddfdec1871a0dc193a607e0c2d960f083cfefaae8ccf655eff2" +checksum = "6ea5977559a71e63db79a263f0e81a89b996e8a38212c4281e37dd1dbaa8b65c" dependencies = [ "arbitrary", ] [[package]] name = "cranelift-entity" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "720444006240622798665bfc6aa8178e2eed556da342fda62f659c5267c3c659" +checksum = "2f871ada808b58158d84dfc43a6a2e2d2756baaf4ed1c51fd969ca8330e6ca5c" dependencies = [ "serde", + "serde_derive", ] [[package]] name = "cranelift-frontend" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a94c4c5508b7407e125af9d5320694b7423322e59a4ac0d07919ae254347ca" +checksum = "e8e6890f587ef59824b3debe577e68fdf9b307b3808c54b8d93a18fd0b70941b" dependencies = [ "cranelift-codegen", "log", @@ -1175,15 +1169,15 @@ dependencies = [ [[package]] name = "cranelift-isle" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1f888d0845dcd6be4d625b91d9d8308f3d95bed5c5d4072ce38e1917faa505" +checksum = "a8d5fc6d5d3b52d1917002b17a8ecce448c2621b5bf394bb4e77e2f676893537" [[package]] name = "cranelift-native" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad5966da08f1e96a3ae63be49966a85c9b249fa465f8cf1b66469a82b1004a0" +checksum = "3e10c2e7faa65d4ae7de9a83b44f2c31aca7dc638e17d0a79572fdf8103d720b" dependencies = [ "cranelift-codegen", "libc", @@ -1192,14 +1186,14 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.99.2" +version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8635c88b424f1d232436f683a301143b36953cd98fc6f86f7bac862dfeb6f5" +checksum = "2755807efc7ec80d1cc0b6815e70f10cedf968889f0469091dbff9c5c0741c48" dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1462,8 +1456,10 @@ version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case", "proc-macro2", "quote", + "rustc_version", "syn 1.0.109", ] @@ -1597,6 +1593,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "docify" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4235e9b248e2ba4b92007fe9c646f3adf0ffde16dc74713eacc92b8bc58d8d2f" +dependencies = [ + "docify_macros", +] + +[[package]] +name = "docify_macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47020e12d7c7505670d1363dd53d6c23724f71a90a3ae32ff8eba40de8404626" +dependencies = [ + "common-path", + "derive-syn-parse", + "once_cell", + "proc-macro2", + "quote", + "regex", + "syn 2.0.39", + "termcolor", + "toml 0.7.8", + "walkdir", +] + [[package]] name = "dockertest" version = "0.4.0" @@ -1802,10 +1825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1901,9 +1921,9 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79269278125006bb0552349c03593ffa9702112ca88bc7046cc669f148fb47c" +checksum = "0111ead599d17a7bff6985fd5756f39ca7033edc79a31b23026a8d5d64fa95cd" dependencies = [ "const-hex", "ethers-contract-abigen", @@ -1920,31 +1940,31 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce95a43c939b2e4e2f3191c5ad4a1f279780b8a39139c9905b43a7433531e2ab" +checksum = "51258120c6b47ea9d9bec0d90f9e8af71c977fbefbef8213c91bfed385fe45eb" dependencies = [ "Inflector", "const-hex", "dunce", "ethers-core", "eyre", - "prettyplease 0.2.15", + "prettyplease", "proc-macro2", "quote", "regex", "serde", "serde_json", "syn 2.0.39", - "toml 0.7.8", + "toml 0.8.8", "walkdir", ] [[package]] name = "ethers-contract-derive" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9ce44906fc871b3ee8c69a695ca7ec7f70e50cb379c9b9cb5e532269e492f6" +checksum = "936e7a0f1197cee2b62dc89f63eff3201dbf87c283ff7e18d86d38f83b845483" dependencies = [ "Inflector", "const-hex", @@ -1958,9 +1978,9 @@ dependencies = [ [[package]] name = "ethers-core" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a17f0708692024db9956b31d7a20163607d2745953f5ae8125ab368ba280ad" +checksum = "2f03e0bdc216eeb9e355b90cf610ef6c5bb8aca631f97b5ae9980ce34ea7878d" dependencies = [ "arrayvec", "bytes", @@ -1988,9 +2008,9 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.10" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6838fa110e57d572336178b7c79e94ff88ef976306852d8cb87d9e5b1fc7c0b5" +checksum = "25d6c0c9455d93d4990c06e049abf9b30daf148cf461ee939c11d88907c60816" dependencies = [ "async-trait", "auto_impl", @@ -2022,12 +2042,6 @@ dependencies = [ "ws_stream_wasm", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "event-listener" version = "4.0.0" @@ -2045,7 +2059,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener", "pin-project-lite 0.2.13", ] @@ -2083,9 +2097,9 @@ dependencies = [ [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" @@ -2095,11 +2109,12 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdlimit" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", + "thiserror", ] [[package]] @@ -2133,16 +2148,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" -[[package]] -name = "file-per-thread-logger" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3cc21c33af89af0930c8cae4ade5e6fdc17b5d2c97b3d2e2edb67a1cf683f3" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "filetime" version = "0.2.22" @@ -2220,7 +2225,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", ] @@ -2243,7 +2248,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "frame-support-procedural", @@ -2268,11 +2273,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "frame-system", "frame-try-runtime", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -2297,9 +2303,11 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ + "aquamarine", "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", @@ -2310,48 +2318,51 @@ dependencies = [ "paste", "scale-info", "serde", - "smallvec", + "serde_json", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", - "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", "expander", "frame-support-procedural-tools", - "itertools", + "itertools 0.12.0", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.0", "proc-macro2", "quote", + "sp-core-hashing", "syn 2.0.39", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", @@ -2360,7 +2371,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "proc-macro2", "quote", @@ -2370,7 +2381,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "cfg-if", "frame-support", @@ -2389,7 +2400,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "sp-api", @@ -2398,13 +2409,11 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime", - "sp-std", ] [[package]] @@ -2665,40 +2674,21 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", - "indexmap 1.9.3", + "indexmap 2.1.0", "stable_deref_trait", ] -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - [[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - [[package]] name = "gloo-timers" version = "0.2.6" @@ -2952,7 +2942,6 @@ dependencies = [ "futures-util", "http", "hyper", - "log", "rustls", "rustls-native-certs", "tokio", @@ -3102,6 +3091,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.3" @@ -3183,21 +3191,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is-terminal" -version = "0.4.9" +name = "itertools" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", + "either", ] [[package]] name = "itertools" -version = "0.10.5" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" dependencies = [ "either", ] @@ -3208,6 +3214,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "ittapi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b996fe614c41395cdaedf3cf408a9534851090959d90d54a535f675550b64b1" +dependencies = [ + "anyhow", + "ittapi-sys", + "log", +] + +[[package]] +name = "ittapi-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f5385394064fa2c886205dba02598013ce83d3e92d33dbdc0c52fe0e7bf4fc" +dependencies = [ + "cc", +] + [[package]] name = "jobserver" version = "0.1.27" @@ -3228,30 +3254,28 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-core", "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types", + "tokio", "tracing", ] [[package]] name = "jsonrpsee-core" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", - "arrayvec", "async-trait", "beef", - "futures-channel", "futures-util", - "globset", "hyper", "jsonrpsee-types", "parking_lot 0.12.1", @@ -3267,9 +3291,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck", "proc-macro-crate 1.3.1", @@ -3280,19 +3304,20 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ - "futures-channel", "futures-util", "http", "hyper", "jsonrpsee-core", "jsonrpsee-types", + "route-recognizer", "serde", "serde_json", "soketto", + "thiserror", "tokio", "tokio-stream", "tokio-util", @@ -3302,9 +3327,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.3" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -3502,7 +3527,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.19.1", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.1", @@ -3596,7 +3621,7 @@ dependencies = [ "bs58", "ed25519-dalek", "hkdf", - "multihash 0.19.1", + "multihash", "quick-protobuf", "rand", "sha2", @@ -3686,7 +3711,7 @@ dependencies = [ "libp2p-identity", "log", "multiaddr", - "multihash 0.19.1", + "multihash", "once_cell", "quick-protobuf", "rand", @@ -3788,7 +3813,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" dependencies = [ "heck", - "proc-macro-warning", + "proc-macro-warning 0.4.2", "proc-macro2", "quote", "syn 2.0.39", @@ -3985,7 +4010,7 @@ dependencies = [ "generator", "scoped-tls", "tracing", - "tracing-subscriber 0.3.17", + "tracing-subscriber", ] [[package]] @@ -4037,9 +4062,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -4049,9 +4074,9 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", "derive-syn-parse", @@ -4063,9 +4088,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.4.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", @@ -4074,9 +4099,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", @@ -4089,15 +4114,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -4321,7 +4337,7 @@ dependencies = [ "modular-frost", "monero-generators", "multiexp", - "pbkdf2 0.12.2", + "pbkdf2", "rand", "rand_chacha", "rand_core", @@ -4348,7 +4364,7 @@ dependencies = [ "data-encoding", "libp2p-identity", "multibase", - "multihash 0.19.1", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -4381,23 +4397,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "multihash" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "blake3", - "core2 0.4.0", - "digest 0.10.7", - "multihash-derive 0.8.0", - "sha2", - "sha3", - "unsigned-varint", -] - [[package]] name = "multihash" version = "0.19.1" @@ -4419,7 +4418,7 @@ dependencies = [ "blake3", "core2 0.4.0", "digest 0.10.7", - "multihash-derive 0.9.0", + "multihash-derive", "ripemd", "sha1", "sha2", @@ -4427,20 +4426,6 @@ dependencies = [ "strobe-rs", ] -[[package]] -name = "multihash-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "multihash-derive" version = "0.9.0" @@ -4448,7 +4433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" dependencies = [ "core2 0.4.0", - "multihash 0.19.1", + "multihash", "multihash-derive-impl", ] @@ -4718,30 +4703,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", ] -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", -] - [[package]] name = "object" version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ + "crc32fast", + "hashbrown 0.14.3", + "indexmap 2.1.0", "memchr", ] @@ -4832,7 +4808,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "frame-system", @@ -4846,7 +4822,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4857,7 +4833,6 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto", "sp-consensus-babe", "sp-core", "sp-io", @@ -4870,7 +4845,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4880,7 +4855,6 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto", "sp-consensus-grandpa", "sp-core", "sp-io", @@ -4893,7 +4867,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "frame-system", @@ -4907,6 +4881,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -4914,25 +4889,26 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents", "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-support", "frame-system", @@ -4948,7 +4924,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -4964,7 +4940,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5114,18 +5090,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbkdf2" -version = "0.11.0" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", -] +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -5297,7 +5264,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -5319,16 +5286,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "prettyplease" version = "0.2.15" @@ -5416,6 +5373,17 @@ dependencies = [ "syn 2.0.39", ] +[[package]] +name = "proc-macro-warning" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "proc-macro2" version = "1.0.70" @@ -5464,9 +5432,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", "prost-derive", @@ -5474,44 +5442,44 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck", - "itertools", - "lazy_static", + "itertools 0.10.5", "log", "multimap", + "once_cell", "petgraph", - "prettyplease 0.1.25", + "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.109", + "syn 2.0.39", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ "prost", ] @@ -5954,6 +5922,12 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "route-recognizer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" + [[package]] name = "rpassword" version = "7.3.1" @@ -6014,7 +5988,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver", ] [[package]] @@ -6126,7 +6100,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "log", "sp-core", @@ -6137,7 +6111,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -6165,14 +6139,13 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", "sc-block-builder", - "sc-client-api", "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", @@ -6188,10 +6161,9 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", - "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", @@ -6203,9 +6175,12 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ - "memmap2", + "array-bytes", + "docify", + "log", + "parity-scale-codec", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -6215,6 +6190,8 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", + "sp-genesis-builder", + "sp-io", "sp-runtime", "sp-state-machine", ] @@ -6222,9 +6199,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", @@ -6233,13 +6210,15 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", + "bip39", "chrono", "clap", "fdlimit", "futures", + "itertools 0.12.0", "libp2p-identity", "log", "names", @@ -6265,14 +6244,13 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", - "tiny-bip39", "tokio", ] [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "fnv", "futures", @@ -6291,13 +6269,14 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "hash-db", "kvdb", @@ -6323,7 +6302,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -6335,7 +6314,6 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api", "sp-blockchain", "sp-consensus", "sp-core", @@ -6348,7 +6326,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "fork-tree", @@ -6365,7 +6343,6 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sc-transaction-pool-api", - "scale-info", "sp-api", "sp-application-crypto", "sp-block-builder", @@ -6384,7 +6361,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6397,7 +6374,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "ahash", "array-bytes", @@ -6418,6 +6395,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-sync", "sc-telemetry", "sc-transaction-pool-api", "sc-utils", @@ -6438,7 +6416,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -6461,7 +6439,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -6473,7 +6451,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-panic-handler", - "sp-runtime-interface", "sp-trie", "sp-version", "sp-wasm-interface", @@ -6483,7 +6460,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -6495,12 +6472,11 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "anyhow", - "cfg-if", - "libc", "log", + "parking_lot 0.12.1", "rustix", "sc-allocator", "sc-executor-common", @@ -6512,7 +6488,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "anstyle", "futures", @@ -6520,7 +6496,7 @@ dependencies = [ "log", "sc-client-api", "sc-network", - "sc-network-common", + "sc-network-sync", "sp-blockchain", "sp-runtime", ] @@ -6528,7 +6504,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -6542,7 +6518,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "async-channel", @@ -6566,6 +6542,7 @@ dependencies = [ "sc-client-api", "sc-network-common", "sc-utils", + "schnellru", "serde", "serde_json", "smallvec", @@ -6581,39 +6558,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sc-network-bitswap" -version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" -dependencies = [ - "async-channel", - "cid", - "futures", - "libp2p-identity", - "log", - "prost", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime", - "thiserror", - "unsigned-varint", -] - [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ - "async-trait", "bitflags 1.3.2", - "futures", - "libp2p-identity", "parity-scale-codec", "prost-build", - "sc-consensus", - "sp-consensus", "sp-consensus-grandpa", "sp-runtime", ] @@ -6621,7 +6573,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "ahash", "futures", @@ -6631,6 +6583,7 @@ dependencies = [ "multiaddr", "sc-network", "sc-network-common", + "sc-network-sync", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -6640,7 +6593,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "async-channel", @@ -6661,14 +6614,13 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "async-channel", "async-trait", "fork-tree", "futures", - "futures-timer", "libp2p", "log", "mockall", @@ -6690,12 +6642,14 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", + "tokio-stream", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "futures", @@ -6704,6 +6658,7 @@ dependencies = [ "parity-scale-codec", "sc-network", "sc-network-common", + "sc-network-sync", "sc-utils", "sp-consensus", "sp-runtime", @@ -6713,25 +6668,18 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ - "bytes", - "fnv", "futures", "futures-timer", - "hyper", - "hyper-rustls", "libp2p", - "log", "num_cpus", - "once_cell", "parity-scale-codec", "parking_lot 0.12.1", "rand", "sc-client-api", "sc-network", "sc-transaction-pool-api", - "sc-utils", "sp-api", "sp-core", "sp-externalities", @@ -6745,7 +6693,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -6754,7 +6702,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "futures", "jsonrpsee", @@ -6784,7 +6732,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -6803,7 +6751,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "http", "jsonrpsee", @@ -6818,7 +6766,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", "futures", @@ -6830,7 +6778,9 @@ dependencies = [ "parking_lot 0.12.1", "sc-chain-spec", "sc-client-api", + "sc-rpc", "sc-transaction-pool-api", + "sc-utils", "serde", "sp-api", "sp-blockchain", @@ -6838,13 +6788,14 @@ dependencies = [ "sp-runtime", "sp-version", "thiserror", + "tokio", "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "directories", @@ -6857,7 +6808,6 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "rand", - "sc-block-builder", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -6866,7 +6816,6 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", - "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", @@ -6895,7 +6844,6 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", - "static_init", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -6907,7 +6855,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "log", "parity-scale-codec", @@ -6918,8 +6866,9 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ + "derive_more", "futures", "libc", "log", @@ -6937,7 +6886,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "chrono", "futures", @@ -6956,7 +6905,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "anstyle", "chrono", @@ -6978,15 +6927,15 @@ dependencies = [ "thiserror", "tracing", "tracing-log", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", @@ -6995,7 +6944,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -7021,7 +6970,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -7037,7 +6986,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-channel", "futures", @@ -7176,7 +7125,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.13.0", "rand", "secp256k1-sys", "serde", @@ -7223,15 +7172,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.20" @@ -7241,12 +7181,6 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "send_wrapper" version = "0.4.0" @@ -7532,7 +7466,7 @@ dependencies = [ "sc-consensus-grandpa", "sc-executor", "sc-network", - "sc-network-common", + "sc-network-sync", "sc-offchain", "sc-rpc-api", "sc-service", @@ -8035,7 +7969,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "hash-db", "log", @@ -8056,12 +7990,12 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "Inflector", "blake2", "expander", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", @@ -8070,7 +8004,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "scale-info", @@ -8083,7 +8017,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "integer-sqrt", "num-traits", @@ -8097,7 +8031,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "scale-info", @@ -8109,7 +8043,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "sp-api", "sp-inherents", @@ -8120,7 +8054,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "futures", "log", @@ -8138,7 +8072,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "futures", @@ -8152,7 +8086,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "parity-scale-codec", @@ -8171,7 +8105,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "finality-grandpa", "log", @@ -8189,7 +8123,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "scale-info", @@ -8201,9 +8135,11 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "array-bytes", + "bandersnatch_vrfs", + "bip39", "bitflags 1.3.2", "blake2", "bounded-collections", @@ -8214,6 +8150,7 @@ dependencies = [ "hash-db", "hash256-std-hasher", "impl-serde", + "itertools 0.12.0", "lazy_static", "log", "merlin", @@ -8234,17 +8171,16 @@ dependencies = [ "sp-std", "sp-storage", "ss58-registry", - "substrate-bip39", "thiserror", - "tiny-bip39", "tracing", + "w3f-bls", "zeroize", ] [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "blake2b_simd", "byteorder", @@ -8256,7 +8192,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "quote", "sp-core-hashing", @@ -8266,7 +8202,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8275,7 +8211,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "proc-macro2", "quote", @@ -8285,7 +8221,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "environmental", "parity-scale-codec", @@ -8293,10 +8229,20 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" +dependencies = [ + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8310,10 +8256,9 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "bytes", - "ed25519", "log", "parity-scale-codec", "rustversion", @@ -8332,7 +8277,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "lazy_static", "sp-core", @@ -8343,7 +8288,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -8355,16 +8300,16 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "thiserror", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -8375,7 +8320,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "sp-api", "sp-core", @@ -8385,7 +8330,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "backtrace", "lazy_static", @@ -8395,7 +8340,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "rustc-hash", "serde", @@ -8405,7 +8350,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "either", "hash256-std-hasher", @@ -8427,7 +8372,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8445,10 +8390,10 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "Inflector", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.39", @@ -8457,7 +8402,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "scale-info", @@ -8472,7 +8417,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8486,7 +8431,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "hash-db", "log", @@ -8507,12 +8452,12 @@ dependencies = [ [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8525,7 +8470,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "async-trait", "parity-scale-codec", @@ -8538,19 +8483,19 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "sp-std", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "sp-api", "sp-runtime", @@ -8559,7 +8504,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "ahash", "hash-db", @@ -8569,6 +8514,7 @@ dependencies = [ "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", + "rand", "scale-info", "schnellru", "sp-core", @@ -8582,7 +8528,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8599,7 +8545,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8610,7 +8556,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -8623,7 +8569,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "parity-scale-codec", "scale-info", @@ -8690,34 +8636,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "static_init" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" -dependencies = [ - "bitflags 1.3.2", - "cfg_aliases", - "libc", - "parking_lot 0.11.2", - "parking_lot_core 0.8.6", - "static_init_macro", - "winapi", -] - -[[package]] -name = "static_init_macro" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" -dependencies = [ - "cfg_aliases", - "memchr", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "std-shims" version = "0.1.1" @@ -8786,27 +8704,15 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "substrate-bip39" -version = "0.4.5" -source = "git+https://github.com/serai-dex/substrate-bip39#efb58a5263b8585b2d0ef17ed3c989e1ca09294e" -dependencies = [ - "hmac", - "pbkdf2 0.12.2", - "schnorrkel", - "sha2", - "zeroize", -] - [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -8825,7 +8731,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "hyper", "log", @@ -8837,17 +8743,16 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/serai-dex/substrate#49b7d20ef96b6ad42ea0266ea27f128e0ef3214d" +source = "git+https://github.com/serai-dex/polkadot-sdk?branch=experimental#2870e14359727983181622107510df8bdc8ebcb4" dependencies = [ "anstyle", - "build-helper", "cargo_metadata", "filetime", "parity-wasm", "sp-maybe-compressed-blob", "strum 0.25.0", "tempfile", - "toml 0.7.8", + "toml 0.8.8", "walkdir", "wasm-opt", ] @@ -8972,6 +8877,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys", +] + [[package]] name = "termtree" version = "0.4.1" @@ -9056,25 +8971,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac", - "once_cell", - "pbkdf2 0.11.0", - "rand", - "rustc-hash", - "sha2", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -9187,6 +9083,18 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + [[package]] name = "toml_datetime" version = "0.6.5" @@ -9220,12 +9128,29 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite 0.2.13", "tower-layer", "tower-service", "tracing", @@ -9306,57 +9231,25 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "parking_lot 0.11.2", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", + "parking_lot 0.12.1", "regex", "sharded-slab", "smallvec", @@ -9391,9 +9284,9 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85" +checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ "hash-db", "hashbrown 0.13.2", @@ -9639,6 +9532,10 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "w3f-bls" +version = "0.1.3" + [[package]] name = "waker-fn" version = "1.1.1" @@ -9738,9 +9635,9 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-encoder" -version = "0.31.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +checksum = "822b645bf4f2446b949776ffca47e2af60b167209ffb70814ef8779d299cd421" dependencies = [ "leb128", ] @@ -9756,9 +9653,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.114.2" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67" +checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52" dependencies = [ "anyhow", "libc", @@ -9772,9 +9669,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.114.2" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047" +checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e" dependencies = [ "anyhow", "cxx", @@ -9784,9 +9681,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.114.2" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4" +checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe" dependencies = [ "anyhow", "cc", @@ -9811,19 +9708,19 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.110.0" +version = "0.116.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dfcdb72d96f01e6c85b6bf20102e7423bdbaad5c337301bab2bbf253d26413c" +checksum = "a58e28b80dd8340cb07b8242ae654756161f6fc8d0038123d679b7b99964fa50" dependencies = [ "indexmap 2.1.0", - "semver 1.0.20", + "semver", ] [[package]] name = "wasmtime" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e87029cc5760db9a3774aff4708596fe90c20ed2baeef97212e98b812fd0fc" +checksum = "ae4b1702ef55144d6f594085f4989dc71fb71a791be1c8354ecc8e489b81199b" dependencies = [ "anyhow", "bincode", @@ -9833,15 +9730,15 @@ dependencies = [ "indexmap 2.1.0", "libc", "log", - "object 0.31.1", + "object", "once_cell", "paste", "psm", "rayon", "serde", + "serde_derive", "serde_json", "target-lexicon", - "wasm-encoder", "wasmparser", "wasmtime-cache", "wasmtime-cranelift", @@ -9853,27 +9750,27 @@ dependencies = [ [[package]] name = "wasmtime-asm-macros" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d84f68d831200016e120f2ee79d81b50cf4c4123112914aefb168d036d445d" +checksum = "c981d0e87bb3e98e08e76644e7ae5dfdef7f1d4105145853f3d677bb4535d65f" dependencies = [ "cfg-if", ] [[package]] name = "wasmtime-cache" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31561fbbaa86d3c042696940bc9601146bf4aaec39ae725c86b5f1358d8d7023" +checksum = "3d7ba8adaa84fdb9dd659275edcf7fc5282c44b9c9f829986c71d44fd52ea80a" dependencies = [ "anyhow", "base64 0.21.5", "bincode", "directories-next", - "file-per-thread-logger", "log", "rustix", "serde", + "serde_derive", "sha2", "toml 0.5.11", "windows-sys", @@ -9882,20 +9779,21 @@ dependencies = [ [[package]] name = "wasmtime-cranelift" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae8ed7a4845f22be6b1ad80f33f43fa03445b03a02f2d40dca695129769cd1a" +checksum = "1453665878e16245b9a25405e550c4a36c6731c6e34ea804edc002a38c3e6741" dependencies = [ "anyhow", + "cfg-if", "cranelift-codegen", "cranelift-control", "cranelift-entity", "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli 0.27.3", + "gimli", "log", - "object 0.31.1", + "object", "target-lexicon", "thiserror", "wasmparser", @@ -9906,33 +9804,34 @@ dependencies = [ [[package]] name = "wasmtime-cranelift-shared" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b17099f9320a1c481634d88101258917d5065717cf22b04ed75b1a8ea062b4" +checksum = "d3dface3d9b72b4670781ff72675eabb291e2836b5dded6bb312b577d2bb561f" dependencies = [ "anyhow", "cranelift-codegen", "cranelift-control", "cranelift-native", - "gimli 0.27.3", - "object 0.31.1", + "gimli", + "object", "target-lexicon", "wasmtime-environ", ] [[package]] name = "wasmtime-environ" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b9227b1001229ff125e0f76bf1d5b9dc4895e6bcfd5cc35a56f84685964ec7" +checksum = "c0116108e7d231cce15fe7dd642c66c3abb14dbcf169b0130e11f223ce8d1ad7" dependencies = [ "anyhow", "cranelift-entity", - "gimli 0.27.3", + "gimli", "indexmap 2.1.0", "log", - "object 0.31.1", + "object", "serde", + "serde_derive", "target-lexicon", "thiserror", "wasmparser", @@ -9941,21 +9840,20 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce606b392c321d7272928003543447119ef937a9c3ebfce5c4bb0bf6b0f5bac" +checksum = "e32b210767452f6b20157bb7c7d98295b92cc47aaad2a8aa31652f4469813a5d" dependencies = [ - "addr2line 0.20.0", "anyhow", "bincode", "cfg-if", - "cpp_demangle", - "gimli 0.27.3", + "gimli", + "ittapi", "log", - "object 0.31.1", - "rustc-demangle", + "object", "rustix", "serde", + "serde_derive", "target-lexicon", "wasmtime-environ", "wasmtime-jit-debug", @@ -9966,11 +9864,11 @@ dependencies = [ [[package]] name = "wasmtime-jit-debug" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef27ea6c34ef888030d15560037fe7ef27a5609fbbba8e1e3e41dc4245f5bb2" +checksum = "bffd2785a16c55ac77565613ebda625f5850d4014af0499df750e8de97c04547" dependencies = [ - "object 0.31.1", + "object", "once_cell", "rustix", "wasmtime-versioned-export-macros", @@ -9978,9 +9876,9 @@ dependencies = [ [[package]] name = "wasmtime-jit-icache-coherence" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b59f94b0409221873565419168e20b5aedf18c4bd64de5c38acf8f0634efeee3" +checksum = "b73ad1395eda136baec5ece7e079e0536a82ef73488e345456cc9b89858ad0ec" dependencies = [ "cfg-if", "libc", @@ -9989,9 +9887,9 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceb587a88ae5bb6ca248455a391aff29ac63329a404b2cdea36d91267c797db4" +checksum = "77b50f7f3c1a8dabb2607f32a81242917bd77cee75f3dec66e04b02ccbb8ba07" dependencies = [ "anyhow", "cc", @@ -10011,32 +9909,40 @@ dependencies = [ "wasmtime-environ", "wasmtime-jit-debug", "wasmtime-versioned-export-macros", + "wasmtime-wmemcheck", "windows-sys", ] [[package]] name = "wasmtime-types" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77943729d4b46141538e8d0b6168915dc5f88575ecdfea26753fd3ba8bab244a" +checksum = "447973db3dc5c24db14130ab0922795c58790aec296d198ad9d253b82ec67471" dependencies = [ "cranelift-entity", "serde", + "serde_derive", "thiserror", "wasmparser", ] [[package]] name = "wasmtime-versioned-export-macros" -version = "12.0.2" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7af9bb3ee875c4907835e607a275d10b04d15623d3aebe01afe8fbd3f85050" +checksum = "9a347bb8ecf12275fb180afb1b1c85c9e186553c43109737bffed4f54c2aa365" dependencies = [ "proc-macro2", "quote", "syn 2.0.39", ] +[[package]] +name = "wasmtime-wmemcheck" +version = "15.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47907bdd67500c66fa308acbce7387c7bfb63b5505ef81be7fc897709afcca60" + [[package]] name = "web-sys" version = "0.3.65" @@ -10299,9 +10205,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0329ef377816896f014435162bb3711ea7a07729c23d0960e6f8048b21b8fe91" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" dependencies = [ "futures", "log", @@ -10379,11 +10285,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 6.0.6", + "zstd-safe 7.0.0", ] [[package]] @@ -10398,11 +10304,10 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 14add4b98..36ac72210 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,5 +91,10 @@ panic = "unwind" lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" } # subxt *can* pull these off crates.io yet there's no benefit to this -sp-core-hashing = { git = "https://github.com/serai-dex/substrate" } -sp-std = { git = "https://github.com/serai-dex/substrate" } +sp-core-hashing = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } + +# The external arkworks-substrate repo refers back to the paritytech +# polkadot-sdk repo, hence patching it to point to serai-dex's +[patch."https://github.com/paritytech/polkadot-sdk"] +sp-crypto-ec-utils = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } diff --git a/coordinator/Cargo.toml b/coordinator/Cargo.toml index 460e5d8bf..ba4261d1f 100644 --- a/coordinator/Cargo.toml +++ b/coordinator/Cargo.toml @@ -37,7 +37,7 @@ processor-messages = { package = "serai-processor-messages", path = "../processo message-queue = { package = "serai-message-queue", path = "../message-queue" } tributary = { package = "tributary-chain", path = "./tributary" } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] } serai-client = { path = "../substrate/client", default-features = false, features = ["serai"] } hex = { version = "0.4", default-features = false, features = ["std"] } @@ -53,5 +53,5 @@ libp2p = { version = "0.52", default-features = false, features = ["tokio", "tcp [dev-dependencies] futures = { version = "0.3", default-features = false, features = ["std"] } tributary = { package = "tributary-chain", path = "./tributary", features = ["tests"] } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] } diff --git a/deny.toml b/deny.toml index 72ffdf033..72581dacf 100644 --- a/deny.toml +++ b/deny.toml @@ -98,6 +98,6 @@ allow-registry = ["https://github.com/rust-lang/crates.io-index"] allow-git = [ "https://github.com/rust-lang-nursery/lazy-static.rs", "https://github.com/serai-dex/substrate-bip39", - "https://github.com/serai-dex/substrate", + "https://github.com/serai-dex/polkadot-sdk", "https://github.com/monero-rs/base58-monero", ] diff --git a/processor/Cargo.toml b/processor/Cargo.toml index a95567f3f..803b0214f 100644 --- a/processor/Cargo.toml +++ b/processor/Cargo.toml @@ -66,7 +66,7 @@ futures = { version = "0.3", default-features = false } frost = { package = "modular-frost", path = "../crypto/frost", features = ["tests"] } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false, features = ["std"] } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, features = ["std"] } dockertest = "0.4" serai-docker-tests = { path = "../tests/docker" } diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 31e142e78..264dfd9d2 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -22,8 +22,8 @@ scale = { package = "parity-scale-codec", version = "3" } serde = { version = "1", features = ["derive"] } serde_json = "1" -sp-core = { git = "https://github.com/serai-dex/substrate" } -sp-runtime = { git = "https://github.com/serai-dex/substrate" } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } serai-runtime = { path = "../runtime", version = "0.1" } simple-request = { path = "../../common/request", version = "0.1" } diff --git a/substrate/coins/pallet/Cargo.toml b/substrate/coins/pallet/Cargo.toml index afbae927a..7d8f5237a 100644 --- a/substrate/coins/pallet/Cargo.toml +++ b/substrate/coins/pallet/Cargo.toml @@ -16,14 +16,14 @@ rustdoc-args = ["--cfg", "docsrs"] parity-scale-codec = { version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } +frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -pallet-transaction-payment = { git = "https://github.com/serai-dex/substrate", default-features = false } +pallet-transaction-payment = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false, features = ["serde"] } coins-primitives = { package = "serai-coins-primitives", path = "../primitives", default-features = false } diff --git a/substrate/coins/primitives/Cargo.toml b/substrate/coins/primitives/Cargo.toml index 8117bb8b6..517a26af6 100644 --- a/substrate/coins/primitives/Cargo.toml +++ b/substrate/coins/primitives/Cargo.toml @@ -23,7 +23,7 @@ scale-info = { version = "2", default-features = false, features = ["derive"] } serai-primitives = { path = "../../primitives", default-features = false } [dev-dependencies] -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } [features] std = ["zeroize", "borsh?/std", "serde?/std", "scale/std", "scale-info/std", "sp-runtime/std", "serai-primitives/std"] diff --git a/substrate/dex/pallet/Cargo.toml b/substrate/dex/pallet/Cargo.toml index 971d5c6d8..c635a5f0c 100644 --- a/substrate/dex/pallet/Cargo.toml +++ b/substrate/dex/pallet/Cargo.toml @@ -16,15 +16,15 @@ rustdoc-args = ["--cfg", "docsrs"] codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false } scale-info = { version = "2.5.0", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-api = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true } +frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-benchmarking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false, optional = true } coins-pallet = { package = "serai-coins-pallet", path = "../../coins/pallet", default-features = false } diff --git a/substrate/dex/pallet/src/mock.rs b/substrate/dex/pallet/src/mock.rs index 9bc302746..dea6d341e 100644 --- a/substrate/dex/pallet/src/mock.rs +++ b/substrate/dex/pallet/src/mock.rs @@ -68,11 +68,7 @@ impl frame_system::Config for Test { type Version = (); type PalletInfo = PalletInfo; type AccountData = (); - type OnNewAccount = (); - type OnKilledAccount = (); type SystemWeightInfo = (); - type SS58Prefix = (); - type OnSetCode = (); type MaxConsumers = ConstU32<16>; } diff --git a/substrate/in-instructions/pallet/Cargo.toml b/substrate/in-instructions/pallet/Cargo.toml index fc342c3bd..c5f18186a 100644 --- a/substrate/in-instructions/pallet/Cargo.toml +++ b/substrate/in-instructions/pallet/Cargo.toml @@ -16,14 +16,14 @@ rustdoc-args = ["--cfg", "docsrs"] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } - -frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } + +frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } in-instructions-primitives = { package = "serai-in-instructions-primitives", path = "../primitives", default-features = false } diff --git a/substrate/in-instructions/primitives/Cargo.toml b/substrate/in-instructions/primitives/Cargo.toml index f7cadccbd..7a619fbbb 100644 --- a/substrate/in-instructions/primitives/Cargo.toml +++ b/substrate/in-instructions/primitives/Cargo.toml @@ -20,9 +20,9 @@ serde = { version = "1", default-features = false, features = ["derive", "alloc" scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } coins-primitives = { package = "serai-coins-primitives", path = "../../coins/primitives", default-features = false } diff --git a/substrate/node/Cargo.toml b/substrate/node/Cargo.toml index 5d34fa9ba..68c92364a 100644 --- a/substrate/node/Cargo.toml +++ b/substrate/node/Cargo.toml @@ -16,45 +16,45 @@ name = "serai-node" clap = { version = "4", features = ["derive"] } futures = "0.3" -jsonrpsee = { version = "0.16", features = ["server"] } +jsonrpsee = { version = "0.20", features = ["server"] } -sp-core = { git = "https://github.com/serai-dex/substrate" } -sp-timestamp = { git = "https://github.com/serai-dex/substrate" } -sp-io = { git = "https://github.com/serai-dex/substrate" } -sp-blockchain = { git = "https://github.com/serai-dex/substrate" } -sp-api = { git = "https://github.com/serai-dex/substrate" } -sp-block-builder = { git = "https://github.com/serai-dex/substrate" } -sp-consensus-babe = { git = "https://github.com/serai-dex/substrate" } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-timestamp = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-blockchain = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-block-builder = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sp-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -frame-benchmarking = { git = "https://github.com/serai-dex/substrate" } +frame-benchmarking = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } serai-runtime = { path = "../runtime", features = ["std"] } -sc-offchain = { git = "https://github.com/serai-dex/substrate" } -sc-transaction-pool = { git = "https://github.com/serai-dex/substrate" } -sc-transaction-pool-api = { git = "https://github.com/serai-dex/substrate" } -sc-basic-authorship = { git = "https://github.com/serai-dex/substrate" } -sc-executor = { git = "https://github.com/serai-dex/substrate" } -sc-service = { git = "https://github.com/serai-dex/substrate" } -sc-client-api = { git = "https://github.com/serai-dex/substrate" } -sc-network-common = { git = "https://github.com/serai-dex/substrate" } -sc-network = { git = "https://github.com/serai-dex/substrate" } +sc-offchain = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-transaction-pool = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-transaction-pool-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-basic-authorship = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-executor = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-service = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-client-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-network-sync = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-network = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -sc-consensus = { git = "https://github.com/serai-dex/substrate" } -sc-consensus-babe = { git = "https://github.com/serai-dex/substrate" } -sc-consensus-grandpa = { git = "https://github.com/serai-dex/substrate" } -sc-authority-discovery = { git = "https://github.com/serai-dex/substrate" } +sc-consensus = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-consensus-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-consensus-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-authority-discovery = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -sc-telemetry = { git = "https://github.com/serai-dex/substrate" } -sc-cli = { git = "https://github.com/serai-dex/substrate" } +sc-telemetry = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +sc-cli = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -sc-rpc-api = { git = "https://github.com/serai-dex/substrate" } +sc-rpc-api = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } -substrate-frame-rpc-system = { git = "https://github.com/serai-dex/substrate" } -pallet-transaction-payment-rpc = { git = "https://github.com/serai-dex/substrate" } +substrate-frame-rpc-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } +pallet-transaction-payment-rpc = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } [build-dependencies] -substrate-build-script-utils = { git = "https://github.com/serai-dex/substrate" } +substrate-build-script-utils = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental" } [features] default = [] diff --git a/substrate/node/src/chain_spec.rs b/substrate/node/src/chain_spec.rs index 042f51783..b123ea11a 100644 --- a/substrate/node/src/chain_spec.rs +++ b/substrate/node/src/chain_spec.rs @@ -16,13 +16,12 @@ fn account_from_name(name: &'static str) -> PublicKey { } fn testnet_genesis( - wasm_binary: &[u8], validators: &[&'static str], endowed_accounts: Vec, ) -> RuntimeGenesisConfig { let validators = validators.iter().map(|name| account_from_name(name)).collect::>(); RuntimeGenesisConfig { - system: SystemConfig { code: wasm_binary.to_vec(), _config: PhantomData }, + system: SystemConfig { _config: PhantomData }, transaction_payment: Default::default(), @@ -67,6 +66,7 @@ fn testnet_genesis( pub fn development_config() -> Result { let wasm_binary = WASM_BINARY.ok_or("Development wasm not available")?; + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Development Network", @@ -75,7 +75,6 @@ pub fn development_config() -> Result { ChainType::Development, || { testnet_genesis( - wasm_binary, &["Alice"], vec![ account_from_name("Alice"), @@ -99,12 +98,15 @@ pub fn development_config() -> Result { None, // Extensions None, + // Code + wasm_binary, )) } pub fn testnet_config() -> Result { let wasm_binary = WASM_BINARY.ok_or("Testnet wasm not available")?; + #[allow(deprecated)] Ok(ChainSpec::from_genesis( // Name "Local Test Network", @@ -113,7 +115,6 @@ pub fn testnet_config() -> Result { ChainType::Local, || { testnet_genesis( - wasm_binary, &["Alice", "Bob", "Charlie", "Dave"], vec![ account_from_name("Alice"), @@ -137,5 +138,7 @@ pub fn testnet_config() -> Result { None, // Extensions None, + // Code + wasm_binary, )) } diff --git a/substrate/node/src/service.rs b/substrate/node/src/service.rs index bceb06b7b..dad77c5b4 100644 --- a/substrate/node/src/service.rs +++ b/substrate/node/src/service.rs @@ -8,7 +8,7 @@ use sp_consensus_babe::{SlotDuration, inherents::InherentDataProvider as BabeInh use sp_io::SubstrateHostFunctions; use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, WasmExecutor}; -use sc_network_common::sync::warp::WarpSyncParams; +use sc_network_sync::warp::WarpSyncParams; use sc_network::{Event, NetworkEventStream}; use sc_service::{error::Error as ServiceError, Configuration, TaskManager, TFullClient}; @@ -40,7 +40,7 @@ type PartialComponents = sc_service::PartialComponents< FullClient, FullBackend, SelectChain, - sc_consensus::DefaultImportQueue, + sc_consensus::DefaultImportQueue, sc_transaction_pool::FullPool, ( BabeBlockImport, @@ -104,6 +104,7 @@ pub fn new_partial(config: &Configuration) -> Result Result Result Result NativeVersion { - NativeVersion { runtime_version: VERSION, can_author_with: Default::default() } -} - // 1 MB pub const BLOCK_SIZE: u32 = 1024 * 1024; // 6 seconds @@ -163,14 +154,12 @@ impl Contains for CallFilter { RuntimeCall::Babe(call) => match call { babe::Call::report_equivocation { .. } => true, babe::Call::report_equivocation_unsigned { .. } => true, - babe::Call::plan_config_change { .. } => false, babe::Call::__Ignore(_, _) => false, }, RuntimeCall::Grandpa(call) => match call { grandpa::Call::report_equivocation { .. } => true, grandpa::Call::report_equivocation_unsigned { .. } => true, - grandpa::Call::note_stalled { .. } => false, grandpa::Call::__Ignore(_, _) => false, }, } @@ -195,13 +184,8 @@ impl system::Config for Runtime { type Version = Version; type PalletInfo = PalletInfo; - type OnNewAccount = (); - type OnKilledAccount = (); - type OnSetCode = (); - type AccountData = (); type SystemWeightInfo = (); - type SS58Prefix = SS58Prefix; // TODO: Remove for Bech32m type MaxConsumers = support::traits::ConstU32<16>; } @@ -276,6 +260,7 @@ impl babe::Config for Runtime { type WeightInfo = (); type MaxAuthorities = MaxAuthorities; + type MaxNominators = ConstU32<1>; // TODO: Handle equivocation reports type KeyOwnerProof = sp_core::Void; @@ -286,7 +271,9 @@ impl grandpa::Config for Runtime { type RuntimeEvent = RuntimeEvent; type WeightInfo = (); + type MaxAuthorities = MaxAuthorities; + type MaxNominators = ConstU32<1>; // TODO: Handle equivocation reports type MaxSetIdSessionEntries = ConstU64<0>; @@ -299,7 +286,6 @@ pub type Block = generic::Block; pub type SignedExtra = ( system::CheckNonZeroSender, system::CheckSpecVersion, - system::CheckTxVersion, system::CheckGenesis, system::CheckEra, system::CheckNonce, diff --git a/substrate/signals/pallet/Cargo.toml b/substrate/signals/pallet/Cargo.toml index bf2cb4ddb..17feda9c8 100644 --- a/substrate/signals/pallet/Cargo.toml +++ b/substrate/signals/pallet/Cargo.toml @@ -16,11 +16,11 @@ rustdoc-args = ["--cfg", "docsrs"] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } +frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../../validator-sets/pallet", default-features = false } diff --git a/substrate/signals/pallet/src/lib.rs b/substrate/signals/pallet/src/lib.rs index 91717e5b7..b06a7f2d6 100644 --- a/substrate/signals/pallet/src/lib.rs +++ b/substrate/signals/pallet/src/lib.rs @@ -9,7 +9,7 @@ pub mod pallet { use sp_io::hashing::blake2_256; use frame_system::pallet_prelude::*; - use frame_support::{pallet_prelude::*, sp_runtime}; + use frame_support::pallet_prelude::*; use serai_primitives::*; use validator_sets_pallet::{primitives::ValidatorSet, Config as VsConfig, Pallet as VsPallet}; diff --git a/substrate/validator-sets/pallet/Cargo.toml b/substrate/validator-sets/pallet/Cargo.toml index d30df1dfe..cfe8e2856 100644 --- a/substrate/validator-sets/pallet/Cargo.toml +++ b/substrate/validator-sets/pallet/Cargo.toml @@ -16,18 +16,18 @@ rustdoc-args = ["--cfg", "docsrs"] scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-io = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-application-crypto = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-session = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-io = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-application-crypto = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-runtime = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-session = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false } -frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false } +frame-system = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +frame-support = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } -pallet-babe = { git = "https://github.com/serai-dex/substrate", default-features = false } -pallet-grandpa = { git = "https://github.com/serai-dex/substrate", default-features = false } +pallet-babe = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +pallet-grandpa = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false } validator-sets-primitives = { package = "serai-validator-sets-primitives", path = "../primitives", default-features = false } diff --git a/substrate/validator-sets/primitives/Cargo.toml b/substrate/validator-sets/primitives/Cargo.toml index fc37c27ac..ca64cde68 100644 --- a/substrate/validator-sets/primitives/Cargo.toml +++ b/substrate/validator-sets/primitives/Cargo.toml @@ -24,8 +24,8 @@ serde = { version = "1", default-features = false, features = ["derive", "alloc" scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] } scale-info = { version = "2", default-features = false, features = ["derive"] } -sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false } -sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false } +sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } +sp-std = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "experimental", default-features = false } serai-primitives = { path = "../../primitives", default-features = false }