diff --git a/Cargo.lock b/Cargo.lock index beec5813..dc127554 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -404,7 +404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", - "itertools 0.10.5", + "itertools", "proc-macro-error", "proc-macro2", "quote", @@ -503,7 +503,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "rayon", "zeroize", @@ -571,7 +571,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint", "num-traits", "paste", @@ -722,15 +722,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - [[package]] name = "arrayvec" version = "0.7.4" @@ -798,19 +789,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", - "futures-core", - "pin-project-lite 0.2.13", -] - [[package]] name = "async-executor" version = "1.8.0" @@ -825,17 +803,6 @@ dependencies = [ "slab", ] -[[package]] -name = "async-fs" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite 2.2.0", -] - [[package]] name = "async-io" version = "1.13.0" @@ -891,7 +858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener-strategy", "pin-project-lite 0.2.13", ] @@ -904,17 +871,6 @@ dependencies = [ "event-listener 2.5.3", ] -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io 2.3.2", - "blocking", - "futures-lite 2.2.0", -] - [[package]] name = "async-oneshot" version = "0.5.9" @@ -924,24 +880,6 @@ dependencies = [ "futures-micro", ] -[[package]] -name = "async-process" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" -dependencies = [ - "async-channel 2.2.0", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-signal", - "blocking", - "cfg-if", - "event-listener 5.2.0", - "futures-lite 2.2.0", - "rustix 0.38.31", - "windows-sys 0.52.0", -] - [[package]] name = "async-recursion" version = "0.3.2" @@ -953,24 +891,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.31", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - [[package]] name = "async-task" version = "4.7.0" @@ -1020,18 +940,6 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" -[[package]] -name = "atomic-take" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "attohttpc" version = "0.24.1" @@ -1253,16 +1161,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", -] - [[package]] name = "blake2b_simd" version = "1.0.2" @@ -1270,8 +1168,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "arrayvec", + "constant_time_eq", ] [[package]] @@ -1281,8 +1179,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", + "arrayvec", + "constant_time_eq", ] [[package]] @@ -1292,10 +1190,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "cc", "cfg-if", - "constant_time_eq 0.3.0", + "constant_time_eq", "rayon", ] @@ -1326,22 +1224,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "blocking" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", - "async-task", - "fastrand 2.0.1", - "futures-io", - "futures-lite 2.2.0", - "piper", - "tracing", -] - [[package]] name = "blst" version = "0.3.11" @@ -1365,6 +1247,18 @@ dependencies = [ "serde", ] +[[package]] +name = "bounded-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" +dependencies = [ + "log", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "brotli" version = "3.4.0" @@ -1870,12 +1764,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -2050,7 +1938,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools 0.10.5", + "itertools", "log", "smallvec", "wasmparser", @@ -2079,7 +1967,7 @@ dependencies = [ "criterion-plot", "futures", "is-terminal", - "itertools 0.10.5", + "itertools", "num-traits", "once_cell", "oorandom", @@ -2099,7 +1987,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools 0.10.5", + "itertools", ] [[package]] @@ -2121,9 +2009,9 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-messenger", - "sp-runtime", + "sp-runtime 24.0.0", "tracing", ] @@ -2146,15 +2034,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.19" @@ -2331,76 +2210,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" -dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 2.0.52", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" -dependencies = [ - "darling_core 0.20.8", - "quote", - "syn 2.0.52", -] - [[package]] name = "data-encoding" version = "2.5.0" @@ -2637,7 +2446,7 @@ dependencies = [ "ark-serialize", "ark-std", "ark-transcript", - "arrayvec 0.7.4", + "arrayvec", "zeroize", ] @@ -2685,19 +2494,19 @@ dependencies = [ "sc-client-api", "sc-executor", "sc-executor-common", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-fees", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-executive", - "sp-externalities", + "sp-externalities 0.19.0", "sp-inherents", "sp-messenger", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "sp-timestamp", - "sp-version", + "sp-version 22.0.0", "subspace-core-primitives", "subspace-runtime-primitives", "tracing", @@ -2714,10 +2523,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-core", - "sp-runtime", - "sp-weights", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", "subspace-core-primitives", "subspace-runtime-primitives", ] @@ -2728,12 +2537,6 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - [[package]] name = "dtoa" version = "1.0.9" @@ -2832,21 +2635,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-zebra" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" -dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519", - "hashbrown 0.14.3", - "hex", - "rand_core 0.6.4", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "either" version = "1.10.0" @@ -3004,17 +2792,6 @@ dependencies = [ "pin-project-lite 0.2.13", ] -[[package]] -name = "event-listener" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite 0.2.13", -] - [[package]] name = "event-listener-primitives" version = "2.0.1" @@ -3036,16 +2813,6 @@ dependencies = [ "pin-project-lite 0.2.13", ] -[[package]] -name = "event-listener-strategy" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" -dependencies = [ - "event-listener 5.2.0", - "pin-project-lite 0.2.13", -] - [[package]] name = "exit-future" version = "0.2.0" @@ -3272,11 +3039,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", ] [[package]] @@ -3299,14 +3066,14 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "static_assertions", ] @@ -3321,22 +3088,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-tracing", -] - -[[package]] -name = "frame-metadata" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", ] [[package]] @@ -3361,7 +3117,7 @@ dependencies = [ "bitflags 1.3.2", "docify", "environmental", - "frame-metadata 16.0.0", + "frame-metadata", "frame-support-procedural", "impl-trait-for-tuples", "k256", @@ -3373,21 +3129,21 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-api", - "sp-arithmetic", - "sp-core", + "sp-api 4.0.0-dev", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", "sp-core-hashing-proc-macro", - "sp-debug-derive", + "sp-debug-derive 8.0.0", "sp-genesis-builder", "sp-inherents", - "sp-io", - "sp-metadata-ir", - "sp-runtime", + "sp-io 23.0.0", + "sp-metadata-ir 0.1.0", + "sp-runtime 24.0.0", "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-weights", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "sp-weights 20.0.0", "static_assertions", "tt-call", ] @@ -3402,12 +3158,12 @@ dependencies = [ "derive-syn-parse", "expander", "frame-support-procedural-tools", - "itertools 0.10.5", + "itertools", "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "sp-core-hashing 9.0.0", + "sp-core-hashing", "syn 2.0.52", ] @@ -3445,12 +3201,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", - "sp-weights", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-version 22.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -3463,9 +3219,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -3474,7 +3230,7 @@ version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev", ] [[package]] @@ -3484,9 +3240,9 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "frame-support", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -4219,7 +3975,6 @@ checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.11", "allocator-api2", - "serde", ] [[package]] @@ -4457,7 +4212,7 @@ version = "1.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07d49e928d0dfa8603bf9ee1161248a91854eda4a31ab4db9313e0b56ac7f3c6" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitflags 2.4.2", "derive_more", "enum-iterator", @@ -4522,9 +4277,9 @@ dependencies = [ "hyper", "log", "rustls 0.21.10", - "rustls-native-certs 0.6.3", + "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "webpki-roots 0.25.4", ] @@ -4551,12 +4306,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.2.3" @@ -4705,12 +4454,6 @@ dependencies = [ "hashbrown 0.14.3", ] -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - [[package]] name = "indoc" version = "2.0.4" @@ -4825,15 +4568,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.10" @@ -4864,29 +4598,17 @@ version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ - "jsonrpsee-client-transport 0.16.3", - "jsonrpsee-core 0.16.3", - "jsonrpsee-http-client 0.16.3", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-http-client", "jsonrpsee-proc-macros", "jsonrpsee-server", - "jsonrpsee-types 0.16.3", + "jsonrpsee-types", "jsonrpsee-wasm-client", "jsonrpsee-ws-client", "tracing", ] -[[package]] -name = "jsonrpsee" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2" -dependencies = [ - "jsonrpsee-client-transport 0.21.0", - "jsonrpsee-core 0.21.0", - "jsonrpsee-http-client 0.21.0", - "jsonrpsee-types 0.21.0", -] - [[package]] name = "jsonrpsee-client-transport" version = "0.16.3" @@ -4899,40 +4621,19 @@ dependencies = [ "futures-util", "gloo-net", "http 0.2.12", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-core", + "jsonrpsee-types", "pin-project", - "rustls-native-certs 0.6.3", + "rustls-native-certs", "soketto", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tracing", "webpki-roots 0.25.4", ] -[[package]] -name = "jsonrpsee-client-transport" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220" -dependencies = [ - "futures-util", - "http 0.2.12", - "jsonrpsee-core 0.21.0", - "pin-project", - "rustls-native-certs 0.7.0", - "rustls-pki-types", - "soketto", - "thiserror", - "tokio", - "tokio-rustls 0.25.0", - "tokio-util", - "tracing", - "url", -] - [[package]] name = "jsonrpsee-core" version = "0.16.3" @@ -4940,7 +4641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec", "async-lock 2.8.0", "async-trait", "beef", @@ -4949,7 +4650,7 @@ dependencies = [ "futures-util", "globset", "hyper", - "jsonrpsee-types 0.16.3", + "jsonrpsee-types", "parking_lot 0.12.1", "rand", "rustc-hash", @@ -4963,73 +4664,29 @@ dependencies = [ ] [[package]] -name = "jsonrpsee-core" -version = "0.21.0" +name = "jsonrpsee-http-client" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ - "anyhow", - "async-lock 3.3.0", "async-trait", - "beef", - "futures-timer", - "futures-util", "hyper", - "jsonrpsee-types 0.21.0", - "pin-project", + "hyper-rustls", + "jsonrpsee-core", + "jsonrpsee-types", "rustc-hash", "serde", "serde_json", "thiserror", "tokio", - "tokio-stream", "tracing", ] [[package]] -name = "jsonrpsee-http-client" +name = "jsonrpsee-proc-macros" version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" -dependencies = [ - "async-trait", - "hyper", - "hyper-rustls", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", - "rustc-hash", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" -dependencies = [ - "async-trait", - "hyper", - "hyper-rustls", - "jsonrpsee-core 0.21.0", - "jsonrpsee-types 0.21.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "tracing", - "url", -] - -[[package]] -name = "jsonrpsee-proc-macros" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", "proc-macro-crate 1.1.3", @@ -5048,8 +4705,8 @@ dependencies = [ "futures-util", "http 0.2.12", "hyper", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-core", + "jsonrpsee-types", "serde", "serde_json", "soketto", @@ -5074,28 +4731,15 @@ dependencies = [ "tracing", ] -[[package]] -name = "jsonrpsee-types" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "jsonrpsee-wasm-client" version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18e5df77c8f625d36e4cfb583c5a674eccebe32403fcfe42f7ceff7fac9324dd" dependencies = [ - "jsonrpsee-client-transport 0.16.3", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] @@ -5105,9 +4749,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http 0.2.12", - "jsonrpsee-client-transport 0.16.3", - "jsonrpsee-core 0.16.3", - "jsonrpsee-types 0.16.3", + "jsonrpsee-client-transport", + "jsonrpsee-core", + "jsonrpsee-types", ] [[package]] @@ -5539,7 +5183,7 @@ version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "asynchronous-codec 0.6.2", "bytes", "either", @@ -5566,7 +5210,7 @@ name = "libp2p-kad" version = "0.45.2" source = "git+https://github.com/subspace/rust-libp2p?rev=d6339da35589d86bae6ecb25a5121c02f2e5b90e#d6339da35589d86bae6ecb25a5121c02f2e5b90e" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "asynchronous-codec 0.7.0", "bytes", "either", @@ -6495,7 +6139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bitflags 1.3.2", "blake2 0.10.6", "c2-chacha", @@ -6523,13 +6167,13 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-offchain", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", - "sp-core", + "sp-core 21.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -6538,14 +6182,14 @@ version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "anyhow", - "jsonrpsee 0.16.3", + "jsonrpsee", "parity-scale-codec", "serde", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-mmr-primitives", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -6823,18 +6467,6 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -6899,7 +6531,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "itoa", ] @@ -6919,7 +6551,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint", "num-integer", "num-traits", ] @@ -7084,9 +6715,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7122,8 +6753,8 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7141,13 +6772,13 @@ dependencies = [ "scale-info", "sp-consensus-slots", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-domains-fraud-proof", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-version 22.0.0", "subspace-core-primitives", "subspace-runtime-primitives", ] @@ -7163,12 +6794,12 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-messenger", "sp-mmr-primitives", - "sp-runtime", - "sp-trie", + "sp-runtime 24.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -7182,11 +6813,11 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7199,8 +6830,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-consensus-subspace", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7225,8 +6856,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7244,9 +6875,9 @@ dependencies = [ "serde", "sp-consensus-slots", "sp-consensus-subspace", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "subspace-core-primitives", "subspace-runtime-primitives", "subspace-verification", @@ -7261,10 +6892,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 21.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "sp-subspace-mmr", ] @@ -7279,9 +6910,9 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7297,10 +6928,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", - "sp-storage", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "sp-timestamp", ] @@ -7326,10 +6957,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7337,15 +6968,15 @@ name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-weights", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -7355,9 +6986,9 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "pallet-transaction-payment", "parity-scale-codec", - "sp-api", - "sp-runtime", - "sp-weights", + "sp-api 4.0.0-dev", + "sp-runtime 24.0.0", + "sp-weights 20.0.0", ] [[package]] @@ -7371,11 +7002,11 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-messenger", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7388,10 +7019,10 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -7435,7 +7066,7 @@ dependencies = [ "memmap2 0.5.10", "parking_lot 0.12.1", "rand", - "siphasher 0.3.11", + "siphasher", "snap", "winapi", ] @@ -7446,7 +7077,7 @@ version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitvec", "byte-slice-cast", "bytes", @@ -7560,15 +7191,6 @@ dependencies = [ "crypto-mac 0.11.0", ] -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "pem" version = "1.1.1" @@ -7642,17 +7264,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand 2.0.1", - "futures-io", -] - [[package]] name = "pkcs8" version = "0.10.2" @@ -7675,6 +7286,43 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" +[[package]] +name = "polkavm-common" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" + +[[package]] +name = "polkavm-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79fa916f7962348bd1bb1a65a83401675e6fc86c51a0fdbcf92a3108e58e6125" +dependencies = [ + "polkavm-derive-impl-macro", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" +dependencies = [ + "polkavm-common", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "polkavm-derive-impl-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15e85319a0d5129dc9f021c62607e0804f5fb777a05cdda44d750ac0732def66" +dependencies = [ + "polkavm-derive-impl", + "syn 2.0.52", +] + [[package]] name = "polling" version = "2.8.0" @@ -7754,7 +7402,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools 0.10.5", + "itertools", "normalize-line-endings", "predicates-core", "regex", @@ -7948,7 +7596,7 @@ checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "multimap", @@ -7969,7 +7617,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools", "proc-macro2", "quote", "syn 1.0.109", @@ -8421,14 +8069,14 @@ dependencies = [ "percent-encoding", "pin-project-lite 0.2.13", "rustls 0.21.10", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "system-configuration 0.6.0", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -8675,20 +8323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-native-certs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.1", - "rustls-pki-types", + "rustls-pemfile", "schannel", "security-framework", ] @@ -8702,16 +8337,6 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" -dependencies = [ - "base64 0.21.7", - "rustls-pki-types", -] - [[package]] name = "rustls-pki-types" version = "1.3.1" @@ -8745,17 +8370,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more", - "twox-hash", -] - [[package]] name = "rw-stream-sink" version = "0.3.0" @@ -8813,8 +8427,8 @@ version = "4.1.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "log", - "sp-core", - "sp-wasm-interface", + "sp-core 21.0.0", + "sp-wasm-interface 14.0.0", "thiserror", ] @@ -8831,12 +8445,12 @@ dependencies = [ "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 21.0.0", "sp-inherents", - "sp-runtime", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", ] @@ -8846,13 +8460,13 @@ version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-builder", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-inherents", - "sp-runtime", - "sp-trie", + "sp-runtime 24.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -8873,11 +8487,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-genesis-builder", - "sp-io", - "sp-runtime", - "sp-state-machine", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", ] [[package]] @@ -8904,17 +8518,17 @@ dependencies = [ "sc-executor", "sc-transaction-pool-api", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-externalities", - "sp-runtime", - "sp-state-machine", + "sp-externalities 0.19.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "sp-statement-store", - "sp-storage", - "sp-trie", + "sp-storage 13.0.0", + "sp-trie 22.0.0", "substrate-prometheus-endpoint", ] @@ -8934,13 +8548,13 @@ dependencies = [ "sc-client-api", "sc-state-db", "schnellru", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-database", - "sp-runtime", - "sp-state-machine", - "sp-trie", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-trie 22.0.0", ] [[package]] @@ -8959,12 +8573,12 @@ dependencies = [ "sc-client-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-runtime", - "sp-state-machine", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -8983,14 +8597,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core", + "sp-core 21.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", ] [[package]] @@ -9014,16 +8628,16 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "schnorrkel", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-slots", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-inherents", "sp-objects", - "sp-runtime", + "sp-runtime 24.0.0", "subspace-archiving", "subspace-core-primitives", "subspace-proof-of-space", @@ -9041,7 +8655,7 @@ dependencies = [ "async-oneshot", "futures", "futures-timer", - "jsonrpsee 0.16.3", + "jsonrpsee", "lru 0.12.3", "parity-scale-codec", "parking_lot 0.12.1", @@ -9049,13 +8663,13 @@ dependencies = [ "sc-consensus-subspace", "sc-rpc", "sc-utils", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-objects", - "sp-runtime", + "sp-runtime 24.0.0", "subspace-archiving", "subspace-core-primitives", "subspace-farmer-components", @@ -9071,14 +8685,14 @@ source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1 dependencies = [ "sc-client-api", "sc-executor", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-domains", - "sp-externalities", - "sp-io", + "sp-externalities 0.19.0", + "sp-io 23.0.0", "sp-messenger-host-functions", - "sp-runtime", + "sp-runtime 24.0.0", "sp-subspace-mmr", ] @@ -9092,15 +8706,15 @@ dependencies = [ "sc-executor-common", "sc-executor-wasmtime", "schnellru", - "sp-api", - "sp-core", - "sp-externalities", - "sp-io", - "sp-panic-handler", - "sp-runtime-interface", - "sp-trie", - "sp-version", - "sp-wasm-interface", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-io 23.0.0", + "sp-panic-handler 8.0.0", + "sp-runtime-interface 17.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", + "sp-wasm-interface 14.0.0", "tracing", ] @@ -9111,7 +8725,7 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface", + "sp-wasm-interface 14.0.0", "thiserror", "wasm-instrument", ] @@ -9129,8 +8743,8 @@ dependencies = [ "rustix 0.36.17", "sc-allocator", "sc-executor-common", - "sp-runtime-interface", - "sp-wasm-interface", + "sp-runtime-interface 17.0.0", + "sp-wasm-interface 14.0.0", "wasmtime", ] @@ -9148,7 +8762,7 @@ dependencies = [ "sc-network-common", "sc-network-sync", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -9159,9 +8773,9 @@ dependencies = [ "array-bytes 6.2.2", "parking_lot 0.12.1", "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "thiserror", ] @@ -9171,7 +8785,7 @@ version = "0.1.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "array-bytes 4.2.0", - "arrayvec 0.7.4", + "arrayvec", "blake2 0.10.6", "bytes", "futures", @@ -9185,12 +8799,12 @@ dependencies = [ "sc-client-api", "sc-network", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev", "sp-consensus", - "sp-core", - "sp-keystore", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "sp-mixnet", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", ] @@ -9200,7 +8814,7 @@ version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "array-bytes 6.2.2", - "async-channel 1.9.0", + "async-channel", "async-trait", "asynchronous-codec 0.6.2", "bytes", @@ -9224,10 +8838,10 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -9242,7 +8856,7 @@ name = "sc-network-bitswap" version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "async-channel 1.9.0", + "async-channel", "cid", "futures", "libp2p-identity 0.1.3", @@ -9252,7 +8866,7 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-runtime", + "sp-runtime 24.0.0", "thiserror", "unsigned-varint 0.7.2", ] @@ -9271,7 +8885,7 @@ dependencies = [ "sc-consensus", "sp-consensus", "sp-consensus-grandpa", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -9288,7 +8902,7 @@ dependencies = [ "sc-network-common", "sc-network-sync", "schnellru", - "sp-runtime", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "tracing", ] @@ -9299,7 +8913,7 @@ version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "array-bytes 6.2.2", - "async-channel 1.9.0", + "async-channel", "futures", "libp2p-identity 0.1.3", "log", @@ -9309,8 +8923,8 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] @@ -9320,7 +8934,7 @@ version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "array-bytes 6.2.2", - "async-channel 1.9.0", + "async-channel", "async-trait", "fork-tree", "futures", @@ -9338,12 +8952,12 @@ dependencies = [ "sc-utils", "schnellru", "smallvec", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -9365,7 +8979,7 @@ dependencies = [ "sc-network-sync", "sc-utils", "sp-consensus", - "sp-runtime", + "sp-runtime 24.0.0", "substrate-prometheus-endpoint", ] @@ -9393,12 +9007,12 @@ dependencies = [ "sc-network-common", "sc-transaction-pool-api", "sc-utils", - "sp-api", - "sp-core", - "sp-externalities", - "sp-keystore", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "threadpool", "tracing", ] @@ -9420,13 +9034,13 @@ dependencies = [ "sc-consensus-slots", "sc-network", "sc-network-gossip", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", "sp-consensus-slots", "sp-consensus-subspace", "sp-inherents", - "sp-runtime", + "sp-runtime 24.0.0", "subspace-core-primitives", "subspace-proof-of-time", "thread-priority", @@ -9448,7 +9062,7 @@ version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "futures", - "jsonrpsee 0.16.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9461,16 +9075,16 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde_json", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", - "sp-keystore", + "sp-core 21.0.0", + "sp-keystore 0.27.0", "sp-offchain", "sp-rpc", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", "sp-statement-store", - "sp-version", + "sp-version 22.0.0", "tokio", ] @@ -9479,7 +9093,7 @@ name = "sc-rpc-api" version = "0.10.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "jsonrpsee 0.16.3", + "jsonrpsee", "parity-scale-codec", "sc-chain-spec", "sc-mixnet", @@ -9487,10 +9101,10 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-version", + "sp-runtime 24.0.0", + "sp-version 22.0.0", "thiserror", ] @@ -9500,7 +9114,7 @@ version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "http 0.2.12", - "jsonrpsee 0.16.3", + "jsonrpsee", "log", "serde_json", "substrate-prometheus-endpoint", @@ -9518,7 +9132,7 @@ dependencies = [ "futures", "futures-util", "hex", - "jsonrpsee 0.16.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9527,12 +9141,12 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-version", + "sp-runtime 24.0.0", + "sp-version 22.0.0", "thiserror", "tokio", "tokio-stream", @@ -9548,7 +9162,7 @@ dependencies = [ "exit-future", "futures", "futures-timer", - "jsonrpsee 0.16.3", + "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -9578,20 +9192,20 @@ dependencies = [ "sc-utils", "serde", "serde_json", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "sp-session", - "sp-state-machine", - "sp-storage", + "sp-state-machine 0.28.0", + "sp-storage 13.0.0", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie", - "sp-version", + "sp-trie 22.0.0", + "sp-version 22.0.0", "static_init", "substrate-prometheus-endpoint", "tempfile", @@ -9609,7 +9223,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "sp-core", + "sp-core 21.0.0", ] [[package]] @@ -9620,7 +9234,7 @@ dependencies = [ "clap 4.5.2", "fs4 0.7.0", "log", - "sp-core", + "sp-core 21.0.0", "thiserror", "tokio", ] @@ -9630,7 +9244,7 @@ name = "sc-subspace-block-relay" version = "0.1.0" source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1adba00615721fa9#b96ae888720551b22ece25cf1adba00615721fa9" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-trait", "derive_more", "futures", @@ -9641,9 +9255,9 @@ dependencies = [ "sc-network-common", "sc-network-sync", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev", "sp-consensus-subspace", - "sp-runtime", + "sp-runtime 24.0.0", "strum_macros 0.25.3", "substrate-prometheus-endpoint", "thiserror", @@ -9670,9 +9284,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core", - "sp-io", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", ] [[package]] @@ -9712,12 +9326,12 @@ dependencies = [ "sc-client-api", "sc-tracing-proc-macro", "serde", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-rpc", - "sp-runtime", - "sp-tracing", + "sp-runtime 24.0.0", + "sp-tracing 10.0.0", "thiserror", "tracing", "tracing-log 0.1.4", @@ -9751,11 +9365,11 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "serde", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", - "sp-runtime", - "sp-tracing", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-tracing 10.0.0", "sp-transaction-pool", "substrate-prometheus-endpoint", "thiserror", @@ -9772,8 +9386,8 @@ dependencies = [ "parity-scale-codec", "serde", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "thiserror", ] @@ -9782,81 +9396,14 @@ name = "sc-utils" version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "async-channel 1.9.0", + "async-channel", "futures", "futures-timer", "lazy_static", "log", "parking_lot 0.12.1", "prometheus", - "sp-arithmetic", -] - -[[package]] -name = "scale-bits" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", -] - -[[package]] -name = "scale-decode" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7caaf753f8ed1ab4752c6afb20174f03598c664724e0e32628e161c21000ff76" -dependencies = [ - "derive_more", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-decode-derive", - "scale-info", - "smallvec", -] - -[[package]] -name = "scale-decode-derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3475108a1b62c7efd1b5c65974f30109a598b2f45f23c9ae030acb9686966db" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "scale-encode" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5" -dependencies = [ - "derive_more", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-encode-derive", - "scale-info", - "smallvec", -] - -[[package]] -name = "scale-encode-derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995491f110efdc6bea96d6a746140e32bfceb4ea47510750a5467295a4707a25" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.1.3", - "proc-macro2", - "quote", - "syn 1.0.109", + "sp-arithmetic 16.0.0", ] [[package]] @@ -9885,39 +9432,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "scale-typegen" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00860983481ac590ac87972062909bef0d6a658013b592ccc0f2feb272feab11" -dependencies = [ - "proc-macro2", - "quote", - "scale-info", - "syn 2.0.52", - "thiserror", -] - -[[package]] -name = "scale-value" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58223c7691bf0bd46b43c9aea6f0472d1067f378d574180232358d7c6e0a8089" -dependencies = [ - "base58", - "blake2 0.10.6", - "derive_more", - "either", - "frame-metadata 15.1.0", - "parity-scale-codec", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "serde", - "yap", -] - [[package]] name = "schannel" version = "0.1.23" @@ -9946,7 +9460,7 @@ checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" dependencies = [ "aead", "arrayref", - "arrayvec 0.7.4", + "arrayvec", "curve25519-dalek 4.1.2", "getrandom_or_panic", "merlin", @@ -10289,6 +9803,12 @@ name = "simple-mermaid" version = "0.1.0" source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" +[[package]] +name = "simple-mermaid" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" + [[package]] name = "simple_moving_average" version = "1.0.2" @@ -10304,12 +9824,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "siphasher" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" - [[package]] name = "slab" version = "0.4.9" @@ -10332,141 +9846,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] -name = "smol" -version = "2.0.0" +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + +[[package]] +name = "snow" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ - "async-channel 2.2.0", - "async-executor", - "async-fs", - "async-io 2.3.2", - "async-lock 3.3.0", - "async-net", - "async-process", - "blocking", - "futures-lite 2.2.0", + "aes-gcm", + "blake2 0.10.6", + "chacha20poly1305", + "curve25519-dalek 4.1.2", + "rand_core 0.6.4", + "ring 0.17.8", + "rustc_version", + "sha2 0.10.8", + "subtle 2.5.0", ] [[package]] -name = "smoldot" -version = "0.16.0" +name = "socket2" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" -dependencies = [ - "arrayvec 0.7.4", - "async-lock 3.3.0", - "atomic-take", - "base64 0.21.7", - "bip39", - "blake2-rfc", - "bs58 0.5.0", - "chacha20", - "crossbeam-queue", - "derive_more", - "ed25519-zebra 4.0.3", - "either", - "event-listener 4.0.3", - "fnv", - "futures-lite 2.2.0", - "futures-util", - "hashbrown 0.14.3", - "hex", - "hmac 0.12.1", - "itertools 0.12.1", - "libm", - "libsecp256k1", - "merlin", - "no-std-net", - "nom", - "num-bigint", - "num-rational", - "num-traits", - "pbkdf2 0.12.2", - "pin-project", - "poly1305", - "rand", - "rand_chacha", - "ruzstd", - "schnorrkel", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "siphasher 1.0.0", - "slab", - "smallvec", - "soketto", - "twox-hash", - "wasmi", - "x25519-dalek 2.0.1", - "zeroize", -] - -[[package]] -name = "smoldot-light" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" -dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", - "base64 0.21.7", - "blake2-rfc", - "derive_more", - "either", - "event-listener 4.0.3", - "fnv", - "futures-channel", - "futures-lite 2.2.0", - "futures-util", - "hashbrown 0.14.3", - "hex", - "itertools 0.12.1", - "log", - "lru 0.12.3", - "no-std-net", - "parking_lot 0.12.1", - "pin-project", - "rand", - "rand_chacha", - "serde", - "serde_json", - "siphasher 1.0.0", - "slab", - "smol", - "smoldot", - "zeroize", -] - -[[package]] -name = "snap" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" - -[[package]] -name = "snow" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" -dependencies = [ - "aes-gcm", - "blake2 0.10.6", - "chacha20poly1305", - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", - "ring 0.17.8", - "rustc_version", - "sha2 0.10.8", - "subtle 2.5.0", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -10508,15 +9914,38 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-api-proc-macro", - "sp-core", - "sp-externalities", - "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", + "sp-api-proc-macro 4.0.0-dev", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-metadata-ir 0.1.0", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", + "thiserror", +] + +[[package]] +name = "sp-api" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298331cb47a948244f6fb4921b5cbeece267d72139fb90760993b6ec37b2212c" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "scale-info", + "sp-api-proc-macro 16.0.0", + "sp-core 30.0.0", + "sp-externalities 0.27.0", + "sp-metadata-ir 0.6.0", + "sp-runtime 33.0.0", + "sp-runtime-interface 26.0.0", + "sp-state-machine 0.37.0", + "sp-std 14.0.0", + "sp-trie 31.0.0", + "sp-version 31.0.0", "thiserror", ] @@ -10534,6 +9963,21 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "sp-api-proc-macro" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18cfbb3ae0216e842dfb805ea8e896e85b07a7c34d432a6c7b7d770924431ed2" +dependencies = [ + "Inflector", + "blake2 0.10.6", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "sp-application-crypto" version = "23.0.0" @@ -10542,9 +9986,23 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-application-crypto" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b4b7b12922cb90cf8dff0cab14087ba0ca25c1f04ba060c7294ce42c78d89ab" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 30.0.0", + "sp-io 32.0.0", + "sp-std 14.0.0", ] [[package]] @@ -10557,7 +10015,22 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 8.0.0", + "static_assertions", +] + +[[package]] +name = "sp-arithmetic" +version = "25.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "910c07fa263b20bf7271fdd4adcb5d3217dfdac14270592e0780223542e7e114" +dependencies = [ + "integer-sqrt", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-std 14.0.0", "static_assertions", ] @@ -10584,10 +10057,10 @@ name = "sp-block-builder" version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "sp-api", + "sp-api 4.0.0-dev", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -10599,7 +10072,7 @@ dependencies = [ "domain-runtime-primitives", "parity-scale-codec", "sp-inherents", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -10612,11 +10085,11 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", "schnellru", - "sp-api", + "sp-api 4.0.0-dev", "sp-consensus", "sp-database", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "thiserror", ] @@ -10628,10 +10101,10 @@ dependencies = [ "async-trait", "futures", "log", - "sp-core", + "sp-core 21.0.0", "sp-inherents", - "sp-runtime", - "sp-state-machine", + "sp-runtime 24.0.0", + "sp-state-machine 0.28.0", "thiserror", ] @@ -10644,13 +10117,13 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", "sp-mmr-primitives", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "strum", ] @@ -10664,12 +10137,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -10680,7 +10153,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std", + "sp-std 8.0.0", "sp-timestamp", ] @@ -10694,16 +10167,16 @@ dependencies = [ "parity-scale-codec", "scale-info", "schnorrkel", - "sp-api", - "sp-application-crypto", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", "sp-consensus-slots", - "sp-core", - "sp-externalities", + "sp-core 21.0.0", + "sp-externalities 0.19.0", "sp-inherents", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-io 23.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "sp-timestamp", "subspace-core-primitives", "subspace-proof-of-space", @@ -10721,15 +10194,15 @@ dependencies = [ "bip39", "bitflags 1.3.2", "blake2 0.10.6", - "bounded-collections", + "bounded-collections 0.1.9", "bs58 0.5.0", "dyn-clonable", - "ed25519-zebra 3.1.0", + "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", "impl-serde", - "itertools 0.10.5", + "itertools", "libsecp256k1", "log", "merlin", @@ -10743,12 +10216,12 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 9.0.0", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing", + "sp-debug-derive 8.0.0", + "sp-externalities 0.19.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", "ss58-registry", "substrate-bip39", "thiserror", @@ -10758,23 +10231,55 @@ dependencies = [ ] [[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +name = "sp-core" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "586e0d5185e4545f465fc9a04fb9c4572d3e294137312496db2b67b0bb579e1f" dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", + "array-bytes 6.2.2", + "bip39", + "bitflags 1.3.2", + "blake2 0.10.6", + "bounded-collections 0.2.0", + "bs58 0.5.0", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "itertools", + "libsecp256k1", + "log", + "merlin", + "parity-scale-codec", + "parking_lot 0.12.1", + "paste", + "primitive-types", + "rand", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-crypto-hashing", + "sp-debug-derive 14.0.0", + "sp-externalities 0.27.0", + "sp-runtime-interface 26.0.0", + "sp-std 14.0.0", + "sp-storage 20.0.0", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tracing", + "w3f-bls", + "zeroize", ] [[package]] name = "sp-core-hashing" -version = "15.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0f4990add7b2cefdeca883c0efa99bb4d912cb2196120e1500c0cc099553b0" +version = "9.0.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "blake2b_simd", "byteorder", @@ -10790,7 +10295,7 @@ version = "9.0.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "quote", - "sp-core-hashing 9.0.0", + "sp-core-hashing", "syn 2.0.52", ] @@ -10811,8 +10316,33 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch", "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale", - "sp-runtime-interface", - "sp-std", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-crypto-hashing" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.8", + "sha3", + "twox-hash", +] + +[[package]] +name = "sp-crypto-hashing-proc-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85d0f1f1e44bd8617eb2a48203ee854981229e3e79e6f468c7175d5fd37489b" +dependencies = [ + "quote", + "sp-crypto-hashing", + "syn 2.0.52", ] [[package]] @@ -10834,13 +10364,24 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "sp-debug-derive" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "sp-domain-digests" version = "0.1.0" source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1adba00615721fa9#b96ae888720551b22ece25cf1adba00615721fa9" dependencies = [ "parity-scale-codec", - "sp-runtime", + "sp-runtime 24.0.0", ] [[package]] @@ -10860,16 +10401,16 @@ dependencies = [ "rs_merkle", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-runtime", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", - "sp-weights", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "sp-version 22.0.0", + "sp-weights 20.0.0", "subspace-core-primitives", "subspace-runtime-primitives", "trie-db", @@ -10889,18 +10430,18 @@ dependencies = [ "sc-client-api", "sc-executor", "scale-info", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", "sp-consensus-slots", - "sp-core", + "sp-core 21.0.0", "sp-domain-digests", "sp-domains", - "sp-externalities", - "sp-runtime", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-trie", + "sp-externalities 0.19.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", "subspace-core-primitives", "subspace-runtime-primitives", "thiserror", @@ -10924,8 +10465,20 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 8.0.0", + "sp-storage 13.0.0", +] + +[[package]] +name = "sp-externalities" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 14.0.0", + "sp-storage 20.0.0", ] [[package]] @@ -10934,9 +10487,9 @@ version = "0.1.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "serde_json", - "sp-api", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -10948,8 +10501,8 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] @@ -10965,14 +10518,40 @@ dependencies = [ "parity-scale-codec", "rustversion", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-keystore 0.27.0", + "sp-runtime-interface 17.0.0", + "sp-state-machine 0.28.0", + "sp-std 8.0.0", + "sp-tracing 10.0.0", + "sp-trie 22.0.0", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca29e042628cb94cbcaefa935e624a9b48f9230dbce6324908e9b4f768317ef" +dependencies = [ + "bytes", + "ed25519-dalek", + "libsecp256k1", + "log", + "parity-scale-codec", + "rustversion", + "secp256k1", + "sp-core 30.0.0", + "sp-crypto-hashing", + "sp-externalities 0.27.0", + "sp-keystore 0.36.0", + "sp-runtime-interface 26.0.0", + "sp-state-machine 0.37.0", + "sp-std 14.0.0", + "sp-tracing 16.0.0", + "sp-trie 31.0.0", "tracing", "tracing-core", ] @@ -10984,11 +10563,23 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", - "sp-core", - "sp-externalities", + "sp-core 21.0.0", + "sp-externalities 0.19.0", "thiserror", ] +[[package]] +name = "sp-keystore" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd4bf9e5fa486416c92c2bb497b7ce2c43eac80cbdc407ffe2d34b365694ac29" +dependencies = [ + "parity-scale-codec", + "parking_lot 0.12.1", + "sp-core 30.0.0", + "sp-externalities 0.27.0", +] + [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" @@ -11009,12 +10600,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-core", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", "sp-domains", "sp-mmr-primitives", - "sp-runtime", - "sp-trie", + "sp-runtime 24.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -11026,14 +10617,14 @@ dependencies = [ "parity-scale-codec", "sc-executor", "scale-info", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", + "sp-core 21.0.0", "sp-domains", - "sp-externalities", + "sp-externalities 0.19.0", "sp-messenger", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", ] [[package]] @@ -11041,10 +10632,22 @@ name = "sp-metadata-ir" version = "0.1.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "frame-metadata 16.0.0", + "frame-metadata", + "parity-scale-codec", + "scale-info", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-metadata-ir" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0b5e87e56c1bb26d9524d48dd127121d630f895bd5914a34f0b017489f7c1d" +dependencies = [ + "frame-metadata", "parity-scale-codec", "scale-info", - "sp-std", + "sp-std 14.0.0", ] [[package]] @@ -11054,9 +10657,9 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-application-crypto", - "sp-std", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-std 8.0.0", ] [[package]] @@ -11069,11 +10672,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-api", - "sp-core", - "sp-debug-derive", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-debug-derive 8.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] @@ -11082,7 +10685,7 @@ name = "sp-objects" version = "0.1.0" source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1adba00615721fa9#b96ae888720551b22ece25cf1adba00615721fa9" dependencies = [ - "sp-api", + "sp-api 4.0.0-dev", "subspace-core-primitives", "subspace-runtime-primitives", ] @@ -11092,9 +10695,9 @@ name = "sp-offchain" version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "sp-api", - "sp-core", - "sp-runtime", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] @@ -11107,6 +10710,17 @@ dependencies = [ "regex", ] +[[package]] +name = "sp-panic-handler" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f5a17a0a11de029a8b811cb6e8b32ce7e02183cc04a3e965c383246798c416" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + [[package]] name = "sp-rpc" version = "6.0.0" @@ -11114,7 +10728,7 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "rustc-hash", "serde", - "sp-core", + "sp-core 21.0.0", ] [[package]] @@ -11132,13 +10746,38 @@ dependencies = [ "rand", "scale-info", "serde", - "simple-mermaid", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", - "sp-weights", + "simple-mermaid 0.1.0", + "sp-application-crypto 23.0.0", + "sp-arithmetic 16.0.0", + "sp-core 21.0.0", + "sp-io 23.0.0", + "sp-std 8.0.0", + "sp-weights 20.0.0", +] + +[[package]] +name = "sp-runtime" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28fcf8f53d917e420e783dd27d06fd276f55160301c5bc977cc5898c4130f6f" +dependencies = [ + "docify", + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "paste", + "rand", + "scale-info", + "serde", + "simple-mermaid 0.1.1", + "sp-application-crypto 32.0.0", + "sp-arithmetic 25.0.0", + "sp-core 30.0.0", + "sp-io 32.0.0", + "sp-std 14.0.0", + "sp-weights 29.0.0", ] [[package]] @@ -11150,12 +10789,32 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.19.0", + "sp-runtime-interface-proc-macro 11.0.0", + "sp-std 8.0.0", + "sp-storage 13.0.0", + "sp-tracing 10.0.0", + "sp-wasm-interface 14.0.0", + "static_assertions", +] + +[[package]] +name = "sp-runtime-interface" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a675ea4858333d4d755899ed5ed780174aa34fec15953428d516af5452295" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "polkavm-derive", + "primitive-types", + "sp-externalities 0.27.0", + "sp-runtime-interface-proc-macro 18.0.0", + "sp-std 14.0.0", + "sp-storage 20.0.0", + "sp-tracing 16.0.0", + "sp-wasm-interface 20.0.0", "static_assertions", ] @@ -11172,6 +10831,20 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0195f32c628fee3ce1dfbbf2e7e52a30ea85f3589da9fe62a8b816d70fc06294" +dependencies = [ + "Inflector", + "expander", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "sp-session" version = "4.0.0-dev" @@ -11179,12 +10852,12 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", - "sp-keystore", - "sp-runtime", + "sp-api 4.0.0-dev", + "sp-core 21.0.0", + "sp-keystore 0.27.0", + "sp-runtime 24.0.0", "sp-staking", - "sp-std", + "sp-std 8.0.0", ] [[package]] @@ -11196,9 +10869,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 21.0.0", + "sp-runtime 24.0.0", + "sp-std 8.0.0", ] [[package]] @@ -11212,11 +10885,33 @@ dependencies = [ "parking_lot 0.12.1", "rand", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-panic-handler 8.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", + "thiserror", + "tracing", + "trie-db", +] + +[[package]] +name = "sp-state-machine" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ae47765916d342b53d07be012a71efc4c1377d875ade31340cc4fb784b9921" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand", + "smallvec", + "sp-core 30.0.0", + "sp-externalities 0.27.0", + "sp-panic-handler 13.0.0", + "sp-std 14.0.0", + "sp-trie 31.0.0", "thiserror", "tracing", "trie-db", @@ -11235,13 +10930,13 @@ dependencies = [ "rand", "scale-info", "sha2 0.10.8", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-externalities", - "sp-runtime", - "sp-runtime-interface", - "sp-std", + "sp-api 4.0.0-dev", + "sp-application-crypto 23.0.0", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", + "sp-std 8.0.0", "thiserror", "x25519-dalek 2.0.1", ] @@ -11251,6 +10946,12 @@ name = "sp-std" version = "8.0.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +[[package]] +name = "sp-std" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8ee986414b0a9ad741776762f4083cd3a5128449b982a3919c4df36874834" + [[package]] name = "sp-storage" version = "13.0.0" @@ -11260,8 +10961,22 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-storage" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dba5791cb3978e95daf99dad919ecb3ec35565604e88cd38d805d9d4981e8bd" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 14.0.0", + "sp-std 14.0.0", ] [[package]] @@ -11271,13 +10986,13 @@ source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1 dependencies = [ "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev", "sp-blockchain", - "sp-core", - "sp-externalities", + "sp-core 21.0.0", + "sp-externalities 0.19.0", "sp-mmr-primitives", - "sp-runtime", - "sp-runtime-interface", + "sp-runtime 24.0.0", + "sp-runtime-interface 17.0.0", ] [[package]] @@ -11288,8 +11003,8 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime", - "sp-std", + "sp-runtime 24.0.0", + "sp-std 8.0.0", "thiserror", ] @@ -11299,7 +11014,20 @@ version = "10.0.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 8.0.0", + "tracing", + "tracing-core", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "sp-tracing" +version = "16.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0351810b9d074df71c4514c5228ed05c250607cba131c1c9d1526760ab69c05c" +dependencies = [ + "parity-scale-codec", + "sp-std 14.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -11310,8 +11038,8 @@ name = "sp-transaction-pool" version = "4.0.0-dev" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "sp-api", - "sp-runtime", + "sp-api 4.0.0-dev", + "sp-runtime 24.0.0", ] [[package]] @@ -11322,11 +11050,11 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-core", + "sp-core 21.0.0", "sp-inherents", - "sp-runtime", - "sp-std", - "sp-trie", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-trie 22.0.0", ] [[package]] @@ -11344,9 +11072,34 @@ dependencies = [ "rand", "scale-info", "schnellru", - "sp-core", - "sp-externalities", - "sp-std", + "sp-core 21.0.0", + "sp-externalities 0.19.0", + "sp-std 8.0.0", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5791e2e310cf88abedbd5f60ff3d9c9a09d95b182b4a7510f3648a2170ace593" +dependencies = [ + "ahash 0.8.11", + "hash-db", + "lazy_static", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand", + "scale-info", + "schnellru", + "sp-core 30.0.0", + "sp-externalities 0.27.0", + "sp-std 14.0.0", "thiserror", "tracing", "trie-db", @@ -11364,9 +11117,27 @@ dependencies = [ "scale-info", "serde", "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", - "sp-version-proc-macro", + "sp-runtime 24.0.0", + "sp-std 8.0.0", + "sp-version-proc-macro 8.0.0", + "thiserror", +] + +[[package]] +name = "sp-version" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "973478ac076be7cb8e0a7968ee43cd7c46fb26e323d36020a9f3bb229e033cd2" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm", + "scale-info", + "serde", + "sp-crypto-hashing-proc-macro", + "sp-runtime 33.0.0", + "sp-std 14.0.0", + "sp-version-proc-macro 13.0.0", "thiserror", ] @@ -11381,6 +11152,18 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "sp-version-proc-macro" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9bc3fed32d6dacbbbfb28dd1fe0224affbb737cb6cbfca1d9149351c2b69a7d" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "sp-wasm-interface" version = "14.0.0" @@ -11390,7 +11173,21 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", + "sp-std 8.0.0", + "wasmtime", +] + +[[package]] +name = "sp-wasm-interface" +version = "20.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef97172c42eb4c6c26506f325f48463e9bc29b2034a587f1b9e48c751229bee" +dependencies = [ + "anyhow", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 14.0.0", "wasmtime", ] @@ -11399,14 +11196,30 @@ name = "sp-weights" version = "20.0.0" source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "bounded-collections", + "bounded-collections 0.1.9", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 16.0.0", + "sp-debug-derive 8.0.0", + "sp-std 8.0.0", +] + +[[package]] +name = "sp-weights" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab8a9c7a1b64fa7dba38622ad1de26f0b2e595727c0e42c7b109ecb8e7120688" +dependencies = [ + "bounded-collections 0.2.0", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic", - "sp-debug-derive", - "sp-std", + "sp-arithmetic 25.0.0", + "sp-debug-derive 14.0.0", + "sp-std 14.0.0", ] [[package]] @@ -11454,10 +11267,11 @@ dependencies = [ "serde", "serde_json", "simple_moving_average", + "sp-api 28.0.0", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-domains-fraud-proof", - "sp-runtime", + "sp-runtime 24.0.0", "subspace-core-primitives", "subspace-erasure-coding", "subspace-farmer", @@ -11468,7 +11282,6 @@ dependencies = [ "subspace-runtime", "subspace-runtime-primitives", "subspace-service", - "subxt", "supports-color 3.0.0", "thiserror", "thread-priority", @@ -11674,7 +11487,7 @@ dependencies = [ "futures", "hex", "hwlocality", - "jsonrpsee 0.16.3", + "jsonrpsee", "libmimalloc-sys", "lru 0.12.3", "mimalloc", @@ -11855,11 +11668,11 @@ dependencies = [ "pallet-utility", "parity-scale-codec", "scale-info", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-builder", "sp-consensus-slots", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-domains-fraud-proof", "sp-inherents", @@ -11868,11 +11681,11 @@ dependencies = [ "sp-mmr-primitives", "sp-objects", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", - "sp-std", + "sp-std 8.0.0", "sp-transaction-pool", - "sp-version", + "sp-version 22.0.0", "static_assertions", "subspace-core-primitives", "subspace-runtime-primitives", @@ -11885,8 +11698,8 @@ version = "0.1.0" source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1adba00615721fa9#b96ae888720551b22ece25cf1adba00615721fa9" dependencies = [ "pallet-transaction-payment", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", "subspace-core-primitives", ] @@ -11901,7 +11714,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "hex", - "jsonrpsee 0.16.3", + "jsonrpsee", "mmr-gadget", "mmr-rpc", "pallet-transaction-payment-rpc", @@ -11933,23 +11746,23 @@ dependencies = [ "sc-transaction-pool", "sc-transaction-pool-api", "schnorrkel", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-slots", "sp-consensus-subspace", - "sp-core", + "sp-core 21.0.0", "sp-domains", "sp-domains-fraud-proof", - "sp-externalities", - "sp-io", + "sp-externalities 0.19.0", + "sp-io 23.0.0", "sp-messenger", "sp-messenger-host-functions", "sp-mmr-primitives", "sp-objects", "sp-offchain", - "sp-runtime", + "sp-runtime 24.0.0", "sp-session", "sp-subspace-mmr", "sp-timestamp", @@ -11974,7 +11787,7 @@ source = "git+https://github.com/subspace/subspace?rev=b96ae888720551b22ece25cf1 dependencies = [ "parity-scale-codec", "schnorrkel", - "sp-arithmetic", + "sp-arithmetic 16.0.0", "subspace-archiving", "subspace-core-primitives", "subspace-proof-of-space", @@ -11988,7 +11801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" dependencies = [ "hmac 0.11.0", - "pbkdf2 0.8.0", + "pbkdf2", "schnorrkel", "sha2 0.9.9", "zeroize", @@ -12001,16 +11814,16 @@ source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4 dependencies = [ "frame-system-rpc-runtime-api", "futures", - "jsonrpsee 0.16.3", + "jsonrpsee", "log", "parity-scale-codec", "sc-rpc-api", "sc-transaction-pool-api", - "sp-api", + "sp-api 4.0.0-dev", "sp-block-builder", "sp-blockchain", - "sp-core", - "sp-runtime", + "sp-core 21.0.0", + "sp-runtime 24.0.0", ] [[package]] @@ -12055,108 +11868,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" -[[package]] -name = "subxt" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3323d5c27898b139d043dc1ee971f602f937b99354ee33ee933bd90e0009fbd" -dependencies = [ - "async-trait", - "base58", - "blake2 0.10.6", - "derivative", - "either", - "frame-metadata 16.0.0", - "futures", - "hex", - "impl-serde", - "instant", - "jsonrpsee 0.21.0", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "scale-value", - "serde", - "serde_json", - "sp-core-hashing 15.0.0", - "subxt-lightclient", - "subxt-macro", - "subxt-metadata", - "thiserror", - "tokio-util", - "tracing", - "url", -] - -[[package]] -name = "subxt-codegen" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0e58c3f88651cff26aa52bae0a0a85f806a2e923a20eb438c16474990743ea" -dependencies = [ - "frame-metadata 16.0.0", - "heck", - "hex", - "jsonrpsee 0.21.0", - "parity-scale-codec", - "proc-macro2", - "quote", - "scale-info", - "scale-typegen", - "subxt-metadata", - "syn 2.0.52", - "thiserror", - "tokio", -] - -[[package]] -name = "subxt-lightclient" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecec7066ba7bc0c3608fcd1d0c7d9584390990cd06095b6ae4f114f74c4b8550" -dependencies = [ - "futures", - "futures-util", - "serde", - "serde_json", - "smoldot-light", - "thiserror", - "tokio", - "tokio-stream", - "tracing", -] - -[[package]] -name = "subxt-macro" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365251668613323064803427af8c7c7bc366cd8b28e33639640757669dafebd5" -dependencies = [ - "darling 0.20.8", - "parity-scale-codec", - "proc-macro-error", - "quote", - "scale-typegen", - "subxt-codegen", - "syn 2.0.52", -] - -[[package]] -name = "subxt-metadata" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02aca8d39a1f6c55fff3a8fd81557d30a610fedc1cef03f889a81bc0f8f0b52" -dependencies = [ - "frame-metadata 16.0.0", - "parity-scale-codec", - "scale-info", - "sp-core-hashing 15.0.0", - "thiserror", -] - [[package]] name = "supports-color" version = "2.1.0" @@ -12485,17 +12196,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.2", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-stream" version = "0.1.14" @@ -12594,10 +12294,6 @@ 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", @@ -13219,37 +12915,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin 0.9.8", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - [[package]] name = "wasmparser" version = "0.102.0" @@ -13260,15 +12925,6 @@ dependencies = [ "url", ] -[[package]] -name = "wasmparser-nostd" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" -dependencies = [ - "indexmap-nostd", -] - [[package]] name = "wasmtime" version = "8.0.1" @@ -13971,12 +13627,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "yap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf" - [[package]] name = "yasna" version = "0.5.2" @@ -13993,7 +13643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41ce2de393c874ba871292e881bf3c13a0d5eb38170ebab2e50b4c410eaa222b" dependencies = [ "async-broadcast", - "async-channel 1.9.0", + "async-channel", "async-executor", "async-io 1.13.0", "async-lock 2.8.0", diff --git a/Cargo.toml b/Cargo.toml index 451de17d..ca7d8a1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,14 +91,13 @@ subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "b96ae888720551b22ece25cf1adba00615721fa9" } subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "b96ae888720551b22ece25cf1adba00615721fa9" } subspace-service = { git = "https://github.com/subspace/subspace", rev = "b96ae888720551b22ece25cf1adba00615721fa9" } -# connect to subspace node as client to make runtime API calls -subxt = { version = "0.34" } supports-color = "3.0.0" thiserror = "1.0.57" thread-priority = "0.16.0" tokio = { version = "1.36.0", features = ["fs", "time"] } tracing = "0.1.40" tracing-subscriber = "0.3.18" +sp-api = "28.0.0" [target.'cfg(windows)'.build-dependencies] winres = "0.1.12" diff --git a/metadata/subspace_metadata.scale b/metadata/subspace_metadata.scale deleted file mode 100644 index 06f35793..00000000 Binary files a/metadata/subspace_metadata.scale and /dev/null differ diff --git a/src/backend/node.rs b/src/backend/node.rs index f7b39f58..11353891 100644 --- a/src/backend/node.rs +++ b/src/backend/node.rs @@ -19,10 +19,12 @@ use sc_network::config::{Ed25519Secret, NodeKeyConfig, NonReservedPeerMode, SetC use sc_service::{BlocksPruning, Configuration, GenericChainSpec}; use sc_storage_monitor::{StorageMonitorParams, StorageMonitorService}; use serde_json::Value; +use sp_api::{ApiError, ProvideRuntimeApi}; +use sp_consensus_subspace::{FarmerPublicKey, SubspaceApi}; use sp_core::crypto::Ss58AddressFormat; use sp_core::storage::StorageKey; use sp_core::H256; -use sp_runtime::traits::Header; +use sp_runtime::traits::{Block as BlockT, Header}; use std::fmt; use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4}; use std::path::PathBuf; @@ -42,8 +44,6 @@ use subspace_service::config::{ }; use subspace_service::sync_from_dsn::DsnSyncPieceGetter; use subspace_service::{FullClient, NewFull}; -use subxt::config::PolkadotConfig; -use subxt::OnlineClient; use tokio::fs; use tokio::time::MissedTickBehavior; use tracing::error; @@ -284,86 +284,34 @@ fn get_total_account_balance( // defined here: https://github.com/subspace/subspace/blob/5d8b65740ff054b01ebcbaf5a905e74274c1a5d0/crates/subspace-core-primitives/src/pieces.rs#L803 const PIECE_SIZE: usize = 1048672/* the actual piece size from your runtime */; +// TODO: needs to be moved to runtime constants or somewhere else +const SLOT_PROBABILITY: (u64, u64) = (1, 6); -// set as default -const WS_URL: &str = "ws://127.0.0.1:19944"; - -// Generate subspace node metadata by running node first. -// And then note down the addr from the terminal log. -// Finally, use the websocket url in this command: -// ```sh -// subxt metadata --url ws://127.0.0.1:19944 > metadata/subspace_metadata.scale -// ``` -#[subxt::subxt(runtime_metadata_path = "metadata/subspace_metadata.scale")] -pub mod subspace {} - -// Subspace runtime API -type SubspaceApi = subspace::runtime_apis::subspace_api::SubspaceApi; - -// Had to define separately as the inferred type differs from the original `sp_consensus_subspace::ChainConstants`. -type RuntimeChainConstants = subspace::runtime_types::sp_consensus_subspace::ChainConstants; - -async fn get_current_solution_range( - api: &OnlineClient, - subspace_api: &SubspaceApi, -) -> anyhow::Result { - let solution_ranges_runtime_api_call = subspace_api.solution_ranges(); - - // get the solution ranges from the latest block - let current_solution_range = api - .runtime_api() - .at_latest() - .await? - .call(solution_ranges_runtime_api_call) - .await? - .current; - - Ok(current_solution_range) -} - -async fn get_slot_probability( - api: &OnlineClient, - subspace_api: &SubspaceApi, -) -> anyhow::Result<(u64, u64)> { - let chain_constants_runtime_api_call = subspace_api.chain_constants(); - - // get the chain constants from the latest block - let current_chain_constants = api - .runtime_api() - .at_latest() - .await? - .call(chain_constants_runtime_api_call) - .await?; - - let RuntimeChainConstants::V0 { - slot_probability, .. - } = current_chain_constants; - - Ok(slot_probability) -} - -/// Get the latest total space pledged #[allow(dead_code)] -async fn get_total_space_pledged() -> anyhow::Result { - let api = OnlineClient::::from_url(WS_URL) - .await - .map_err(|e| anyhow::Error::new(e).context("Failed to create OnlineClient from WS_URL"))?; - - let subspace_api: SubspaceApi = subspace::apis().subspace_api(); - - let current_solution_range = get_current_solution_range(&api, &subspace_api).await?; - - let slot_probability = get_slot_probability(&api, &subspace_api).await?; +pub(crate) fn get_total_space_pledged( + client: &Client, + block_hash: H256, +) -> Result +where + Block: BlockT + sp_api::__private::BlockT, + Client: ProvideRuntimeApi, + Client::Api: SubspaceApi, +{ + let current_solution_range = client + .runtime_api() + .solution_ranges(block_hash) + .map(|solution_ranges| solution_ranges.current) + .expect("Failed to get current solution range"); // Calculate the total space pledged let total_space_pledged: u128 = u128::from(u64::MAX) .checked_mul(PIECE_SIZE as u128) .expect("Multiplication with piece size works; qed") - .checked_mul(u128::from(slot_probability.0)) + .checked_mul(u128::from(SLOT_PROBABILITY.0)) .expect("Multiplication with slot probability_0 works; qed") .checked_div(u128::from(current_solution_range)) .expect("Division by current solution range works; qed") - .checked_div(u128::from(slot_probability.1)) + .checked_div(u128::from(SLOT_PROBABILITY.1)) .expect("Division by slot probability_1 works; qed"); Ok(total_space_pledged)