From 3e9ae982639590108c7b75f42e1af4508f03f8b3 Mon Sep 17 00:00:00 2001 From: clearloop Date: Wed, 21 Aug 2024 06:14:42 +0800 Subject: [PATCH] chore(gsdk): upgrade to subxt-0.37.0 (#4151) --- Cargo.lock | 1072 +++++++++++++------- Cargo.toml | 18 +- gclient/src/api/calls.rs | 16 +- gclient/src/api/error.rs | 3 + gclient/src/api/listener/iterator.rs | 20 +- gsdk/api-gen/Cargo.toml | 10 +- gsdk/api-gen/src/main.rs | 47 +- gsdk/src/api.rs | 13 +- gsdk/src/config.rs | 1 + gsdk/src/metadata/generated.rs | 1349 +++++++++++++++----------- gsdk/src/result.rs | 4 + gsdk/src/signer/calls.rs | 8 +- gsdk/src/signer/storage.rs | 15 +- gsdk/src/signer/utils.rs | 14 +- gsdk/src/storage.rs | 32 +- gsdk/src/subscription.rs | 81 +- gsdk/src/utils.rs | 26 +- gsdk/tests/rpc.rs | 10 +- utils/node-loader/src/batch_pool.rs | 2 +- utils/node-loader/src/main.rs | 8 +- utils/validator-checks/Cargo.toml | 1 + utils/validator-checks/src/result.rs | 6 + 22 files changed, 1694 insertions(+), 1062 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0e75f201034..8fdd65d2dd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1320,6 +1320,18 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite 0.2.13", +] + [[package]] name = "async-executor" version = "1.5.4" @@ -1336,14 +1348,13 @@ dependencies = [ [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock 3.4.0", "blocking", - "futures-lite 1.13.0", + "futures-lite 2.3.0", ] [[package]] @@ -1407,31 +1418,33 @@ dependencies = [ [[package]] name = "async-net" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 1.13.0", + "async-io 2.3.3", "blocking", - "futures-lite 1.13.0", + "futures-lite 2.3.0", ] [[package]] name = "async-process" -version = "1.7.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", - "autocfg", + "async-channel 2.3.1", + "async-io 2.3.3", + "async-lock 3.4.0", + "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 2.5.3", - "futures-lite 1.13.0", - "rustix 0.37.23", - "signal-hook", - "windows-sys 0.48.0", + "event-listener 5.2.0", + "futures-lite 2.3.0", + "rustix 0.38.31", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -1445,6 +1458,24 @@ dependencies = [ "syn 2.0.71", ] +[[package]] +name = "async-signal" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + [[package]] name = "async-stream" version = "0.3.5" @@ -1469,9 +1500,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.1" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" @@ -1522,10 +1553,10 @@ dependencies = [ ] [[package]] -name = "atomic" -version = "0.5.3" +name = "atomic-take" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" [[package]] name = "atomic-waker" @@ -1913,7 +1944,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-lock 2.8.0", "async-task", "fastrand 2.0.1", @@ -2222,6 +2253,12 @@ dependencies = [ "libc", ] +[[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" @@ -2252,6 +2289,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" @@ -2274,6 +2317,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "chacha20poly1305" version = "0.9.1" @@ -2281,9 +2335,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20", + "chacha20 0.8.2", "cipher 0.3.0", - "poly1305", + "poly1305 0.7.2", "zeroize", ] @@ -2405,7 +2459,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex 0.7.0", - "strsim 0.11.0", + "strsim 0.11.1", "terminal_size", ] @@ -2563,6 +2617,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[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.0" @@ -2719,9 +2783,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -3151,19 +3215,6 @@ dependencies = [ "syn 2.0.71", ] -[[package]] -name = "curve25519-dalek-ng" -version = "4.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.6.4", - "subtle-ng", - "zeroize", -] - [[package]] name = "cxx" version = "1.0.106" @@ -3220,12 +3271,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -3244,15 +3295,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim 0.11.1", "syn 2.0.71", ] @@ -3269,11 +3320,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.10", "quote", "syn 2.0.71", ] @@ -4009,6 +4060,17 @@ dependencies = [ "syn 1.0.109", ] +[[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.71", +] + [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -4387,6 +4449,21 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ed25519-zebra" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" +dependencies = [ + "curve25519-dalek 4.1.3", + "ed25519", + "hashbrown 0.14.5", + "hex", + "rand_core 0.6.4", + "sha2 0.10.8", + "zeroize", +] + [[package]] name = "either" version = "1.13.0" @@ -4574,7 +4651,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.71", @@ -5188,7 +5265,7 @@ dependencies = [ name = "ethexe-utils" version = "1.5.0" dependencies = [ - "async-channel", + "async-channel 1.9.0", "futures", "futures-timer", "log", @@ -5221,6 +5298,16 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "pin-project-lite 0.2.13", +] + [[package]] name = "event-listener" version = "5.2.0" @@ -5399,6 +5486,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" @@ -5507,7 +5604,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", "static_assertions", ] @@ -5585,7 +5682,7 @@ dependencies = [ "sp-core", "sp-npos-elections", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -5602,7 +5699,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-tracing 10.0.0", ] @@ -5615,7 +5712,6 @@ dependencies = [ "cfg-if", "parity-scale-codec", "scale-info", - "serde", ] [[package]] @@ -5685,7 +5781,7 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-tracing 10.0.0", "sp-weights", "static_assertions", @@ -5707,7 +5803,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-core-hashing", "syn 2.0.71", ] @@ -5756,7 +5852,7 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-version", "static_assertions", "trybuild", @@ -5789,7 +5885,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-version", "sp-weights", ] @@ -5806,7 +5902,7 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -5827,7 +5923,7 @@ dependencies = [ "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -5940,7 +6036,10 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ + "fastrand 2.0.1", "futures-core", + "futures-io", + "parking", "pin-project-lite 0.2.13", ] @@ -6318,7 +6417,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -6466,7 +6565,7 @@ dependencies = [ "gear-lazy-pages-common", "gear-runtime-interface", "log", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -6542,7 +6641,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "substrate-test-client", "vara-runtime", ] @@ -6620,7 +6719,7 @@ dependencies = [ "pallet-gear-messenger", "pallet-session", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -6641,7 +6740,7 @@ dependencies = [ "sha2 0.10.8", "sp-io", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "winapi", ] @@ -6663,7 +6762,7 @@ dependencies = [ "log", "parity-scale-codec", "sp-core", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-wasm-interface-common", "wasmi 0.30.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", "wat", @@ -6675,7 +6774,7 @@ version = "1.5.0" dependencies = [ "parity-scale-codec", "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-wasm-interface-common", ] @@ -6825,6 +6924,7 @@ dependencies = [ name = "gear-validator-checks" version = "0.1.0" dependencies = [ + "anyhow", "clap 4.5.9", "env_logger", "futures", @@ -7230,7 +7330,7 @@ name = "gsdk-api-gen" version = "0.1.0" dependencies = [ "color-eyre", - "frame-metadata 15.1.0", + "frame-metadata 16.0.0", "gear-runtime-interface", "gear-utils", "heck 0.5.0", @@ -7243,7 +7343,6 @@ dependencies = [ "scale-info", "sp-io", "subxt-codegen", - "subxt-metadata", "syn 2.0.71", ] @@ -7812,7 +7911,7 @@ dependencies = [ "hyper 0.14.27", "log", "rustls 0.21.7", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", "webpki-roots 0.23.1", @@ -8096,9 +8195,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -8182,6 +8281,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.13.0" @@ -8217,6 +8325,26 @@ dependencies = [ "cc", ] +[[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.32" @@ -8246,20 +8374,31 @@ dependencies = [ "jsonrpsee-proc-macros 0.16.3", "jsonrpsee-server 0.16.3", "jsonrpsee-types 0.16.3", - "jsonrpsee-ws-client", + "jsonrpsee-ws-client 0.16.3", "tracing", ] [[package]] name = "jsonrpsee" -version = "0.20.1" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" +dependencies = [ + "jsonrpsee-client-transport 0.22.5", + "jsonrpsee-core 0.22.5", + "jsonrpsee-http-client 0.22.5", + "jsonrpsee-types 0.22.5", +] + +[[package]] +name = "jsonrpsee" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad9b31183a8bcbe843e32ca8554ad2936633548d95a7bb6a8e14c767dea6b05" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" dependencies = [ - "jsonrpsee-client-transport 0.20.1", - "jsonrpsee-core 0.20.1", - "jsonrpsee-http-client 0.20.1", - "jsonrpsee-types 0.20.1", + "jsonrpsee-core 0.23.2", + "jsonrpsee-types 0.23.2", + "jsonrpsee-ws-client 0.23.2", ] [[package]] @@ -8287,7 +8426,7 @@ dependencies = [ "jsonrpsee-core 0.16.3", "jsonrpsee-types 0.16.3", "pin-project", - "rustls-native-certs", + "rustls-native-certs 0.6.3", "soketto 0.7.1", "thiserror", "tokio", @@ -8299,19 +8438,43 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f2743cad51cc86b0dbfe316309eeb87a9d96a3d7f4dd7a99767c4b5f065335" +checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" dependencies = [ "futures-util", "http 0.2.9", - "jsonrpsee-core 0.20.1", + "jsonrpsee-core 0.22.5", "pin-project", - "rustls-native-certs", + "rustls-native-certs 0.7.2", + "rustls-pki-types", "soketto 0.7.1", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.25.0", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "jsonrpsee-client-transport" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" +dependencies = [ + "base64 0.22.1", + "futures-util", + "http 1.1.0", + "jsonrpsee-core 0.23.2", + "pin-project", + "rustls 0.23.10", + "rustls-pki-types", + "rustls-platform-verifier", + "soketto 0.8.0", + "thiserror", + "tokio", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -8347,23 +8510,46 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.20.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35dc957af59ce98373bcdde0c1698060ca6c2d2e9ae357b459c7158b6df33330" +checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" dependencies = [ "anyhow", - "async-lock 2.8.0", "async-trait", "beef", "futures-timer", "futures-util", "hyper 0.14.27", - "jsonrpsee-types 0.20.1", + "jsonrpsee-types 0.22.5", + "pin-project", + "rustc-hash 1.1.0", + "serde", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tracing", +] + +[[package]] +name = "jsonrpsee-core" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" +dependencies = [ + "anyhow", + "async-trait", + "beef", + "futures-timer", + "futures-util", + "jsonrpsee-types 0.23.2", + "pin-project", "rustc-hash 1.1.0", "serde", "serde_json", "thiserror", "tokio", + "tokio-stream", "tracing", ] @@ -8411,15 +8597,15 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd865d0072764cb937b0110a92b5f53e995f7101cb346beca03d93a2dea79de" +checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", "hyper 0.14.27", "hyper-rustls", - "jsonrpsee-core 0.20.1", - "jsonrpsee-types 0.20.1", + "jsonrpsee-core 0.22.5", + "jsonrpsee-types 0.22.5", "serde", "serde_json", "thiserror", @@ -8520,16 +8706,28 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.20.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9e25aec855b2a7d3ed90fded6c41e8c3fb72b63f071e1be3f0004eba19b625" +checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" dependencies = [ "anyhow", "beef", "serde", "serde_json", "thiserror", - "tracing", +] + +[[package]] +name = "jsonrpsee-types" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" +dependencies = [ + "beef", + "http 1.1.0", + "serde", + "serde_json", + "thiserror", ] [[package]] @@ -8556,6 +8754,19 @@ dependencies = [ "jsonrpsee-types 0.16.3", ] +[[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 = "jsonwebtoken" version = "8.3.0" @@ -8803,9 +9014,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -10910,7 +11121,7 @@ dependencies = [ "sp-application-crypto", "sp-authority-discovery", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -10924,7 +11135,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -10948,7 +11159,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -10969,7 +11180,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-tracing 10.0.0", ] @@ -10985,7 +11196,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11003,7 +11214,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11022,7 +11233,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11039,7 +11250,7 @@ dependencies = [ "serde", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11061,7 +11272,7 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "strum 0.24.1", ] @@ -11076,7 +11287,7 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11176,7 +11387,7 @@ dependencies = [ "sp-externalities 0.19.0", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "test-syscalls", "wabt", ] @@ -11251,7 +11462,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11304,7 +11515,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "test-syscalls", "wabt", ] @@ -11347,7 +11558,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11396,7 +11607,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11421,7 +11632,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11453,7 +11664,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "wabt", ] @@ -11489,7 +11700,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "wabt", ] @@ -11517,7 +11728,7 @@ dependencies = [ "sp-api", "sp-core", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11548,7 +11759,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11582,7 +11793,7 @@ dependencies = [ "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11625,7 +11836,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11648,7 +11859,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11664,7 +11875,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11684,7 +11895,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11700,7 +11911,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11718,7 +11929,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-tracing 10.0.0", ] @@ -11730,7 +11941,7 @@ dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11747,7 +11958,7 @@ dependencies = [ "serde", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11764,7 +11975,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11779,7 +11990,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11797,7 +12008,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11816,7 +12027,7 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11833,7 +12044,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-weights", ] @@ -11855,7 +12066,7 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-trie", ] @@ -11879,7 +12090,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11914,7 +12125,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11932,7 +12143,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", "sp-timestamp", ] @@ -11950,7 +12161,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -11997,7 +12208,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -12013,7 +12224,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -12028,7 +12239,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -12043,7 +12254,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -12073,7 +12284,7 @@ dependencies = [ "memmap2 0.5.10", "parking_lot 0.12.3", "rand 0.8.5", - "siphasher", + "siphasher 0.3.11", "snap", ] @@ -12117,9 +12328,9 @@ source = "git+https://github.com/gear-tech/parity-wasm?branch=v0.45.0-sign-ext#b [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -12375,7 +12586,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -12384,7 +12595,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -12530,6 +12741,17 @@ dependencies = [ "universal-hash 0.4.0", ] +[[package]] +name = "poly1305" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" +dependencies = [ + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", +] + [[package]] name = "polyval" version = "0.5.3" @@ -13179,10 +13401,26 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" +name = "reconnecting-jsonrpsee-ws-client" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags 1.3.2", ] @@ -13802,12 +14040,27 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.4", + "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", @@ -13828,6 +14081,19 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-native-certs" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.3" @@ -13853,6 +14119,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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93bda3f493b9abe5b93b3e7e3ecde0df292f2bd28c0296b90586ee0055ff5123" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-native-certs 0.7.2", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.4", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.100.2" @@ -13904,12 +14197,12 @@ dependencies = [ [[package]] name = "ruzstd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" dependencies = [ "byteorder", - "thiserror-core", + "derive_more", "twox-hash", ] @@ -14409,7 +14702,7 @@ version = "0.10.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "array-bytes 6.2.3", - "async-channel", + "async-channel 1.9.0", "async-trait", "asynchronous-codec 0.6.2", "bytes", @@ -14449,7 +14742,7 @@ name = "sc-network-bitswap" version = "0.10.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ - "async-channel", + "async-channel 1.9.0", "cid", "futures", "libp2p-identity 0.1.3", @@ -14506,7 +14799,7 @@ version = "0.10.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "array-bytes 6.2.3", - "async-channel", + "async-channel 1.9.0", "futures", "libp2p-identity 0.1.3", "log", @@ -14527,7 +14820,7 @@ version = "0.10.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "array-bytes 6.2.3", - "async-channel", + "async-channel 1.9.0", "futures", "libp2p 0.51.4", "log", @@ -14546,7 +14839,7 @@ version = "0.10.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "array-bytes 6.2.3", - "async-channel", + "async-channel 1.9.0", "async-trait", "fork-tree", "futures", @@ -14844,7 +15137,7 @@ dependencies = [ "serde_json", "sp-core", "sp-io", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -14953,7 +15246,7 @@ name = "sc-utils" version = "4.0.0-dev" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ - "async-channel", + "async-channel 1.9.0", "futures", "futures-timer", "lazy_static", @@ -14965,38 +15258,38 @@ dependencies = [ [[package]] name = "scale-bits" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" +checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" dependencies = [ "parity-scale-codec", "scale-info", + "scale-type-resolver", "serde", ] [[package]] name = "scale-decode" -version = "0.9.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095" +checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", "primitive-types", "scale-bits", "scale-decode-derive", - "scale-info", + "scale-type-resolver", "smallvec", ] [[package]] name = "scale-decode-derive" -version = "0.9.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47" +checksum = "9bb22f574168103cdd3133b19281639ca65ad985e24612728f727339dcaf4021" dependencies = [ "darling 0.14.4", - "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -15004,24 +15297,24 @@ dependencies = [ [[package]] name = "scale-encode" -version = "0.5.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5" +checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e" dependencies = [ "derive_more", "parity-scale-codec", "primitive-types", "scale-bits", "scale-encode-derive", - "scale-info", + "scale-type-resolver", "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", @@ -15032,9 +15325,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "bitvec", "cfg-if", @@ -15046,21 +15339,44 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.11.2" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.1.3", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", ] +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498d1aecf2ea61325d4511787c115791639c0fd21ef4f8e11e49dd09eff2bbac" +dependencies = [ + "proc-macro2", + "quote", + "scale-info", + "syn 2.0.71", + "thiserror", +] + [[package]] name = "scale-value" -version = "0.12.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6538d1cc1af9c0baf401c57da8a6d4730ef582db0d330d2efa56ec946b5b0283" +checksum = "ba4d772cfb7569e03868400344a1695d16560bf62b86b918604773607d39ec84" dependencies = [ "base58", "blake2 0.10.6", @@ -15072,6 +15388,7 @@ dependencies = [ "scale-decode", "scale-encode", "scale-info", + "scale-type-resolver", "serde", "yap", ] @@ -15141,17 +15458,20 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.10.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" dependencies = [ + "aead 0.5.2", "arrayref", "arrayvec 0.7.4", - "curve25519-dalek-ng", + "curve25519-dalek 4.1.3", + "getrandom_or_panic", "merlin 3.0.0", "rand_core 0.6.4", - "sha2 0.9.9", - "subtle-ng", + "serde_bytes", + "sha2 0.10.8", + "subtle 2.6.1", "zeroize", ] @@ -15284,22 +15604,23 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -15385,6 +15706,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "serde_bytes" +version = "0.11.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" +dependencies = [ + "serde", +] + [[package]] name = "serde_cbor" version = "0.11.2" @@ -15484,7 +15814,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.71", @@ -15619,16 +15949,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -15685,6 +16005,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slab" version = "0.4.9" @@ -15708,46 +16034,48 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +checksum = "aad24f41392790e6ac67f4f4cd871da61f7d758e07b5622431e491e897d9c8a7" dependencies = [ - "async-channel", + "async-channel 2.3.1", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io 2.3.3", + "async-lock 3.4.0", "async-net", "async-process", "blocking", - "futures-lite 1.13.0", + "futures-lite 2.3.0", ] [[package]] name = "smoldot" -version = "0.8.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cce5e2881b30bad7ef89f383a816ad0b22c45915911f28499026de4a76d20ee" +checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" dependencies = [ "arrayvec 0.7.4", - "async-lock 2.8.0", - "atomic", + "async-lock 3.4.0", + "atomic-take", "base64 0.21.7", "bip39", "blake2-rfc", "bs58 0.5.1", + "chacha20 0.9.1", "crossbeam-queue", "derive_more", - "ed25519-zebra", + "ed25519-zebra 4.0.3", "either", - "event-listener 2.5.3", + "event-listener 4.0.3", "fnv", - "futures-channel", + "futures-lite 2.3.0", "futures-util", "hashbrown 0.14.5", "hex", "hmac 0.12.1", - "itertools 0.10.5", + "itertools 0.12.1", + "libm", "libsecp256k1", "merlin 3.0.0", "no-std-net", @@ -15757,51 +16085,59 @@ dependencies = [ "num-traits", "pbkdf2 0.12.2", "pin-project", + "poly1305 0.8.0", "rand 0.8.5", "rand_chacha 0.3.1", "ruzstd", - "schnorrkel 0.10.2", + "schnorrkel 0.11.4", "serde", "serde_json", "sha2 0.10.8", - "siphasher", + "sha3", + "siphasher 1.0.1", "slab", "smallvec", - "smol", - "snow", "soketto 0.7.1", - "tiny-keccak", "twox-hash", - "wasmi 0.30.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi 0.31.2", + "x25519-dalek 2.0.1", + "zeroize", ] [[package]] name = "smoldot-light" -version = "0.6.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2f7b4687b83ff244ef6137735ed5716ad37dcdf3ee16c4eb1a32fb9808fa47" +checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" dependencies = [ - "async-lock 2.8.0", + "async-channel 2.3.1", + "async-lock 3.4.0", + "base64 0.21.7", "blake2-rfc", "derive_more", "either", - "event-listener 2.5.3", + "event-listener 4.0.3", "fnv", "futures-channel", + "futures-lite 2.3.0", "futures-util", "hashbrown 0.14.5", "hex", - "itertools 0.10.5", + "itertools 0.12.1", "log", - "lru 0.10.1", + "lru 0.12.3", + "no-std-net", "parking_lot 0.12.3", + "pin-project", "rand 0.8.5", + "rand_chacha 0.3.1", "serde", "serde_json", - "siphasher", + "siphasher 1.0.1", "slab", "smol", "smoldot", + "zeroize", ] [[package]] @@ -15920,7 +16256,7 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-trie", "sp-version", "thiserror", @@ -15950,7 +16286,7 @@ dependencies = [ "serde", "sp-core", "sp-io", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -15963,7 +16299,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "static_assertions", ] @@ -15995,7 +16331,7 @@ dependencies = [ "sp-api", "sp-application-crypto", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16006,7 +16342,7 @@ dependencies = [ "sp-api", "sp-inherents", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16055,7 +16391,7 @@ dependencies = [ "sp-consensus-slots", "sp-inherents", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16074,7 +16410,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16093,7 +16429,7 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16104,7 +16440,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-timestamp", ] @@ -16121,7 +16457,7 @@ dependencies = [ "bounded-collections", "bs58 0.5.1", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures", "hash-db", "hash256-std-hasher", @@ -16143,11 +16479,11 @@ dependencies = [ "secrecy", "serde", "sp-allocator", - "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-core-hashing", "sp-debug-derive 8.0.0", "sp-externalities 0.19.0", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", "ss58-registry", "substrate-bip39", @@ -16157,21 +16493,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ee599a8399448e65197f9a6cee338ad192e9023e35e31f22382964c3c174c68" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "sp-std 8.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "9.0.0" @@ -16191,7 +16512,7 @@ version = "9.0.0" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "quote", - "sp-core-hashing 9.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-core-hashing", "syn 2.0.71", ] @@ -16213,7 +16534,7 @@ dependencies = [ "ark-ed-on-bls12-381-bandersnatch-ext", "ark-scale 0.0.12", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16236,6 +16557,20 @@ dependencies = [ "sp-runtime-interface 24.0.0", ] +[[package]] +name = "sp-crypto-hashing" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" +dependencies = [ + "blake2b_simd", + "byteorder", + "digest 0.10.7", + "sha2 0.10.8", + "sha3", + "twox-hash", +] + [[package]] name = "sp-database" version = "4.0.0-dev" @@ -16272,7 +16607,7 @@ source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#0 dependencies = [ "environmental", "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", ] @@ -16294,7 +16629,7 @@ dependencies = [ "serde_json", "sp-api", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16307,7 +16642,7 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "thiserror", ] @@ -16328,7 +16663,7 @@ dependencies = [ "sp-keystore", "sp-runtime-interface 17.0.0", "sp-state-machine", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-tracing 10.0.0", "sp-trie", "tracing", @@ -16375,7 +16710,7 @@ dependencies = [ "frame-metadata 16.0.0", "parity-scale-codec", "scale-info", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16387,7 +16722,7 @@ dependencies = [ "scale-info", "sp-api", "sp-application-crypto", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16401,7 +16736,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16452,7 +16787,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-weights", ] @@ -16467,7 +16802,7 @@ dependencies = [ "primitive-types", "sp-externalities 0.19.0", "sp-runtime-interface-proc-macro 11.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", "sp-tracing 10.0.0", "sp-wasm-interface 14.0.0", @@ -16530,7 +16865,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16544,7 +16879,7 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16561,7 +16896,7 @@ dependencies = [ "sp-core", "sp-externalities 0.19.0", "sp-panic-handler", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-trie", "thiserror", "tracing", @@ -16587,17 +16922,11 @@ dependencies = [ "sp-externalities 0.19.0", "sp-runtime", "sp-runtime-interface 17.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "thiserror", "x25519-dalek 2.0.1", ] -[[package]] -name = "sp-std" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53458e3c57df53698b3401ec0934bea8e8cfce034816873c0b0abbd83d7bac0d" - [[package]] name = "sp-std" version = "8.0.0" @@ -16618,7 +16947,7 @@ dependencies = [ "ref-cast", "serde", "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16642,7 +16971,7 @@ dependencies = [ "parity-scale-codec", "sp-inherents", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "thiserror", ] @@ -16652,7 +16981,7 @@ version = "10.0.0" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "tracing", "tracing-core", "tracing-subscriber 0.2.25", @@ -16689,7 +17018,7 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-trie", ] @@ -16710,7 +17039,7 @@ dependencies = [ "scale-info", "schnellru", "sp-core", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "thiserror", "tracing", "trie-db", @@ -16729,7 +17058,7 @@ dependencies = [ "serde", "sp-core-hashing-proc-macro", "sp-runtime", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-version-proc-macro", "thiserror", ] @@ -16755,7 +17084,7 @@ dependencies = [ "log", "parity-scale-codec", "sp-allocator", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-wasm-interface-common", "wasmtime", ] @@ -16776,7 +17105,7 @@ version = "7.0.0" source = "git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0#09bdd2a6953d057ae360ec3ef6ec735f9306cc04" dependencies = [ "parity-scale-codec", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "wasmi 0.13.2", ] @@ -16792,7 +17121,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-debug-derive 8.0.0", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", ] [[package]] @@ -16862,7 +17191,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", @@ -16876,7 +17205,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", @@ -16928,9 +17257,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "structopt" @@ -17154,30 +17483,24 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "subtle-ng" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" - [[package]] name = "subxt" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588b8ce92699eeb06290f4fb02dad4f7e426c4e6db4d53889c6bcbc808cf24ac" +checksum = "a160cba1edbf3ec4fbbeaea3f1a185f70448116a6bccc8276bb39adb3b3053bd" dependencies = [ "async-trait", - "base58", - "blake2 0.10.6", - "derivative", + "derive-where", "either", "frame-metadata 16.0.0", "futures", "hex", "impl-serde", - "jsonrpsee 0.20.1", + "instant", + "jsonrpsee 0.22.5", "parity-scale-codec", "primitive-types", + "reconnecting-jsonrpsee-ws-client", "scale-bits", "scale-decode", "scale-encode", @@ -17185,39 +17508,70 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp-crypto-hashing", + "subxt-core", "subxt-lightclient", "subxt-macro", "subxt-metadata", "thiserror", + "tokio-util", "tracing", + "url", ] [[package]] name = "subxt-codegen" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98f5a534c8d475919e9c845d51fc2316da4fcadd04fe17552d932d2106de930e" +checksum = "d703dca0905cc5272d7cc27a4ac5f37dcaae7671acc7fef0200057cc8c317786" dependencies = [ "frame-metadata 16.0.0", - "heck 0.4.1", + "heck 0.5.0", "hex", - "jsonrpsee 0.20.1", + "jsonrpsee 0.22.5", "parity-scale-codec", "proc-macro2", "quote", "scale-info", + "scale-typegen", "subxt-metadata", "syn 2.0.71", "thiserror", "tokio", ] +[[package]] +name = "subxt-core" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59f41eb2e2eea6ed45649508cc735f92c27f1fcfb15229e75f8270ea73177345" +dependencies = [ + "base58", + "blake2 0.10.6", + "derive-where", + "frame-metadata 16.0.0", + "hashbrown 0.14.5", + "hex", + "impl-serde", + "parity-scale-codec", + "primitive-types", + "scale-bits", + "scale-decode", + "scale-encode", + "scale-info", + "scale-value", + "serde", + "serde_json", + "sp-crypto-hashing", + "subxt-metadata", + "tracing", +] + [[package]] name = "subxt-lightclient" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10fd0ac9b091211f962b6ae19e26cd08e0b86efa064dfb7fac69c8f79f122329" +checksum = "9d9406fbdb9548c110803cb8afa750f8b911d51eefdf95474b11319591d225d9" dependencies = [ "futures", "futures-util", @@ -17232,27 +17586,30 @@ dependencies = [ [[package]] name = "subxt-macro" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e8be9ab6fe88b8c13edbe15911e148482cfb905a8b8d5b8d766a64c54be0bd" +checksum = "1c195f803d70687e409aba9be6c87115b5da8952cd83c4d13f2e043239818fcd" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", + "parity-scale-codec", "proc-macro-error", + "quote", + "scale-typegen", "subxt-codegen", "syn 2.0.71", ] [[package]] name = "subxt-metadata" -version = "0.32.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6898275765d36a37e5ef564358e0341cf41b5f3a91683d7d8b859381b65ac8a" +checksum = "738be5890fdeff899bbffff4d9c0f244fe2a952fb861301b937e3aa40ebb55da" dependencies = [ "frame-metadata 16.0.0", + "hashbrown 0.14.5", "parity-scale-codec", "scale-info", - "sp-core-hashing 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "thiserror", + "sp-crypto-hashing", ] [[package]] @@ -17487,26 +17844,6 @@ dependencies = [ "thiserror-impl", ] -[[package]] -name = "thiserror-core" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" -dependencies = [ - "thiserror-core-impl", -] - -[[package]] -name = "thiserror-core-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "thiserror-impl" version = "1.0.62" @@ -17669,6 +18006,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.26.0" @@ -17682,9 +18030,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite 0.2.13", @@ -17738,9 +18086,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -17748,7 +18096,6 @@ dependencies = [ "futures-sink", "pin-project-lite 0.2.13", "tokio", - "tracing", ] [[package]] @@ -18481,7 +18828,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 8.0.0 (git+https://github.com/gear-tech/polkadot-sdk.git?branch=gear-v1.4.0)", + "sp-std 8.0.0", "sp-storage 13.0.0", "sp-transaction-pool", "sp-version", @@ -19039,7 +19386,7 @@ dependencies = [ "intx", "smallvec", "spin 0.9.8", - "wasmi_arena 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmi_arena 0.4.1", "wasmi_core 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmparser-nostd 0.100.1", ] @@ -19052,11 +19399,24 @@ dependencies = [ "intx", "smallvec", "spin 0.9.8", - "wasmi_arena 0.4.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", + "wasmi_arena 0.4.0", "wasmi_core 0.12.0 (git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0)", "wasmparser-nostd 0.100.1", ] +[[package]] +name = "wasmi" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena 0.4.1", + "wasmi_core 0.13.0", + "wasmparser-nostd 0.100.1", +] + [[package]] name = "wasmi-validation" version = "0.5.0" @@ -19068,13 +19428,13 @@ dependencies = [ [[package]] name = "wasmi_arena" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" +source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" [[package]] name = "wasmi_arena" -version = "0.4.0" -source = "git+https://github.com/gear-tech/wasmi?branch=gear-v0.30.0#c8b0be9c2012e0478959a59074fd953a942782bc" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] name = "wasmi_core" @@ -19126,6 +19486,18 @@ dependencies = [ "region", ] +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.102.0" diff --git a/Cargo.toml b/Cargo.toml index f1b6d73be64..c864e1c4a3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -166,9 +166,9 @@ serde = { version = "^1", default-features = false } serde_json = "^1" serde_yaml = "0.8.26" sha-1 = "0.10.1" -subxt = "0.32.1" -subxt-metadata = "0.32.1" -subxt-codegen = "0.32.1" +subxt = "0.37.0" +subxt-metadata = "0.37.0" +subxt-codegen = "0.37.0" syn = "2.0.71" thiserror = "1.0.62" tokio = { version = "1.38.0" } @@ -303,9 +303,13 @@ ethexe-rpc = { path = "ethexe/rpc", default-features = false } ethexe-common = { path = "ethexe/common" } # Common executors between `sandbox-host` and `calc-stack-height` -sandbox-wasmer = { package = "wasmer", version = "4.3.4", features = ["singlepass"] } +sandbox-wasmer = { package = "wasmer", version = "4.3.4", features = [ + "singlepass", +] } sandbox-wasmer-types = { package = "wasmer-types", version = "4.3.4" } -sandbox-wasmi = { package = "wasmi", git = "https://github.com/gear-tech/wasmi", branch = "v0.13.2-sign-ext", features = ["virtual_memory"] } +sandbox-wasmi = { package = "wasmi", git = "https://github.com/gear-tech/wasmi", branch = "v0.13.2-sign-ext", features = [ + "virtual_memory", +] } # Substrate deps binary-merkle-tree = { version = "4.0.0-dev", git = "https://github.com/gear-tech/polkadot-sdk.git", branch = "gear-v1.4.0", default-features = false } @@ -526,11 +530,11 @@ wasm-opt = "0.116" # utils/wasm-builde wasmprinter = "0.2" # utils/wasm-gen whoami = "1.5.1" # gcli fail = "0.5" # gear-common -scale-value = "^0.12" # gsdk +scale-value = "^0.16" # gsdk heck = "0.5.0" # gsdk-api-gen etc = "0.1.19" # gcli toml_edit = "0.22.12" # crates-io -scale-decode = "0.9.0" # gsdk +scale-decode = "0.13.0" # gsdk directories = "5.0.1" # utils/key-finder num-traits = { version = "0.2", default-features = false } # gear-core glob = "0.3.1" # cargo-gbuild diff --git a/gclient/src/api/calls.rs b/gclient/src/api/calls.rs index b9b0947bb62..faa3e06226a 100644 --- a/gclient/src/api/calls.rs +++ b/gclient/src/api/calls.rs @@ -1336,11 +1336,11 @@ impl GearApi { .await } - fn process_set_code(&self, events: &ExtrinsicEvents) -> Result { + fn process_set_code(&self, events: &ExtrinsicEvents) -> Result<()> { for event in events.iter() { let event = event?.as_root_event::()?; if let Event::System(SystemEvent::CodeUpdated) = event { - return Ok(events.block_hash()); + return Ok(()); } } @@ -1354,7 +1354,7 @@ impl GearApi { /// [`pallet_system::set_code`](https://crates.parity.io/frame_system/pallet/struct.Pallet.html#method.set_code) /// extrinsic. pub async fn set_code(&self, code: impl AsRef<[u8]>) -> Result { - let events = self + let (block_hash, events) = self .0 .calls .sudo_unchecked_weight( @@ -1367,7 +1367,8 @@ impl GearApi { }, ) .await?; - self.process_set_code(&events) + self.process_set_code(&events)?; + Ok(block_hash) } /// Upgrade the runtime by reading the code from the file located at the @@ -1387,7 +1388,7 @@ impl GearApi { /// [`pallet_system::set_code_without_checks`](https://crates.parity.io/frame_system/pallet/struct.Pallet.html#method.set_code_without_checks) /// extrinsic. pub async fn set_code_without_checks(&self, code: impl AsRef<[u8]>) -> Result { - let events = self + let (block_hash, events) = self .0 .calls .sudo_unchecked_weight( @@ -1400,7 +1401,8 @@ impl GearApi { }, ) .await?; - self.process_set_code(&events) + self.process_set_code(&events)?; + Ok(block_hash) } /// Upgrade the runtime by reading the code from the file located at the @@ -1438,7 +1440,7 @@ impl GearApi { }, ) .await?; - Ok(events.block_hash()) + Ok(events.0) } /// Same as [`upload_code`](Self::upload_code), but upload code diff --git a/gclient/src/api/error.rs b/gclient/src/api/error.rs index 5d1128a37c7..b12418cfafd 100644 --- a/gclient/src/api/error.rs +++ b/gclient/src/api/error.rs @@ -42,6 +42,9 @@ pub enum Error { /// A wrapper around [`subxt::error::Error`]. #[error(transparent)] Subxt(SubxtError), + /// Subxt core error + #[error(transparent)] + SubxtCore(#[from] subxt::ext::subxt_core::Error), /// Occurs when an event of the expected type cannot be found. #[error("Expected event wasn't found")] EventNotFound, diff --git a/gclient/src/api/listener/iterator.rs b/gclient/src/api/listener/iterator.rs index 93be87e67e1..341433d89c7 100644 --- a/gclient/src/api/listener/iterator.rs +++ b/gclient/src/api/listener/iterator.rs @@ -20,12 +20,11 @@ use super::EventProcessor; use crate::{Error, Result}; use async_trait::async_trait; use gsdk::{ - config::GearConfig, ext::sp_core::H256, metadata::{gear::Event as GearEvent, Event}, + subscription::BlockEvents, Blocks, }; -use subxt::events::Events; /// Event listener that allows catching and processing events propagated through /// the network. @@ -53,8 +52,8 @@ impl EventProcessor for EventListener { } async fn proc(&mut self, predicate: impl Fn(Event) -> Option + Copy) -> Result { - while let Some(events) = self.0.next_events().await { - if let Some(res) = self.proc_events_inner(events?, predicate) { + while let Some(events) = self.0.next_events().await? { + if let Some(res) = self.proc_events_inner(events, predicate) { return Ok(res); } } @@ -69,8 +68,8 @@ impl EventProcessor for EventListener { ) -> Result> { let mut res = vec![]; - while let Some(events) = self.0.next_events().await { - for event in events?.iter() { + while let Some(events) = self.0.next_events().await? { + for event in events.iter() { if let Some(data) = predicate(event?.as_root_event::()?) { res.push(data); } @@ -93,8 +92,7 @@ impl EventListener { /// [`QueueNotProcessed`](https://docs.gear.rs/pallet_gear/pallet/enum.Event.html#variant.QueueNotProcessed) /// event. pub async fn queue_processing_reverted(&mut self) -> Result { - while let Some(events) = self.0.next_events().await { - let events = events?; + while let Some(events) = self.0.next_events().await? { let events_bh = events.block_hash(); if let Some(res) = self.proc_events_inner(events, |e| { @@ -113,8 +111,8 @@ impl EventListener { Ok(self .0 .next_events() - .await - .ok_or(Error::EventNotFound)?? + .await? + .ok_or(Error::EventNotFound)? .block_hash()) } @@ -135,7 +133,7 @@ impl EventListener { fn proc_events_inner( &mut self, - events: Events, + events: BlockEvents, predicate: impl Fn(Event) -> Option, ) -> Option { events diff --git a/gsdk/api-gen/Cargo.toml b/gsdk/api-gen/Cargo.toml index da442f11568..c7d2c4f9b2f 100644 --- a/gsdk/api-gen/Cargo.toml +++ b/gsdk/api-gen/Cargo.toml @@ -16,15 +16,11 @@ proc-macro2.workspace = true quote.workspace = true parity-scale-codec.workspace = true scale-info.workspace = true +subxt-codegen.workspace = true +syn = { workspace = true, features = ["full", "parsing"] } heck.workspace = true hex.workspace = true # NOTE: only required by this package. # # Same version from `/Cargo.lock` -frame-metadata = "15.1.0" -subxt-metadata.workspace = true -subxt-codegen.workspace = true -# TODO: inherit from workspace -# -# use "2.0.15" because subxt-codegen-0.29.0 requires it. -syn = { version = "2.0.71", features = ["full", "parsing"] } +frame-metadata = "16.0.0" diff --git a/gsdk/api-gen/src/main.rs b/gsdk/api-gen/src/main.rs index 8bdc43fbf19..046f3f018bf 100644 --- a/gsdk/api-gen/src/main.rs +++ b/gsdk/api-gen/src/main.rs @@ -27,8 +27,7 @@ use std::{ env, fs, io::{self, Write}, }; -use subxt_codegen::{DerivesRegistry, RuntimeGenerator, TypeSubstitutes}; -use subxt_metadata::Metadata; +use subxt_codegen::{CodegenBuilder, Metadata}; use syn::{parse_quote, Fields, ItemEnum, ItemImpl, ItemMod, Variant}; const RUNTIME_WASM: &str = "RUNTIME_WASM"; @@ -120,23 +119,13 @@ fn metadata() -> Vec { } fn generate_runtime_types(metadata: Metadata) -> TokenStream { - let generator = RuntimeGenerator::new(metadata); - let runtime_types_mod = parse_quote!( - pub mod runtime_types {} - ); - - let crate_path = Default::default(); - - let mut derives = DerivesRegistry::new(); - derives.extend_for_all( - [ - parse_quote!(Debug), - parse_quote!(crate::gp::Encode), - parse_quote!(crate::gp::Decode), - parse_quote!(crate::gp::DecodeAsType), - ], - [], - ); + let mut builder = CodegenBuilder::new(); + builder.set_additional_global_derives(vec![ + parse_quote!(Debug), + parse_quote!(crate::gp::Encode), + parse_quote!(crate::gp::Decode), + parse_quote!(crate::gp::DecodeAsType), + ]); for ty in [ parse_quote!(gprimitives::CodeId), @@ -144,17 +133,16 @@ fn generate_runtime_types(metadata: Metadata) -> TokenStream { parse_quote!(gprimitives::ActorId), parse_quote!(gprimitives::ReservationId), ] { - derives.extend_for_type(ty, [parse_quote!(Copy)], []); + builder.add_derives_for_type(ty, [parse_quote!(Copy)], true); } - generator - .generate_runtime_types( - runtime_types_mod, - derives, - TypeSubstitutes::with_default_substitutes(&crate_path), - crate_path, - true, - ) + builder.runtime_types_only(); + builder.disable_default_derives(); + builder.set_target_module(parse_quote! { + pub mod runtime_types {} + }); + builder + .generate(metadata) .expect("Failed to generate runtime types") } @@ -362,6 +350,9 @@ fn generate_impls(metadata: &Metadata) -> TokenStream { "staking" => quote! { pub use super::runtime_types::#pallet::pallet::pallet::Event; }, + "referenda" => quote! { + pub use super::runtime_types::#pallet::pallet::Event1 as Event; + }, "fellowship_referenda" => quote! { pub use super::runtime_types::#pallet::pallet::Event2 as Event; }, diff --git a/gsdk/src/api.rs b/gsdk/src/api.rs index c1ffba0c6c1..1989753561a 100644 --- a/gsdk/src/api.rs +++ b/gsdk/src/api.rs @@ -17,12 +17,11 @@ // along with this program. If not, see . use crate::{ - client::Rpc, config::GearConfig, metadata::Event, signer::Signer, Blocks, Events, Result, - TxInBlock, + client::Rpc, config::GearConfig, metadata::Event, signer::Signer, Blocks, Events, TxInBlock, }; +use anyhow::Result; use core::ops::{Deref, DerefMut}; -use std::result::Result as StdResult; -use subxt::{Error, OnlineClient}; +use subxt::OnlineClient; /// Gear api wrapper. #[derive(Clone)] @@ -108,8 +107,8 @@ impl Api { tx.fetch_events() .await? .iter() - .map(|e| -> StdResult { e?.as_root_event::() }) - .collect::, Error>>() + .map(|e| -> Result { e?.as_root_event::().map_err(Into::into) }) + .collect::>>() .map_err(Into::into) } @@ -122,7 +121,7 @@ impl Api { /// New signer from api pub fn signer(self, suri: &str, passwd: Option<&str>) -> Result { - Signer::new(self, suri, passwd) + Signer::new(self, suri, passwd).map_err(Into::into) } } diff --git a/gsdk/src/config.rs b/gsdk/src/config.rs index bbe05453e4f..990cd2c7eab 100644 --- a/gsdk/src/config.rs +++ b/gsdk/src/config.rs @@ -36,6 +36,7 @@ pub type Header = SubstrateHeader; pub struct GearConfig; impl Config for GearConfig { + type AssetId = (); type Hash = sp_core::H256; type Hasher = BlakeTwo256; type AccountId = sp_runtime::AccountId32; diff --git a/gsdk/src/metadata/generated.rs b/gsdk/src/metadata/generated.rs index e32efdd40d5..a2e7ab27986 100644 --- a/gsdk/src/metadata/generated.rs +++ b/gsdk/src/metadata/generated.rs @@ -31,17 +31,19 @@ pub mod runtime_types { pub mod bounded_btree_map { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] - pub struct BoundedBTreeMap<_0, _1>(pub ::subxt::utils::KeyedVec<_0, _1>); + pub struct BoundedBTreeMap<_0, _1>( + pub ::subxt::ext::subxt_core::utils::KeyedVec<_0, _1>, + ); } pub mod bounded_vec { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] - pub struct BoundedVec<_0>(pub ::std::vec::Vec<_0>); + pub struct BoundedVec<_0>(pub ::subxt::ext::subxt_core::alloc::vec::Vec<_0>); } pub mod weak_bounded_vec { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] - pub struct WeakBoundedVec<_0>(pub ::std::vec::Vec<_0>); + pub struct WeakBoundedVec<_0>(pub ::subxt::ext::subxt_core::alloc::vec::Vec<_0>); } } pub mod finality_grandpa { @@ -122,7 +124,7 @@ pub mod runtime_types { pub enum Bounded<_0, _1> { #[codec(index = 0)] Legacy { - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 1)] Inline( @@ -132,7 +134,7 @@ pub mod runtime_types { ), #[codec(index = 2)] Lookup { - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, len: ::core::primitive::u32, }, __Ignore(::core::marker::PhantomData<(_0, _1)>), @@ -155,7 +157,7 @@ pub mod runtime_types { pub mod fungible { use super::runtime_types; #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -262,7 +264,7 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::remark`]."] remark { - remark: ::std::vec::Vec<::core::primitive::u8>, + remark: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::set_heap_pages`]."] @@ -270,36 +272,38 @@ pub mod runtime_types { #[codec(index = 2)] #[doc = "See [`Pallet::set_code`]."] set_code { - code: ::std::vec::Vec<::core::primitive::u8>, + code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 3)] #[doc = "See [`Pallet::set_code_without_checks`]."] set_code_without_checks { - code: ::std::vec::Vec<::core::primitive::u8>, + code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 4)] #[doc = "See [`Pallet::set_storage`]."] set_storage { - items: ::std::vec::Vec<( - ::std::vec::Vec<::core::primitive::u8>, - ::std::vec::Vec<::core::primitive::u8>, + items: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, )>, }, #[codec(index = 5)] #[doc = "See [`Pallet::kill_storage`]."] kill_storage { - keys: ::std::vec::Vec<::std::vec::Vec<::core::primitive::u8>>, + keys: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + >, }, #[codec(index = 6)] #[doc = "See [`Pallet::kill_prefix`]."] kill_prefix { - prefix: ::std::vec::Vec<::core::primitive::u8>, + prefix: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, subkeys: ::core::primitive::u32, }, #[codec(index = 7)] #[doc = "See [`Pallet::remark_with_event`]."] remark_with_event { - remark: ::std::vec::Vec<::core::primitive::u8>, + remark: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -348,18 +352,18 @@ pub mod runtime_types { #[codec(index = 3)] #[doc = "A new account was created."] NewAccount { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 4)] #[doc = "An account was reaped."] KilledAccount { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 5)] #[doc = "On on-chain remark happened."] Remarked { - sender: ::subxt::utils::AccountId32, - hash: ::subxt::utils::H256, + sender: ::subxt::ext::subxt_core::utils::AccountId32, + hash: ::subxt::ext::subxt_core::utils::H256, }, } } @@ -375,13 +379,13 @@ pub mod runtime_types { pub struct EventRecord<_0, _1> { pub phase: runtime_types::frame_system::Phase, pub event: _0, - pub topics: ::std::vec::Vec<_1>, + pub topics: ::subxt::ext::subxt_core::alloc::vec::Vec<_1>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct LastRuntimeUpgradeInfo { #[codec(compact)] pub spec_version: ::core::primitive::u32, - pub spec_name: ::std::string::String, + pub spec_name: ::subxt::ext::subxt_core::alloc::string::String, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum Phase { @@ -636,7 +640,7 @@ pub mod runtime_types { } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct CodeMetadata { - pub author: ::subxt::utils::H256, + pub author: ::subxt::ext::subxt_core::utils::H256, #[codec(compact)] pub block_number: ::core::primitive::u32, } @@ -654,7 +658,7 @@ pub mod runtime_types { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct LimitedVec<_0, _1>( - pub ::std::vec::Vec<_0>, + pub ::subxt::ext::subxt_core::alloc::vec::Vec<_0>, #[codec(skip)] pub ::core::marker::PhantomData<_1>, ); } @@ -677,13 +681,14 @@ pub mod runtime_types { Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode, )] pub struct InstrumentedCode { - pub code: ::std::vec::Vec<::core::primitive::u8>, + pub code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, pub original_code_len: ::core::primitive::u32, - pub exports: - ::std::vec::Vec, + pub exports: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gear_core::message::DispatchKind, + >, pub static_pages: runtime_types::gear_core::pages::PagesAmount, pub stack_end: - ::core::option::Option, + ::core::option::Option, pub instantiated_section_sizes: runtime_types::gear_core::code::instrumented::InstantiatedSectionSizes, pub version: ::core::primitive::u32, @@ -736,7 +741,7 @@ pub mod runtime_types { Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode, )] pub struct ContextStore { - pub outgoing: ::subxt::utils::KeyedVec< + pub outgoing: ::subxt::ext::subxt_core::utils::KeyedVec< ::core::primitive::u32, ::core::option::Option< runtime_types::gear_core::buffer::LimitedVec< @@ -751,7 +756,9 @@ pub mod runtime_types { runtime_types::gear_core::message::PayloadSizeError, >, >, - pub initialized: ::std::vec::Vec, + pub initialized: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gprimitives::ActorId, + >, pub reservation_nonce: runtime_types::gear_core::reservation::ReservationNonce, pub system_reservation: ::core::option::Option<::core::primitive::u64>, @@ -845,7 +852,7 @@ pub mod runtime_types { pub mod pages { use super::runtime_types; #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -853,15 +860,7 @@ pub mod runtime_types { )] pub struct Page(pub ::core::primitive::u32); #[derive( - ::subxt::ext::codec::CompactAs, - Debug, - crate::gp::Decode, - crate::gp::DecodeAsType, - crate::gp::Encode, - )] - pub struct Page2(pub ::core::primitive::u32); - #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -872,7 +871,7 @@ pub mod runtime_types { pub mod percent { use super::runtime_types; #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -886,19 +885,20 @@ pub mod runtime_types { pub struct ActiveProgram<_0> { pub allocations_tree_len: ::core::primitive::u32, pub memory_infix: runtime_types::gear_core::program::MemoryInfix, - pub gas_reservation_map: ::subxt::utils::KeyedVec< + pub gas_reservation_map: ::subxt::ext::subxt_core::utils::KeyedVec< runtime_types::gprimitives::ReservationId, runtime_types::gear_core::reservation::GasReservationSlot, >, - pub code_hash: ::subxt::utils::H256, - pub code_exports: - ::std::vec::Vec, + pub code_hash: ::subxt::ext::subxt_core::utils::H256, + pub code_exports: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gear_core::message::DispatchKind, + >, pub static_pages: runtime_types::gear_core::pages::PagesAmount, pub state: runtime_types::gear_core::program::ProgramState, pub expiration_block: _0, } #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -933,7 +933,7 @@ pub mod runtime_types { pub finish: ::core::primitive::u32, } #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -1039,7 +1039,7 @@ pub mod runtime_types { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct IntervalsTree<_0> { - pub inner: ::subxt::utils::KeyedVec<_0, _0>, + pub inner: ::subxt::ext::subxt_core::utils::KeyedVec<_0, _0>, } } } @@ -1053,7 +1053,7 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::report_equivocation`]."] report_equivocation { - equivocation_proof: ::std::boxed::Box< + equivocation_proof: ::subxt::ext::subxt_core::alloc::boxed::Box< runtime_types::sp_consensus_slots::EquivocationProof< runtime_types::sp_runtime::generic::header::Header< ::core::primitive::u32, @@ -1066,7 +1066,7 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "See [`Pallet::report_equivocation_unsigned`]."] report_equivocation_unsigned { - equivocation_proof: ::std::boxed::Box< + equivocation_proof: ::subxt::ext::subxt_core::alloc::boxed::Box< runtime_types::sp_consensus_slots::EquivocationProof< runtime_types::sp_runtime::generic::header::Header< ::core::primitive::u32, @@ -1106,8 +1106,8 @@ pub mod runtime_types { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct Bag { - pub head: ::core::option::Option<::subxt::utils::AccountId32>, - pub tail: ::core::option::Option<::subxt::utils::AccountId32>, + pub head: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, + pub tail: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum ListError { @@ -1122,9 +1122,9 @@ pub mod runtime_types { } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct Node { - pub id: ::subxt::utils::AccountId32, - pub prev: ::core::option::Option<::subxt::utils::AccountId32>, - pub next: ::core::option::Option<::subxt::utils::AccountId32>, + pub id: ::subxt::ext::subxt_core::utils::AccountId32, + pub prev: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, + pub next: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, pub bag_upper: ::core::primitive::u64, pub score: ::core::primitive::u64, } @@ -1137,18 +1137,30 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::rebag`]."] rebag { - dislocated: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + dislocated: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::put_in_front_of`]."] put_in_front_of { - lighter: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + lighter: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 2)] #[doc = "See [`Pallet::put_in_front_of_other`]."] put_in_front_of_other { - heavier: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - lighter: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + heavier: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + lighter: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -1164,14 +1176,14 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "Moved an account from one bag to another."] Rebagged { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, from: ::core::primitive::u64, to: ::core::primitive::u64, }, #[codec(index = 1)] #[doc = "Updated the score of some account to the given amount."] ScoreUpdated { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, new_score: ::core::primitive::u64, }, } @@ -1187,46 +1199,69 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::transfer_allow_death`]."] transfer_allow_death { - dest: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + dest: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] value: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "See [`Pallet::force_transfer`]."] force_transfer { - source: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - dest: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + source: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + dest: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] value: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "See [`Pallet::transfer_keep_alive`]."] transfer_keep_alive { - dest: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + dest: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] value: ::core::primitive::u128, }, #[codec(index = 4)] #[doc = "See [`Pallet::transfer_all`]."] transfer_all { - dest: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + dest: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, keep_alive: ::core::primitive::bool, }, #[codec(index = 5)] #[doc = "See [`Pallet::force_unreserve`]."] force_unreserve { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, amount: ::core::primitive::u128, }, #[codec(index = 6)] #[doc = "See [`Pallet::upgrade_accounts`]."] upgrade_accounts { - who: ::std::vec::Vec<::subxt::utils::AccountId32>, + who: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, }, #[codec(index = 8)] #[doc = "See [`Pallet::force_set_balance`]."] force_set_balance { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] new_free: ::core::primitive::u128, }, @@ -1271,47 +1306,47 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "An account was created with some free balance."] Endowed { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, free_balance: ::core::primitive::u128, }, #[codec(index = 1)] #[doc = "An account was removed whose balance was non-zero but below ExistentialDeposit,"] #[doc = "resulting in an outright loss."] DustLost { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "Transfer succeeded."] Transfer { - from: ::subxt::utils::AccountId32, - to: ::subxt::utils::AccountId32, + from: ::subxt::ext::subxt_core::utils::AccountId32, + to: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "A balance was set by root."] BalanceSet { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, free: ::core::primitive::u128, }, #[codec(index = 4)] #[doc = "Some balance was reserved (moved from free to reserved)."] Reserved { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 5)] #[doc = "Some balance was unreserved (moved from reserved to free)."] Unreserved { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 6)] #[doc = "Some balance was moved from the reserve of the first account to the second account."] #[doc = "Final argument indicates the destination balance type."] ReserveRepatriated { - from: ::subxt::utils::AccountId32, - to: ::subxt::utils::AccountId32, + from: ::subxt::ext::subxt_core::utils::AccountId32, + to: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, destination_status: runtime_types::frame_support::traits::tokens::misc::BalanceStatus, @@ -1319,48 +1354,50 @@ pub mod runtime_types { #[codec(index = 7)] #[doc = "Some amount was deposited (e.g. for transaction fees)."] Deposit { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 8)] #[doc = "Some amount was withdrawn from the account (e.g. for transaction fees)."] Withdraw { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 9)] #[doc = "Some amount was removed from the account (e.g. for misbehavior)."] Slashed { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 10)] #[doc = "Some amount was minted into an account."] Minted { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 11)] #[doc = "Some amount was burned from an account."] Burned { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 12)] #[doc = "Some amount was suspended from an account (it can be restored later)."] Suspended { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 13)] #[doc = "Some amount was restored into an account."] Restored { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 14)] #[doc = "An account was upgraded."] - Upgraded { who: ::subxt::utils::AccountId32 }, + Upgraded { + who: ::subxt::ext::subxt_core::utils::AccountId32, + }, #[codec(index = 15)] #[doc = "Total issuance was increased by `amount`, creating a credit to be balanced."] Issued { amount: ::core::primitive::u128 }, @@ -1370,25 +1407,25 @@ pub mod runtime_types { #[codec(index = 17)] #[doc = "Some balance was locked."] Locked { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 18)] #[doc = "Some balance was unlocked."] Unlocked { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 19)] #[doc = "Some balance was frozen."] Frozen { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 20)] #[doc = "Some balance was thawed."] Thawed { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, } @@ -1409,7 +1446,7 @@ pub mod runtime_types { pub reasons: runtime_types::pallet_balances::types::Reasons, } #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -1449,7 +1486,8 @@ pub mod runtime_types { propose_bounty { #[codec(compact)] value: ::core::primitive::u128, - description: ::std::vec::Vec<::core::primitive::u8>, + description: + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::approve_bounty`]."] @@ -1462,7 +1500,10 @@ pub mod runtime_types { propose_curator { #[codec(compact)] bounty_id: ::core::primitive::u32, - curator: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + curator: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] fee: ::core::primitive::u128, }, @@ -1483,7 +1524,10 @@ pub mod runtime_types { award_bounty { #[codec(compact)] bounty_id: ::core::primitive::u32, - beneficiary: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + beneficiary: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 6)] #[doc = "See [`Pallet::claim_bounty`]."] @@ -1502,7 +1546,7 @@ pub mod runtime_types { extend_bounty_expiry { #[codec(compact)] bounty_id: ::core::primitive::u32, - remark: ::std::vec::Vec<::core::primitive::u8>, + remark: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -1562,14 +1606,14 @@ pub mod runtime_types { #[doc = "A bounty is awarded to a beneficiary."] BountyAwarded { index: ::core::primitive::u32, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 4)] #[doc = "A bounty is claimed by beneficiary."] BountyClaimed { index: ::core::primitive::u32, payout: ::core::primitive::u128, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 5)] #[doc = "A bounty is cancelled."] @@ -1584,7 +1628,7 @@ pub mod runtime_types { #[doc = "A bounty curator is proposed."] CuratorProposed { bounty_id: ::core::primitive::u32, - curator: ::subxt::utils::AccountId32, + curator: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 9)] #[doc = "A bounty curator is unassigned."] @@ -1593,7 +1637,7 @@ pub mod runtime_types { #[doc = "A bounty curator is accepted."] CuratorAccepted { bounty_id: ::core::primitive::u32, - curator: ::subxt::utils::AccountId32, + curator: ::subxt::ext::subxt_core::utils::AccountId32, }, } } @@ -1640,7 +1684,8 @@ pub mod runtime_types { parent_bounty_id: ::core::primitive::u32, #[codec(compact)] value: ::core::primitive::u128, - description: ::std::vec::Vec<::core::primitive::u8>, + description: + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::propose_curator`]."] @@ -1649,7 +1694,10 @@ pub mod runtime_types { parent_bounty_id: ::core::primitive::u32, #[codec(compact)] child_bounty_id: ::core::primitive::u32, - curator: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + curator: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] fee: ::core::primitive::u128, }, @@ -1676,7 +1724,10 @@ pub mod runtime_types { parent_bounty_id: ::core::primitive::u32, #[codec(compact)] child_bounty_id: ::core::primitive::u32, - beneficiary: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + beneficiary: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 5)] #[doc = "See [`Pallet::claim_child_bounty`]."] @@ -1722,7 +1773,7 @@ pub mod runtime_types { Awarded { index: ::core::primitive::u32, child_index: ::core::primitive::u32, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 2)] #[doc = "A child-bounty is claimed by beneficiary."] @@ -1730,7 +1781,7 @@ pub mod runtime_types { index: ::core::primitive::u32, child_index: ::core::primitive::u32, payout: ::core::primitive::u128, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 3)] #[doc = "A child-bounty is cancelled."] @@ -1804,7 +1855,10 @@ pub mod runtime_types { #[doc = "See [`Pallet::delegate`]."] delegate { class: ::core::primitive::u16, - to: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + to: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, conviction: runtime_types::pallet_conviction_voting::conviction::Conviction, balance: ::core::primitive::u128, }, @@ -1815,7 +1869,10 @@ pub mod runtime_types { #[doc = "See [`Pallet::unlock`]."] unlock { class: ::core::primitive::u16, - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 4)] #[doc = "See [`Pallet::remove_vote`]."] @@ -1826,7 +1883,10 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::remove_other_vote`]."] remove_other_vote { - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, class: ::core::primitive::u16, index: ::core::primitive::u32, }, @@ -1877,10 +1937,13 @@ pub mod runtime_types { pub enum Event { #[codec(index = 0)] #[doc = "An account has delegated their vote to another account. \\[who, target\\]"] - Delegated(::subxt::utils::AccountId32, ::subxt::utils::AccountId32), + Delegated( + ::subxt::ext::subxt_core::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, + ), #[codec(index = 1)] #[doc = "An \\[account\\] has cancelled a previous delegation operation."] - Undelegated(::subxt::utils::AccountId32), + Undelegated(::subxt::ext::subxt_core::utils::AccountId32), } } pub mod types { @@ -1921,7 +1984,7 @@ pub mod runtime_types { runtime_types::pallet_conviction_voting::types::Delegations<_0>, pub prior: runtime_types::pallet_conviction_voting::vote::PriorLock<_1, _0>, #[codec(skip)] - pub __subxt_unused_type_params: ::core::marker::PhantomData<_2>, + pub __ignore: ::core::marker::PhantomData<_2>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct Delegating<_0, _1, _2> { @@ -1935,7 +1998,7 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct PriorLock<_0, _1>(pub _0, pub _1); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -1961,7 +2024,7 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] #[doc = "Contains a variant per dispatchable extrinsic that this pallet has."] pub enum Call { - # [codec (index = 0)] # [doc = "See [`Pallet::submit_unsigned`]."] submit_unsigned { raw_solution: ::std::boxed::Box < runtime_types::pallet_election_provider_multi_phase::RawSolution < runtime_types::vara_runtime::NposSolution16 > > , witness : runtime_types::pallet_election_provider_multi_phase::SolutionOrSnapshotSize , } , # [codec (index = 1)] # [doc = "See [`Pallet::set_minimum_untrusted_score`]."] set_minimum_untrusted_score { maybe_next_score: ::core::option::Option < runtime_types::sp_npos_elections::ElectionScore > , } , # [codec (index = 2)] # [doc = "See [`Pallet::set_emergency_election_result`]."] set_emergency_election_result { supports: ::std::vec::Vec < (::subxt::utils::AccountId32 , runtime_types::sp_npos_elections::Support < ::subxt::utils::AccountId32 > ,) > , } , # [codec (index = 3)] # [doc = "See [`Pallet::submit`]."] submit { raw_solution: ::std::boxed::Box < runtime_types::pallet_election_provider_multi_phase::RawSolution < runtime_types::vara_runtime::NposSolution16 > > , } , # [codec (index = 4)] # [doc = "See [`Pallet::governance_fallback`]."] governance_fallback { maybe_max_voters: ::core::option::Option <::core::primitive::u32 > , maybe_max_targets: ::core::option::Option <::core::primitive::u32 > , } , } + # [codec (index = 0)] # [doc = "See [`Pallet::submit_unsigned`]."] submit_unsigned { raw_solution : ::subxt::ext ::subxt_core::alloc::boxed::Box < runtime_types::pallet_election_provider_multi_phase::RawSolution < runtime_types::vara_runtime::NposSolution16 > > , witness : runtime_types::pallet_election_provider_multi_phase::SolutionOrSnapshotSize , } , # [codec (index = 1)] # [doc = "See [`Pallet::set_minimum_untrusted_score`]."] set_minimum_untrusted_score { maybe_next_score: ::core::option::Option < runtime_types::sp_npos_elections::ElectionScore > , } , # [codec (index = 2)] # [doc = "See [`Pallet::set_emergency_election_result`]."] set_emergency_election_result { supports : ::subxt::ext ::subxt_core::alloc::vec::Vec < (::subxt::ext ::subxt_core::utils::AccountId32 , runtime_types::sp_npos_elections::Support < ::subxt::ext ::subxt_core::utils::AccountId32 > ,) > , } , # [codec (index = 3)] # [doc = "See [`Pallet::submit`]."] submit { raw_solution : ::subxt::ext ::subxt_core::alloc::boxed::Box < runtime_types::pallet_election_provider_multi_phase::RawSolution < runtime_types::vara_runtime::NposSolution16 > > , } , # [codec (index = 4)] # [doc = "See [`Pallet::governance_fallback`]."] governance_fallback { maybe_max_voters: ::core::option::Option <::core::primitive::u32 > , maybe_max_targets: ::core::option::Option <::core::primitive::u32 > , } , } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] #[doc = "Error of the pallet that can be returned in response to dispatches."] pub enum Error { @@ -2022,7 +2085,8 @@ pub mod runtime_types { SolutionStored { compute: runtime_types::pallet_election_provider_multi_phase::ElectionCompute, - origin: ::core::option::Option<::subxt::utils::AccountId32>, + origin: + ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, prev_ejected: ::core::primitive::bool, }, #[codec(index = 1)] @@ -2040,13 +2104,13 @@ pub mod runtime_types { #[codec(index = 3)] #[doc = "An account has been rewarded for their signed submission being finalized."] Rewarded { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, value: ::core::primitive::u128, }, #[codec(index = 4)] #[doc = "An account has been slashed for submitting an invalid signed submission."] Slashed { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, value: ::core::primitive::u128, }, #[codec(index = 5)] @@ -2106,16 +2170,18 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct ReadySolution { pub supports: runtime_types::bounded_collections::bounded_vec::BoundedVec<( - ::subxt::utils::AccountId32, - runtime_types::sp_npos_elections::Support<::subxt::utils::AccountId32>, + ::subxt::ext::subxt_core::utils::AccountId32, + runtime_types::sp_npos_elections::Support< + ::subxt::ext::subxt_core::utils::AccountId32, + >, )>, pub score: runtime_types::sp_npos_elections::ElectionScore, pub compute: runtime_types::pallet_election_provider_multi_phase::ElectionCompute, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct RoundSnapshot<_0, _1> { - pub voters: ::std::vec::Vec<_1>, - pub targets: ::std::vec::Vec<_0>, + pub voters: ::subxt::ext::subxt_core::alloc::vec::Vec<_1>, + pub targets: ::subxt::ext::subxt_core::alloc::vec::Vec<_0>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct SolutionOrSnapshotSize { @@ -2135,14 +2201,15 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::upload_code`]."] upload_code { - code: ::std::vec::Vec<::core::primitive::u8>, + code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::upload_program`]."] upload_program { - code: ::std::vec::Vec<::core::primitive::u8>, - salt: ::std::vec::Vec<::core::primitive::u8>, - init_payload: ::std::vec::Vec<::core::primitive::u8>, + code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + salt: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + init_payload: + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: ::core::primitive::u128, keep_alive: ::core::primitive::bool, @@ -2151,8 +2218,9 @@ pub mod runtime_types { #[doc = "See [`Pallet::create_program`]."] create_program { code_id: runtime_types::gprimitives::CodeId, - salt: ::std::vec::Vec<::core::primitive::u8>, - init_payload: ::std::vec::Vec<::core::primitive::u8>, + salt: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + init_payload: + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: ::core::primitive::u128, keep_alive: ::core::primitive::bool, @@ -2161,7 +2229,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::send_message`]."] send_message { destination: runtime_types::gprimitives::ActorId, - payload: ::std::vec::Vec<::core::primitive::u8>, + payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: ::core::primitive::u128, keep_alive: ::core::primitive::bool, @@ -2170,7 +2238,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::send_reply`]."] send_reply { reply_to_id: runtime_types::gprimitives::MessageId, - payload: ::std::vec::Vec<::core::primitive::u8>, + payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: ::core::primitive::u128, keep_alive: ::core::primitive::bool, @@ -2270,7 +2338,7 @@ pub mod runtime_types { #[doc = "added to the Gear message queue."] MessageQueued { id: runtime_types::gprimitives::MessageId, - source: ::subxt::utils::AccountId32, + source: ::subxt::ext::subxt_core::utils::AccountId32, destination: runtime_types::gprimitives::ActorId, entry: runtime_types::gear_common::event::MessageEntry, }, @@ -2295,11 +2363,13 @@ pub mod runtime_types { #[doc = "The result of processing the messages within the block."] MessagesDispatched { total: ::core::primitive::u32, - statuses: ::subxt::utils::KeyedVec< + statuses: ::subxt::ext::subxt_core::utils::KeyedVec< runtime_types::gprimitives::MessageId, runtime_types::gear_common::event::DispatchStatus, >, - state_changes: ::std::vec::Vec, + state_changes: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gprimitives::ActorId, + >, }, #[codec(index = 4)] #[doc = "Messages execution delayed (waited) and successfully"] @@ -2634,10 +2704,12 @@ pub mod runtime_types { } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct DebugData { - pub dispatch_queue: - ::std::vec::Vec, - pub programs: - ::std::vec::Vec, + pub dispatch_queue: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gear_core::message::stored::StoredDispatch, + >, + pub programs: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::pallet_gear_debug::pallet::ProgramDetails, + >, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] #[doc = "The `Error` enum of this pallet."] @@ -2659,11 +2731,11 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct ProgramInfo { pub static_pages: runtime_types::gear_core::pages::PagesAmount, - pub persistent_pages: ::subxt::utils::KeyedVec< + pub persistent_pages: ::subxt::ext::subxt_core::utils::KeyedVec< runtime_types::gear_core::pages::Page, runtime_types::gear_core::memory::PageBuf, >, - pub code_hash: ::subxt::utils::H256, + pub code_hash: ::subxt::ext::subxt_core::utils::H256, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum ProgramState { @@ -2681,9 +2753,9 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct EthMessage { pub nonce: runtime_types::primitive_types::U256, - pub source: ::subxt::utils::H256, - pub destination: ::subxt::utils::H160, - pub payload: ::std::vec::Vec<::core::primitive::u8>, + pub source: ::subxt::ext::subxt_core::utils::H256, + pub destination: ::subxt::ext::subxt_core::utils::H160, + pub payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, } } pub mod pallet { @@ -2700,8 +2772,8 @@ pub mod runtime_types { #[codec(index = 2)] #[doc = "See [`Pallet::send_eth_message`]."] send_eth_message { - destination: ::subxt::utils::H160, - payload: ::std::vec::Vec<::core::primitive::u8>, + destination: ::subxt::ext::subxt_core::utils::H160, + payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -2732,7 +2804,7 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "Grandpa validator's keys set was hashed and set in storage at"] #[doc = "first block of the last session in the era."] - AuthoritySetHashChanged(::subxt::utils::H256), + AuthoritySetHashChanged(::subxt::ext::subxt_core::utils::H256), #[codec(index = 1)] #[doc = "Bridge got cleared on initialization of the second block in a new era."] BridgeCleared, @@ -2751,11 +2823,11 @@ pub mod runtime_types { #[doc = "A new message was queued for bridging."] MessageQueued { message: runtime_types::pallet_gear_eth_bridge::internal::EthMessage, - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 6)] #[doc = "Merkle root of the queue changed: new messages queued within the block."] - QueueMerkleRootChanged(::subxt::utils::H256), + QueueMerkleRootChanged(::subxt::ext::subxt_core::utils::H256), } } } @@ -2931,13 +3003,19 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "See [`Pallet::force_refill`]."] force_refill { - from: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + from: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, value: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "See [`Pallet::withdraw`]."] withdraw { - to: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + to: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, value: ::core::primitive::u128, }, #[codec(index = 3)] @@ -2981,7 +3059,7 @@ pub mod runtime_types { #[codec(index = 0)] SendMessage { destination: runtime_types::gprimitives::ActorId, - payload: ::std::vec::Vec<::core::primitive::u8>, + payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: _0, keep_alive: ::core::primitive::bool, @@ -2989,14 +3067,14 @@ pub mod runtime_types { #[codec(index = 1)] SendReply { reply_to_id: runtime_types::gprimitives::MessageId, - payload: ::std::vec::Vec<::core::primitive::u8>, + payload: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, gas_limit: ::core::primitive::u64, value: _0, keep_alive: ::core::primitive::bool, }, #[codec(index = 2)] UploadCode { - code: ::std::vec::Vec<::core::primitive::u8>, + code: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 3)] DeclineVoucher, @@ -3007,7 +3085,9 @@ pub mod runtime_types { pub struct VoucherInfo<_0, _1> { pub owner: _0, pub programs: ::core::option::Option< - ::std::vec::Vec, + ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gprimitives::ActorId, + >, >, pub code_uploading: ::core::primitive::bool, pub expiry: _1, @@ -3021,10 +3101,12 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::issue`]."] issue { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, balance: ::core::primitive::u128, programs: ::core::option::Option< - ::std::vec::Vec, + ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gprimitives::ActorId, + >, >, code_uploading: ::core::primitive::bool, duration: ::core::primitive::u32, @@ -3040,19 +3122,22 @@ pub mod runtime_types { #[codec(index = 2)] #[doc = "See [`Pallet::revoke`]."] revoke { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, }, #[codec(index = 3)] #[doc = "See [`Pallet::update`]."] update { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, - move_ownership: ::core::option::Option<::subxt::utils::AccountId32>, + move_ownership: + ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, balance_top_up: ::core::option::Option<::core::primitive::u128>, append_programs: ::core::option::Option< ::core::option::Option< - ::std::vec::Vec, + ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::gprimitives::ActorId, + >, >, >, code_uploading: ::core::option::Option<::core::primitive::bool>, @@ -3114,8 +3199,8 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "Voucher has been issued."] VoucherIssued { - owner: ::subxt::utils::AccountId32, - spender: ::subxt::utils::AccountId32, + owner: ::subxt::ext::subxt_core::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, }, #[codec(index = 1)] @@ -3123,20 +3208,21 @@ pub mod runtime_types { #[doc = ""] #[doc = "NOTE: currently means only \"refunded\"."] VoucherRevoked { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, }, #[codec(index = 2)] #[doc = "Voucher has been updated."] VoucherUpdated { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, - new_owner: ::core::option::Option<::subxt::utils::AccountId32>, + new_owner: + ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, }, #[codec(index = 3)] #[doc = "Voucher has been declined (set to expired state)."] VoucherDeclined { - spender: ::subxt::utils::AccountId32, + spender: ::subxt::ext::subxt_core::utils::AccountId32, voucher_id: runtime_types::pallet_gear_voucher::internal::VoucherId, }, } @@ -3152,9 +3238,9 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::report_equivocation`]."] report_equivocation { - equivocation_proof: ::std::boxed::Box< + equivocation_proof: ::subxt::ext::subxt_core::alloc::boxed::Box< runtime_types::sp_consensus_grandpa::EquivocationProof< - ::subxt::utils::H256, + ::subxt::ext::subxt_core::utils::H256, ::core::primitive::u32, >, >, @@ -3163,9 +3249,9 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "See [`Pallet::report_equivocation_unsigned`]."] report_equivocation_unsigned { - equivocation_proof: ::std::boxed::Box< + equivocation_proof: ::subxt::ext::subxt_core::alloc::boxed::Box< runtime_types::sp_consensus_grandpa::EquivocationProof< - ::subxt::utils::H256, + ::subxt::ext::subxt_core::utils::H256, ::core::primitive::u32, >, >, @@ -3211,7 +3297,7 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "New authority set has been applied."] NewAuthorities { - authority_set: ::std::vec::Vec<( + authority_set: ::subxt::ext::subxt_core::alloc::vec::Vec<( runtime_types::sp_consensus_grandpa::app::Public, ::core::primitive::u64, )>, @@ -3275,19 +3361,23 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::add_registrar`]."] add_registrar { - account: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + account: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::set_identity`]."] set_identity { - info: - ::std::boxed::Box, + info: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::pallet_identity::legacy::IdentityInfo, + >, }, #[codec(index = 2)] #[doc = "See [`Pallet::set_subs`]."] set_subs { - subs: ::std::vec::Vec<( - ::subxt::utils::AccountId32, + subs: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::utils::AccountId32, runtime_types::pallet_identity::types::Data, )>, }, @@ -3318,7 +3408,10 @@ pub mod runtime_types { set_account_id { #[codec(compact)] index: ::core::primitive::u32, - new: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + new: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 8)] #[doc = "See [`Pallet::set_fields`]."] @@ -3332,33 +3425,48 @@ pub mod runtime_types { provide_judgement { #[codec(compact)] reg_index: ::core::primitive::u32, - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, judgement: runtime_types::pallet_identity::types::Judgement< ::core::primitive::u128, >, - identity: ::subxt::utils::H256, + identity: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 10)] #[doc = "See [`Pallet::kill_identity`]."] kill_identity { - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 11)] #[doc = "See [`Pallet::add_sub`]."] add_sub { - sub: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + sub: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, data: runtime_types::pallet_identity::types::Data, }, #[codec(index = 12)] #[doc = "See [`Pallet::rename_sub`]."] rename_sub { - sub: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + sub: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, data: runtime_types::pallet_identity::types::Data, }, #[codec(index = 13)] #[doc = "See [`Pallet::remove_sub`]."] remove_sub { - sub: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + sub: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 14)] #[doc = "See [`Pallet::quit_sub`]."] @@ -3424,35 +3532,37 @@ pub mod runtime_types { pub enum Event { #[codec(index = 0)] #[doc = "A name was set or reset (which will remove all judgements)."] - IdentitySet { who: ::subxt::utils::AccountId32 }, + IdentitySet { + who: ::subxt::ext::subxt_core::utils::AccountId32, + }, #[codec(index = 1)] #[doc = "A name was cleared, and the given balance returned."] IdentityCleared { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, deposit: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "A name was removed and the given balance slashed."] IdentityKilled { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, deposit: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "A judgement was asked from a registrar."] JudgementRequested { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, registrar_index: ::core::primitive::u32, }, #[codec(index = 4)] #[doc = "A judgement request was retracted."] JudgementUnrequested { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, registrar_index: ::core::primitive::u32, }, #[codec(index = 5)] #[doc = "A judgement was given by a registrar."] JudgementGiven { - target: ::subxt::utils::AccountId32, + target: ::subxt::ext::subxt_core::utils::AccountId32, registrar_index: ::core::primitive::u32, }, #[codec(index = 6)] @@ -3463,23 +3573,23 @@ pub mod runtime_types { #[codec(index = 7)] #[doc = "A sub-identity was added to an identity and the deposit paid."] SubIdentityAdded { - sub: ::subxt::utils::AccountId32, - main: ::subxt::utils::AccountId32, + sub: ::subxt::ext::subxt_core::utils::AccountId32, + main: ::subxt::ext::subxt_core::utils::AccountId32, deposit: ::core::primitive::u128, }, #[codec(index = 8)] #[doc = "A sub-identity was removed from an identity and the deposit freed."] SubIdentityRemoved { - sub: ::subxt::utils::AccountId32, - main: ::subxt::utils::AccountId32, + sub: ::subxt::ext::subxt_core::utils::AccountId32, + main: ::subxt::ext::subxt_core::utils::AccountId32, deposit: ::core::primitive::u128, }, #[codec(index = 9)] #[doc = "A sub-identity was cleared, and the given deposit repatriated from the"] #[doc = "main identity account to the sub-identity account."] SubIdentityRevoked { - sub: ::subxt::utils::AccountId32, - main: ::subxt::utils::AccountId32, + sub: ::subxt::ext::subxt_core::utils::AccountId32, + main: ::subxt::ext::subxt_core::utils::AccountId32, deposit: ::core::primitive::u128, }, } @@ -3638,10 +3748,10 @@ pub mod runtime_types { #[codec(index = 2)] #[doc = "At the end of the session, at least one validator was found to be offline."] SomeOffline { - offline: ::std::vec::Vec<( - ::subxt::utils::AccountId32, + offline: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::utils::AccountId32, runtime_types::sp_staking::Exposure< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, ::core::primitive::u128, >, )>, @@ -3680,25 +3790,35 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::as_multi_threshold_1`]."] as_multi_threshold_1 { - other_signatories: ::std::vec::Vec<::subxt::utils::AccountId32>, - call: ::std::boxed::Box, + other_signatories: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::as_multi`]."] as_multi { threshold: ::core::primitive::u16, - other_signatories: ::std::vec::Vec<::subxt::utils::AccountId32>, + other_signatories: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, maybe_timepoint: ::core::option::Option< runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, >, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, max_weight: runtime_types::sp_weights::weight_v2::Weight, }, #[codec(index = 2)] #[doc = "See [`Pallet::approve_as_multi`]."] approve_as_multi { threshold: ::core::primitive::u16, - other_signatories: ::std::vec::Vec<::subxt::utils::AccountId32>, + other_signatories: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, maybe_timepoint: ::core::option::Option< runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, >, @@ -3709,7 +3829,9 @@ pub mod runtime_types { #[doc = "See [`Pallet::cancel_as_multi`]."] cancel_as_multi { threshold: ::core::primitive::u16, - other_signatories: ::std::vec::Vec<::subxt::utils::AccountId32>, + other_signatories: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, timepoint: runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, call_hash: [::core::primitive::u8; 32usize], @@ -3767,26 +3889,26 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "A new multisig operation has begun."] NewMultisig { - approving: ::subxt::utils::AccountId32, - multisig: ::subxt::utils::AccountId32, + approving: ::subxt::ext::subxt_core::utils::AccountId32, + multisig: ::subxt::ext::subxt_core::utils::AccountId32, call_hash: [::core::primitive::u8; 32usize], }, #[codec(index = 1)] #[doc = "A multisig operation has been approved by someone."] MultisigApproval { - approving: ::subxt::utils::AccountId32, + approving: ::subxt::ext::subxt_core::utils::AccountId32, timepoint: runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, - multisig: ::subxt::utils::AccountId32, + multisig: ::subxt::ext::subxt_core::utils::AccountId32, call_hash: [::core::primitive::u8; 32usize], }, #[codec(index = 2)] #[doc = "A multisig operation has been executed."] MultisigExecuted { - approving: ::subxt::utils::AccountId32, + approving: ::subxt::ext::subxt_core::utils::AccountId32, timepoint: runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, - multisig: ::subxt::utils::AccountId32, + multisig: ::subxt::ext::subxt_core::utils::AccountId32, call_hash: [::core::primitive::u8; 32usize], result: ::core::result::Result<(), runtime_types::sp_runtime::DispatchError>, @@ -3794,10 +3916,10 @@ pub mod runtime_types { #[codec(index = 3)] #[doc = "A multisig operation has been cancelled."] MultisigCancelled { - cancelling: ::subxt::utils::AccountId32, + cancelling: ::subxt::ext::subxt_core::utils::AccountId32, timepoint: runtime_types::pallet_multisig::Timepoint<::core::primitive::u32>, - multisig: ::subxt::utils::AccountId32, + multisig: ::subxt::ext::subxt_core::utils::AccountId32, call_hash: [::core::primitive::u8; 32usize], }, } @@ -3842,8 +3964,10 @@ pub mod runtime_types { #[codec(index = 3)] #[doc = "See [`Pallet::unbond`]."] unbond { - member_account: - ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + member_account: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, #[codec(compact)] unbonding_points: ::core::primitive::u128, }, @@ -3856,8 +3980,10 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::withdraw_unbonded`]."] withdraw_unbonded { - member_account: - ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + member_account: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, num_slashing_spans: ::core::primitive::u32, }, #[codec(index = 6)] @@ -3865,25 +3991,45 @@ pub mod runtime_types { create { #[codec(compact)] amount: ::core::primitive::u128, - root: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - nominator: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - bouncer: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + root: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + nominator: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + bouncer: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 7)] #[doc = "See [`Pallet::create_with_pool_id`]."] create_with_pool_id { #[codec(compact)] amount: ::core::primitive::u128, - root: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - nominator: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - bouncer: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + root: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + nominator: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + bouncer: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, pool_id: ::core::primitive::u32, }, #[codec(index = 8)] #[doc = "See [`Pallet::nominate`]."] nominate { pool_id: ::core::primitive::u32, - validators: ::std::vec::Vec<::subxt::utils::AccountId32>, + validators: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, }, #[codec(index = 9)] #[doc = "See [`Pallet::set_state`]."] @@ -3895,7 +4041,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::set_metadata`]."] set_metadata { pool_id: ::core::primitive::u32, - metadata: ::std::vec::Vec<::core::primitive::u8>, + metadata: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 11)] #[doc = "See [`Pallet::set_configs`]."] @@ -3924,13 +4070,13 @@ pub mod runtime_types { update_roles { pool_id: ::core::primitive::u32, new_root: runtime_types::pallet_nomination_pools::ConfigOp< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, new_nominator: runtime_types::pallet_nomination_pools::ConfigOp< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, new_bouncer: runtime_types::pallet_nomination_pools::ConfigOp< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, }, #[codec(index = 13)] @@ -3939,7 +4085,10 @@ pub mod runtime_types { #[codec(index = 14)] #[doc = "See [`Pallet::bond_extra_other`]."] bond_extra_other { - member: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + member: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, extra: runtime_types::pallet_nomination_pools::BondExtra< ::core::primitive::u128, >, @@ -3951,14 +4100,16 @@ pub mod runtime_types { }, #[codec(index = 16)] #[doc = "See [`Pallet::claim_payout_other`]."] - claim_payout_other { other: ::subxt::utils::AccountId32 }, + claim_payout_other { + other: ::subxt::ext::subxt_core::utils::AccountId32, + }, #[codec(index = 17)] #[doc = "See [`Pallet::set_commission`]."] set_commission { pool_id: ::core::primitive::u32, new_commission: ::core::option::Option<( runtime_types::sp_arithmetic::per_things::Perbill, - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, )>, }, #[codec(index = 18)] @@ -4109,13 +4260,13 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "A pool has been created."] Created { - depositor: ::subxt::utils::AccountId32, + depositor: ::subxt::ext::subxt_core::utils::AccountId32, pool_id: ::core::primitive::u32, }, #[codec(index = 1)] #[doc = "A member has became bonded in a pool."] Bonded { - member: ::subxt::utils::AccountId32, + member: ::subxt::ext::subxt_core::utils::AccountId32, pool_id: ::core::primitive::u32, bonded: ::core::primitive::u128, joined: ::core::primitive::bool, @@ -4123,7 +4274,7 @@ pub mod runtime_types { #[codec(index = 2)] #[doc = "A payout has been made to a member."] PaidOut { - member: ::subxt::utils::AccountId32, + member: ::subxt::ext::subxt_core::utils::AccountId32, pool_id: ::core::primitive::u32, payout: ::core::primitive::u128, }, @@ -4140,7 +4291,7 @@ pub mod runtime_types { #[doc = "number of points that are issued in the unbonding pool will be less than the amount"] #[doc = "requested to be unbonded."] Unbonded { - member: ::subxt::utils::AccountId32, + member: ::subxt::ext::subxt_core::utils::AccountId32, pool_id: ::core::primitive::u32, balance: ::core::primitive::u128, points: ::core::primitive::u128, @@ -4154,7 +4305,7 @@ pub mod runtime_types { #[doc = "Similar to `Unbonded` event, in the absence of slashing, the ratio of point to balance"] #[doc = "will be 1."] Withdrawn { - member: ::subxt::utils::AccountId32, + member: ::subxt::ext::subxt_core::utils::AccountId32, pool_id: ::core::primitive::u32, balance: ::core::primitive::u128, points: ::core::primitive::u128, @@ -4174,15 +4325,17 @@ pub mod runtime_types { #[doc = "The removal can be voluntary (withdrawn all unbonded funds) or involuntary (kicked)."] MemberRemoved { pool_id: ::core::primitive::u32, - member: ::subxt::utils::AccountId32, + member: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 8)] #[doc = "The roles of a pool have been updated to the given new roles. Note that the depositor"] #[doc = "can never change."] RolesUpdated { - root: ::core::option::Option<::subxt::utils::AccountId32>, - bouncer: ::core::option::Option<::subxt::utils::AccountId32>, - nominator: ::core::option::Option<::subxt::utils::AccountId32>, + root: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, + bouncer: + ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, + nominator: + ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, }, #[codec(index = 9)] #[doc = "The active balance of pool `pool_id` has been slashed to `balance`."] @@ -4203,7 +4356,7 @@ pub mod runtime_types { pool_id: ::core::primitive::u32, current: ::core::option::Option<( runtime_types::sp_arithmetic::per_things::Perbill, - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, )>, }, #[codec(index = 12)] @@ -4257,8 +4410,9 @@ pub mod runtime_types { pub commission: runtime_types::pallet_nomination_pools::Commission, pub member_counter: ::core::primitive::u32, pub points: ::core::primitive::u128, - pub roles: - runtime_types::pallet_nomination_pools::PoolRoles<::subxt::utils::AccountId32>, + pub roles: runtime_types::pallet_nomination_pools::PoolRoles< + ::subxt::ext::subxt_core::utils::AccountId32, + >, pub state: runtime_types::pallet_nomination_pools::PoolState, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -4276,7 +4430,7 @@ pub mod runtime_types { pub struct Commission { pub current: ::core::option::Option<( runtime_types::sp_arithmetic::per_things::Perbill, - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, )>, pub max: ::core::option::Option, pub change_rate: ::core::option::Option< @@ -4365,7 +4519,7 @@ pub mod runtime_types { #[doc = "\\[kind, timeslot\\]."] Offence { kind: [::core::primitive::u8; 16usize], - timeslot: ::std::vec::Vec<::core::primitive::u8>, + timeslot: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, } } @@ -4380,21 +4534,29 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::note_preimage`]."] note_preimage { - bytes: ::std::vec::Vec<::core::primitive::u8>, + bytes: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::unnote_preimage`]."] - unnote_preimage { hash: ::subxt::utils::H256 }, + unnote_preimage { + hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 2)] #[doc = "See [`Pallet::request_preimage`]."] - request_preimage { hash: ::subxt::utils::H256 }, + request_preimage { + hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 3)] #[doc = "See [`Pallet::unrequest_preimage`]."] - unrequest_preimage { hash: ::subxt::utils::H256 }, + unrequest_preimage { + hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 4)] #[doc = "See [`Pallet::ensure_updated`]."] ensure_updated { - hashes: ::std::vec::Vec<::subxt::utils::H256>, + hashes: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::H256, + >, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -4430,13 +4592,19 @@ pub mod runtime_types { pub enum Event { #[codec(index = 0)] #[doc = "A preimage has been noted."] - Noted { hash: ::subxt::utils::H256 }, + Noted { + hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 1)] #[doc = "A preimage has been requested."] - Requested { hash: ::subxt::utils::H256 }, + Requested { + hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 2)] #[doc = "A preimage has ben cleared."] - Cleared { hash: ::subxt::utils::H256 }, + Cleared { + hash: ::subxt::ext::subxt_core::utils::H256, + }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum HoldReason { @@ -4483,22 +4651,33 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::proxy`]."] proxy { - real: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + real: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, force_proxy_type: ::core::option::Option, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::add_proxy`]."] add_proxy { - delegate: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + delegate: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, proxy_type: runtime_types::vara_runtime::ProxyType, delay: ::core::primitive::u32, }, #[codec(index = 2)] #[doc = "See [`Pallet::remove_proxy`]."] remove_proxy { - delegate: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + delegate: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, proxy_type: runtime_types::vara_runtime::ProxyType, delay: ::core::primitive::u32, }, @@ -4515,7 +4694,10 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::kill_pure`]."] kill_pure { - spawner: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + spawner: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, proxy_type: runtime_types::vara_runtime::ProxyType, index: ::core::primitive::u16, #[codec(compact)] @@ -4526,29 +4708,46 @@ pub mod runtime_types { #[codec(index = 6)] #[doc = "See [`Pallet::announce`]."] announce { - real: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - call_hash: ::subxt::utils::H256, + real: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + call_hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 7)] #[doc = "See [`Pallet::remove_announcement`]."] remove_announcement { - real: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - call_hash: ::subxt::utils::H256, + real: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + call_hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 8)] #[doc = "See [`Pallet::reject_announcement`]."] reject_announcement { - delegate: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - call_hash: ::subxt::utils::H256, + delegate: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + call_hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 9)] #[doc = "See [`Pallet::proxy_announced`]."] proxy_announced { - delegate: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - real: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + delegate: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + real: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, force_proxy_type: ::core::option::Option, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -4592,31 +4791,31 @@ pub mod runtime_types { #[doc = "A pure account has been created by new proxy with given"] #[doc = "disambiguation index and proxy type."] PureCreated { - pure: ::subxt::utils::AccountId32, - who: ::subxt::utils::AccountId32, + pure: ::subxt::ext::subxt_core::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, proxy_type: runtime_types::vara_runtime::ProxyType, disambiguation_index: ::core::primitive::u16, }, #[codec(index = 2)] #[doc = "An announcement was placed to make a call in the future."] Announced { - real: ::subxt::utils::AccountId32, - proxy: ::subxt::utils::AccountId32, - call_hash: ::subxt::utils::H256, + real: ::subxt::ext::subxt_core::utils::AccountId32, + proxy: ::subxt::ext::subxt_core::utils::AccountId32, + call_hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 3)] #[doc = "A proxy was added."] ProxyAdded { - delegator: ::subxt::utils::AccountId32, - delegatee: ::subxt::utils::AccountId32, + delegator: ::subxt::ext::subxt_core::utils::AccountId32, + delegatee: ::subxt::ext::subxt_core::utils::AccountId32, proxy_type: runtime_types::vara_runtime::ProxyType, delay: ::core::primitive::u32, }, #[codec(index = 4)] #[doc = "A proxy was removed."] ProxyRemoved { - delegator: ::subxt::utils::AccountId32, - delegatee: ::subxt::utils::AccountId32, + delegator: ::subxt::ext::subxt_core::utils::AccountId32, + delegatee: ::subxt::ext::subxt_core::utils::AccountId32, proxy_type: runtime_types::vara_runtime::ProxyType, delay: ::core::primitive::u32, }, @@ -4645,22 +4844,34 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::add_member`]."] add_member { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::promote_member`]."] promote_member { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 2)] #[doc = "See [`Pallet::demote_member`]."] demote_member { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 3)] #[doc = "See [`Pallet::remove_member`]."] remove_member { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, min_rank: ::core::primitive::u16, }, #[codec(index = 4)] @@ -4712,24 +4923,26 @@ pub mod runtime_types { pub enum Event { #[codec(index = 0)] #[doc = "A member `who` has been added."] - MemberAdded { who: ::subxt::utils::AccountId32 }, + MemberAdded { + who: ::subxt::ext::subxt_core::utils::AccountId32, + }, #[codec(index = 1)] #[doc = "The member `who`se rank has been changed to the given `rank`."] RankChanged { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, rank: ::core::primitive::u16, }, #[codec(index = 2)] #[doc = "The member `who` of given `rank` has been removed from the collective."] MemberRemoved { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, rank: ::core::primitive::u16, }, #[codec(index = 3)] #[doc = "The member `who` has voted for the `poll` with the given `vote` leading to an updated"] #[doc = "`tally`."] Voted { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, poll: ::core::primitive::u32, vote: runtime_types::pallet_ranked_collective::VoteRecord, tally: runtime_types::pallet_ranked_collective::Tally, @@ -4737,7 +4950,7 @@ pub mod runtime_types { } } #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -4770,53 +4983,9 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::submit`]."] submit { - proposal_origin: - ::std::boxed::Box, - proposal: runtime_types::frame_support::traits::preimages::Bounded< - runtime_types::vara_runtime::RuntimeCall, - runtime_types::sp_runtime::traits::BlakeTwo256, + proposal_origin: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::OriginCaller, >, - enactment_moment: - runtime_types::frame_support::traits::schedule::DispatchTime< - ::core::primitive::u32, - >, - }, - #[codec(index = 1)] - #[doc = "See [`Pallet::place_decision_deposit`]."] - place_decision_deposit { index: ::core::primitive::u32 }, - #[codec(index = 2)] - #[doc = "See [`Pallet::refund_decision_deposit`]."] - refund_decision_deposit { index: ::core::primitive::u32 }, - #[codec(index = 3)] - #[doc = "See [`Pallet::cancel`]."] - cancel { index: ::core::primitive::u32 }, - #[codec(index = 4)] - #[doc = "See [`Pallet::kill`]."] - kill { index: ::core::primitive::u32 }, - #[codec(index = 5)] - #[doc = "See [`Pallet::nudge_referendum`]."] - nudge_referendum { index: ::core::primitive::u32 }, - #[codec(index = 6)] - #[doc = "See [`Pallet::one_fewer_deciding`]."] - one_fewer_deciding { track: ::core::primitive::u16 }, - #[codec(index = 7)] - #[doc = "See [`Pallet::refund_submission_deposit`]."] - refund_submission_deposit { index: ::core::primitive::u32 }, - #[codec(index = 8)] - #[doc = "See [`Pallet::set_metadata`]."] - set_metadata { - index: ::core::primitive::u32, - maybe_hash: ::core::option::Option<::subxt::utils::H256>, - }, - } - #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] - #[doc = "Contains a variant per dispatchable extrinsic that this pallet has."] - pub enum Call2 { - #[codec(index = 0)] - #[doc = "See [`Pallet::submit`]."] - submit { - proposal_origin: - ::std::boxed::Box, proposal: runtime_types::frame_support::traits::preimages::Bounded< runtime_types::vara_runtime::RuntimeCall, runtime_types::sp_runtime::traits::BlakeTwo256, @@ -4851,7 +5020,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::set_metadata`]."] set_metadata { index: ::core::primitive::u32, - maybe_hash: ::core::option::Option<::subxt::utils::H256>, + maybe_hash: ::core::option::Option<::subxt::ext::subxt_core::utils::H256>, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -4898,51 +5067,8 @@ pub mod runtime_types { PreimageNotExist, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] - #[doc = "The `Error` enum of this pallet."] - pub enum Error2 { - #[codec(index = 0)] - #[doc = "Referendum is not ongoing."] - NotOngoing, - #[codec(index = 1)] - #[doc = "Referendum's decision deposit is already paid."] - HasDeposit, - #[codec(index = 2)] - #[doc = "The track identifier given was invalid."] - BadTrack, - #[codec(index = 3)] - #[doc = "There are already a full complement of referenda in progress for this track."] - Full, - #[codec(index = 4)] - #[doc = "The queue of the track is empty."] - QueueEmpty, - #[codec(index = 5)] - #[doc = "The referendum index provided is invalid in this context."] - BadReferendum, - #[codec(index = 6)] - #[doc = "There was nothing to do in the advancement."] - NothingToDo, - #[codec(index = 7)] - #[doc = "No track exists for the proposal origin."] - NoTrack, - #[codec(index = 8)] - #[doc = "Any deposit cannot be refunded until after the decision is over."] - Unfinished, - #[codec(index = 9)] - #[doc = "The deposit refunder is not the depositor."] - NoPermission, - #[codec(index = 10)] - #[doc = "The deposit cannot be refunded since none was made."] - NoDeposit, - #[codec(index = 11)] - #[doc = "The referendum status is invalid for this operation."] - BadStatus, - #[codec(index = 12)] - #[doc = "The preimage does not exist."] - PreimageNotExist, - } - #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] #[doc = "The `Event` enum of this pallet"] - pub enum Event { + pub enum Event1 { #[codec(index = 0)] #[doc = "A referendum has been submitted."] Submitted { @@ -4957,20 +5083,20 @@ pub mod runtime_types { #[doc = "The decision deposit has been placed."] DecisionDepositPlaced { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "The decision deposit has been refunded."] DecisionDepositRefunded { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "A deposit has been slashed."] DepositSlashed { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 4)] @@ -5037,20 +5163,20 @@ pub mod runtime_types { #[doc = "The submission deposit has been refunded."] SubmissionDepositRefunded { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 14)] #[doc = "Metadata for a referendum has been set."] MetadataSet { index: ::core::primitive::u32, - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 15)] #[doc = "Metadata for a referendum has been cleared."] MetadataCleared { index: ::core::primitive::u32, - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -5070,20 +5196,20 @@ pub mod runtime_types { #[doc = "The decision deposit has been placed."] DecisionDepositPlaced { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "The decision deposit has been refunded."] DecisionDepositRefunded { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "A deposit has been slashed."] DepositSlashed { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 4)] @@ -5138,20 +5264,20 @@ pub mod runtime_types { #[doc = "The submission deposit has been refunded."] SubmissionDepositRefunded { index: ::core::primitive::u32, - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 14)] #[doc = "Metadata for a referendum has been set."] MetadataSet { index: ::core::primitive::u32, - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, #[codec(index = 15)] #[doc = "Metadata for a referendum has been cleared."] MetadataCleared { index: ::core::primitive::u32, - hash: ::subxt::utils::H256, + hash: ::subxt::ext::subxt_core::utils::H256, }, } } @@ -5267,7 +5393,7 @@ pub mod runtime_types { } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct TrackInfo<_0, _1> { - pub name: ::std::string::String, + pub name: ::subxt::ext::subxt_core::alloc::string::String, pub max_deciding: ::core::primitive::u32, pub decision_deposit: _0, pub prepare_period: _1, @@ -5295,7 +5421,9 @@ pub mod runtime_types { ::core::primitive::u32, )>, priority: ::core::primitive::u8, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::cancel`]."] @@ -5313,7 +5441,9 @@ pub mod runtime_types { ::core::primitive::u32, )>, priority: ::core::primitive::u8, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 3)] #[doc = "See [`Pallet::cancel_named`]."] @@ -5329,7 +5459,9 @@ pub mod runtime_types { ::core::primitive::u32, )>, priority: ::core::primitive::u8, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 5)] #[doc = "See [`Pallet::schedule_named_after`]."] @@ -5341,7 +5473,9 @@ pub mod runtime_types { ::core::primitive::u32, )>, priority: ::core::primitive::u8, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -5414,7 +5548,7 @@ pub mod runtime_types { pub maybe_periodic: ::core::option::Option<(_2, _2)>, pub origin: _3, #[codec(skip)] - pub __subxt_unused_type_params: ::core::marker::PhantomData<_4>, + pub __ignore: ::core::marker::PhantomData<_4>, } } pub mod pallet_session { @@ -5428,7 +5562,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::set_keys`]."] set_keys { keys: runtime_types::vara_runtime::SessionKeys, - proof: ::std::vec::Vec<::core::primitive::u8>, + proof: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, }, #[codec(index = 1)] #[doc = "See [`Pallet::purge_keys`]."] @@ -5482,7 +5616,7 @@ pub mod runtime_types { #[codec(compact)] value: ::core::primitive::u128, payee: runtime_types::pallet_staking::RewardDestination< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, }, #[codec(index = 1)] @@ -5510,8 +5644,11 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::nominate`]."] nominate { - targets: ::std::vec::Vec< - ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + targets: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, >, }, #[codec(index = 6)] @@ -5521,7 +5658,7 @@ pub mod runtime_types { #[doc = "See [`Pallet::set_payee`]."] set_payee { payee: runtime_types::pallet_staking::RewardDestination< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, }, #[codec(index = 8)] @@ -5553,12 +5690,14 @@ pub mod runtime_types { #[codec(index = 14)] #[doc = "See [`Pallet::set_invulnerables`]."] set_invulnerables { - invulnerables: ::std::vec::Vec<::subxt::utils::AccountId32>, + invulnerables: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::AccountId32, + >, }, #[codec(index = 15)] #[doc = "See [`Pallet::force_unstake`]."] force_unstake { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, num_slashing_spans: ::core::primitive::u32, }, #[codec(index = 16)] @@ -5568,12 +5707,13 @@ pub mod runtime_types { #[doc = "See [`Pallet::cancel_deferred_slash`]."] cancel_deferred_slash { era: ::core::primitive::u32, - slash_indices: ::std::vec::Vec<::core::primitive::u32>, + slash_indices: + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u32>, }, #[codec(index = 18)] #[doc = "See [`Pallet::payout_stakers`]."] payout_stakers { - validator_stash: ::subxt::utils::AccountId32, + validator_stash: ::subxt::ext::subxt_core::utils::AccountId32, era: ::core::primitive::u32, }, #[codec(index = 19)] @@ -5585,14 +5725,17 @@ pub mod runtime_types { #[codec(index = 20)] #[doc = "See [`Pallet::reap_stash`]."] reap_stash { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, num_slashing_spans: ::core::primitive::u32, }, #[codec(index = 21)] #[doc = "See [`Pallet::kick`]."] kick { - who: ::std::vec::Vec< - ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + who: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, >, }, #[codec(index = 22)] @@ -5625,12 +5768,12 @@ pub mod runtime_types { #[codec(index = 23)] #[doc = "See [`Pallet::chill_other`]."] chill_other { - controller: ::subxt::utils::AccountId32, + controller: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 24)] #[doc = "See [`Pallet::force_apply_min_commission`]."] force_apply_min_commission { - validator_stash: ::subxt::utils::AccountId32, + validator_stash: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 25)] #[doc = "See [`Pallet::set_min_commission`]."] @@ -5640,7 +5783,7 @@ pub mod runtime_types { #[codec(index = 26)] #[doc = "See [`Pallet::payout_stakers_by_page`]."] payout_stakers_by_page { - validator_stash: ::subxt::utils::AccountId32, + validator_stash: ::subxt::ext::subxt_core::utils::AccountId32, era: ::core::primitive::u32, page: ::core::primitive::u32, }, @@ -5760,23 +5903,23 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "The nominator has been rewarded by this amount to this destination."] Rewarded { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, dest: runtime_types::pallet_staking::RewardDestination< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, amount: ::core::primitive::u128, }, #[codec(index = 2)] #[doc = "A staker (validator or nominator) has been slashed by the given amount."] Slashed { - staker: ::subxt::utils::AccountId32, + staker: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 3)] #[doc = "A slash for the given validator, for the given percentage of their stake, at the given"] #[doc = "era as been reported."] SlashReported { - validator: ::subxt::utils::AccountId32, + validator: ::subxt::ext::subxt_core::utils::AccountId32, fraction: runtime_types::sp_arithmetic::per_things::Perbill, slash_era: ::core::primitive::u32, }, @@ -5795,44 +5938,46 @@ pub mod runtime_types { #[doc = "NOTE: This event is only emitted when funds are bonded via a dispatchable. Notably,"] #[doc = "it will not be emitted for staking rewards when they are added to stake."] Bonded { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 7)] #[doc = "An account has unbonded this amount."] Unbonded { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 8)] #[doc = "An account has called `withdraw_unbonded` and removed unbonding chunks worth `Balance`"] #[doc = "from the unlocking queue."] Withdrawn { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, amount: ::core::primitive::u128, }, #[codec(index = 9)] #[doc = "A nominator has been kicked from a validator."] Kicked { - nominator: ::subxt::utils::AccountId32, - stash: ::subxt::utils::AccountId32, + nominator: ::subxt::ext::subxt_core::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 10)] #[doc = "The election failed. No new era is planned."] StakingElectionFailed, #[codec(index = 11)] #[doc = "An account has stopped participating as either a validator or nominator."] - Chilled { stash: ::subxt::utils::AccountId32 }, + Chilled { + stash: ::subxt::ext::subxt_core::utils::AccountId32, + }, #[codec(index = 12)] #[doc = "The stakers' rewards are getting paid."] PayoutStarted { era_index: ::core::primitive::u32, - validator_stash: ::subxt::utils::AccountId32, + validator_stash: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 13)] #[doc = "A validator has set their preferences."] ValidatorPrefsSet { - stash: ::subxt::utils::AccountId32, + stash: ::subxt::ext::subxt_core::utils::AccountId32, prefs: runtime_types::pallet_staking::ValidatorPrefs, }, #[codec(index = 14)] @@ -5856,7 +6001,7 @@ pub mod runtime_types { pub span_index: ::core::primitive::u32, pub last_start: ::core::primitive::u32, pub last_nonzero_slash: ::core::primitive::u32, - pub prior: ::std::vec::Vec<::core::primitive::u32>, + pub prior: ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u32>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct SpanRecord<_0> { @@ -5872,7 +6017,8 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct EraRewardPoints<_0> { pub total: ::core::primitive::u32, - pub individual: ::subxt::utils::KeyedVec<_0, ::core::primitive::u32>, + pub individual: + ::subxt::ext::subxt_core::utils::KeyedVec<_0, ::core::primitive::u32>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum Forcing { @@ -5888,7 +6034,7 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct Nominations { pub targets: runtime_types::bounded_collections::bounded_vec::BoundedVec< - ::subxt::utils::AccountId32, + ::subxt::ext::subxt_core::utils::AccountId32, >, pub submitted_in: ::core::primitive::u32, pub suppressed: ::core::primitive::bool, @@ -5908,7 +6054,7 @@ pub mod runtime_types { } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct StakingLedger { - pub stash: ::subxt::utils::AccountId32, + pub stash: ::subxt::ext::subxt_core::utils::AccountId32, #[codec(compact)] pub total: ::core::primitive::u128, #[codec(compact)] @@ -5925,8 +6071,8 @@ pub mod runtime_types { pub struct UnappliedSlash<_0, _1> { pub validator: _0, pub own: _1, - pub others: ::std::vec::Vec<(_0, _1)>, - pub reporters: ::std::vec::Vec<_0>, + pub others: ::subxt::ext::subxt_core::alloc::vec::Vec<(_0, _1)>, + pub reporters: ::subxt::ext::subxt_core::alloc::vec::Vec<_0>, pub payout: _1, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -5953,24 +6099,36 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::sudo`]."] sudo { - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::sudo_unchecked_weight`]."] sudo_unchecked_weight { - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, weight: runtime_types::sp_weights::weight_v2::Weight, }, #[codec(index = 2)] #[doc = "See [`Pallet::set_key`]."] set_key { - new: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + new: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 3)] #[doc = "See [`Pallet::sudo_as`]."] sudo_as { - who: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - call: ::std::boxed::Box, + who: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 4)] #[doc = "See [`Pallet::remove_key`]."] @@ -5995,8 +6153,8 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "The sudo key has been updated."] KeyChanged { - old: ::core::option::Option<::subxt::utils::AccountId32>, - new: ::subxt::utils::AccountId32, + old: ::core::option::Option<::subxt::ext::subxt_core::utils::AccountId32>, + new: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 2)] #[doc = "The key was permanently removed."] @@ -6037,7 +6195,7 @@ pub mod runtime_types { #[doc = "A transaction fee `actual_fee`, of which `tip` was added to the minimum inclusion fee,"] #[doc = "has been paid by `who`."] TransactionFeePaid { - who: ::subxt::utils::AccountId32, + who: ::subxt::ext::subxt_core::utils::AccountId32, actual_fee: ::core::primitive::u128, tip: ::core::primitive::u128, }, @@ -6065,7 +6223,10 @@ pub mod runtime_types { propose_spend { #[codec(compact)] value: ::core::primitive::u128, - beneficiary: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + beneficiary: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::reject_proposal`]."] @@ -6084,7 +6245,10 @@ pub mod runtime_types { spend_local { #[codec(compact)] amount: ::core::primitive::u128, - beneficiary: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + beneficiary: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 4)] #[doc = "See [`Pallet::remove_approval`]."] @@ -6095,10 +6259,12 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::spend`]."] spend { - asset_kind: ::std::boxed::Box<()>, + asset_kind: ::subxt::ext::subxt_core::alloc::boxed::Box<()>, #[codec(compact)] amount: ::core::primitive::u128, - beneficiary: ::std::boxed::Box<::subxt::utils::AccountId32>, + beneficiary: ::subxt::ext::subxt_core::alloc::boxed::Box< + ::subxt::ext::subxt_core::utils::AccountId32, + >, valid_from: ::core::option::Option<::core::primitive::u32>, }, #[codec(index = 6)] @@ -6170,7 +6336,7 @@ pub mod runtime_types { Awarded { proposal_index: ::core::primitive::u32, award: ::core::primitive::u128, - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 3)] #[doc = "A proposal was rejected; funds were slashed."] @@ -6196,7 +6362,7 @@ pub mod runtime_types { SpendApproved { proposal_index: ::core::primitive::u32, amount: ::core::primitive::u128, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, }, #[codec(index = 8)] #[doc = "The inactive funds of the pallet have been updated."] @@ -6210,7 +6376,7 @@ pub mod runtime_types { index: ::core::primitive::u32, asset_kind: (), amount: ::core::primitive::u128, - beneficiary: ::subxt::utils::AccountId32, + beneficiary: ::subxt::ext::subxt_core::utils::AccountId32, valid_from: ::core::primitive::u32, expire_at: ::core::primitive::u32, }, @@ -6260,7 +6426,7 @@ pub mod runtime_types { pub expire_at: _3, pub status: runtime_types::pallet_treasury::PaymentState<_0>, #[codec(skip)] - pub __subxt_unused_type_params: ::core::marker::PhantomData<_4>, + pub __ignore: ::core::marker::PhantomData<_4>, } } pub mod pallet_utility { @@ -6273,34 +6439,48 @@ pub mod runtime_types { #[codec(index = 0)] #[doc = "See [`Pallet::batch`]."] batch { - calls: ::std::vec::Vec, + calls: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 1)] #[doc = "See [`Pallet::as_derivative`]."] as_derivative { index: ::core::primitive::u16, - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 2)] #[doc = "See [`Pallet::batch_all`]."] batch_all { - calls: ::std::vec::Vec, + calls: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 3)] #[doc = "See [`Pallet::dispatch_as`]."] dispatch_as { - as_origin: ::std::boxed::Box, - call: ::std::boxed::Box, + as_origin: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::OriginCaller, + >, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 4)] #[doc = "See [`Pallet::force_batch`]."] force_batch { - calls: ::std::vec::Vec, + calls: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::vara_runtime::RuntimeCall, + >, }, #[codec(index = 5)] #[doc = "See [`Pallet::with_weight`]."] with_weight { - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, weight: runtime_types::sp_weights::weight_v2::Weight, }, } @@ -6357,12 +6537,18 @@ pub mod runtime_types { #[codec(index = 1)] #[doc = "See [`Pallet::vest_other`]."] vest_other { - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, }, #[codec(index = 2)] #[doc = "See [`Pallet::vested_transfer`]."] vested_transfer { - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, schedule: runtime_types::pallet_vesting::vesting_info::VestingInfo< ::core::primitive::u128, ::core::primitive::u32, @@ -6371,8 +6557,14 @@ pub mod runtime_types { #[codec(index = 3)] #[doc = "See [`Pallet::force_vested_transfer`]."] force_vested_transfer { - source: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + source: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, schedule: runtime_types::pallet_vesting::vesting_info::VestingInfo< ::core::primitive::u128, ::core::primitive::u32, @@ -6387,7 +6579,10 @@ pub mod runtime_types { #[codec(index = 5)] #[doc = "See [`Pallet::force_remove_vesting_schedule`]."] force_remove_vesting_schedule { - target: ::subxt::utils::MultiAddress<::subxt::utils::AccountId32, ()>, + target: ::subxt::ext::subxt_core::utils::MultiAddress< + ::subxt::ext::subxt_core::utils::AccountId32, + (), + >, schedule_index: ::core::primitive::u32, }, } @@ -6418,13 +6613,13 @@ pub mod runtime_types { #[doc = "The amount vested has been updated. This could indicate a change in funds available."] #[doc = "The balance given is the amount which is left unvested (and thus locked)."] VestingUpdated { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, unvested: ::core::primitive::u128, }, #[codec(index = 1)] #[doc = "An \\[account\\] has become fully vested."] VestingCompleted { - account: ::subxt::utils::AccountId32, + account: ::subxt::ext::subxt_core::utils::AccountId32, }, } } @@ -6454,21 +6649,27 @@ pub mod runtime_types { pub enum Call { #[codec(index = 0)] #[doc = "See [`Pallet::whitelist_call`]."] - whitelist_call { call_hash: ::subxt::utils::H256 }, + whitelist_call { + call_hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 1)] #[doc = "See [`Pallet::remove_whitelisted_call`]."] - remove_whitelisted_call { call_hash: ::subxt::utils::H256 }, + remove_whitelisted_call { + call_hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 2)] #[doc = "See [`Pallet::dispatch_whitelisted_call`]."] dispatch_whitelisted_call { - call_hash: ::subxt::utils::H256, + call_hash: ::subxt::ext::subxt_core::utils::H256, call_encoded_len: ::core::primitive::u32, call_weight_witness: runtime_types::sp_weights::weight_v2::Weight, }, #[codec(index = 3)] #[doc = "See [`Pallet::dispatch_whitelisted_call_with_preimage`]."] dispatch_whitelisted_call_with_preimage { - call: ::std::boxed::Box, + call: ::subxt::ext::subxt_core::alloc::boxed::Box< + runtime_types::vara_runtime::RuntimeCall, + >, }, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -6494,12 +6695,16 @@ pub mod runtime_types { #[doc = "The `Event` enum of this pallet"] pub enum Event { #[codec(index = 0)] - CallWhitelisted { call_hash: ::subxt::utils::H256 }, + CallWhitelisted { + call_hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 1)] - WhitelistedCallRemoved { call_hash: ::subxt::utils::H256 }, + WhitelistedCallRemoved { + call_hash: ::subxt::ext::subxt_core::utils::H256, + }, #[codec(index = 2)] WhitelistedCallDispatched { - call_hash: ::subxt::utils::H256, + call_hash: ::subxt::ext::subxt_core::utils::H256, result: ::core::result::Result< runtime_types::frame_support::dispatch::PostDispatchInfo, runtime_types::sp_runtime::DispatchErrorWithPostInfo< @@ -6522,7 +6727,7 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct FixedI64(pub ::core::primitive::i64); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6533,7 +6738,7 @@ pub mod runtime_types { pub mod per_things { use super::runtime_types; #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6541,7 +6746,7 @@ pub mod runtime_types { )] pub struct PerU16(pub ::core::primitive::u16); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6549,7 +6754,7 @@ pub mod runtime_types { )] pub struct Perbill(pub ::core::primitive::u32); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6557,7 +6762,7 @@ pub mod runtime_types { )] pub struct Percent(pub ::core::primitive::u8); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6565,7 +6770,7 @@ pub mod runtime_types { )] pub struct Permill(pub ::core::primitive::u32); #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6696,7 +6901,7 @@ pub mod runtime_types { pub second_header: _0, } #[derive( - ::subxt::ext::codec::CompactAs, + ::subxt::ext ::subxt_core::ext::codec::CompactAs, Debug, crate::gp::Decode, crate::gp::DecodeAsType, @@ -6754,7 +6959,8 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct Support<_0> { pub total: ::core::primitive::u128, - pub voters: ::std::vec::Vec<(_0, ::core::primitive::u128)>, + pub voters: + ::subxt::ext::subxt_core::alloc::vec::Vec<(_0, ::core::primitive::u128)>, } } pub mod sp_runtime { @@ -6767,8 +6973,9 @@ pub mod runtime_types { Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode, )] pub struct Digest { - pub logs: - ::std::vec::Vec, + pub logs: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::sp_runtime::generic::digest::DigestItem, + >, } #[derive( Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode, @@ -6777,20 +6984,20 @@ pub mod runtime_types { #[codec(index = 6)] PreRuntime( [::core::primitive::u8; 4usize], - ::std::vec::Vec<::core::primitive::u8>, + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, ), #[codec(index = 4)] Consensus( [::core::primitive::u8; 4usize], - ::std::vec::Vec<::core::primitive::u8>, + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, ), #[codec(index = 5)] Seal( [::core::primitive::u8; 4usize], - ::std::vec::Vec<::core::primitive::u8>, + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, ), #[codec(index = 0)] - Other(::std::vec::Vec<::core::primitive::u8>), + Other(::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>), #[codec(index = 8)] RuntimeEnvironmentUpdated, } @@ -7321,11 +7528,11 @@ pub mod runtime_types { Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode, )] pub struct Header<_0> { - pub parent_hash: ::subxt::utils::H256, + pub parent_hash: ::subxt::ext::subxt_core::utils::H256, #[codec(compact)] pub number: _0, - pub state_root: ::subxt::utils::H256, - pub extrinsics_root: ::subxt::utils::H256, + pub state_root: ::subxt::ext::subxt_core::utils::H256, + pub extrinsics_root: ::subxt::ext::subxt_core::utils::H256, pub digest: runtime_types::sp_runtime::generic::digest::Digest, } } @@ -7421,7 +7628,9 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct MembershipProof { pub session: ::core::primitive::u32, - pub trie_nodes: ::std::vec::Vec<::std::vec::Vec<::core::primitive::u8>>, + pub trie_nodes: ::subxt::ext::subxt_core::alloc::vec::Vec< + ::subxt::ext::subxt_core::alloc::vec::Vec<::core::primitive::u8>, + >, pub validator_count: ::core::primitive::u32, } } @@ -7432,7 +7641,7 @@ pub mod runtime_types { #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct OffenceDetails<_0, _1> { pub offender: _1, - pub reporters: ::std::vec::Vec<_0>, + pub reporters: ::subxt::ext::subxt_core::alloc::vec::Vec<_0>, } } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] @@ -7441,13 +7650,17 @@ pub mod runtime_types { pub total: _1, #[codec(compact)] pub own: _1, - pub others: ::std::vec::Vec>, + pub others: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::sp_staking::IndividualExposure<_0, _1>, + >, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct ExposurePage<_0, _1> { #[codec(compact)] pub page_total: _1, - pub others: ::std::vec::Vec>, + pub others: ::subxt::ext::subxt_core::alloc::vec::Vec< + runtime_types::sp_staking::IndividualExposure<_0, _1>, + >, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct IndividualExposure<_0, _1> { @@ -7469,13 +7682,15 @@ pub mod runtime_types { use super::runtime_types; #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct RuntimeVersion { - pub spec_name: ::std::string::String, - pub impl_name: ::std::string::String, + pub spec_name: ::subxt::ext::subxt_core::alloc::string::String, + pub impl_name: ::subxt::ext::subxt_core::alloc::string::String, pub authoring_version: ::core::primitive::u32, pub spec_version: ::core::primitive::u32, pub impl_version: ::core::primitive::u32, - pub apis: - ::std::vec::Vec<([::core::primitive::u8; 8usize], ::core::primitive::u32)>, + pub apis: ::subxt::ext::subxt_core::alloc::vec::Vec<( + [::core::primitive::u8; 8usize], + ::core::primitive::u32, + )>, pub transaction_version: ::core::primitive::u32, pub state_version: ::core::primitive::u8, } @@ -7568,166 +7783,168 @@ pub mod runtime_types { pub struct CustomCheckNonce(#[codec(compact)] pub ::core::primitive::u32); #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub struct NposSolution16 { - pub votes1: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, - ::subxt::ext::codec::Compact<::core::primitive::u16>, + pub votes1: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes2: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes2: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, ( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ), - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes3: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes3: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 2usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes4: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes4: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 3usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes5: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes5: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 4usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes6: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes6: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 5usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes7: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes7: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 6usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes8: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes8: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 7usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes9: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes9: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 8usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes10: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes10: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 9usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes11: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes11: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 10usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes12: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes12: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 11usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes13: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes13: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 12usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes14: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes14: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 13usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes15: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes15: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 14usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, - pub votes16: ::std::vec::Vec<( - ::subxt::ext::codec::Compact<::core::primitive::u32>, + pub votes16: ::subxt::ext::subxt_core::alloc::vec::Vec<( + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u32>, [( - ::subxt::ext::codec::Compact<::core::primitive::u16>, - ::subxt::ext::codec::Compact< + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact< runtime_types::sp_arithmetic::per_things::PerU16, >, ); 15usize], - ::subxt::ext::codec::Compact<::core::primitive::u16>, + ::subxt::ext::subxt_core::ext::codec::Compact<::core::primitive::u16>, )>, } #[derive(Debug, crate::gp::Decode, crate::gp::DecodeAsType, crate::gp::Encode)] pub enum OriginCaller { #[codec(index = 0)] system( - runtime_types::frame_support::dispatch::RawOrigin<::subxt::utils::AccountId32>, + runtime_types::frame_support::dispatch::RawOrigin< + ::subxt::ext::subxt_core::utils::AccountId32, + >, ), #[codec(index = 20)] Origins( @@ -7786,7 +8003,7 @@ pub mod runtime_types { #[codec(index = 18)] FellowshipCollective(runtime_types::pallet_ranked_collective::pallet::Call), #[codec(index = 19)] - FellowshipReferenda(runtime_types::pallet_referenda::pallet::Call2), + FellowshipReferenda(runtime_types::pallet_referenda::pallet::Call), #[codec(index = 21)] Whitelist(runtime_types::pallet_whitelist::pallet::Call), #[codec(index = 22)] @@ -7853,7 +8070,7 @@ pub mod runtime_types { #[codec(index = 18)] FellowshipCollective(runtime_types::pallet_ranked_collective::pallet::Error), #[codec(index = 19)] - FellowshipReferenda(runtime_types::pallet_referenda::pallet::Error2), + FellowshipReferenda(runtime_types::pallet_referenda::pallet::Error), #[codec(index = 21)] Whitelist(runtime_types::pallet_whitelist::pallet::Error), #[codec(index = 22)] @@ -7926,7 +8143,7 @@ pub mod runtime_types { #[codec(index = 16)] ConvictionVoting(runtime_types::pallet_conviction_voting::pallet::Event), #[codec(index = 17)] - Referenda(runtime_types::pallet_referenda::pallet::Event), + Referenda(runtime_types::pallet_referenda::pallet::Event1), #[codec(index = 18)] FellowshipCollective(runtime_types::pallet_ranked_collective::pallet::Event), #[codec(index = 19)] @@ -9699,7 +9916,7 @@ pub mod exports { pub use super::runtime_types::pallet_conviction_voting::pallet::Event; } pub mod referenda { - pub use super::runtime_types::pallet_referenda::pallet::Event; + pub use super::runtime_types::pallet_referenda::pallet::Event1 as Event; } pub mod fellowship_collective { pub use super::runtime_types::pallet_ranked_collective::pallet::Event; diff --git a/gsdk/src/result.rs b/gsdk/src/result.rs index ef18e85d107..bf9955a15e0 100644 --- a/gsdk/src/result.rs +++ b/gsdk/src/result.rs @@ -81,10 +81,14 @@ pub enum Error { #[error(transparent)] Subxt(#[from] subxt::Error), #[error(transparent)] + SubxtCore(#[from] subxt::ext::subxt_core::Error), + #[error(transparent)] SubxtPublic(#[from] sp_core::crypto::PublicError), #[error(transparent)] SubxtMetadata(#[from] subxt::error::MetadataError), #[error(transparent)] + ScaleValueEncode(#[from] scale_value::scale::EncodeError), + #[error(transparent)] Tx(#[from] TxError), #[error(transparent)] SubxtRpc(#[from] jsonrpsee::core::Error), diff --git a/gsdk/src/signer/calls.rs b/gsdk/src/signer/calls.rs index d889828a263..2400b66e6ea 100644 --- a/gsdk/src/signer/calls.rs +++ b/gsdk/src/signer/calls.rs @@ -19,7 +19,6 @@ //! gear api calls use super::Inner; use crate::{ - config::GearConfig, metadata::{ calls::{BalancesCall, GearCall, GearVoucherCall, SudoCall, UtilityCall}, runtime_types::{ @@ -29,14 +28,13 @@ use crate::{ vara_runtime::RuntimeCall, Convert, }, - Error, Result, TxInBlock, + signer::utils::EventsResult, + Result, TxInBlock, }; use gear_core::ids::*; use sp_runtime::AccountId32; use std::sync::Arc; -use subxt::{blocks::ExtrinsicEvents, dynamic::Value}; - -type EventsResult = Result, Error>; +use subxt::dynamic::Value; /// Implementation of calls to programs/other users for [`Signer`]. #[derive(Clone)] diff --git a/gsdk/src/signer/storage.rs b/gsdk/src/signer/storage.rs index 4be6a5c462b..3811d7cc224 100644 --- a/gsdk/src/signer/storage.rs +++ b/gsdk/src/signer/storage.rs @@ -18,7 +18,6 @@ //! Storage interfaces use crate::{ - config::GearConfig, metadata::{ runtime_types::{ frame_system::pallet::Call, @@ -31,9 +30,9 @@ use crate::{ storage::{GearBankStorage, GearGasStorage, GearProgramStorage}, vara_runtime::RuntimeCall, }, - signer::Inner, + signer::{utils::EventsResult, Inner}, utils::storage_address_bytes, - Api, BlockNumber, Error, GearGasNode, GearGasNodeId, GearPages, Result, + Api, BlockNumber, Error, GearGasNode, GearGasNodeId, GearPages, }; use gear_core::{ ids::*, @@ -44,12 +43,12 @@ use parity_scale_codec::Encode; use sp_runtime::AccountId32; use std::sync::Arc; use subxt::{ - blocks::ExtrinsicEvents, dynamic::Value, metadata::EncodeWithMetadata, storage::StorageAddress, + dynamic::Value, + metadata::EncodeWithMetadata, + storage::{Address, StaticStorageKey}, utils::Static, }; -type EventsResult = Result, Error>; - /// Implementation of storage calls for [`Signer`]. #[derive(Clone)] pub struct SignerStorage(pub(crate) Arc); @@ -57,7 +56,7 @@ pub struct SignerStorage(pub(crate) Arc); // pallet-system impl SignerStorage { /// Sets storage values via calling sudo pallet - pub async fn set_storage(&self, items: &[(impl StorageAddress, impl Encode)]) -> EventsResult { + pub async fn set_storage(&self, items: &[(impl Address, impl Encode)]) -> EventsResult { let metadata = self.0.api().metadata(); let mut items_to_set = Vec::with_capacity(items.len()); for item in items { @@ -96,7 +95,7 @@ impl SignerStorage { let gas_nodes = gas_nodes.as_ref(); let mut gas_nodes_to_set = Vec::with_capacity(gas_nodes.len()); for gas_node in gas_nodes { - let addr = Api::storage(GearGasStorage::GasNodes, vec![Static(gas_node.0)]); + let addr = Api::storage(GearGasStorage::GasNodes, StaticStorageKey::new(&gas_node.0)); gas_nodes_to_set.push((addr, &gas_node.1)); } self.set_storage(&gas_nodes_to_set).await diff --git a/gsdk/src/signer/utils.rs b/gsdk/src/signer/utils.rs index c4988410cfa..7eb0968ed0e 100644 --- a/gsdk/src/signer/utils.rs +++ b/gsdk/src/signer/utils.rs @@ -27,7 +27,7 @@ use crate::{ }, result::Result, signer::SignerRpc, - Error, TxInBlock, TxStatus, + TxInBlock, TxStatus, }; use anyhow::anyhow; use colored::Colorize; @@ -36,13 +36,14 @@ use sp_core::H256; use std::sync::Arc; use subxt::{ blocks::ExtrinsicEvents, + config::polkadot::PolkadotExtrinsicParamsBuilder, dynamic::Value, tx::{DynamicPayload, TxProgress}, Error as SubxtError, OnlineClient, }; type TxProgressT = TxProgress>; -type EventsResult = Result, Error>; +pub type EventsResult = Result<(H256, ExtrinsicEvents)>; impl Inner { /// Logging balance spent @@ -151,7 +152,7 @@ impl Inner { } } - Ok(events) + Ok((tx.block_hash(), events)) } /// Run transaction. @@ -228,7 +229,12 @@ impl Inner { if let Some(nonce) = self.nonce { self.api .tx() - .create_signed_with_nonce(tx, &self.signer, nonce, Default::default())? + .create_signed( + tx, + &self.signer, + PolkadotExtrinsicParamsBuilder::new().nonce(nonce).build(), + ) + .await? .submit_and_watch() .await } else { diff --git a/gsdk/src/storage.rs b/gsdk/src/storage.rs index 4c5ff19cde3..4096bdc8d0c 100644 --- a/gsdk/src/storage.rs +++ b/gsdk/src/storage.rs @@ -37,8 +37,7 @@ use crate::{ vara_runtime::RuntimeEvent, }, result::{Error, Result}, - utils::storage_address_bytes, - Api, BlockNumber, GearGasNode, GearGasNodeId, GearPages, + utils, Api, BlockNumber, GearGasNode, GearGasNodeId, GearPages, }; use anyhow::anyhow; use gear_core::ids::*; @@ -51,8 +50,8 @@ use subxt::{ dynamic::{DecodedValueThunk, Value}, ext::codec::{Decode, Encode}, metadata::types::StorageEntryType, - storage::address::{StorageAddress, Yes}, - utils::Static, + storage::{Address, DynamicAddress, StaticStorageKey}, + utils::Yes, }; impl Api { @@ -85,14 +84,13 @@ impl Api { /// /// ``` #[storage_fetch] - pub async fn fetch_storage_at<'a, Address, Value>( + pub async fn fetch_storage_at<'a, Addr, Value>( &self, - address: &'a Address, + address: &'a Addr, block_hash: Option, ) -> Result where - Address: - StorageAddress + 'a, + Addr: Address + 'a, Value: Decode, { let client = self.storage(); @@ -193,7 +191,7 @@ impl Api { let mut gas_nodes = Vec::with_capacity(gas_node_ids.len()); for gas_node_id in gas_node_ids { - let addr = Self::storage(GearGasStorage::GasNodes, vec![Static(gas_node_id)]); + let addr = Self::storage(GearGasStorage::GasNodes, StaticStorageKey::new(gas_node_id)); let gas_node = self.fetch_storage_at(&addr, block_hash).await?; gas_nodes.push((*gas_node_id, gas_node)); } @@ -339,9 +337,9 @@ impl Api { .iter(pages_storage_address) .await?; - while let Some(Ok((encoded_key, encoded_value))) = pages_stream.next().await { - let (_, page) = <([u8; 68], u32)>::decode(&mut encoded_key.as_slice())?; - let data = encoded_value.encoded().to_vec(); + while let Some(Ok(pair)) = pages_stream.next().await { + let (_, page) = <([u8; 68], u32)>::decode(&mut pair.key_bytes.as_ref())?; + let data = pair.value.encoded().to_vec(); pages.insert(page, data); } @@ -365,7 +363,7 @@ impl Api { }; for page in page_numbers { - let addr = Self::storage( + let addr: DynamicAddress> = Self::storage( GearProgramStorage::MemoryPages, vec![ Value::from_bytes(program_id), @@ -375,8 +373,7 @@ impl Api { ); let metadata = self.metadata(); - let lookup_bytes = storage_address_bytes(&addr, &metadata)?; - + let lookup_bytes = utils::storage_address_bytes(&addr, &metadata)?; let encoded_page = self .get_storage(block_hash) .await? @@ -448,10 +445,7 @@ impl Api { } /// Get storage entry type id using `metadata` and storage entry `address` -pub(crate) fn storage_type_id( - metadata: &subxt::Metadata, - address: &impl StorageAddress, -) -> Result { +pub(crate) fn storage_type_id(metadata: &subxt::Metadata, address: &impl Address) -> Result { let storage_type = metadata .pallet_by_name_err(address.pallet_name())? .storage() diff --git a/gsdk/src/subscription.rs b/gsdk/src/subscription.rs index ab4c75281fc..86b4bb92cbb 100644 --- a/gsdk/src/subscription.rs +++ b/gsdk/src/subscription.rs @@ -19,12 +19,14 @@ //! Subscription implementation. use crate::{config::GearConfig, metadata::Event}; +use anyhow::Result; use futures::{Stream, StreamExt}; -use std::{marker::Unpin, pin::Pin, result::Result as StdResult, task::Poll}; -use subxt::{backend::StreamOf, blocks::Block, events::Events as SubxtEvents, Error, OnlineClient}; +use sp_core::H256; +use std::{marker::Unpin, ops::Deref, pin::Pin, task::Poll}; +use subxt::{backend::StreamOfResults, blocks::Block, events::Events as SubxtEvents, OnlineClient}; type SubxtBlock = Block>; -type BlockSubscription = StreamOf>; +type BlockSubscription = StreamOfResults; /// Subscription of finalized blocks. pub struct Blocks(BlockSubscription); @@ -32,7 +34,7 @@ pub struct Blocks(BlockSubscription); impl Unpin for Blocks {} impl Stream for Blocks { - type Item = StdResult; + type Item = Result; fn poll_next( mut self: Pin<&mut Self>, @@ -40,18 +42,18 @@ impl Stream for Blocks { ) -> Poll> { let res = futures::ready!(self.0.poll_next_unpin(cx)); - Poll::Ready(res) + Poll::Ready(res.map(|inner| inner.map_err(Into::into))) } } impl Blocks { /// Wait for the next block from the subscription. - pub async fn next_events(&mut self) -> Option, Error>> { - if let Some(block) = StreamExt::next(self).await { - Some(block.ok()?.events().await) - } else { - None - } + pub async fn next_events(&mut self) -> Result> { + let Some(next) = StreamExt::next(self).await else { + return Ok(None); + }; + + Ok(Some(BlockEvents::new(next?).await?)) } } @@ -66,14 +68,12 @@ pub struct Events(Blocks); impl Events { /// Wait for the next events from the subscription. - pub async fn next(&mut self) -> Option, Error>> { - self.0.next_events().await.map(|r| { - r.and_then(|es| { - es.iter() - .map(|ev| ev.and_then(|e| e.as_root_event::())) - .collect::, Error>>() - }) - }) + pub async fn next(&mut self) -> Result> { + if let Some(es) = self.0.next_events().await? { + es.events() + } else { + Ok(Default::default()) + } } } @@ -82,3 +82,46 @@ impl From for Events { Self(sub.into()) } } + +/// Subxt events wrapper with block info +#[derive(Clone, Debug)] +pub struct BlockEvents { + /// Block hash of the provided events + block_hash: H256, + /// subxt events + events: SubxtEvents, +} + +impl BlockEvents { + /// Wrap subxt events with block info + pub async fn new(block: Block>) -> Result { + Ok(Self { + block_hash: block.hash(), + events: block.events().await?, + }) + } + + /// Get the block hash of the holding events + pub fn block_hash(&self) -> H256 { + self.block_hash + } + + /// Get gear events + pub fn events(&self) -> Result> { + self.events + .iter() + .map(|ev| { + ev.and_then(|e| e.as_root_event::()) + .map_err(Into::into) + }) + .collect::>>() + } +} + +impl Deref for BlockEvents { + type Target = SubxtEvents; + + fn deref(&self) -> &Self::Target { + &self.events + } +} diff --git a/gsdk/src/utils.rs b/gsdk/src/utils.rs index 71cef3bcb76..19315d5c3ea 100644 --- a/gsdk/src/utils.rs +++ b/gsdk/src/utils.rs @@ -29,9 +29,8 @@ use sp_core::H256; use subxt::{ dynamic::Value, error::{DispatchError as SubxtDispatchError, Error}, - metadata::{EncodeWithMetadata, Metadata}, - storage::{DynamicAddress, Storage, StorageAddress}, - OnlineClient, + storage::{Address, DynamicAddress, Storage, StorageKey}, + Metadata, OnlineClient, }; impl Api { @@ -73,33 +72,30 @@ impl Api { } /// Get the storage address from storage info. - pub fn storage( + pub fn storage( storage: T, - encodable: Vec, - ) -> DynamicAddress { - subxt::dynamic::storage(T::PALLET, storage.storage_name(), encodable) + keys: Keys, + ) -> DynamicAddress { + subxt::dynamic::storage(T::PALLET, storage.storage_name(), keys) } /// Get the storage root address from storage info. - pub fn storage_root(storage: T) -> DynamicAddress { - subxt::dynamic::storage(T::PALLET, storage.storage_name(), vec![]) + pub fn storage_root(storage: T) -> DynamicAddress> { + subxt::dynamic::storage(T::PALLET, storage.storage_name(), Default::default()) } } /// Return the root of a given [`StorageAddress`]: hash the pallet name and entry name /// and append those bytes to the output. -pub(crate) fn write_storage_address_root_bytes( - addr: &Address, - out: &mut Vec, -) { +pub(crate) fn write_storage_address_root_bytes(addr: &impl Address, out: &mut Vec) { out.extend(hashing::twox_128(addr.pallet_name().as_bytes())); out.extend(hashing::twox_128(addr.entry_name().as_bytes())); } /// Outputs the [`storage_address_root_bytes`] as well as any additional bytes that represent /// a lookup in a storage map at that location. -pub(crate) fn storage_address_bytes( - addr: &Address, +pub(crate) fn storage_address_bytes( + addr: &impl Address, metadata: &Metadata, ) -> Result, Error> { let mut bytes = Vec::new(); diff --git a/gsdk/tests/rpc.rs b/gsdk/tests/rpc.rs index b51cef00736..8ae224973ce 100644 --- a/gsdk/tests/rpc.rs +++ b/gsdk/tests/rpc.rs @@ -259,11 +259,11 @@ async fn test_runtime_wasm_blob_version() -> Result<()> { git_commit_hash ); - let block_hash_1 = finalized_blocks.next_events().await.unwrap()?.block_hash(); + let block_hash_1 = finalized_blocks.next_events().await?.unwrap().block_hash(); let wasm_blob_version_2 = api.runtime_wasm_blob_version(Some(block_hash_1)).await?; assert_eq!(wasm_blob_version_1, wasm_blob_version_2); - let block_hash_2 = finalized_blocks.next_events().await.unwrap()?.block_hash(); + let block_hash_2 = finalized_blocks.next_events().await?.unwrap().block_hash(); let wasm_blob_version_3 = api.runtime_wasm_blob_version(Some(block_hash_2)).await?; assert_ne!(block_hash_1, block_hash_2); assert_eq!(wasm_blob_version_2, wasm_blob_version_3); @@ -525,11 +525,13 @@ async fn query_program_counters( let mut count_memory_page = 0u64; let mut count_program = 0u64; let mut count_active_program = 0u64; - while let Some(Ok((key, value))) = iter.next().await { + while let Some(pair) = iter.next().await { + let pair = pair?; + let (key, value) = (pair.key_bytes, pair.value); let program = Program::::decode(&mut value.encoded())?; count_program += 1; - let program_id = ProgramId::decode(&mut key.as_slice())?; + let program_id = ProgramId::decode(&mut key.as_ref())?; if let Program::Active(_) = program { count_active_program += 1; diff --git a/utils/node-loader/src/batch_pool.rs b/utils/node-loader/src/batch_pool.rs index 9a718969752..ad23c5836da 100644 --- a/utils/node-loader/src/batch_pool.rs +++ b/utils/node-loader/src/batch_pool.rs @@ -28,7 +28,7 @@ mod report; type Seed = u64; type CallId = usize; -type EventsReceiver = Receiver>; +type EventsReceiver = Receiver; pub struct BatchPool { api: GearApiFacade, diff --git a/utils/node-loader/src/main.rs b/utils/node-loader/src/main.rs index ecd91d02bcc..392f73f393e 100644 --- a/utils/node-loader/src/main.rs +++ b/utils/node-loader/src/main.rs @@ -8,7 +8,7 @@ use anyhow::{anyhow, Result}; use args::{parse_cli_params, LoadParams, Params}; use batch_pool::{api::GearApiFacade, BatchPool}; -use gsdk::config::GearConfig; +use gsdk::subscription::BlockEvents; use names::Generator; use rand::rngs::SmallRng; use tokio::sync::broadcast::Sender; @@ -36,12 +36,12 @@ async fn run(params: Params) -> Result<()> { /// Connect to API of provided node address and subscribe for events. /// /// Broadcast new events to receivers. -async fn listen_events(tx: Sender>, node: String) -> Result<()> { +async fn listen_events(tx: Sender, node: String) -> Result<()> { let api = gsdk::Api::new(node.as_str()).await?; let mut event_listener = api.subscribe_finalized_blocks().await?; - while let Some(events) = event_listener.next_events().await { - tx.send(events?)?; + while let Some(events) = event_listener.next_events().await? { + tx.send(events)?; } Err(anyhow!("Listen events: Can't get new events")) diff --git a/utils/validator-checks/Cargo.toml b/utils/validator-checks/Cargo.toml index 346637e4353..c8be222430a 100644 --- a/utils/validator-checks/Cargo.toml +++ b/utils/validator-checks/Cargo.toml @@ -8,6 +8,7 @@ name = "validator-checks" path = "bin/validator-checks.rs" [dependencies] +anyhow.workspace = true gsdk.workspace = true clap = { workspace = true, features = ["derive"] } subxt.workspace = true diff --git a/utils/validator-checks/src/result.rs b/utils/validator-checks/src/result.rs index fe91997c943..287ec668528 100644 --- a/utils/validator-checks/src/result.rs +++ b/utils/validator-checks/src/result.rs @@ -4,12 +4,18 @@ use std::result::Result as StdResult; #[derive(Debug, thiserror::Error)] pub enum Error { + /// Any error + #[error(transparent)] + Anyhow(#[from] anyhow::Error), /// Some errors happens in gprogram. #[error(transparent)] GSdk(#[from] gsdk::Error), /// Some errors happens in subxt. #[error(transparent)] Subxt(#[from] subxt::Error), + /// Subxt core error + #[error(transparent)] + SubxtCore(#[from] subxt::ext::subxt_core::Error), /// Failed to setup logger. #[error(transparent)] EnvLogger(#[from] log::SetLoggerError),