From eef50c6ec560aac1f70a14124d087216b86d73a6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 7 Jul 2024 13:44:21 +0100 Subject: [PATCH] Move to unsigned extrinsics, use logical hashes to de-duplicate chronicle extrinsics in the txpool Signed-off-by: Ryan --- Cargo.lock | 1922 +++++++++-------- crates/chronicle-domain-test/src/test.rs | 5 +- crates/chronicle-telemetry/src/telemetry.rs | 6 +- .../chronicle-test-infrastructure/Cargo.toml | 5 +- .../src/api_test.rs | 3 +- .../src/substitutes/stubstrate.rs | 8 +- crates/chronicle/src/bootstrap/mod.rs | 10 +- crates/common/Cargo.toml | 9 +- crates/common/src/attributes.rs | 10 +- crates/common/src/ledger.rs | 44 +- crates/common/src/opa/core.rs | 10 +- crates/common/src/prov/model/mod.rs | 18 +- crates/common/src/prov/operations.rs | 11 +- crates/embedded-substrate/Cargo.toml | 3 +- crates/embedded-substrate/src/lib.rs | 10 +- crates/opactl/Cargo.toml | 5 +- crates/opactl/src/main.rs | 2 +- crates/opactl/src/test/stubstrate.rs | 6 +- crates/pallet-chronicle/Cargo.toml | 4 +- crates/pallet-chronicle/src/lib.rs | 33 +- crates/pallet-chronicle/src/tests.rs | 4 +- crates/pallet-opa/Cargo.toml | 4 +- crates/protocol-abstract/Cargo.toml | 3 +- .../protocol-abstract/src/abstract_ledger.rs | 7 +- .../protocol-substrate-chronicle/Cargo.toml | 8 +- .../src/subxt_client.rs | 36 +- crates/protocol-substrate-opa/Cargo.toml | 2 +- crates/protocol-substrate-opa/src/lib.rs | 4 +- .../src/submission_builder.rs | 6 +- .../protocol-substrate-opa/src/transaction.rs | 14 +- crates/protocol-substrate/Cargo.toml | 6 +- crates/protocol-substrate/src/lib.rs | 17 +- crates/protocol-substrate/src/subxt_client.rs | 136 +- node/node-chronicle/src/benchmarking.rs | 18 +- node/node-chronicle/src/chain_spec.rs | 6 - node/node-chronicle/src/command.rs | 2 +- node/runtime-chronicle/Cargo.toml | 4 +- .../src/check_operation_unique.rs | 71 - node/runtime-chronicle/src/lib.rs | 20 +- node/runtime-chronicle/src/no_nonce_fees.rs | 13 +- 40 files changed, 1313 insertions(+), 1192 deletions(-) delete mode 100644 node/runtime-chronicle/src/check_operation_unique.rs diff --git a/Cargo.lock b/Cargo.lock index 5ab42845..5fac82c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,7 +79,7 @@ dependencies = [ "cipher 0.4.4", "ctr", "ghash", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -262,7 +262,7 @@ dependencies = [ "tracing", "url", "user-error", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -299,7 +299,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -1007,7 +1007,7 @@ dependencies = [ "static_assertions_next", "tempfile", "thiserror", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -1022,8 +1022,8 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "strum 0.26.2", - "syn 2.0.67", + "strum 0.26.3", + "syn 2.0.68", "thiserror", ] @@ -1177,7 +1177,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -1194,7 +1194,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -1301,7 +1301,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.36.0", + "object 0.36.1", "rustc-demangle", ] @@ -1412,7 +1412,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -1422,10 +1422,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" dependencies = [ "bitcoin_hashes 0.11.0", - "rand 0.8.5", - "rand_core 0.6.4", - "serde", - "unicode-normalization", ] [[package]] @@ -1473,9 +1469,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -1597,18 +1593,6 @@ dependencies = [ "serde_with", ] -[[package]] -name = "bounded-collections" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" -dependencies = [ - "log", - "parity-scale-codec", - "scale-info", - "serde", -] - [[package]] name = "bounded-collections" version = "0.2.0" @@ -1696,7 +1680,7 @@ checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -1819,15 +1803,21 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.99" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", "once_cell", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -1858,6 +1848,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha" version = "0.3.0" @@ -1946,7 +1942,7 @@ dependencies = [ "tracing-log 0.1.4", "url", "user-error", - "uuid 1.8.0", + "uuid 1.9.1", "valico", ] @@ -1982,7 +1978,7 @@ dependencies = [ "tokio", "tonic 0.10.2", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -1994,7 +1990,7 @@ dependencies = [ "arrow-flight", "arrow-ipc", "arrow-schema", - "clap 4.5.7", + "clap 4.5.8", "prettytable-rs", "tokio", "tonic 0.10.2", @@ -2036,7 +2032,7 @@ dependencies = [ "tokio", "tracing", "tracing-log 0.1.4", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -2056,7 +2052,7 @@ dependencies = [ "serde_json", "thiserror", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -2142,16 +2138,16 @@ dependencies = [ "r2d2", "scale-info", "serde_json", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "subxt", "tempfile", "testcontainers", "tokio", "tokio-stream", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -2166,7 +2162,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2296,19 +2292,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", - "clap_derive 4.5.5", + "clap_derive 4.5.8", ] [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -2341,14 +2337,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -2404,13 +2400,23 @@ dependencies = [ "yansi", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "strum 0.26.2", + "strum 0.26.3", "strum_macros 0.26.4", "unicode-width", ] @@ -2418,7 +2424,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +source = "git+https://github.com/w3f/ring-proof#96137b150288a66bc9e4df495efc64769b5d1321" dependencies = [ "ark-ec", "ark-ff", @@ -2466,14 +2472,14 @@ dependencies = [ "rdf-types", "reqwest", "rust-embed", - "scale-decode 0.10.0", - "scale-encode 0.5.0", + "scale-decode 0.13.1", + "scale-encode 0.7.1", "scale-info", "serde", "serde_derive", "serde_json", "serde_yaml", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "tempfile", "testcontainers", @@ -2482,7 +2488,7 @@ dependencies = [ "tokio", "tracing", "url", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -2785,7 +2791,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.7", + "clap 4.5.8", "criterion-plot", "futures", "is-terminal", @@ -2871,7 +2877,7 @@ checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -2883,7 +2889,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -2915,17 +2921,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle 2.6.0", -] - -[[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array 0.14.7", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -2967,7 +2963,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -2983,7 +2979,7 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "rustc_version", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -2995,7 +2991,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3028,7 +3024,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3045,7 +3041,7 @@ checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3117,7 +3113,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3150,7 +3146,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3272,7 +3268,18 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", +] + +[[package]] +name = "derive-where" +version = "1.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] @@ -3316,7 +3323,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3325,14 +3332,14 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62d6dcd069e7b5fe49a302411f759d4cf1cf2c27fe798ef46fb8baefc053dd2b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "chrono", "diesel_derives", "itoa", "pq-sys", "r2d2", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -3345,7 +3352,7 @@ dependencies = [ "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3365,7 +3372,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3401,7 +3408,7 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -3473,7 +3480,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3519,7 +3526,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.67", + "syn 2.0.68", "termcolor", "toml 0.8.14", "walkdir", @@ -3554,7 +3561,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3639,7 +3646,7 @@ dependencies = [ "rand_core 0.6.4", "serde", "sha2 0.10.8", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -3674,9 +3681,9 @@ dependencies = [ [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -3696,7 +3703,7 @@ dependencies = [ "rand_core 0.6.4", "sec1 0.3.0", "serdect 0.1.0", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -3716,7 +3723,7 @@ dependencies = [ "rand_core 0.6.4", "sec1 0.7.3", "serdect 0.2.0", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -3733,14 +3740,14 @@ dependencies = [ "protocol-substrate", "protocol-substrate-chronicle", "sc-cli", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "subxt", "tempfile", "thiserror", "tokio", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -3869,7 +3876,7 @@ dependencies = [ "prettyplease 0.2.20", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -3926,7 +3933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -3936,7 +3943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -4006,6 +4013,16 @@ dependencies = [ "scale-info", ] +[[package]] +name = "finito" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2384245d85162258a14b43567a9ee3598f5ae746a1581fb5d3d2cb780f0dbf95" +dependencies = [ + "futures-timer", + "pin-project", +] + [[package]] name = "fixed-hash" version = "0.8.0" @@ -4123,10 +4140,10 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", @@ -4141,7 +4158,7 @@ dependencies = [ "Inflector", "array-bytes 6.2.3", "chrono", - "clap 4.5.7", + "clap 4.5.8", "comfy-table", "frame-benchmarking", "frame-support", @@ -4166,16 +4183,16 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-database", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-inherents", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", "thousands", @@ -4193,9 +4210,9 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -4234,11 +4251,11 @@ dependencies = [ "log", "parity-scale-codec", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "spinners", "substrate-rpc-client", "tokio", @@ -4268,20 +4285,20 @@ dependencies = [ "serde_json", "smallvec", "sp-api", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", "sp-crypto-hashing-proc-macro", "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-genesis-builder", "sp-inherents", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", "sp-metadata-ir", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-staking", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-state-machine 0.35.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-weights 27.0.0", "static_assertions", "tt-call", ] @@ -4301,8 +4318,8 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "sp-crypto-hashing", - "syn 2.0.67", + "sp-crypto-hashing 0.0.0", + "syn 2.0.68", ] [[package]] @@ -4314,7 +4331,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -4324,7 +4341,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -4339,12 +4356,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-version", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-weights 27.0.0", ] [[package]] @@ -4357,8 +4374,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -4379,7 +4396,7 @@ dependencies = [ "frame-support", "parity-scale-codec", "sp-api", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -4478,7 +4495,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -4691,7 +4708,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "ignore", "walkdir", ] @@ -4736,7 +4753,7 @@ checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -4747,7 +4764,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff 0.13.0", "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -4977,16 +4994,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.0", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" @@ -5133,9 +5140,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" dependencies = [ "bytes", "futures-channel", @@ -5168,6 +5175,24 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.0", + "hyper-util", + "log", + "rustls 0.23.10", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + [[package]] name = "hyper-timeout" version = "0.4.1" @@ -5201,7 +5226,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", "hyper-util", "native-tls", "tokio", @@ -5211,16 +5236,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.0", - "hyper 1.3.1", + "hyper 1.4.0", "pin-project-lite 0.2.14", "socket2 0.5.7", "tokio", @@ -5561,6 +5586,26 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.31" @@ -5750,18 +5795,6 @@ dependencies = [ "smallvec", ] -[[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" version = "0.22.5" @@ -5773,24 +5806,37 @@ dependencies = [ "jsonrpsee-proc-macros", "jsonrpsee-server", "jsonrpsee-types 0.22.5", - "jsonrpsee-ws-client", + "jsonrpsee-ws-client 0.22.5", "tokio", "tracing", ] +[[package]] +name = "jsonrpsee" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" +dependencies = [ + "jsonrpsee-client-transport 0.23.2", + "jsonrpsee-core 0.23.2", + "jsonrpsee-http-client 0.23.2", + "jsonrpsee-types 0.23.2", + "jsonrpsee-ws-client 0.23.2", +] + [[package]] name = "jsonrpsee-client-transport" -version = "0.21.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220" +checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" dependencies = [ "futures-util", "http 0.2.12", - "jsonrpsee-core 0.21.0", + "jsonrpsee-core 0.22.5", "pin-project", - "rustls-native-certs 0.7.0", + "rustls-native-certs 0.7.1", "rustls-pki-types", - "soketto", + "soketto 0.7.1", "thiserror", "tokio", "tokio-rustls 0.25.0", @@ -5801,20 +5847,22 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" dependencies = [ + "base64 0.22.1", "futures-util", - "http 0.2.12", - "jsonrpsee-core 0.22.5", + "http 1.1.0", + "jsonrpsee-core 0.23.2", "pin-project", - "rustls-native-certs 0.7.0", + "rustls 0.23.10", "rustls-pki-types", - "soketto", + "rustls-platform-verifier", + "soketto 0.8.0", "thiserror", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -5822,19 +5870,20 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.21.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" dependencies = [ "anyhow", - "async-lock", "async-trait", "beef", "futures-timer", "futures-util", "hyper 0.14.29", - "jsonrpsee-types 0.21.0", + "jsonrpsee-types 0.22.5", + "parking_lot 0.12.3", "pin-project", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -5846,20 +5895,21 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" dependencies = [ "anyhow", "async-trait", "beef", + "bytes", "futures-timer", "futures-util", - "hyper 0.14.29", - "jsonrpsee-types 0.22.5", - "parking_lot 0.12.3", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "jsonrpsee-types 0.23.2", "pin-project", - "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -5871,15 +5921,15 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.21.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572" +checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", "hyper 0.14.29", - "hyper-rustls", - "jsonrpsee-core 0.21.0", - "jsonrpsee-types 0.21.0", + "hyper-rustls 0.24.2", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", "serde", "serde_json", "thiserror", @@ -5891,15 +5941,20 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" +checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac" dependencies = [ "async-trait", - "hyper 0.14.29", - "hyper-rustls", - "jsonrpsee-core 0.22.5", - "jsonrpsee-types 0.22.5", + "base64 0.22.1", + "http-body 1.0.0", + "hyper 1.4.0", + "hyper-rustls 0.27.2", + "hyper-util", + "jsonrpsee-core 0.23.2", + "jsonrpsee-types 0.23.2", + "rustls 0.23.10", + "rustls-platform-verifier", "serde", "serde_json", "thiserror", @@ -5919,7 +5974,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -5937,7 +5992,7 @@ dependencies = [ "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.7.1", "thiserror", "tokio", "tokio-stream", @@ -5948,9 +6003,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.21.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" dependencies = [ "anyhow", "beef", @@ -5961,12 +6016,12 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ - "anyhow", "beef", + "http 1.1.0", "serde", "serde_json", "thiserror", @@ -5985,6 +6040,19 @@ dependencies = [ "url", ] +[[package]] +name = "jsonrpsee-ws-client" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" +dependencies = [ + "http 1.1.0", + "jsonrpsee-client-transport 0.23.2", + "jsonrpsee-core 0.23.2", + "jsonrpsee-types 0.23.2", + "url", +] + [[package]] name = "jsonschema" version = "0.17.1" @@ -5995,7 +6063,7 @@ dependencies = [ "anyhow", "base64 0.21.7", "bytecount", - "clap 4.5.7", + "clap 4.5.8", "fancy-regex", "fraction", "getrandom 0.2.15", @@ -6012,7 +6080,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -6079,6 +6147,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-hash" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c" +dependencies = [ + "primitive-types", + "tiny-keccak", +] + [[package]] name = "keystream" version = "1.0.0" @@ -6220,12 +6298,12 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6609,7 +6687,7 @@ dependencies = [ "parking_lot 0.12.3", "quicksink", "rw-stream-sink", - "soketto", + "soketto 0.7.1", "url", "webpki-roots 0.22.6", ] @@ -6633,7 +6711,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -6679,7 +6757,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -6802,9 +6880,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -6870,50 +6948,50 @@ checksum = "f21755d53936fc1663b414dba30636788f2183d3e782bdee4b1e7236637974e7" [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse 0.2.0", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -7058,7 +7136,7 @@ checksum = "5d58e362dc7206e9456ddbcdbd53c71ba441020e62104703075a69151e38d85f" dependencies = [ "base64 0.22.1", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", "hyper-tls 0.6.0", "hyper-util", "indexmap 2.2.6", @@ -7159,7 +7237,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_distr", - "subtle 2.6.0", + "subtle 2.6.1", "thiserror", "zeroize", ] @@ -7332,13 +7410,13 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] @@ -7472,9 +7550,9 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -7503,7 +7581,7 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" name = "node-chronicle" version = "0.1.0" dependencies = [ - "clap 4.5.7", + "clap 4.5.8", "common 0.7.5", "frame-benchmarking", "frame-benchmarking-cli", @@ -7535,12 +7613,12 @@ dependencies = [ "sp-blockchain", "sp-consensus-aura", "sp-consensus-grandpa", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", "sp-keyring", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "sp-timestamp", "structopt", "substrate-build-script-utils", @@ -7609,9 +7687,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -7757,9 +7835,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -7811,7 +7889,7 @@ dependencies = [ "async-trait", "chronicle-signing", "chronicle-telemetry", - "clap 4.5.7", + "clap 4.5.8", "common 0.7.5", "const_format", "frame-support", @@ -7834,9 +7912,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "subxt", "tempfile", "thiserror", @@ -7845,7 +7923,7 @@ dependencies = [ "tracing", "url", "user-error", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -7866,7 +7944,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -7883,7 +7961,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -8058,9 +8136,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" dependencies = [ "num-traits", ] @@ -8094,9 +8172,9 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-consensus-aura", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -8110,7 +8188,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -8128,12 +8206,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -8149,11 +8227,11 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-consensus-grandpa", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-session", "sp-staking", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", @@ -8171,10 +8249,10 @@ dependencies = [ "pallet-authorship", "parity-scale-codec", "scale-info", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-staking", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -8195,12 +8273,12 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -8215,14 +8293,14 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-session", "sp-staking", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-state-machine 0.35.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", ] [[package]] @@ -8236,8 +8314,8 @@ dependencies = [ "frame-system", "parity-scale-codec", "scale-info", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -8254,8 +8332,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-inherents", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-timestamp", @@ -8385,7 +8463,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8411,7 +8489,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", "rand_core 0.6.4", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -8420,15 +8498,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.0", -] - [[package]] name = "pbkdf2" version = "0.12.2" @@ -8486,9 +8555,9 @@ checksum = "b687ff7b5da449d39e418ad391e5e08da53ec334903ddbb921db208908fc372c" [[package]] name = "pest" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -8497,9 +8566,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -8507,22 +8576,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "pest_meta" -version = "2.7.10" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", @@ -8632,7 +8701,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -8730,7 +8799,7 @@ dependencies = [ "headers", "http 1.1.0", "http-body-util", - "hyper 1.3.1", + "hyper 1.4.0", "hyper-util", "mime", "nix 0.28.0", @@ -8765,7 +8834,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -8777,7 +8846,7 @@ dependencies = [ "libc", "log", "polkavm-assembler", - "polkavm-common", + "polkavm-common 0.9.0", "polkavm-linux-raw", ] @@ -8790,6 +8859,12 @@ dependencies = [ "log", ] +[[package]] +name = "polkavm-common" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92c99f7eee94e7be43ba37eef65ad0ee8cbaf89b7c00001c3f6d2be985cb1817" + [[package]] name = "polkavm-common" version = "0.9.0" @@ -8799,13 +8874,34 @@ dependencies = [ "log", ] +[[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 0.8.0", +] + [[package]] name = "polkavm-derive" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" dependencies = [ - "polkavm-derive-impl-macro", + "polkavm-derive-impl-macro 0.9.0", +] + +[[package]] +name = "polkavm-derive-impl" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c10b2654a8a10a83c260bfb93e97b262cf0017494ab94a65d389e0eda6de6c9c" +dependencies = [ + "polkavm-common 0.8.0", + "proc-macro2", + "quote", + "syn 2.0.68", ] [[package]] @@ -8814,10 +8910,20 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" dependencies = [ - "polkavm-common", + "polkavm-common 0.9.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", +] + +[[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 0.8.0", + "syn 2.0.68", ] [[package]] @@ -8826,8 +8932,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" dependencies = [ - "polkavm-derive-impl", - "syn 2.0.67", + "polkavm-derive-impl 0.9.0", + "syn 2.0.68", ] [[package]] @@ -8840,7 +8946,7 @@ dependencies = [ "hashbrown 0.14.5", "log", "object 0.32.2", - "polkavm-common", + "polkavm-common 0.9.0", "regalloc2 0.9.3", "rustc-demangle", ] @@ -8992,7 +9098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -9073,7 +9179,7 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -9119,7 +9225,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -9130,7 +9236,7 @@ checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "rand 0.8.5", @@ -9207,7 +9313,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -9258,14 +9364,14 @@ dependencies = [ "k256 0.11.6", "pallet-chronicle", "protocol-abstract", - "scale-decode 0.10.0", - "scale-encode 0.5.0", + "scale-decode 0.13.1", + "scale-encode 0.7.1", "serde", "subxt", "thiserror", "tokio", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -9285,14 +9391,14 @@ dependencies = [ "parity-scale-codec", "protocol-abstract", "protocol-substrate", - "scale-encode 0.5.0", + "scale-encode 0.7.1", "scale-info", "serde", "subxt", "thiserror", "tokio", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] @@ -9319,14 +9425,14 @@ dependencies = [ "thiserror", "tokio", "tracing", - "uuid 1.8.0", + "uuid 1.9.1", ] [[package]] name = "psl" -version = "2.1.47" +version = "2.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d56874e5b5a5f59b4a301a4cf32e26375dcc66d02cfaed473ab0f713a7cc0e" +checksum = "20f2890e9f6f068d927643e8d547931b537f21fd298e197c4837f1265b11e560" dependencies = [ "psl-types", ] @@ -9565,7 +9671,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -9620,6 +9726,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "reconnecting-jsonrpsee-ws-client" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06fa4f17e09edfc3131636082faaec633c7baa269396b4004040bc6c52f49f65" +dependencies = [ + "cfg_aliases 0.2.1", + "finito", + "futures", + "jsonrpsee 0.23.2", + "serde_json", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -9644,7 +9766,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -9675,7 +9797,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -9768,7 +9890,7 @@ dependencies = [ "http 0.2.12", "http-body 0.4.6", "hyper 0.14.29", - "hyper-rustls", + "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -9825,7 +9947,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -9840,7 +9962,7 @@ dependencies = [ [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" +source = "git+https://github.com/w3f/ring-proof#96137b150288a66bc9e4df495efc64769b5d1321" dependencies = [ "ark-ec", "ark-ff", @@ -9971,11 +10093,11 @@ dependencies = [ "sp-block-builder", "sp-consensus-aura", "sp-consensus-grandpa", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-genesis-builder", "sp-inherents", "sp-offchain", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-session", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-transaction-pool", @@ -10004,7 +10126,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.67", + "syn 2.0.68", "walkdir", ] @@ -10109,7 +10231,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.14", @@ -10149,8 +10271,23 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.4", - "subtle 2.6.0", + "rustls-webpki 0.102.5", + "subtle 2.6.1", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "log", + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.5", + "subtle 2.6.1", "zeroize", ] @@ -10168,9 +10305,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile 2.1.2", @@ -10204,6 +10341,33 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +[[package]] +name = "rustls-platform-verifier" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-native-certs 0.7.1", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.5", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -10216,9 +10380,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -10327,7 +10491,7 @@ version = "23.0.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "log", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", ] @@ -10348,9 +10512,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", ] @@ -10363,10 +10527,10 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-trie 29.0.0", ] [[package]] @@ -10387,12 +10551,12 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", "sp-genesis-builder", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", ] [[package]] @@ -10403,7 +10567,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -10413,7 +10577,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "array-bytes 6.2.3", "chrono", - "clap 4.5.7", + "clap 4.5.8", "fdlimit", "futures", "itertools 0.10.5", @@ -10437,11 +10601,11 @@ dependencies = [ "serde", "serde_json", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-keyring", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-version", "thiserror", "tokio", @@ -10463,14 +10627,14 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-database", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "sp-statement-store", "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "substrate-prometheus-endpoint", ] @@ -10491,13 +10655,13 @@ dependencies = [ "sc-client-api", "sc-state-db", "schnellru", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-database", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", + "sp-trie 29.0.0", ] [[package]] @@ -10518,9 +10682,9 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "substrate-prometheus-endpoint", "thiserror", ] @@ -10540,16 +10704,16 @@ dependencies = [ "sc-consensus-slots", "sc-telemetry", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-aura", "sp-consensus-slots", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", "thiserror", ] @@ -10584,15 +10748,15 @@ dependencies = [ "sc-utils", "serde_json", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", "thiserror", ] @@ -10610,14 +10774,14 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-telemetry", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-slots", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", ] [[package]] @@ -10632,12 +10796,12 @@ dependencies = [ "sc-executor-wasmtime", "schnellru", "sp-api", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "sp-version", "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "tracing", @@ -10699,7 +10863,7 @@ dependencies = [ "sc-network-common", "sc-network-sync", "sp-blockchain", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", ] [[package]] @@ -10710,9 +10874,9 @@ dependencies = [ "array-bytes 6.2.3", "parking_lot 0.12.3", "serde_json", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", "thiserror", ] @@ -10738,10 +10902,10 @@ dependencies = [ "sc-transaction-pool-api", "sp-api", "sp-consensus", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-keystore 0.34.0", "sp-mixnet", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "thiserror", ] @@ -10775,10 +10939,10 @@ dependencies = [ "serde", "serde_json", "smallvec", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -10803,7 +10967,7 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "thiserror", "unsigned-varint", ] @@ -10822,7 +10986,7 @@ dependencies = [ "sc-consensus", "sp-consensus", "sp-consensus-grandpa", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", ] [[package]] @@ -10839,7 +11003,7 @@ dependencies = [ "sc-network-common", "sc-network-sync", "schnellru", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", "tracing", ] @@ -10860,8 +11024,8 @@ dependencies = [ "sc-client-api", "sc-network", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "thiserror", ] @@ -10889,12 +11053,12 @@ dependencies = [ "sc-utils", "schnellru", "smallvec", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", "sp-blockchain", "sp-consensus", "sp-consensus-grandpa", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", "thiserror", "tokio", @@ -10916,7 +11080,7 @@ dependencies = [ "sc-network-sync", "sc-utils", "sp-consensus", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "substrate-prometheus-endpoint", ] @@ -10931,7 +11095,7 @@ dependencies = [ "futures", "futures-timer", "hyper 0.14.29", - "hyper-rustls", + "hyper-rustls 0.24.2", "libp2p", "log", "num_cpus", @@ -10945,11 +11109,11 @@ dependencies = [ "sc-transaction-pool-api", "sc-utils", "sp-api", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", "sp-offchain", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "threadpool", "tracing", ] @@ -10984,11 +11148,11 @@ dependencies = [ "serde_json", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-keystore 0.34.0", "sp-offchain", "sp-rpc", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-session", "sp-statement-store", "sp-version", @@ -11008,9 +11172,9 @@ dependencies = [ "scale-info", "serde", "serde_json", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-rpc", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-version", "thiserror", ] @@ -11055,9 +11219,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-rpc", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-version", "thiserror", "tokio", @@ -11108,16 +11272,16 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-consensus", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "sp-session", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-state-machine 0.35.0", "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-transaction-pool", "sp-transaction-storage-proof", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "sp-version", "static_init", "substrate-prometheus-endpoint", @@ -11136,7 +11300,7 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", ] [[package]] @@ -11151,8 +11315,8 @@ dependencies = [ "sc-keystore", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "sp-statement-store", "substrate-prometheus-endpoint", "tokio", @@ -11173,9 +11337,9 @@ dependencies = [ "sc-telemetry", "serde", "serde_json", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", + "sp-io 30.0.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -11218,9 +11382,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-rpc", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", "tracing", @@ -11236,7 +11400,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -11257,9 +11421,9 @@ dependencies = [ "serde", "sp-api", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", + "sp-runtime 31.0.1", "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-transaction-pool", "substrate-prometheus-endpoint", @@ -11277,8 +11441,8 @@ dependencies = [ "parity-scale-codec", "serde", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "thiserror", ] @@ -11294,68 +11458,68 @@ dependencies = [ "log", "parking_lot 0.12.3", "prometheus", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 23.0.0", ] [[package]] name = "scale-bits" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" +checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" dependencies = [ "parity-scale-codec", "scale-info", + "scale-type-resolver 0.1.1", "serde", ] [[package]] name = "scale-bits" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662d10dcd57b1c2a3c41c9cf68f71fb09747ada1ea932ad961aca7e2ca28315f" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" dependencies = [ "parity-scale-codec", "scale-info", - "scale-type-resolver", + "scale-type-resolver 0.2.0", "serde", ] [[package]] name = "scale-decode" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7caaf753f8ed1ab4752c6afb20174f03598c664724e0e32628e161c21000ff76" +checksum = "afc79ba56a1c742f5aeeed1f1801f3edf51f7e818f0a54582cac6f131364ea7b" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types", - "scale-bits 0.4.0", - "scale-decode-derive", - "scale-info", + "scale-bits 0.5.0", + "scale-type-resolver 0.1.1", "smallvec", ] [[package]] name = "scale-decode" -version = "0.11.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc79ba56a1c742f5aeeed1f1801f3edf51f7e818f0a54582cac6f131364ea7b" +checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", - "scale-bits 0.5.0", - "scale-type-resolver", + "primitive-types", + "scale-bits 0.6.0", + "scale-decode-derive", + "scale-type-resolver 0.2.0", "smallvec", ] [[package]] name = "scale-decode-derive" -version = "0.10.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3475108a1b62c7efd1b5c65974f30109a598b2f45f23c9ae030acb9686966db" +checksum = "9bb22f574168103cdd3133b19281639ca65ad985e24612728f727339dcaf4021" dependencies = [ "darling 0.14.4", - "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -11363,37 +11527,37 @@ dependencies = [ [[package]] name = "scale-encode" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5" +checksum = "628800925a33794fb5387781b883b5e14d130fece9af5a63613867b8de07c5c7" dependencies = [ "derive_more", "parity-scale-codec", - "primitive-types", - "scale-bits 0.4.0", - "scale-encode-derive", - "scale-info", + "scale-bits 0.5.0", + "scale-type-resolver 0.1.1", "smallvec", ] [[package]] name = "scale-encode" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628800925a33794fb5387781b883b5e14d130fece9af5a63613867b8de07c5c7" +checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e" dependencies = [ "derive_more", "parity-scale-codec", - "scale-bits 0.5.0", - "scale-type-resolver", + "primitive-types", + "scale-bits 0.6.0", + "scale-encode-derive", + "scale-type-resolver 0.2.0", "smallvec", ] [[package]] name = "scale-encode-derive" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995491f110efdc6bea96d6a746140e32bfceb4ea47510750a5467295a4707a25" +checksum = "82ab7e60e2d9c8d47105f44527b26f04418e5e624ffc034f6b4a86c0ba19c5bf" dependencies = [ "darling 0.14.4", "proc-macro-crate 1.1.3", @@ -11438,24 +11602,34 @@ dependencies = [ "smallvec", ] +[[package]] +name = "scale-type-resolver" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" +dependencies = [ + "scale-info", + "smallvec", +] + [[package]] name = "scale-typegen" -version = "0.1.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00860983481ac590ac87972062909bef0d6a658013b592ccc0f2feb272feab11" +checksum = "498d1aecf2ea61325d4511787c115791639c0fd21ef4f8e11e49dd09eff2bbac" dependencies = [ "proc-macro2", "quote", "scale-info", - "syn 2.0.67", + "syn 2.0.68", "thiserror", ] [[package]] name = "scale-value" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58223c7691bf0bd46b43c9aea6f0472d1067f378d574180232358d7c6e0a8089" +checksum = "c07ccfee963104335c971aaf8b7b0e749be8569116322df23f1f75c4ca9e4a28" dependencies = [ "base58", "blake2 0.10.6", @@ -11463,19 +11637,20 @@ dependencies = [ "either", "frame-metadata 15.1.0", "parity-scale-codec", - "scale-bits 0.4.0", - "scale-decode 0.10.0", - "scale-encode 0.5.0", + "scale-bits 0.5.0", + "scale-decode 0.11.1", + "scale-encode 0.6.0", "scale-info", + "scale-type-resolver 0.1.1", "serde", "yap", ] [[package]] name = "scale-value" -version = "0.14.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07ccfee963104335c971aaf8b7b0e749be8569116322df23f1f75c4ca9e4a28" +checksum = "f2cf9738c263c665144177201126bdad39d3d62512152f178f35002228026976" dependencies = [ "base58", "blake2 0.10.6", @@ -11483,11 +11658,11 @@ dependencies = [ "either", "frame-metadata 15.1.0", "parity-scale-codec", - "scale-bits 0.5.0", - "scale-decode 0.11.1", - "scale-encode 0.6.0", + "scale-bits 0.6.0", + "scale-decode 0.13.1", + "scale-encode 0.7.1", "scale-info", - "scale-type-resolver", + "scale-type-resolver 0.2.0", "serde", "yap", ] @@ -11536,7 +11711,7 @@ dependencies = [ "rand_core 0.6.4", "serde_bytes", "sha2 0.10.8", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -11573,7 +11748,7 @@ dependencies = [ "generic-array 0.14.7", "pkcs8 0.9.0", "serdect 0.1.0", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -11588,7 +11763,7 @@ dependencies = [ "generic-array 0.14.7", "pkcs8 0.10.2", "serdect 0.2.0", - "subtle 2.6.0", + "subtle 2.6.1", "zeroize", ] @@ -11653,10 +11828,11 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] @@ -11721,9 +11897,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -11736,14 +11912,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -12071,7 +12247,7 @@ dependencies = [ "num-bigint", "num-rational", "num-traits", - "pbkdf2 0.12.2", + "pbkdf2", "pin-project", "poly1305", "rand 0.8.5", @@ -12085,7 +12261,7 @@ dependencies = [ "siphasher 1.0.1", "slab", "smallvec", - "soketto", + "soketto 0.7.1", "twox-hash", "wasmi", "x25519-dalek 2.0.1", @@ -12148,7 +12324,7 @@ dependencies = [ "ring 0.17.8", "rustc_version", "sha2 0.10.8", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -12188,6 +12364,21 @@ dependencies = [ "sha-1", ] +[[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "httparse", + "log", + "rand 0.8.5", + "sha1", +] + [[package]] name = "sp-api" version = "26.0.0" @@ -12198,14 +12389,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api-proc-macro", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-metadata-ir", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-state-machine 0.35.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "sp-version", "thiserror", ] @@ -12221,62 +12412,62 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "sp-application-crypto" version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4fe7a9b7fa9da76272b201e2fb3c7900d97d32a46b66af9a04dad457f73c71" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 30.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-application-crypto" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13ca6121c22c8bd3d1dce1f05c479101fd0d7b159bef2a3e8c834138d839c75c" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 31.0.0", + "sp-io 33.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sp-arithmetic" version = "23.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42721f072b421f292a072e8f52a3b3c0fbc27428f0c9fe24067bc47046bad63" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "static_assertions", ] [[package]] name = "sp-arithmetic" -version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +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 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions", ] @@ -12305,7 +12496,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "sp-api", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -12322,8 +12513,8 @@ dependencies = [ "sp-api", "sp-consensus", "sp-database", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "thiserror", ] @@ -12335,10 +12526,10 @@ dependencies = [ "async-trait", "futures", "log", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "thiserror", ] @@ -12351,10 +12542,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-consensus-slots", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-timestamp", ] @@ -12369,11 +12560,11 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-consensus-slots", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-timestamp", ] @@ -12389,10 +12580,10 @@ dependencies = [ "scale-info", "serde", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -12411,14 +12602,13 @@ dependencies = [ [[package]] name = "sp-core" version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f230cb12575455070da0fc174815958423a0b9a641d5e304a9457113c7cb4007" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "array-bytes 6.2.3", - "bip39", + "bandersnatch_vrfs", "bitflags 1.3.2", "blake2 0.10.6", - "bounded-collections 0.1.9", + "bounded-collections", "bs58 0.5.1", "dyn-clonable", "ed25519-zebra 3.1.0", @@ -12427,9 +12617,11 @@ dependencies = [ "hash256-std-hasher", "impl-serde", "itertools 0.10.5", + "k256 0.13.3", "libsecp256k1", "log", "merlin", + "parity-bip39", "parity-scale-codec", "parking_lot 0.12.3", "paste", @@ -12440,14 +12632,14 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-crypto-hashing 0.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "ss58-registry", - "substrate-bip39 0.4.6", + "substrate-bip39 0.4.7", "thiserror", "tracing", "w3f-bls", @@ -12456,14 +12648,14 @@ dependencies = [ [[package]] name = "sp-core" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d7a0fd8f16dcc3761198fc83be12872f823b37b749bc72a3a6a1f702509366" dependencies = [ "array-bytes 6.2.3", - "bandersnatch_vrfs", "bitflags 1.3.2", "blake2 0.10.6", - "bounded-collections 0.2.0", + "bounded-collections", "bs58 0.5.1", "dyn-clonable", "ed25519-zebra 3.1.0", @@ -12487,38 +12679,24 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-crypto-hashing", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-crypto-hashing 0.1.0", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-externalities 0.27.0", + "sp-runtime-interface 26.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 20.0.0", "ss58-registry", - "substrate-bip39 0.4.7", + "substrate-bip39 0.5.0", "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" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -12548,14 +12726,28 @@ dependencies = [ "twox-hash", ] +[[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.0.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "quote", - "sp-crypto-hashing", - "syn 2.0.67", + "sp-crypto-hashing 0.0.0", + "syn 2.0.68", ] [[package]] @@ -12575,7 +12767,7 @@ checksum = "48d09fa0a5f7299fb81ee25ae3853d26200f7a348148aed6de76be905c007dbe" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -12585,50 +12777,50 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "sp-externalities" version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63867ec85950ced90d4ab1bba902a47db1b1efdf2829f653945669b2bb470a9c" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "environmental", "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] name = "sp-externalities" -version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d6a4572eadd4a63cff92509a210bf425501a0c5e76574b30a366ac77653787" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 20.0.0", ] [[package]] @@ -12638,7 +12830,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "serde_json", "sp-api", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -12651,7 +12843,7 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "scale-info", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", ] @@ -12659,50 +12851,52 @@ dependencies = [ [[package]] name = "sp-io" version = "30.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55f26d89feedaf0faf81688b6e1e1e81329cd8b4c6a4fd6c5b97ed9dd068b8a" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "bytes", "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", + "polkavm-derive 0.9.1", "rustversion", "secp256k1", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-keystore 0.34.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface 24.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-state-machine 0.35.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-keystore 0.34.0", + "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-state-machine 0.35.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "tracing", "tracing-core", ] [[package]] name = "sp-io" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "33.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e09bba780b55bd9e67979cd8f654a31e4a6cf45426ff371394a65953d2177f2" dependencies = [ "bytes", "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", - "polkavm-derive", + "polkavm-derive 0.9.1", "rustversion", "secp256k1", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 31.0.0", + "sp-crypto-hashing 0.1.0", + "sp-externalities 0.27.0", + "sp-keystore 0.37.0", + "sp-runtime-interface 26.0.0", + "sp-state-machine 0.38.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 32.0.0", "tracing", "tracing-core", ] @@ -12712,33 +12906,32 @@ name = "sp-keyring" version = "31.0.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "strum 0.24.1", ] [[package]] name = "sp-keystore" version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96806a28a62ed9ddecd0b28857b1344d029390f7c5c42a2ff9199cbf5638635c" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-keystore" -version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbab8b61bd61d5f8625a0c75753b5d5a23be55d3445419acd42caf59cf6236b" dependencies = [ "parity-scale-codec", "parking_lot 0.12.3", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 31.0.0", + "sp-externalities 0.27.0", ] [[package]] @@ -12769,7 +12962,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-application-crypto 30.0.0", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -12779,8 +12972,8 @@ version = "26.0.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "sp-api", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", ] [[package]] @@ -12811,14 +13004,13 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 dependencies = [ "rustc-hash", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", ] [[package]] name = "sp-runtime" version = "31.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3bb49a4475d390198dfd3d41bef4564ab569fbaf1b5e38ae69b35fc01199d91" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "docify", "either", @@ -12831,18 +13023,19 @@ dependencies = [ "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 30.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-arithmetic 23.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-io 30.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-weights 27.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-application-crypto 30.0.0", + "sp-arithmetic 23.0.0", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-weights 27.0.0", ] [[package]] name = "sp-runtime" -version = "31.0.1" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "34.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3cb126971e7db2f0fcf8053dce740684c438c7180cfca1959598230f342c58" dependencies = [ "docify", "either", @@ -12855,31 +13048,12 @@ dependencies = [ "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66b66d8cec3d785fa6289336c1d9cbd4305d5d84f7134378c4d79ed7983e6fb" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-runtime-interface-proc-macro 17.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-application-crypto 33.0.0", + "sp-arithmetic 25.0.0", + "sp-core 31.0.0", + "sp-io 33.0.0", "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-storage 19.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-wasm-interface 20.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "static_assertions", + "sp-weights 30.0.0", ] [[package]] @@ -12890,7 +13064,7 @@ dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive", + "polkavm-derive 0.9.1", "primitive-types", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", @@ -12904,12 +13078,12 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", - "polkavm-derive", + "polkavm-derive 0.9.1", "primitive-types", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)", "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", @@ -12920,44 +13094,64 @@ dependencies = [ "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 0.8.0", + "primitive-types", + "sp-externalities 0.27.0", + "sp-runtime-interface-proc-macro 18.0.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-storage 20.0.0", + "sp-tracing 16.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-wasm-interface 20.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "static_assertions", +] + [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfaf6e85b2ec12a4b99cd6d8d57d083e30c94b7f1b0d8f93547121495aae6f0c" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "Inflector", "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "Inflector", "expander", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +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.67", + "syn 2.0.68", ] [[package]] @@ -12968,9 +13162,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-api", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-keystore 0.34.0", + "sp-runtime 31.0.1", "sp-staking", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] @@ -12984,16 +13178,15 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-state-machine" version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718c779ad1d6fcc0be64c7ce030b33fa44b5c8914b3a1319ef63bb5f27fb98df" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "hash-db", "log", @@ -13001,11 +13194,11 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "smallvec", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-trie 29.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", "thiserror", "tracing", "trie-db", @@ -13013,8 +13206,9 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eae0eac8034ba14437e772366336f579398a46d101de13dbb781ab1e35e67c5" dependencies = [ "hash-db", "log", @@ -13022,11 +13216,11 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "smallvec", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-panic-handler 13.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 31.0.0", + "sp-externalities 0.27.0", + "sp-panic-handler 13.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-trie 32.0.0", "thiserror", "tracing", "trie-db", @@ -13046,11 +13240,11 @@ dependencies = [ "scale-info", "sha2 0.10.8", "sp-api", - "sp-application-crypto 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-crypto-hashing", + "sp-application-crypto 30.0.0", + "sp-core 28.0.0", + "sp-crypto-hashing 0.0.0", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", @@ -13071,45 +13265,45 @@ source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0 [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" [[package]] name = "sp-storage" version = "19.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb92d7b24033a8a856d6e20dd980b653cbd7af7ec471cc988b1b7c1d2e3a32b" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", ] [[package]] name = "sp-storage" -version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +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 (git+https://github.com/paritytech/polkadot-sdk)", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -13120,7 +13314,7 @@ dependencies = [ "async-trait", "parity-scale-codec", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", ] @@ -13153,7 +13347,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "parity-scale-codec", "tracing", @@ -13167,7 +13361,7 @@ version = "26.0.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "sp-api", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", ] [[package]] @@ -13178,18 +13372,17 @@ dependencies = [ "async-trait", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-inherents", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-trie 29.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-trie 29.0.0", ] [[package]] name = "sp-trie" version = "29.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4d24d84a0beb44a71dcac1b41980e1edf7fb722c7f3046710136a283cd479b" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "ahash 0.8.11", "hash-db", @@ -13201,9 +13394,9 @@ dependencies = [ "rand 0.8.5", "scale-info", "schnellru", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-externalities 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-core 28.0.0", + "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "thiserror", "tracing", "trie-db", @@ -13212,8 +13405,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "32.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1aa91ad26c62b93d73e65f9ce7ebd04459c4bad086599348846a81988d6faa4" dependencies = [ "ahash 0.8.11", "hash-db", @@ -13225,9 +13419,9 @@ dependencies = [ "rand 0.8.5", "scale-info", "schnellru", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 31.0.0", + "sp-externalities 0.27.0", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", "tracing", "trie-db", @@ -13245,7 +13439,7 @@ dependencies = [ "scale-info", "serde", "sp-crypto-hashing-proc-macro", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-version-proc-macro", "thiserror", @@ -13259,7 +13453,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -13292,7 +13486,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#812dbff17513cbd2aeb2ff9c41214711bd1c0004" +source = "git+https://github.com/paritytech/polkadot-sdk#221eddc90cd1efc4fc3c822ce5ccf289272fb41d" dependencies = [ "impl-trait-for-tuples", "log", @@ -13302,32 +13496,32 @@ dependencies = [ [[package]] name = "sp-weights" version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e874bdf9dd3fd3242f5b7867a4eaedd545b02f29041a46d222a9d9d5caaaa5c" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ - "bounded-collections 0.1.9", + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 23.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-arithmetic 23.0.0", + "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", ] [[package]] name = "sp-weights" -version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "30.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af6c661fe3066b29f9e1d258000f402ff5cc2529a9191972d214e5871d0ba87" dependencies = [ - "bounded-collections 0.2.0", + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", - "sp-arithmetic 23.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-arithmetic 25.0.0", + "sp-debug-derive 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-std 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -13431,7 +13625,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ "bitflags 1.3.2", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", "parking_lot 0.11.2", "parking_lot_core 0.8.6", @@ -13445,7 +13639,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70a2595fc3aa78f2d0e45dd425b22282dd863273761cc77780914b2cf3003acf" dependencies = [ - "cfg_aliases", + "cfg_aliases 0.1.1", "memchr", "proc-macro2", "quote", @@ -13505,9 +13699,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros 0.26.4", ] @@ -13535,29 +13729,29 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "substrate-bip39" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" +version = "0.4.7" +source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.8.0", + "hmac 0.12.1", + "pbkdf2", "schnorrkel", - "sha2 0.9.9", + "sha2 0.10.8", "zeroize", ] [[package]] name = "substrate-bip39" -version = "0.4.7" -source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b564c293e6194e8b222e52436bcb99f60de72043c7f845cf6c4406db4df121" dependencies = [ "hmac 0.12.1", - "pbkdf2 0.12.2", + "pbkdf2", "schnorrkel", "sha2 0.10.8", "zeroize", @@ -13583,8 +13777,8 @@ dependencies = [ "sp-api", "sp-block-builder", "sp-blockchain", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-runtime 31.0.1", ] [[package]] @@ -13609,7 +13803,7 @@ dependencies = [ "log", "sc-rpc-api", "serde", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", ] [[package]] @@ -13624,12 +13818,12 @@ dependencies = [ "pallet-session", "parity-scale-codec", "scale-info", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", + "sp-io 30.0.0", + "sp-runtime 31.0.1", "sp-staking", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-weights 27.0.0", ] [[package]] @@ -13659,39 +13853,36 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "subxt" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3323d5c27898b139d043dc1ee971f602f937b99354ee33ee933bd90e0009fbd" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" dependencies = [ "async-trait", - "base58", - "blake2 0.10.6", - "derivative", + "derive-where", "either", "frame-metadata 16.0.0", "futures", "hex", "impl-serde", "instant", - "jsonrpsee 0.21.0", + "jsonrpsee 0.23.2", "parity-scale-codec", "primitive-types", - "scale-bits 0.4.0", - "scale-decode 0.10.0", - "scale-encode 0.5.0", + "reconnecting-jsonrpsee-ws-client", + "scale-bits 0.6.0", + "scale-decode 0.13.1", + "scale-encode 0.7.1", "scale-info", - "scale-value 0.13.0", + "scale-value 0.16.0", "serde", "serde_json", - "sp-core 28.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "sp-core-hashing", - "sp-runtime 31.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-crypto-hashing 0.1.0", + "subxt-core", "subxt-lightclient", "subxt-macro", "subxt-metadata", @@ -13703,30 +13894,57 @@ dependencies = [ [[package]] name = "subxt-codegen" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0e58c3f88651cff26aa52bae0a0a85f806a2e923a20eb438c16474990743ea" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" dependencies = [ "frame-metadata 16.0.0", - "heck 0.4.1", + "heck 0.5.0", "hex", - "jsonrpsee 0.21.0", + "jsonrpsee 0.23.2", "parity-scale-codec", "proc-macro2", "quote", "scale-info", "scale-typegen", "subxt-metadata", - "syn 2.0.67", + "syn 2.0.68", "thiserror", "tokio", ] +[[package]] +name = "subxt-core" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" +dependencies = [ + "base58", + "blake2 0.10.6", + "derive-where", + "frame-metadata 16.0.0", + "hashbrown 0.14.5", + "hex", + "impl-serde", + "keccak-hash", + "parity-scale-codec", + "primitive-types", + "scale-bits 0.6.0", + "scale-decode 0.13.1", + "scale-encode 0.7.1", + "scale-info", + "scale-value 0.16.0", + "serde", + "serde_json", + "sp-core 31.0.0", + "sp-crypto-hashing 0.1.0", + "sp-runtime 34.0.0", + "subxt-metadata", + "tracing", +] + [[package]] name = "subxt-lightclient" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecec7066ba7bc0c3608fcd1d0c7d9584390990cd06095b6ae4f114f74c4b8550" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" dependencies = [ "futures", "futures-util", @@ -13741,9 +13959,8 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365251668613323064803427af8c7c7bc366cd8b28e33639640757669dafebd5" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" dependencies = [ "darling 0.20.9", "parity-scale-codec", @@ -13751,20 +13968,19 @@ dependencies = [ "quote", "scale-typegen", "subxt-codegen", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] name = "subxt-metadata" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02aca8d39a1f6c55fff3a8fd81557d30a610fedc1cef03f889a81bc0f8f0b52" +version = "0.37.0" +source = "git+https://github.com/paritytech/subxt#b076f4c66ca2b7627f32d899211ea99a47db1c28" dependencies = [ "frame-metadata 16.0.0", + "hashbrown 0.14.5", "parity-scale-codec", "scale-info", - "sp-core-hashing", - "thiserror", + "sp-crypto-hashing 0.1.0", ] [[package]] @@ -13780,9 +13996,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.67" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -13957,7 +14173,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -14067,9 +14283,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" dependencies = [ "tinyvec_macros", ] @@ -14118,7 +14334,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -14163,6 +14379,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.10", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -14326,7 +14553,7 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.6", - "rustls-native-certs 0.7.0", + "rustls-native-certs 0.7.1", "rustls-pemfile 2.1.2", "rustls-pki-types", "tokio", @@ -14364,7 +14591,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "futures-core", "futures-util", @@ -14408,7 +14635,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -14605,7 +14832,7 @@ version = "0.38.0" source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0#3c3d6fceb82372a3019b37117aa453d564b212de" dependencies = [ "async-trait", - "clap 4.5.7", + "clap 4.5.8", "frame-remote-externalities", "frame-try-runtime", "hex", @@ -14618,19 +14845,19 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-consensus-babe", - "sp-core 28.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-core 28.0.0", "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", "sp-inherents", - "sp-io 30.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-keystore 0.34.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-io 30.0.0", + "sp-keystore 0.34.0", "sp-rpc", - "sp-runtime 31.0.1 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", - "sp-state-machine 0.35.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-runtime 31.0.1", + "sp-state-machine 0.35.0", "sp-timestamp", "sp-transaction-storage-proof", "sp-version", - "sp-weights 27.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.9.0)", + "sp-weights 27.0.0", "substrate-rpc-client", "zstd 0.12.4", ] @@ -14776,7 +15003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle 2.6.0", + "subtle 2.6.1", ] [[package]] @@ -14871,9 +15098,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom 0.2.15", "serde", @@ -15036,7 +15263,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -15070,7 +15297,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -15435,6 +15662,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.4.2" @@ -15449,9 +15685,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.24" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8" +checksum = "2caba658a80831539b30698ae9862a72db6697dfdd7151e46920f5f2755c3ce2" dependencies = [ "bytemuck", "safe_arch", @@ -15525,7 +15761,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -15552,7 +15788,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -15587,18 +15823,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -15615,9 +15851,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -15633,9 +15869,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -15651,15 +15887,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -15675,9 +15911,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -15693,9 +15929,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -15711,9 +15947,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -15729,9 +15965,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -15859,22 +16095,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -15894,7 +16130,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.67", + "syn 2.0.68", ] [[package]] @@ -15937,9 +16173,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/crates/chronicle-domain-test/src/test.rs b/crates/chronicle-domain-test/src/test.rs index 913a8db7..99545b3c 100644 --- a/crates/chronicle-domain-test/src/test.rs +++ b/crates/chronicle-domain-test/src/test.rs @@ -64,10 +64,7 @@ pub async fn main() { #[cfg(test)] mod test { use chronicle::{ - api::{ - chronicle_graphql::{construct_schema, OpaCheck, Subscription}, - Store, - }, + api::chronicle_graphql::{construct_schema, Subscription}, async_graphql::{Request, Response, Schema}, bootstrap::opa::CliPolicyLoader, chrono::{NaiveDate, TimeZone, Utc}, diff --git a/crates/chronicle-telemetry/src/telemetry.rs b/crates/chronicle-telemetry/src/telemetry.rs index 5a3172bc..96a9a48b 100644 --- a/crates/chronicle-telemetry/src/telemetry.rs +++ b/crates/chronicle-telemetry/src/telemetry.rs @@ -1,10 +1,6 @@ use opentelemetry::{global, logs::LogError, metrics::MetricsError, trace::TraceError}; use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; -use opentelemetry_sdk::{ - logs::Config, - runtime, - trace::{self as sdktrace, RandomIdGenerator}, -}; +use opentelemetry_sdk::{runtime, trace as sdktrace}; use tracing_opentelemetry::{MetricsLayer, OpenTelemetryLayer}; use tracing_subscriber::{fmt::format::FmtSpan, prelude::*, EnvFilter}; diff --git a/crates/chronicle-test-infrastructure/Cargo.toml b/crates/chronicle-test-infrastructure/Cargo.toml index 2c646770..e05ad809 100644 --- a/crates/chronicle-test-infrastructure/Cargo.toml +++ b/crates/chronicle-test-infrastructure/Cargo.toml @@ -28,7 +28,7 @@ futures = { workspace = true } insta = { workspace = true, features = ["json", "yaml"] } lazy_static = { workspace = true } pallet-chronicle = { path = "../pallet-chronicle" } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", ] } portpicker = { workspace = true } @@ -40,7 +40,8 @@ scale-info = { version = "2.10.0", default-features = false, features = [ "derive", ] } serde_json = { workspace = true } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } + tempfile = { workspace = true } testcontainers = { workspace = true } tokio = { workspace = true } diff --git a/crates/chronicle-test-infrastructure/src/api_test.rs b/crates/chronicle-test-infrastructure/src/api_test.rs index a729b849..ecd0a14f 100644 --- a/crates/chronicle-test-infrastructure/src/api_test.rs +++ b/crates/chronicle-test-infrastructure/src/api_test.rs @@ -8,10 +8,9 @@ use common::{ prov::{ json_ld::ToJson, operations::{ChronicleOperation, DerivationType}, - ActivityId, AgentId, DomaintypeId, EntityId, NamespaceId, + ActivityId, AgentId, DomaintypeId, EntityId, }, }; -use uuid::Uuid; use crate::substitutes::test_api; diff --git a/crates/chronicle-test-infrastructure/src/substitutes/stubstrate.rs b/crates/chronicle-test-infrastructure/src/substitutes/stubstrate.rs index 539398a5..db051bed 100644 --- a/crates/chronicle-test-infrastructure/src/substitutes/stubstrate.rs +++ b/crates/chronicle-test-infrastructure/src/substitutes/stubstrate.rs @@ -5,12 +5,12 @@ use super::mockchain::{new_test_ext, ChronicleModule, RuntimeEvent, RuntimeOrigi use protocol_abstract::{ BlockId, FromBlock, LedgerEvent, LedgerEventContext, LedgerReader, LedgerWriter, Position, Span, }; -use protocol_substrate::{PolkadotConfig, SubstrateStateReader, SubxtClientError}; +use protocol_substrate::{SubstrateStateReader, SubxtClientError}; use protocol_substrate_chronicle::{ protocol::WriteConsistency, ChronicleEvent, ChronicleEventCodec, ChronicleTransaction, }; use std::sync::{Arc, Mutex}; -use subxt::metadata::{DecodeWithMetadata, EncodeWithMetadata}; +use subxt::metadata::DecodeWithMetadata; #[derive(Clone)] pub struct Stubstrate { @@ -90,7 +90,7 @@ impl LedgerWriter for Stubstrate { ) -> Result<(Self::Submittable, ChronicleTransactionId), Self::Error> { Ok(( OperationSubmission { - correlation_id: tx.correlation_id.into_bytes(), + correlation_id: tx.correlation_id, identity: tx.identity, items: tx.operations, }, @@ -142,7 +142,7 @@ impl LedgerWriter for Stubstrate { impl SubstrateStateReader for Stubstrate { type Error = SubxtClientError; - async fn get_state_entry( + async fn get_state_entry + Send + Sync, V: DecodeWithMetadata>( &self, _pallet_name: &str, _entry_name: &str, diff --git a/crates/chronicle/src/bootstrap/mod.rs b/crates/chronicle/src/bootstrap/mod.rs index 4a2a1069..9ff6115b 100644 --- a/crates/chronicle/src/bootstrap/mod.rs +++ b/crates/chronicle/src/bootstrap/mod.rs @@ -184,7 +184,7 @@ where #[allow(dead_code)] fn namespace_bindings(options: &ArgMatches) -> Vec { options - .values_of("namespace-binding") + .get_many::("namespace-binding") .map(|values| { values .map(|value| { @@ -297,7 +297,7 @@ pub async fn api( embedded_tp.connect_chronicle::().await?, UniqueUuid, chronicle_signing(options).await?, - vec![], + namespace_bindings(options), remote_opa, liveness_check_interval, ) @@ -413,10 +413,8 @@ async fn configure_opa(options: &ArgMatches) -> Result } else { let (opa, settings) = self::opa::opa_executor_from_substrate_state( &ChronicleSubstrateClient::connect(validator_address(options)?).await?, - &protocol_substrate_opa::OpaSubstrateClient::connect( - validator_address(options)?, - ) - .await?, + &protocol_substrate_opa::OpaSubstrateClient::connect(validator_address(options)?) + .await?, ) .await?; diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 929ffdcb..e72243b6 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -49,7 +49,7 @@ macro-attr-2018 = { workspace = true } mime = { version = "0.3", optional = true } newtype-derive-2018 = { workspace = true } opa = { git = "https://github.com/chronicleworks/opa-rs", rev = "9fa2fbce", optional = true } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", "max-encoded-len", ], optional = true } @@ -62,15 +62,15 @@ rust-embed = { version = "6", features = [ "debug-embed", "include-exclude", ], optional = true } -scale-decode = { version = "^0.10.0", default-features = false, features = [ +scale-decode = { version = "0.13.1", default-features = false, features = [ "derive", ], optional = true } -scale-encode = { version = "^0.5.0", default-features = false, features = [ +scale-encode = { version = "0.7.1", default-features = false, features = [ "derive", "primitive-types", "bits", ], optional = true } -scale-info = { version = "^2.10.0", default-features = false, features = [ +scale-info = { version = "2.11.3", default-features = false, features = [ "derive", ], optional = true } serde = { version = "1.0", default-features = false, features = [ @@ -134,6 +134,7 @@ std = [ ] # Enable parity support, annoyingly lazy_static has a non standard way of enabling non_std parity-encoding = [ + "dep:sp-std", "lazy_static/spin_no_std", "parity-scale-codec", "scale-info", diff --git a/crates/common/src/attributes.rs b/crates/common/src/attributes.rs index 1b32aaea..f88d397b 100644 --- a/crates/common/src/attributes.rs +++ b/crates/common/src/attributes.rs @@ -74,11 +74,11 @@ impl From for SerdeWrapper { #[cfg(feature = "parity-encoding")] impl scale_encode::EncodeAsType for SerdeWrapper { - fn encode_as_type_to( + fn encode_as_type_to( &self, - type_id: u32, - _types: &scale_info::PortableRegistry, - out: &mut scale_encode::Vec, + type_id: R::TypeId, + types: &R, + out: &mut Vec, ) -> Result<(), scale_encode::Error> { let json_string = match serde_json::to_string(&self.0) { Ok(json_string) => json_string, @@ -86,7 +86,7 @@ impl scale_encode::EncodeAsType for SerdeWrapper { tracing::error!("Failed to serialize Value to JSON string: {}", e); return Err(scale_encode::Error::new(scale_encode::error::ErrorKind::WrongShape { actual: Kind::Str, - expected: type_id, + expected_id: "type_id".to_string(), })); }, }; diff --git a/crates/common/src/ledger.rs b/crates/common/src/ledger.rs index 6c65ecc6..2544d7b4 100644 --- a/crates/common/src/ledger.rs +++ b/crates/common/src/ledger.rs @@ -21,10 +21,12 @@ use parity_scale_codec::{ }; #[cfg(not(feature = "std"))] use scale_info::prelude::*; + + #[cfg(feature = "std")] use std::{ boxed::Box, collections::btree_map::Entry, collections::BTreeMap, collections::BTreeSet, - sync::Arc, + sync::Arc }; #[derive(Debug, Clone)] @@ -93,25 +95,55 @@ impl core::fmt::Display for SubmissionError { )] #[derive(Debug, Clone, Eq, PartialEq)] pub struct OperationSubmission { - pub correlation_id: [u8; 16], + pub correlation_id: [u8; 32], pub items: Arc>, pub identity: Arc, } impl OperationSubmission { - pub fn new(uuid: Uuid, identity: SignedIdentity, operations: Vec) -> Self { + + pub fn correlation_id(&self) -> &[u8; 32] { + &self.correlation_id + } + + #[cfg(feature = "std")] + pub fn logical_hash(operations: &[ChronicleOperation]) -> [u8; 32] { + use k256::sha2::{Sha256, Digest}; + use tracing::debug; + + let mut hasher = Sha256::new(); + use core::hash::{Hash, Hasher}; + + for operation in operations.iter() { + let mut operation_hasher = std::hash::SipHasher::new_with_keys(1, 1); + operation.hash(&mut operation_hasher); + let operation_hash = operation_hasher.finish().to_ne_bytes(); + debug!("Operation hash: {:?} {:?}", operation_hash, operation); + hasher.update(operation_hash); + } + let result = hasher.finalize(); + let mut hash: [u8; 32] = result.into(); + hash.copy_from_slice(&result); + debug!("Final hash: {:?}", hash); + hash + } + + #[cfg(feature = "std")] + pub fn new(identity: SignedIdentity, operations: Vec) -> Self { OperationSubmission { - correlation_id: uuid.into_bytes(), + correlation_id: Self::logical_hash(&operations), identity: identity.into(), items: operations.into(), } } - pub fn new_anonymous(uuid: Uuid, operations: Vec) -> Self { - Self::new(uuid, SignedIdentity::new_no_identity(), operations) + #[cfg(feature = "std")] + pub fn new_anonymous(operations: Vec) -> Self { + Self::new(SignedIdentity::new_no_identity(), operations) } } + pub type SubmitResult = Result; #[derive(Debug, Clone)] diff --git a/crates/common/src/opa/core.rs b/crates/common/src/opa/core.rs index c92bd6fe..0d8318f3 100644 --- a/crates/common/src/opa/core.rs +++ b/crates/common/src/opa/core.rs @@ -130,6 +130,12 @@ impl From for KeyAddress { #[derive(Debug, PartialEq, Eq, Clone)] pub struct KeyAddress(H128); +impl AsRef<[u8]> for KeyAddress { + fn as_ref(&self) -> &[u8] { + self.0 .0.as_ref() + } +} + #[derive(Debug, Clone, Eq, PartialEq, Hash)] // This message is used to bootstrap the root key for a newly created authz tp, // it can only be executed once @@ -229,7 +235,7 @@ pub enum Operation { #[derive(Debug, Clone, Eq, PartialEq, Hash)] pub struct OpaSubmission { pub version: String, - pub correlation_id: [u8; 16], + pub correlation_id: [u8; 32], pub span_id: u64, pub payload: Payload, } @@ -509,7 +515,7 @@ pub mod codec { #[derive(Encode, EncodeAsType, DecodeAsType, Decode, Debug, TypeInfo, Clone, PartialEq, Eq)] pub struct OpaSubmissionV1 { pub version: String, - pub correlation_id: [u8; 16], + pub correlation_id: [u8; 32], pub span_id: u64, pub payload: PayloadV1, } diff --git a/crates/common/src/prov/model/mod.rs b/crates/common/src/prov/model/mod.rs index df24fa5f..9c327ebc 100644 --- a/crates/common/src/prov/model/mod.rs +++ b/crates/common/src/prov/model/mod.rs @@ -233,10 +233,10 @@ pub enum ChronicleTransactionIdError { derive(scale_info::TypeInfo, parity_scale_codec::Encode, parity_scale_codec::Decode) )] #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone, Copy, Default)] -pub struct ChronicleTransactionId([u8; 16]); +pub struct ChronicleTransactionId([u8; 32]); impl core::ops::Deref for ChronicleTransactionId { - type Target = [u8; 16]; + type Target = [u8; 32]; fn deref(&self) -> &Self::Target { &self.0 @@ -249,14 +249,8 @@ impl core::fmt::Display for ChronicleTransactionId { } } -impl From for ChronicleTransactionId { - fn from(u: Uuid) -> Self { - Self(u.into_bytes()) - } -} - -impl From<[u8; 16]> for ChronicleTransactionId { - fn from(u: [u8; 16]) -> Self { +impl From<[u8; 32]> for ChronicleTransactionId { + fn from(u: [u8; 32]) -> Self { Self(u) } } @@ -274,8 +268,8 @@ impl core::convert::TryFrom<&str> for ChronicleTransactionId { fn try_from(s: &str) -> Result { let bytes = hex::decode(s)?; - let mut array = [0; 16]; - array.copy_from_slice(&bytes[0..16]); + let mut array = [0; 32]; + array.copy_from_slice(&bytes[0..32]); Ok(Self(array)) } } diff --git a/crates/common/src/prov/operations.rs b/crates/common/src/prov/operations.rs index bdd562ba..b7b9e15c 100644 --- a/crates/common/src/prov/operations.rs +++ b/crates/common/src/prov/operations.rs @@ -237,11 +237,11 @@ impl From> for TimeWrapper { #[cfg(feature = "parity-encoding")] impl scale_encode::EncodeAsType for TimeWrapper { - fn encode_as_type_to( + fn encode_as_type_to( &self, - type_id: u32, - types: &scale_info::PortableRegistry, - out: &mut scale_encode::Vec, + type_id: R::TypeId, + types: &R, + out: &mut Vec, ) -> Result<(), scale_encode::Error> { let timestamp = self.0.timestamp(); let subsec_nanos = self.0.timestamp_subsec_nanos(); @@ -617,7 +617,10 @@ pub enum ChronicleOperation { WasInformedBy(WasInformedBy), } + + impl ChronicleOperation { + pub fn create_namespace(id: NamespaceId) -> Self { ChronicleOperation::CreateNamespace(CreateNamespace::new(id)) } diff --git a/crates/embedded-substrate/Cargo.toml b/crates/embedded-substrate/Cargo.toml index 970f8203..6989ace7 100644 --- a/crates/embedded-substrate/Cargo.toml +++ b/crates/embedded-substrate/Cargo.toml @@ -17,7 +17,8 @@ sc-cli = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkad sp-io = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0' } sp-runtime = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0' } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } + tempfile = { version = "3" } thiserror = { workspace = true } tokio = { workspace = true } diff --git a/crates/embedded-substrate/src/lib.rs b/crates/embedded-substrate/src/lib.rs index f0dfb939..377f802c 100644 --- a/crates/embedded-substrate/src/lib.rs +++ b/crates/embedded-substrate/src/lib.rs @@ -5,7 +5,6 @@ use sc_cli::{print_node_infos, CliConfiguration, Signals, SubstrateCli}; use subxt::{ config::ExtrinsicParams, ext::futures::{pin_mut, FutureExt}, - utils::{AccountId32, MultiAddress, MultiSignature}, }; use tempfile::TempDir; use thiserror::Error; @@ -229,12 +228,9 @@ pub mod test_runtime { }, ChronicleEvent, ChronicleTransaction, }; - use subxt::{ - ext::{ - futures::StreamExt, - sp_core::{Pair, Public}, - }, - PolkadotConfig, + use subxt::ext::{ + futures::StreamExt, + sp_core::{Pair, Public}, }; use uuid::Uuid; diff --git a/crates/opactl/Cargo.toml b/crates/opactl/Cargo.toml index ee3a4fb6..b1123347 100644 --- a/crates/opactl/Cargo.toml +++ b/crates/opactl/Cargo.toml @@ -40,7 +40,7 @@ frame-system = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = ' hex = { workspace = true } insta = { workspace = true, features = ["yaml"] } pallet-opa = { path = "../pallet-opa", features = ["std"] } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", ] } @@ -53,7 +53,8 @@ serde_json = { workspace = true } sp-core = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0', features = ["std"] } sp-io = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0', features = ["std"] } sp-runtime = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0', features = ["std"] } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } + tempfile = { workspace = true } [features] diff --git a/crates/opactl/src/main.rs b/crates/opactl/src/main.rs index 351d9f7b..74de3f8b 100644 --- a/crates/opactl/src/main.rs +++ b/crates/opactl/src/main.rs @@ -27,7 +27,7 @@ use common::{ prov::ChronicleTransactionId, }; use protocol_abstract::{FromBlock, LedgerReader, LedgerWriter}; -use protocol_substrate::{PolkadotConfig, SubstrateStateReader, SubxtClientError}; +use protocol_substrate::{SubstrateStateReader, SubxtClientError}; use protocol_substrate_opa::{ submission_builder::SubmissionBuilder, transaction::{OpaTransaction, TransactionError}, diff --git a/crates/opactl/src/test/stubstrate.rs b/crates/opactl/src/test/stubstrate.rs index 6c23beb8..3a32325a 100644 --- a/crates/opactl/src/test/stubstrate.rs +++ b/crates/opactl/src/test/stubstrate.rs @@ -2,7 +2,7 @@ use std::sync::{Arc, Mutex}; use frame_support::StoragePrefixedMap; use futures::{stream::BoxStream, StreamExt}; -use subxt::metadata::{DecodeWithMetadata, EncodeWithMetadata}; +use subxt::metadata::DecodeWithMetadata; use common::opa::{codec::OpaSubmissionV1, Keys, PolicyMeta}; use pallet_opa::{ChronicleTransactionId, Event}; @@ -10,7 +10,7 @@ use protocol_abstract::{ BlockId, FromBlock, LedgerEvent, LedgerEventContext, LedgerReader, LedgerTransaction, LedgerWriter, Position, Span, WriteConsistency, }; -use protocol_substrate::{PolkadotConfig, SubstrateStateReader, SubxtClientError}; +use protocol_substrate::{SubstrateStateReader, SubxtClientError}; use protocol_substrate_opa::{transaction::OpaTransaction, OpaEvent, OpaEventCodec}; use crate::test::mockchain::System; @@ -146,7 +146,7 @@ impl LedgerWriter for Stubstrate { impl SubstrateStateReader for Stubstrate { type Error = SubxtClientError; - async fn get_state_entry( + async fn get_state_entry + Send + Sync, V: DecodeWithMetadata>( &self, pallet_name: &str, entry_name: &str, diff --git a/crates/pallet-chronicle/Cargo.toml b/crates/pallet-chronicle/Cargo.toml index beee09ca..7bd782d8 100644 --- a/crates/pallet-chronicle/Cargo.toml +++ b/crates/pallet-chronicle/Cargo.toml @@ -19,10 +19,10 @@ sp-std = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkad sp-runtime = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0', default-features = false } macro-attr-2018 = { workspace = true } newtype-derive-2018 = { workspace = true } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", ] } -scale-info = { version = "^2.10.0", default-features = false, features = [ +scale-info = { version = "2.11.3", default-features = false, features = [ "derive", ] } serde = { version = "1.0", default-features = false } diff --git a/crates/pallet-chronicle/src/lib.rs b/crates/pallet-chronicle/src/lib.rs index 97516ab0..e5c62611 100644 --- a/crates/pallet-chronicle/src/lib.rs +++ b/crates/pallet-chronicle/src/lib.rs @@ -39,7 +39,6 @@ pub mod pallet { use frame_support::{pallet_prelude::*, traits::BuildGenesisConfig}; use frame_system::pallet_prelude::*; use sp_core::blake2_128; - use sp_runtime::traits::{DispatchInfoOf, PostDispatchInfoOf}; use sp_std::{collections::btree_set::BTreeSet, vec::Vec}; #[pallet::pallet] @@ -101,8 +100,8 @@ pub mod pallet { #[pallet::event] #[pallet::generate_deposit(pub (super) fn deposit_event)] pub enum Event { - Applied(common::prov::ProvModel, common::identity::SignedIdentity, [u8; 16]), - Contradiction(common::prov::Contradiction, common::identity::SignedIdentity, [u8; 16]), + Applied(common::prov::ProvModel, common::identity::SignedIdentity, [u8; 32]), + Contradiction(common::prov::Contradiction, common::identity::SignedIdentity, [u8; 32]), } // Errors inform users that something went wrong. @@ -163,13 +162,8 @@ pub mod pallet { let pays_fee = Pays::No; (weight, dispatch_class, pays_fee) })] - pub fn apply(origin: OriginFor, operations: OperationSubmission) -> DispatchResult { - // Check that the extrinsic was signed and get the signer. - // This function will return an error if the extrinsic is not signed. - // https://docs.substrate.io/main-docs/build/origins/ - let _who = ensure_signed(origin)?; - - // Get operations and load tßheir dependencies + pub fn apply(_origin: OriginFor, operations: OperationSubmission) -> DispatchResult { + // Get operations and load their dependencies let deps = operations .items .iter() @@ -240,4 +234,23 @@ pub mod pallet { Ok(()) } } + + #[pallet::validate_unsigned] + impl ValidateUnsigned for Pallet { + type Call = Call; + + fn validate_unsigned(_source: TransactionSource, call: &Self::Call) -> TransactionValidity { + if let Call::apply { operations, .. } = call { + tracing::error!("Correlation ID: {:?}", operations.correlation_id); + ValidTransaction::with_tag_prefix("chronicle") + .priority(1) + .and_provides(operations.correlation_id) + .longevity(TransactionLongevity::MAX) + .propagate(true) + .build() + } else { + InvalidTransaction::Call.into() + } + } + } } diff --git a/crates/pallet-chronicle/src/tests.rs b/crates/pallet-chronicle/src/tests.rs index 9de9a02d..dfb922c0 100644 --- a/crates/pallet-chronicle/src/tests.rs +++ b/crates/pallet-chronicle/src/tests.rs @@ -14,7 +14,7 @@ fn it_works_for_default_value() { new_test_ext().execute_with(|| { // Go past genesis block so events get deposited System::set_block_number(1); - let op = OperationSubmission::new_anonymous(Uuid::from_bytes([0u8; 16]), vec![]); + let op = OperationSubmission::new_anonymous(vec![]); // Dispatch a signed extrinsic. assert_ok!(ChronicleModule::apply(RuntimeOrigin::signed(1), op.clone())); // Assert that the correct event was deposited @@ -40,7 +40,7 @@ fn single_operation() { id: NamespaceId::from_external_id("test", uuid), }); - let sub = OperationSubmission::new_anonymous(Uuid::from_bytes([0u8; 16]), vec![op.clone()]); + let sub = OperationSubmission::new_anonymous( vec![op.clone()]); // Dispatch our operation assert_ok!(ChronicleModule::apply(RuntimeOrigin::signed(1), sub.clone(),)); diff --git a/crates/pallet-opa/Cargo.toml b/crates/pallet-opa/Cargo.toml index c348412f..6f90f5bb 100644 --- a/crates/pallet-opa/Cargo.toml +++ b/crates/pallet-opa/Cargo.toml @@ -25,10 +25,10 @@ k256 = { version = "0.11", default-features = false, features = [ ] } macro-attr-2018 = { workspace = true } newtype-derive-2018 = { workspace = true } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", ] } -scale-info = { version = "^2.10.0", default-features = false, features = [ +scale-info = { version = "2.11.3", default-features = false, features = [ "derive", ] } serde = { version = "1", default-features = false } diff --git a/crates/protocol-abstract/Cargo.toml b/crates/protocol-abstract/Cargo.toml index d4fdbe59..98788838 100644 --- a/crates/protocol-abstract/Cargo.toml +++ b/crates/protocol-abstract/Cargo.toml @@ -12,7 +12,8 @@ futures = { workspace = true } k256 = { workspace = true } pallet-chronicle = { path = "../pallet-chronicle", features = ["std"] } serde = { workspace = true } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } + thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } diff --git a/crates/protocol-abstract/src/abstract_ledger.rs b/crates/protocol-abstract/src/abstract_ledger.rs index 7ce0c4d2..46beff8f 100644 --- a/crates/protocol-abstract/src/abstract_ledger.rs +++ b/crates/protocol-abstract/src/abstract_ledger.rs @@ -106,7 +106,7 @@ pub type LedgerEventContext = (Event, ChronicleTransactionId, BlockId, Po #[async_trait::async_trait] pub trait LedgerEvent { - fn correlation_id(&self) -> [u8; 16]; + fn correlation_id(&self) -> [u8; 32]; } #[async_trait::async_trait] @@ -129,10 +129,9 @@ pub trait LedgerTransaction { type Error: std::error::Error + Send + Sync + 'static; type Payload: Sized + Send + Sync; async fn as_payload(&self) -> Result; - fn correlation_id(&self) -> [u8; 16]; + //A logical hash of the transaction + fn correlation_id(&self) -> [u8; 32]; - // Identify the content of this transaction - fn operation_hash(&self) -> u64; } #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/protocol-substrate-chronicle/Cargo.toml b/crates/protocol-substrate-chronicle/Cargo.toml index 022b23d0..f11721ba 100644 --- a/crates/protocol-substrate-chronicle/Cargo.toml +++ b/crates/protocol-substrate-chronicle/Cargo.toml @@ -11,7 +11,7 @@ clap_builder = { version = "*" } futures = { workspace = true } k256 = { workspace = true } serde = { workspace = true } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } thiserror = { workspace = true } tracing = { workspace = true } uuid = { workspace = true, features = ["std", "v4"] } @@ -20,19 +20,19 @@ chronicle-signing = { path = "../chronicle-signing" } common = { path = "../common", features = ["parity-encoding", "std"] } hex = { workspace = true } opa = { git = "https://github.com/chronicleworks/opa-rs", rev = "9fa2fbce" } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", "max-encoded-len", "std", ] } protocol-abstract = { path = "../protocol-abstract" } protocol-substrate = { path = "../protocol-substrate" } -scale-encode = { version = "^0.5.0", features = [ +scale-encode = { version = "0.7.1", features = [ "derive", "primitive-types", "bits", ] } -scale-info = { version = "^2.10.0", features = ["derive", "std"] } +scale-info = { version = "2.11.3", features = ["derive", "std"] } tokio = { workspace = true } [dev-dependencies] diff --git a/crates/protocol-substrate-chronicle/src/subxt_client.rs b/crates/protocol-substrate-chronicle/src/subxt_client.rs index c152a173..c517ea2d 100644 --- a/crates/protocol-substrate-chronicle/src/subxt_client.rs +++ b/crates/protocol-substrate-chronicle/src/subxt_client.rs @@ -1,4 +1,4 @@ -use std::{convert::Infallible, hash::Hash, marker::PhantomData, sync::Arc}; +use std::{convert::Infallible, hash::Hash, sync::Arc}; use chronicle_signing::{ ChronicleSigning, OwnedSecret, SecretError, BATCHER_NAMESPACE, BATCHER_PK, @@ -28,12 +28,12 @@ pub enum ChronicleEvent { Committed { diff: common::prov::ProvModel, identity: SignedIdentity, - correlation_id: [u8; 16], + correlation_id: [u8; 32], }, Contradicted { contradiction: common::prov::Contradiction, identity: SignedIdentity, - correlation_id: [u8; 16], + correlation_id: [u8; 32], }, } @@ -47,7 +47,7 @@ impl ChronicleEvent { pub fn new_committed( diff: common::prov::ProvModel, identity: SignedIdentity, - correlation_id: [u8; 16], + correlation_id: [u8; 32], ) -> Self { ChronicleEvent::Committed { diff, identity, correlation_id } } @@ -55,7 +55,7 @@ impl ChronicleEvent { pub fn new_contradicted( contradiction: common::prov::Contradiction, identity: SignedIdentity, - correlation_id: [u8; 16], + correlation_id: [u8; 32], ) -> Self { ChronicleEvent::Contradicted { contradiction, identity, correlation_id } } @@ -67,8 +67,8 @@ fn extract_event( where C: subxt::Config, { - type Applied = (common::prov::ProvModel, common::identity::SignedIdentity, [u8; 16]); - type Contradicted = (common::prov::Contradiction, common::identity::SignedIdentity, [u8; 16]); + type Applied = (common::prov::ProvModel, common::identity::SignedIdentity, [u8; 32]); + type Contradicted = (common::prov::Contradiction, common::identity::SignedIdentity, [u8; 32]); match (event.pallet_name(), event.variant_name(), event.field_bytes()) { ("Chronicle", "Applied", mut event_bytes) => match Applied::decode(&mut event_bytes) { Ok((prov_model, identity, correlation_id)) => @@ -94,7 +94,7 @@ where } impl LedgerEvent for ChronicleEvent { - fn correlation_id(&self) -> [u8; 16] { + fn correlation_id(&self) -> [u8; 32] { match self { Self::Committed { correlation_id, .. } => *correlation_id, Self::Contradicted { correlation_id, .. } => *correlation_id, @@ -123,7 +123,7 @@ impl LedgerEventCodec for ChronicleEventCodec { } pub struct ChronicleTransaction { - pub correlation_id: uuid::Uuid, + pub correlation_id: [u8; 32], key: subxt::ext::sp_core::ecdsa::Pair, //We need the batcher key to sign transactions pub identity: Arc, pub operations: Arc>, @@ -135,14 +135,15 @@ impl ChronicleTransaction { identity: SignedIdentity, operations: impl IntoIterator, ) -> Result { + let operations: Vec<_> = operations.into_iter().collect(); Ok(Self { - correlation_id: uuid::Uuid::new_v4(), + correlation_id: OperationSubmission::logical_hash(&operations), key: subxt::ext::sp_core::ecdsa::Pair::from_seed_slice( &signer.copy_signing_key(BATCHER_NAMESPACE, BATCHER_PK).await?.to_bytes(), ) .unwrap(), identity: identity.into(), - operations: Arc::new(operations.into_iter().collect::>()), + operations: Arc::new(operations), }) } } @@ -166,22 +167,15 @@ impl LedgerTransaction for ChronicleTransaction { async fn as_payload(&self) -> Result { Ok(ApplyArgs { operations: OperationSubmission { - correlation_id: self.correlation_id.into_bytes(), + correlation_id: self.correlation_id, identity: self.identity.clone(), items: self.operations.clone(), }, }) } - fn correlation_id(&self) -> [u8; 16] { - self.correlation_id.into_bytes() - } - - fn operation_hash(&self) -> u64 { - use std::hash::Hasher; - let mut hasher = std::hash::DefaultHasher::new(); - self.operations.hash(&mut hasher); - hasher.finish() + fn correlation_id(&self) -> [u8; 32] { + self.correlation_id } } diff --git a/crates/protocol-substrate-opa/Cargo.toml b/crates/protocol-substrate-opa/Cargo.toml index a1122a8e..8d42d9fe 100644 --- a/crates/protocol-substrate-opa/Cargo.toml +++ b/crates/protocol-substrate-opa/Cargo.toml @@ -17,7 +17,7 @@ rand = { workspace = true } rand_core = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } diff --git a/crates/protocol-substrate-opa/src/lib.rs b/crates/protocol-substrate-opa/src/lib.rs index c15f5bc3..293bfbcc 100644 --- a/crates/protocol-substrate-opa/src/lib.rs +++ b/crates/protocol-substrate-opa/src/lib.rs @@ -1,7 +1,5 @@ #![cfg_attr(feature = "strict", deny(warnings))] -use std::marker::PhantomData; - use pallet_opa::ChronicleTransactionId; use protocol_abstract::{LedgerEvent, LedgerEventCodec, Span}; use protocol_substrate::{ChronicleConfig, SubstrateClient, SubxtClientError}; @@ -95,7 +93,7 @@ impl LedgerEventCodec for OpaEventCodec { } impl LedgerEvent for OpaEvent { - fn correlation_id(&self) -> [u8; 16] { + fn correlation_id(&self) -> [u8; 32] { match self { Self::PolicyUpdate { correlation_id, .. } => **correlation_id, Self::KeyUpdate { correlation_id, .. } => **correlation_id, diff --git a/crates/protocol-substrate-opa/src/submission_builder.rs b/crates/protocol-substrate-opa/src/submission_builder.rs index f7926a0c..c0010516 100644 --- a/crates/protocol-substrate-opa/src/submission_builder.rs +++ b/crates/protocol-substrate-opa/src/submission_builder.rs @@ -183,7 +183,11 @@ impl SubmissionBuilder { pub fn build(self, span_id: u64, correlation_id: Uuid) -> OpaSubmission { OpaSubmission { span_id, - correlation_id: correlation_id.into_bytes(), + correlation_id: { + let mut bytes = [0u8; 32]; + bytes[..16].copy_from_slice(correlation_id.as_bytes()); + bytes + }, version: "1.0".to_string(), payload: match self.message { Some(BuildingMessage::BootstrapRoot(message)) => Payload::BootstrapRoot(message), diff --git a/crates/protocol-substrate-opa/src/transaction.rs b/crates/protocol-substrate-opa/src/transaction.rs index d1ccac6e..0a2185a1 100644 --- a/crates/protocol-substrate-opa/src/transaction.rs +++ b/crates/protocol-substrate-opa/src/transaction.rs @@ -148,7 +148,7 @@ impl LedgerTransaction for OpaTransaction { .into()) } - fn correlation_id(&self) -> [u8; 16] { + fn correlation_id(&self) -> [u8; 32] { match self { OpaTransaction::BootstrapRoot(o, _, _) => o.correlation_id, OpaTransaction::RotateRoot(o, _, _) => o.correlation_id, @@ -157,16 +157,4 @@ impl LedgerTransaction for OpaTransaction { OpaTransaction::SetPolicy(o, _, _, _) => o.correlation_id, } } - - fn operation_hash(&self) -> u64 { - let mut hasher = std::hash::DefaultHasher::new(); - match self { - OpaTransaction::BootstrapRoot(o, _, _) => o.hash(&mut hasher), - OpaTransaction::RotateRoot(o, _, _) => o.hash(&mut hasher), - OpaTransaction::RegisterKey(o, _, _, _, _) => o.hash(&mut hasher), - OpaTransaction::RotateKey(o, _, _, _) => o.hash(&mut hasher), - OpaTransaction::SetPolicy(o, _, _, _) => o.hash(&mut hasher), - } - std::hash::Hasher::finish(&hasher) - } } diff --git a/crates/protocol-substrate/Cargo.toml b/crates/protocol-substrate/Cargo.toml index 70b09a00..77ff8418 100644 --- a/crates/protocol-substrate/Cargo.toml +++ b/crates/protocol-substrate/Cargo.toml @@ -13,13 +13,13 @@ futures = { workspace = true } hex = { workspace = true } k256 = { workspace = true } serde = { workspace = true } -subxt = { version = "0.34", features = ["substrate-compat"] } +subxt = { git = "https://github.com/paritytech/subxt", features = ["substrate-compat"] } thiserror = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } -scale-decode = { version="^0.10.0", features = ["derive"] } -scale-encode = { version="^0.5.0", features = ["derive"] } +scale-decode = { version="0.13.1", features = ["derive"] } +scale-encode = { version="0.7.1", features = ["derive"] } # Local dependencies chronicle-signing = { path = "../chronicle-signing" } common = { path = "../common", features = ["parity-encoding", "std"] } diff --git a/crates/protocol-substrate/src/lib.rs b/crates/protocol-substrate/src/lib.rs index 4490b200..01640e39 100644 --- a/crates/protocol-substrate/src/lib.rs +++ b/crates/protocol-substrate/src/lib.rs @@ -6,26 +6,13 @@ pub use subxt_client::*; use subxt::{config::signed_extensions, utils::MultiAddress, SubstrateConfig}; /// Default set of commonly used types by Polkadot nodes. -pub enum ChronicleConfig {} +pub struct ChronicleConfig; impl Config for ChronicleConfig { type AccountId = ::AccountId; type Address = MultiAddress; type AssetId = u32; - type ExtrinsicParams = signed_extensions::AnyOf< - Self, - ( - // Load in the existing signed extensions we're interested in - // (if the extension isn't actually needed it'll just be ignored): - signed_extensions::CheckSpecVersion, - signed_extensions::CheckTxVersion, - signed_extensions::CheckGenesis, - signed_extensions::CheckMortality, - signed_extensions::CheckNonce, - // And add a new one of our own: - ChronicleStructureHash, - ), - >; + type ExtrinsicParams = subxt::config::DefaultExtrinsicParams; type Hash = ::Hash; type Hasher = ::Hasher; type Header = ::Header; diff --git a/crates/protocol-substrate/src/subxt_client.rs b/crates/protocol-substrate/src/subxt_client.rs index e9169ca9..aeb24eda 100644 --- a/crates/protocol-substrate/src/subxt_client.rs +++ b/crates/protocol-substrate/src/subxt_client.rs @@ -5,25 +5,24 @@ use futures::{ stream::{self, BoxStream}, FutureExt, StreamExt, TryFutureExt, TryStreamExt, }; - use pallet_chronicle::ChronicleTransactionId; use subxt::{ backend::BackendExt, - config::{signed_extensions, DefaultExtrinsicParamsBuilder, ExtrinsicParams, SignedExtension}, + config::{ + signed_extensions::CheckNonceParams, DefaultExtrinsicParamsBuilder, ExtrinsicParamsEncoder, + RefineParamsData, + }, + dynamic::Value, error::MetadataError, ext::{ - codec::{Decode, Encode, Error, Input, Output}, - scale_decode::DecodeAsType, - scale_encode::{EncodeAsType, PortableRegistry}, - sp_core::{twox_128, H256}, + codec::{Compact, Encode}, + sp_core::twox_128, }, metadata::{ types::{PalletMetadata, StorageEntryMetadata, StorageEntryType}, - DecodeWithMetadata, EncodeWithMetadata, + DecodeWithMetadata, }, - storage::{DynamicAddress, StorageAddress}, - tx::{Payload, SubmittableExtrinsic}, - utils::{AccountId32, MultiAddress, MultiSignature}, + tx::{DefaultPayload, SubmittableExtrinsic}, Metadata, OnlineClient, }; @@ -43,47 +42,9 @@ pub struct SubstrateClient { _p: PhantomData<(EC, T)>, } -#[derive(EncodeAsType, DecodeAsType, Clone, Copy)] -pub struct ChronicleStructureHash(u64); - -impl subxt::config::ExtrinsicParamsEncoder for ChronicleStructureHash { - fn encode_extra_to(&self, v: &mut Vec) { - self.0.encode_to(v); - } -} - -impl SignedExtension for ChronicleStructureHash { - type Decoded = (); - - fn matches(identifier: &str, _type_id: u32, _types: &PortableRegistry) -> bool { - identifier == "ChronicleStructureHash" - } -} - -impl ExtrinsicParams for ChronicleStructureHash -where - C: subxt::Config, -{ - type OtherParams = u64; - - fn new>( - _nonce: u64, - _client: Client, - other_params: Self::OtherParams, - ) -> Result { - Ok(Self(other_params)) - } -} - -type ExtrinsicResult = - Result<(SubmittableExtrinsic>, [u8; 16]), subxt::Error>; - -pub fn custom( - chronicle_hash: u64, -) -> <::ExtrinsicParams as ExtrinsicParams>::OtherParams -{ - ((), (), (), signed_extensions::CheckMortalityParams::immortal(), (), chronicle_hash) -} +type SubmittableExtrinsicType = + SubmittableExtrinsic>; +type ExtrinsicResult = Result<(SubmittableExtrinsicType, [u8; 32]), SubxtClientError>; impl SubstrateClient where @@ -114,7 +75,6 @@ where where Self: LedgerReader + Sized, { - tracing::debug!(target: "substrate_client", "Creating a retryable ledger reader."); RetryLedger::new(self.clone(), duration) } @@ -126,17 +86,17 @@ where pub async fn create_extrinsic + Send>( &self, signer: &S, - correlation_id: [u8; 16], - operation_hash: u64, + correlation_id: [u8; 32], operations: &T, - ) -> ExtrinsicResult { - let payload = Payload::new("Chronicle", "apply", operations.as_payload().await.unwrap()); + ) -> ExtrinsicResult { + let payload = + DefaultPayload::new("Chronicle", "apply", operations.as_payload().await.unwrap()); self.client .tx() - .create_signed(&payload, signer, custom(operation_hash)) - .await + .create_unsigned(&payload) .map(|extrinsic| (extrinsic, correlation_id)) + .map_err(SubxtClientError::from) } pub async fn send_extrinsic( @@ -144,8 +104,7 @@ where consistency: WriteConsistency, extrinsic: ( SubmittableExtrinsic>, - [u8; 16], - u64, + [u8; 32], ), ) -> Result { extrinsic @@ -196,6 +155,13 @@ pub enum SubxtClientError { #[source] subxt::ext::scale_value::serde::SerializerError, ), + + #[error("Subxt client error: {0}")] + SubxtClientError( + #[from] + #[source] + subxt::ext::subxt_core::Error, + ), } impl From for SubxtClientError { @@ -218,20 +184,21 @@ where &self, from_block: ::Hash, num_blocks: Option, - ) -> Result< - BoxStream::Hash, SubxtClientError>>, - SubxtClientError, - > { + ) -> Result::Hash>, SubxtClientError> { // Get the block at hash let block = self.client.blocks().at(from_block).await?; - let from_block_num = block.number(); + let (from_block_num, num_blocks) = if from_block == self.client.genesis_hash() { + (1, num_blocks.map(|num_blocks| num_blocks - 1)) + } else { + (block.number(), num_blocks) + }; let hashes = stream::unfold( (self.client.clone(), from_block_num), move |(client, block_num)| async move { if let Some(num_blocks) = num_blocks { - if num_blocks == block_num { + if num_blocks - (block_num + from_block_num) == 0 { return None; } } @@ -244,9 +211,12 @@ where subxt::utils::H256::zero(), ) .await - .map_err(SubxtClientError::from); + .map_err(|e| SubxtClientError::from(e)); - Some((block_hash, (client, block_num + 1))) + match block_hash { + Ok(hash) => Some((hash, (client, block_num + 1))), + Err(_) => None, + } }, ); @@ -394,7 +364,7 @@ where move |(mut block_hashes, self_clone)| async move { let next_block_hash = block_hashes.next().await; match next_block_hash { - Some(Ok(block_hash)) => { + Some(block_hash) => { let events = self_clone.events_for_block(block_hash).await; match events { Ok(events) => Some((events, (block_hashes, self_clone))), @@ -404,10 +374,6 @@ where }, } }, - Some(Err(e)) => { - tracing::error!("Subscription error {}", e); - None - }, _ => None, } }, @@ -428,7 +394,7 @@ where { type Error = SubxtClientError; type Submittable = - (SubmittableExtrinsic>, [u8; 16], u64); + (SubmittableExtrinsic>, [u8; 32]); type Transaction = T; async fn pre_submit( @@ -436,10 +402,9 @@ where tx: Self::Transaction, ) -> Result<(Self::Submittable, ChronicleTransactionId), Self::Error> { let correlation_id = tx.correlation_id(); - let operation_hash = tx.operation_hash(); - let (ext, id) = self.create_extrinsic(&tx, correlation_id, operation_hash, &tx).await?; - - Ok(((ext, id, operation_hash), id.into())) + self.create_extrinsic(&tx, correlation_id, &tx) + .await + .map(|extrinsic| (extrinsic, ChronicleTransactionId::from(correlation_id))) } async fn do_submit( @@ -448,7 +413,7 @@ where submittable: Self::Submittable, ) -> Result { tracing::info!( - correlation_id = ?uuid::Uuid::from_bytes(submittable.1), + correlation_id = %hex::encode(submittable.1), ); self.send_extrinsic(consistency, submittable) @@ -461,7 +426,7 @@ where pub trait SubstrateStateReader { type Error: std::error::Error; /// Get the state entry at `address` - async fn get_state_entry( + async fn get_state_entry + Send + Sync, V: DecodeWithMetadata>( &self, pallet_name: &str, entry_name: &str, @@ -469,7 +434,7 @@ pub trait SubstrateStateReader { ) -> Result, Self::Error>; } -pub(crate) fn validate_storage_address( +pub(crate) fn validate_storage_address( address: &Address, pallet: PalletMetadata<'_>, ) -> Result<(), subxt::Error> { @@ -530,7 +495,7 @@ fn decode_storage_with_metadata( Ok(val) } -pub(crate) fn write_storage_address_root_bytes( +pub(crate) fn write_storage_address_root_bytes( addr: &Address, out: &mut Vec, ) { @@ -538,7 +503,7 @@ pub(crate) fn write_storage_address_root_bytes( out.extend(twox_128(addr.entry_name().as_bytes())); } -pub(crate) fn storage_address_bytes( +pub(crate) fn storage_address_bytes( addr: &Address, metadata: &Metadata, ) -> Result, subxt::Error> { @@ -556,7 +521,7 @@ where { type Error = SubxtClientError; - async fn get_state_entry( + async fn get_state_entry + Send + Sync, V: DecodeWithMetadata>( &self, pallet_name: &str, entry_name: &str, @@ -565,7 +530,8 @@ where let metadata = self.client.metadata(); let (pallet, entry) = lookup_entry_details(pallet_name, entry_name, &metadata)?; - let address = DynamicAddress::new(pallet_name, entry_name, vec![address]); + let address = + subxt::dynamic::storage(pallet_name, entry_name, vec![Value::from_bytes(address)]); // Metadata validation checks whether the static address given // is likely to actually correspond to a real storage entry or not. diff --git a/node/node-chronicle/src/benchmarking.rs b/node/node-chronicle/src/benchmarking.rs index 84c1d7ea..184551ae 100644 --- a/node/node-chronicle/src/benchmarking.rs +++ b/node/node-chronicle/src/benchmarking.rs @@ -45,7 +45,7 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder { self.client.as_ref(), acc, SystemCall::remark { remark: vec![] }.into(), - nonce, + nonce.into(), ) .into(); @@ -85,12 +85,12 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for OperationSubmissionBuilder { acc, RuntimeCall::Chronicle(pallet_chronicle::Call::apply { operations: OperationSubmission { - correlation_id: [0; 16], + correlation_id: [0; 32], items: vec![self.value.clone()].into(), identity: common::identity::SignedIdentity::new_no_identity().into(), }, }), - nonce, + nonce.into(), ) .into(); @@ -105,7 +105,7 @@ pub fn create_benchmark_extrinsic( client: &FullClient, sender: sp_core::sr25519::Pair, call: runtime::RuntimeCall, - nonce: u32, + nonce: u64, ) -> runtime::UncheckedExtrinsic { let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); let best_hash = client.chain_info().best_hash; @@ -116,7 +116,7 @@ pub fn create_benchmark_extrinsic( .map(|c| c / 2) .unwrap_or(2) as u64; let extra: runtime::SignedExtra = ( - frame_system::CheckNonZeroSender::::new(), + //frame_system::CheckNonZeroSender::::new(), frame_system::CheckSpecVersion::::new(), frame_system::CheckTxVersion::::new(), frame_system::CheckGenesis::::new(), @@ -125,22 +125,20 @@ pub fn create_benchmark_extrinsic( best_block.saturated_into(), )), runtime_chronicle::no_nonce_fees::CheckNonce::::from(nonce), - frame_system::CheckWeight::::new(), - runtime_chronicle::check_operation_unique::CheckOperationUniqueness::::from(0), + //frame_system::CheckWeight::::new(), ); let raw_payload = runtime::SignedPayload::from_raw( call.clone(), extra.clone(), ( - (), + // (), runtime::VERSION.spec_version, runtime::VERSION.transaction_version, genesis_hash, best_hash, (), - (), - (), + // (), ), ); let signature = raw_payload.using_encoded(|e| sender.sign(e)); diff --git a/node/node-chronicle/src/chain_spec.rs b/node/node-chronicle/src/chain_spec.rs index f17207a6..66a85cd6 100644 --- a/node/node-chronicle/src/chain_spec.rs +++ b/node/node-chronicle/src/chain_spec.rs @@ -1,6 +1,5 @@ use std::path::Path; -use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use runtime_chronicle::{ opaque::SessionKeys, pallet_chronicle, AccountId, AuraConfig, GrandpaConfig, Runtime, RuntimeGenesisConfig, SessionConfig, Signature, SudoConfig, SystemConfig, ValidatorSetConfig, @@ -65,11 +64,6 @@ pub fn authority_keys_from_keystore(p: &std::path::Path) -> (AccountId, AuraId, .next() .expect("Grandpa key should be present in keystore"); - let im_online_key = Keystore::sr25519_public_keys(&keystore, KeyTypeId(*b"onli")) - .into_iter() - .next() - .expect("ImOnline key should be present in keystore"); - (AccountPublic::from(authority_key).into_account(), authority_key.into(), grandpa_key.into()) } diff --git a/node/node-chronicle/src/command.rs b/node/node-chronicle/src/command.rs index 012c5cf5..7d6d2353 100644 --- a/node/node-chronicle/src/command.rs +++ b/node/node-chronicle/src/command.rs @@ -1,5 +1,5 @@ use crate::{ - benchmarking::{inherent_benchmark_data, OperationSubmissionBuilder, RemarkBuilder}, + benchmarking::{inherent_benchmark_data, RemarkBuilder}, chain_spec, cli::{Cli, Subcommand}, service, diff --git a/node/runtime-chronicle/Cargo.toml b/node/runtime-chronicle/Cargo.toml index cd57fbd8..2e192f7b 100644 --- a/node/runtime-chronicle/Cargo.toml +++ b/node/runtime-chronicle/Cargo.toml @@ -26,10 +26,10 @@ pallet-im-online = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag substrate-validator-set = { git = 'https://github.com/gautamdhameja/substrate-validator-set.git', tag = "polkadot-v1.9.0", default-features = false } -parity-scale-codec = { version = "3.6.1", default-features = false, features = [ +parity-scale-codec = { version = "3.6", default-features = false, features = [ "derive", ] } -scale-info = { version = "^2.10.0", default-features = false, features = [ +scale-info = { version = "2.11.3", default-features = false, features = [ "derive", ] } sp-api = { git = 'https://github.com/paritytech/polkadot-sdk.git', tag = 'polkadot-v1.9.0', default-features = false } diff --git a/node/runtime-chronicle/src/check_operation_unique.rs b/node/runtime-chronicle/src/check_operation_unique.rs deleted file mode 100644 index f7c5b5ac..00000000 --- a/node/runtime-chronicle/src/check_operation_unique.rs +++ /dev/null @@ -1,71 +0,0 @@ -use core::marker::PhantomData; -use frame_support::pallet_prelude::{ - TransactionValidity, TransactionValidityError, ValidTransaction, -}; -use frame_system::Config; -use parity_scale_codec::{Decode, Encode}; -use scale_info::TypeInfo; -use sp_runtime::{ - traits::{DispatchInfoOf, PostDispatchInfoOf}, - DispatchResult, -}; - -#[derive(Eq, PartialEq, Clone, Encode, TypeInfo)] -#[scale_info(skip_type_params(T))] -pub struct CheckOperationUniqueness(u64, PhantomData); - -impl Decode for CheckOperationUniqueness { - fn decode( - input: &mut I, - ) -> Result { - let value = u64::decode(input)?; - Ok(Self(value, PhantomData)) - } -} - -impl From for CheckOperationUniqueness { - fn from(value: u64) -> Self { - Self(value, PhantomData) - } -} - -impl core::fmt::Debug for CheckOperationUniqueness { - fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { - write!(f, "ChronicleStructureHash({})", self.0) - } -} - -impl sp_runtime::traits::SignedExtension for CheckOperationUniqueness -where - T: Send + Sync, -{ - type AccountId = T::AccountId; - type AdditionalSigned = (); - type Call = T::RuntimeCall; - type Pre = (); - - const IDENTIFIER: &'static str = "ChronicleStructureHash"; - - fn additional_signed(&self) -> sp_std::result::Result<(), TransactionValidityError> { - Ok(()) - } - fn pre_dispatch( - self, - who: &Self::AccountId, - call: &Self::Call, - info: &DispatchInfoOf, - len: usize, - ) -> Result { - self.validate(who, call, info, len).map(|_| ()) - } - - fn validate( - &self, - _who: &Self::AccountId, - _call: &Self::Call, - _info: &DispatchInfoOf, - _len: usize, - ) -> TransactionValidity { - Ok(ValidTransaction { priority: 0, propagate: true, ..Default::default() }) - } -} diff --git a/node/runtime-chronicle/src/lib.rs b/node/runtime-chronicle/src/lib.rs index 4f77dd6e..3fef1cc9 100644 --- a/node/runtime-chronicle/src/lib.rs +++ b/node/runtime-chronicle/src/lib.rs @@ -8,7 +8,6 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs")); use frame_support::pallet_prelude::TransactionPriority; use frame_system::EnsureRoot; use pallet_grandpa::AuthorityId as GrandpaId; -use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use sp_api::impl_runtime_apis; use sp_consensus_aura::sr25519::AuthorityId as AuraId; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; @@ -26,7 +25,6 @@ use sp_std::prelude::*; use sp_version::NativeVersion; use sp_version::RuntimeVersion; -pub mod check_operation_unique; pub mod no_nonce_fees; // A few exports that help ease life for downstream crates. @@ -67,7 +65,7 @@ pub type AccountId = <::Signer as IdentifyAccount>::Account pub type Balance = (); /// Index of a transaction in the chain. -pub type Nonce = u32; +pub type Nonce = u64; /// A hash of some data used by the chain. pub type Hash = sp_core::H256; @@ -155,7 +153,6 @@ parameter_types! { } // Configure FRAME pallets to include in runtime. - impl frame_system::Config for Runtime { type AccountData = (); /// The basic call filter to use in dispatchable. @@ -306,11 +303,11 @@ construct_runtime!( Timestamp: pallet_timestamp = 1, ValidatorSet: substrate_validator_set = 2, Session: pallet_session = 3, - Sudo: pallet_sudo = 5, - Aura: pallet_aura = 6, - Grandpa: pallet_grandpa = 7, - Chronicle: pallet_chronicle = 8, - Opa: pallet_opa = 9, + Sudo: pallet_sudo = 4, + Aura: pallet_aura = 5, + Grandpa: pallet_grandpa = 6, + Chronicle: pallet_chronicle = 7, + Opa: pallet_opa = 8, } ); @@ -323,14 +320,13 @@ pub type Block = generic::Block; /// The SignedExtension to the basic transaction logic. pub type SignedExtra = ( - frame_system::CheckNonZeroSender, + //frame_system::CheckNonZeroSender, frame_system::CheckSpecVersion, frame_system::CheckTxVersion, frame_system::CheckGenesis, frame_system::CheckEra, no_nonce_fees::CheckNonce, - frame_system::CheckWeight, - check_operation_unique::CheckOperationUniqueness, + //frame_system::CheckWeight, ); /// Unchecked extrinsic type as expected by this runtime. diff --git a/node/runtime-chronicle/src/no_nonce_fees.rs b/node/runtime-chronicle/src/no_nonce_fees.rs index f65d480f..69574500 100644 --- a/node/runtime-chronicle/src/no_nonce_fees.rs +++ b/node/runtime-chronicle/src/no_nonce_fees.rs @@ -63,14 +63,7 @@ where _len: usize, ) -> Result<(), TransactionValidityError> { let mut account = Account::::get(who); - if self.0 != account.nonce { - return Err(if self.0 < account.nonce { - InvalidTransaction::Stale - } else { - InvalidTransaction::Future - } - .into()) - } + account.nonce += T::Nonce::one(); Account::::insert(who, account); Ok(()) @@ -88,7 +81,7 @@ where return InvalidTransaction::Stale.into() } - let provides = vec![Encode::encode(&(who, self.0))]; + let provides = vec![Encode::encode(&(who, self.0)), Encode::encode(&(_len as u32))]; let requires = if account.nonce < self.0 { vec![Encode::encode(&(who, self.0 - One::one()))] } else { @@ -99,7 +92,7 @@ where priority: 0, requires, provides, - longevity: TransactionLongevity::max_value(), + longevity: TransactionLongevity::MAX, propagate: true, }) }