diff --git a/Cargo.lock b/Cargo.lock index 6c17a8b7..27ee6d48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2333,7 +2333,7 @@ dependencies = [ "pezsp-consensus-babe", "pezsp-consensus-grandpa", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-debug-derive", "pezsp-externalities", "pezsp-genesis-builder", @@ -5683,6 +5683,7 @@ dependencies = [ "scale-info", "scale-info-legacy", "scale-type-resolver", + "serde_yaml", "sp-crypto-hashing", "thiserror 2.0.17", ] @@ -5723,7 +5724,7 @@ dependencies = [ "log", "parity-scale-codec", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "pezsp-state-machine", @@ -5927,7 +5928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ "gloo-timers 0.2.6", - "send_wrapper", + "send_wrapper 0.4.0", ] [[package]] @@ -7737,7 +7738,7 @@ dependencies = [ "rand 0.8.5", "rustls 0.21.12", "rustls-pemfile", - "secrecy 0.8.0", + "secrecy", "serde", "serde_json", "serde_yaml", @@ -10468,7 +10469,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-consensus", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-inherents", "pezsp-keyring", "pezsp-runtime", @@ -11475,7 +11476,7 @@ dependencies = [ "pezsc-client-api", "pezsc-consensus-babe", "pezsc-network-types", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-inherents", "pezsp-runtime", "pezsp-state-machine", @@ -11584,7 +11585,7 @@ dependencies = [ "pezsp-consensus-babe", "pezsp-consensus-slots", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-externalities", "pezsp-inherents", "pezsp-io", @@ -12301,6 +12302,16 @@ dependencies = [ "scale-info", ] +[[package]] +name = "pezframe-metadata" +version = "23.0.1" +dependencies = [ + "cfg-if", + "parity-scale-codec", + "scale-info", + "serde", +] + [[package]] name = "pezframe-metadata-hash-extension" version = "0.1.0" @@ -12364,7 +12375,7 @@ dependencies = [ "pezsp-api", "pezsp-arithmetic", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-crypto-hashing-proc-macro", "pezsp-debug-derive", "pezsp-genesis-builder", @@ -12402,7 +12413,7 @@ dependencies = [ "pezframe-support", "pezframe-support-procedural-tools", "pezframe-system", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-metadata-ir", "pezsp-runtime", @@ -12832,7 +12843,7 @@ dependencies = [ "pezsp-authority-discovery", "pezsp-consensus-babe", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-keyring", "pezsp-keystore", "pezsp-tracing", @@ -13254,7 +13265,7 @@ dependencies = [ "pezsc-executor-common", "pezsc-executor-wasmtime", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-externalities", "pezsp-io", "pezsp-tracing", @@ -13800,7 +13811,7 @@ dependencies = [ "pezsp-application-crypto", "pezsp-arithmetic", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-inherents", "pezsp-io", "pezsp-keyring", @@ -13825,7 +13836,7 @@ dependencies = [ [[package]] name = "pezkuwi-sdk" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-test-pezutils", "assets-common", @@ -13898,6 +13909,7 @@ dependencies = [ "pezframe-election-provider-solution-type", "pezframe-election-provider-support", "pezframe-executive", + "pezframe-metadata", "pezframe-metadata-hash-extension", "pezframe-support", "pezframe-support-procedural", @@ -13952,8 +13964,19 @@ dependencies = [ "pezkuwi-runtime-teyrchains", "pezkuwi-sdk-frame", "pezkuwi-service", + "pezkuwi-ss58-registry", "pezkuwi-statement-distribution", "pezkuwi-statement-table", + "pezkuwi-subxt", + "pezkuwi-subxt-codegen", + "pezkuwi-subxt-core", + "pezkuwi-subxt-lightclient", + "pezkuwi-subxt-macro", + "pezkuwi-subxt-metadata", + "pezkuwi-subxt-rpcs", + "pezkuwi-subxt-signer", + "pezkuwi-subxt-utils-fetchmetadata", + "pezkuwi-subxt-utils-stripmetadata", "pezkuwi-teyrchain-primitives", "pezmmr-gadget", "pezmmr-rpc", @@ -14043,7 +14066,6 @@ dependencies = [ "pezpallet-revive-proc-macro", "pezpallet-revive-uapi", "pezpallet-root-offences", - "pezpallet-root-testing", "pezpallet-safe-mode", "pezpallet-salary", "pezpallet-scheduler", @@ -14154,7 +14176,7 @@ dependencies = [ "pezsp-core-hashing", "pezsp-core-hashing-proc-macro", "pezsp-crypto-ec-utils", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-crypto-hashing-proc-macro", "pezsp-database", "pezsp-debug-derive", @@ -14172,7 +14194,6 @@ dependencies = [ "pezsp-offchain", "pezsp-panic-handler", "pezsp-rpc", - "pezsp-runtime", "pezsp-runtime-interface", "pezsp-runtime-interface-proc-macro", "pezsp-session", @@ -14204,6 +14225,12 @@ dependencies = [ "xcm-pez-procedural", "xcm-pez-simulator", "xcm-runtime-pezapis", + "zombienet-configuration", + "zombienet-orchestrator", + "zombienet-prom-metrics-parser", + "zombienet-provider", + "zombienet-sdk", + "zombienet-support", ] [[package]] @@ -14605,14 +14632,17 @@ dependencies = [ [[package]] name = "pezkuwi-subxt" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ + "assert_matches", "async-trait", + "bitvec", "derive-where", "either", "frame-metadata", "futures", "hex", + "http-body 1.0.1", + "hyper 1.8.1", "jsonrpsee", "parity-scale-codec", "pezkuwi-subxt-core", @@ -14620,7 +14650,11 @@ dependencies = [ "pezkuwi-subxt-macro", "pezkuwi-subxt-metadata", "pezkuwi-subxt-rpcs", - "pezsp-crypto-hashing 0.1.0 (git+https://github.com/pezkuwichain/pezkuwi-sdk.git?branch=main)", + "pezkuwi-subxt-signer", + "pezsp-core", + "pezsp-crypto-hashing", + "pezsp-keyring", + "pezsp-runtime", "primitive-types 0.13.1", "scale-bits", "scale-decode", @@ -14629,10 +14663,12 @@ dependencies = [ "scale-value", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", + "tower 0.4.13", "tracing", + "tracing-subscriber 0.3.22", "url", "wasm-bindgen-futures", "web-time", @@ -14641,8 +14677,9 @@ dependencies = [ [[package]] name = "pezkuwi-subxt-codegen" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ + "frame-metadata", + "getrandom 0.2.16", "heck 0.5.0", "parity-scale-codec", "pezkuwi-subxt-metadata", @@ -14651,26 +14688,31 @@ dependencies = [ "scale-info", "scale-typegen", "syn 2.0.111", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] name = "pezkuwi-subxt-core" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ + "assert_matches", "base58", + "bitvec", "blake2 0.10.6", "derive-where", "frame-decode", "frame-metadata", - "hashbrown 0.14.5", + "hashbrown 0.15.5", "hex", "impl-serde", "keccak-hash", "parity-scale-codec", + "pezkuwi-subxt-macro", "pezkuwi-subxt-metadata", - "pezsp-crypto-hashing 0.1.0 (git+https://github.com/pezkuwichain/pezkuwi-sdk.git?branch=main)", + "pezkuwi-subxt-signer", + "pezsp-core", + "pezsp-crypto-hashing", + "pezsp-keyring", "primitive-types 0.13.1", "scale-bits", "scale-decode", @@ -14679,36 +14721,49 @@ dependencies = [ "scale-value", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tracing", ] [[package]] name = "pezkuwi-subxt-lightclient" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ "futures", + "futures-timer", "futures-util", + "getrandom 0.2.16", + "js-sys", + "pin-project", + "send_wrapper 0.6.0", "serde", "serde_json", + "smoldot", "smoldot-light", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-stream", "tracing", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "web-time", ] [[package]] name = "pezkuwi-subxt-macro" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ "darling 0.20.11", "parity-scale-codec", "pezkuwi-subxt-codegen", "pezkuwi-subxt-metadata", "pezkuwi-subxt-utils-fetchmetadata", + "pezsc-executor", + "pezsc-executor-common", + "pezsp-io", + "pezsp-maybe-compressed-blob", + "pezsp-state-machine", "proc-macro-error2", "quote 1.0.42", "scale-typegen", @@ -14718,29 +14773,33 @@ dependencies = [ [[package]] name = "pezkuwi-subxt-metadata" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ + "bitvec", + "criterion", "frame-decode", "frame-metadata", - "hashbrown 0.14.5", + "hashbrown 0.15.5", "parity-scale-codec", - "pezsp-crypto-hashing 0.1.0 (git+https://github.com/pezkuwichain/pezkuwi-sdk.git?branch=main)", + "pezkuwi-subxt-codegen", + "pezsp-crypto-hashing", "scale-info", "scale-info-legacy", "scale-type-resolver", - "thiserror 2.0.17", + "thiserror 1.0.69", ] [[package]] name = "pezkuwi-subxt-rpcs" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ "derive-where", "finito", "frame-metadata", "futures", + "getrandom 0.2.16", "hex", + "http-body 1.0.1", + "hyper 1.8.1", "impl-serde", "jsonrpsee", "parity-scale-codec", @@ -14749,50 +14808,69 @@ dependencies = [ "primitive-types 0.13.1", "serde", "serde_json", - "thiserror 2.0.17", + "thiserror 1.0.69", "tokio", "tokio-util", + "tower 0.4.13", "tracing", "url", + "wasm-bindgen-futures", ] [[package]] name = "pezkuwi-subxt-signer" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ "base64 0.22.1", "bip32", "bip39", "cfg-if", "crypto_secretbox", + "getrandom 0.2.16", "hex", + "hex-literal", "hmac 0.12.1", "keccak-hash", "parity-scale-codec", "pbkdf2", "pezkuwi-subxt-core", - "pezsp-crypto-hashing 0.1.0 (git+https://github.com/pezkuwichain/pezkuwi-sdk.git?branch=main)", + "pezsp-core", + "pezsp-crypto-hashing", + "pezsp-keyring", + "proptest", "regex", "schnorrkel 0.11.5", "scrypt", - "secp256k1 0.30.0", - "secrecy 0.10.3", + "secp256k1 0.28.2", + "secrecy", "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.17", + "thiserror 1.0.69", "zeroize", ] [[package]] name = "pezkuwi-subxt-utils-fetchmetadata" version = "0.44.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-subxt?branch=main#0e696a8159057fb01632ce1030acc359d2389f44" dependencies = [ + "frame-metadata", "hex", + "jsonrpsee", "parity-scale-codec", - "thiserror 2.0.17", + "thiserror 1.0.69", + "tokio", + "url", +] + +[[package]] +name = "pezkuwi-subxt-utils-stripmetadata" +version = "0.44.0" +dependencies = [ + "either", + "frame-metadata", + "parity-scale-codec", + "scale-info", ] [[package]] @@ -15349,7 +15427,7 @@ dependencies = [ "pezpallet-collective", "pezpallet-identity", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "scale-info", @@ -16676,7 +16754,7 @@ dependencies = [ "pezframe-system", "pezsp-arithmetic", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "pezsp-tracing", @@ -17373,7 +17451,7 @@ dependencies = [ "pezsc-service", "pezsp-arithmetic", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-rpc", "pezsp-runtime", @@ -17495,7 +17573,7 @@ dependencies = [ "pezframe-system", "pezsp-consensus-sassafras", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "scale-info", @@ -17599,7 +17677,7 @@ dependencies = [ "pezframe-system", "pezpallet-balances", "pezsp-arithmetic", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "rand_chacha 0.3.1", @@ -18635,7 +18713,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-consensus-babe", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-genesis-builder", "pezsp-io", "pezsp-keyring", @@ -18855,7 +18933,7 @@ dependencies = [ "pezsp-consensus-babe", "pezsp-consensus-slots", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-inherents", "pezsp-keyring", "pezsp-keystore", @@ -19002,7 +19080,7 @@ dependencies = [ "pezsp-consensus", "pezsp-consensus-grandpa", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-keyring", "pezsp-keystore", "pezsp-runtime", @@ -19141,7 +19219,7 @@ dependencies = [ "pezsc-tracing", "pezsp-api", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-externalities", "pezsp-io", "pezsp-maybe-compressed-blob", @@ -19298,7 +19376,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-consensus", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-runtime", "pezsp-tracing", "pin-project", @@ -19577,7 +19655,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-consensus", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-keystore", "pezsp-offchain", "pezsp-rpc", @@ -19700,7 +19778,7 @@ dependencies = [ "pezsc-executor", "pezsc-executor-common", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-state-machine", "pezsp-version", @@ -19880,7 +19958,7 @@ dependencies = [ "log", "pezsc-telemetry", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "rand 0.8.5", @@ -19978,7 +20056,7 @@ dependencies = [ "pezsp-blockchain", "pezsp-consensus", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-runtime", "pezsp-tracing", "pezsp-transaction-pool", @@ -20127,7 +20205,7 @@ dependencies = [ "hex-literal", "parity-scale-codec", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-runtime", "pezsp-tracing", "scale-info", @@ -20606,7 +20684,7 @@ dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "primitive-types 0.13.1", "rand 0.8.5", "scale-info", @@ -20717,7 +20795,7 @@ dependencies = [ "pezsp-api", "pezsp-application-crypto", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-keystore", "pezsp-mmr-primitives", @@ -20807,7 +20885,7 @@ dependencies = [ "parking_lot 0.12.5", "paste", "pezkuwi-ss58-registry", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-debug-derive", "pezsp-externalities", "pezsp-std", @@ -20818,7 +20896,7 @@ dependencies = [ "scale-info", "schnorrkel 0.11.5", "secp256k1 0.28.2", - "secrecy 0.8.0", + "secrecy", "serde", "serde_json", "sha2 0.10.9", @@ -20841,7 +20919,7 @@ dependencies = [ name = "pezsp-core-hashing" version = "15.0.0" dependencies = [ - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", ] [[package]] @@ -20884,24 +20962,11 @@ dependencies = [ "twox-hash 1.6.3", ] -[[package]] -name = "pezsp-crypto-hashing" -version = "0.1.0" -source = "git+https://github.com/pezkuwichain/pezkuwi-sdk.git?branch=main#7cbb4eb7359970576a2f239d21e0a7cc494f16d0" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.9", - "sha3", - "twox-hash 1.6.3", -] - [[package]] name = "pezsp-crypto-hashing-proc-macro" version = "0.1.0" dependencies = [ - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "quote 1.0.42", "syn 2.0.111", ] @@ -20967,7 +21032,7 @@ dependencies = [ "log", "parity-scale-codec", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-externalities", "pezsp-keystore", "pezsp-runtime-interface", @@ -21262,7 +21327,7 @@ dependencies = [ "pezsp-api", "pezsp-application-crypto", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-externalities", "pezsp-runtime", "pezsp-runtime-interface", @@ -24472,15 +24537,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secrecy" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a" -dependencies = [ - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -24575,6 +24631,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" +[[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + [[package]] name = "serde" version = "1.0.228" @@ -25292,7 +25354,7 @@ dependencies = [ "scale-info", "schnorrkel 0.11.5", "secp256k1 0.28.2", - "secrecy 0.8.0", + "secrecy", "serde", "sha2 0.10.9", "sp-crypto-hashing", @@ -29038,7 +29100,7 @@ dependencies = [ "pezsp-arithmetic", "pezsp-consensus-aura", "pezsp-core", - "pezsp-crypto-hashing 0.1.0", + "pezsp-crypto-hashing", "pezsp-io", "pezsp-runtime", "pezsp-tracing", @@ -29552,8 +29614,7 @@ dependencies = [ [[package]] name = "zombienet-configuration" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "anyhow", "lazy_static", @@ -29572,8 +29633,7 @@ dependencies = [ [[package]] name = "zombienet-orchestrator" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "anyhow", "async-trait", @@ -29582,6 +29642,7 @@ dependencies = [ "futures", "glob-match", "hex", + "lazy_static", "libp2p", "libsecp256k1", "multiaddr 0.18.2", @@ -29597,6 +29658,7 @@ dependencies = [ "sp-core", "thiserror 1.0.69", "tokio", + "toml 0.8.23", "tracing", "uuid", "zombienet-configuration", @@ -29607,8 +29669,7 @@ dependencies = [ [[package]] name = "zombienet-prom-metrics-parser" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "pest", "pest_derive", @@ -29617,8 +29678,7 @@ dependencies = [ [[package]] name = "zombienet-provider" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "anyhow", "async-trait", @@ -29648,15 +29708,18 @@ dependencies = [ [[package]] name = "zombienet-sdk" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "async-trait", "futures", + "k8s-openapi", + "kube", "lazy_static", "pezkuwi-subxt", "pezkuwi-subxt-signer", + "serde_json", "tokio", + "tracing-subscriber 0.3.22", "zombienet-configuration", "zombienet-orchestrator", "zombienet-provider", @@ -29665,8 +29728,7 @@ dependencies = [ [[package]] name = "zombienet-support" -version = "0.4.3" -source = "git+https://github.com/pezkuwichain/pezkuwi-zombienet-sdk?branch=main#e2c356521dd8541ef997ad2ef6ebdb25af96c980" +version = "0.44.0" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index e1a2043b..b6f12ecc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -161,7 +161,6 @@ members = [ "bizinikiwi/pezframe/message-queue", "bizinikiwi/pezframe/meta-tx", "bizinikiwi/pezframe/metadata-hash-extension", - "bizinikiwi/pezframe/pezframe-metadata", "bizinikiwi/pezframe/migrations", "bizinikiwi/pezframe/mixnet", "bizinikiwi/pezframe/multi-asset-bounties", @@ -183,6 +182,7 @@ members = [ "bizinikiwi/pezframe/paged-list/fuzzer", "bizinikiwi/pezframe/parameters", "bizinikiwi/pezframe/people", + "bizinikiwi/pezframe/pezframe-metadata", "bizinikiwi/pezframe/preimage", "bizinikiwi/pezframe/proxy", "bizinikiwi/pezframe/ranked-collective", @@ -619,10 +619,10 @@ members = [ # Vendored pezkuwi-zombienet-sdk crates "vendor/pezkuwi-zombienet-sdk/crates/configuration", "vendor/pezkuwi-zombienet-sdk/crates/orchestrator", + "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser", "vendor/pezkuwi-zombienet-sdk/crates/provider", "vendor/pezkuwi-zombienet-sdk/crates/sdk", "vendor/pezkuwi-zombienet-sdk/crates/support", - "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser", ] default-members = [ @@ -716,8 +716,11 @@ async-trait = { version = "0.1.88" } asynchronous-codec = { version = "0.6" } backoff = { version = "0.4" } backtrace = { version = "0.3.71" } +base58 = { version = "0.2.0" } +base64 = { version = "0.22.1", default-features = false } binary-merkle-tree = { path = "bizinikiwi/utils/binary-merkle-tree", default-features = false } bincode = { version = "1.3.3" } +bip32 = { version = "0.5.2", default-features = false } bip39 = { version = "2.2.0", default-features = false } bitflags = { version = "1.3.2" } bitvec = { version = "1.0.1", default-features = false } @@ -767,6 +770,7 @@ color-eyre = { version = "0.6.3", default-features = false } color-print = { version = "0.3.4" } colored = { version = "2.0.4" } comfy-table = { version = "7.1.4", default-features = false } +configuration = { package = "zombienet-configuration", path = "vendor/pezkuwi-zombienet-sdk/crates/configuration" } console = { version = "0.15.8" } const-hex = { version = "1.10.0", default-features = false } coretime-pezkuwichain-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/coretime/coretime-pezkuwichain" } @@ -775,7 +779,9 @@ coretime-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tes coretime-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/coretime/coretime-zagros" } cpu-time = { version = "1.0.0" } criterion = { version = "0.5.1", default-features = false } +crypto_secretbox = { version = "0.1.1", default-features = false } curve25519-dalek = { version = "4.1.3" } +darling = { version = "0.20.10" } derive-syn-parse = { version = "0.2.0" } derive-where = { version = "1.2.7" } derive_more = { version = "0.99.17", default-features = false } @@ -794,16 +800,19 @@ enumn = { version = "0.1.13" } env_filter = { version = "0.1.3" } env_logger = { version = "0.11.2" } environmental = { version = "1.1.4", default-features = false } +erased-serde = { version = "0.4" } ethabi = { version = "2.0.0", default-features = false, package = "ethabi-decode" } ethbloom = { version = "0.14.1", default-features = false } ethereum-types = { version = "0.15.1", default-features = false } exit-future = { version = "0.2.0" } expander = { version = "2.0.0" } +fancy-regex = { version = "0.14.0" } fatality = { version = "0.1.1" } fdlimit = { version = "0.3.0" } femme = { version = "2.2.1" } filetime = { version = "0.2.16" } finality-grandpa = { version = "0.16.3", default-features = false } +finito = { version = "0.1.0", default-features = false } first-pezpallet = { package = "pezkuwi-sdk-docs-first-pezpallet", path = "docs/sdk/packages/guides/first-pezpallet", default-features = false } first-runtime = { package = "pezkuwi-sdk-docs-first-runtime", path = "docs/sdk/packages/guides/first-runtime", default-features = false } flate2 = { version = "1.0" } @@ -812,6 +821,7 @@ foldhash = { version = "0.1.5", default-features = false } forwarded-header-value = { version = "0.1.1" } fraction = { version = "0.13.1" } frame = { path = "bizinikiwi/pezframe", default-features = false, package = "pezkuwi-sdk-frame" } +frame-decode = { version = "0.15.0", default-features = false } frame-metadata = { version = "23.0.0", default-features = false } frame-storage-access-test-runtime = { path = "bizinikiwi/utils/pezframe/storage-access-test-runtime", default-features = false } fs4 = { version = "0.7.0" } @@ -820,8 +830,10 @@ futures = { version = "0.3.31" } futures-timer = { version = "3.0.2" } futures-util = { version = "0.3.30", default-features = false } gethostname = { version = "0.2.3" } +getrandom = { version = "0.2", default-features = false } git2 = { version = "0.20.0", default-features = false } glob = { version = "0.3" } +glob-match = { version = "0.2.1" } glutton-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/glutton/glutton-zagros" } governor = { version = "0.6.0" } gum = { path = "pezkuwi/node/gum", default-features = false, package = "pez-tracing-gum" } @@ -830,6 +842,7 @@ handlebars = { version = "5.1.0" } hash-db = { version = "0.16.0", default-features = false } hash256-std-hasher = { version = "0.15.2", default-features = false } hashbrown = "0.15.3" +heck = { version = "0.5.0" } hex = { version = "0.4.3", default-features = false } hex-literal = { version = "0.4.1", default-features = false } hkdf = { version = "0.12.0" } @@ -860,15 +873,20 @@ is_executable = { version = "1.0.1" } isahc = { version = "1.2" } itertools = { version = "0.11" } jobserver = { version = "0.1.26" } +js-sys = { version = "0.3.70" } jsonpath_lib = { version = "0.3" } jsonrpsee = { version = "0.24.10" } jsonrpsee-core = { version = "0.24.10" } k256 = { version = "0.13.4", default-features = false } +k8s-openapi = { version = "0.20.0", features = ["v1_28"] } +keccak-hash = { version = "0.11.0", default-features = false } +kube = { version = "0.87.1" } kvdb = { version = "0.13.0" } kvdb-memorydb = { version = "0.13.0" } kvdb-rocksdb = { version = "0.21.0" } kvdb-shared-tests = { version = "0.11.0" } landlock = { version = "0.3.0" } +lazy_static = { version = "1.5" } libc = { version = "0.2.155" } libfuzzer-sys = { version = "0.4" } libp2p = { version = "0.54.1" } @@ -909,6 +927,7 @@ num-traits = { version = "0.2.17", default-features = false } num_cpus = { version = "1.13.1" } once_cell = { version = "1.21.3" } orchestra = { version = "0.4.0", default-features = false } +orchestrator = { package = "zombienet-orchestrator", path = "vendor/pezkuwi-zombienet-sdk/crates/orchestrator" } pez-chain-spec-guide-runtime = { path = "docs/sdk/src/reference_docs/chain_spec_runtime" } pez-equivocation-detector = { path = "pezbridges/relays/equivocation" } pez-ethereum-standards = { path = "bizinikiwi/primitives/pez-ethereum-standards" } @@ -1143,6 +1162,8 @@ people-pezkuwichain-emulated-chain = { path = "pezcumulus/teyrchains/integration people-pezkuwichain-runtime = { path = "pezcumulus/teyrchains/runtimes/people/people-pezkuwichain" } people-zagros-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/people/people-zagros" } people-zagros-runtime = { path = "pezcumulus/teyrchains/runtimes/people/people-zagros" } +pest = { version = "2.7" } +pest_derive = { version = "2.7" } pez-penpal-emulated-chain = { path = "pezcumulus/teyrchains/integration-tests/emulated/chains/teyrchains/testing/penpal" } pez-penpal-runtime = { path = "pezcumulus/teyrchains/runtimes/testing/penpal" } pez-revive-dev-node = { path = "bizinikiwi/pezframe/revive/dev-node/node" } @@ -1394,15 +1415,18 @@ primitive-types = { version = "0.13.1", default-features = false, features = [ "num-traits", ] } proc-macro-crate = { version = "3.0.0" } +proc-macro-error2 = { version = "2.0.0" } proc-macro-warning = { version = "1.0.0", default-features = false } proc-macro2 = { version = "1.0.86" } procfs = { version = "0.16.0" } +prom-metrics-parser = { package = "zombienet-prom-metrics-parser", path = "vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser" } prometheus = { version = "0.13.0", default-features = false } prometheus-endpoint = { path = "bizinikiwi/utils/prometheus", default-features = false, package = "bizinikiwi-prometheus-endpoint" } prometheus-parse = { version = "0.2.2" } proptest = { version = "1" } prost = { version = "0.12.4" } prost-build = { version = "0.13.2" } +provider = { package = "zombienet-provider", path = "vendor/pezkuwi-zombienet-sdk/crates/provider" } pyroscope = { version = "0.5.8" } pyroscope_pprofrs = { version = "0.2.8" } quick_cache = { version = "0.3" } @@ -1419,6 +1443,7 @@ regex = { version = "1.10.2" } relay-bizinikiwi-client = { path = "pezbridges/relays/client-bizinikiwi" } relay-utils = { path = "pezbridges/relays/utils" } remote-externalities = { path = "bizinikiwi/utils/pezframe/remote-externalities", default-features = false, package = "frame-remote-externalities" } +reqwest = { version = "0.12.9" } revm = { version = "27.0.2", default-features = false } ripemd = { version = "0.1.3", default-features = false } rlp = { version = "0.6.1", default-features = false } @@ -1436,13 +1461,23 @@ rustls = { version = "0.23.18", default-features = false, features = [ rustversion = { version = "1.0.17" } rusty-fork = { version = "0.3.0", default-features = false } safe-mix = { version = "1.0", default-features = false } +sc-chain-spec = { version = "46.0.0", default-features = false } +scale-bits = { version = "0.7.0", default-features = false } +scale-decode = { version = "0.16.2", default-features = false } +scale-encode = { version = "0.10.0", default-features = false } scale-info = { version = "2.11.6", default-features = false } +scale-info-legacy = { version = "0.4.0", default-features = false } +scale-type-resolver = { version = "0.2.0" } +scale-typegen = { version = "0.12.0" } +scale-value = { version = "0.18.1", default-features = false } schemars = { version = "1.1.0", default-features = false } schnellru = { version = "0.2.3" } schnorrkel = { version = "0.11.4", default-features = false } +scrypt = { version = "0.11.0", default-features = false } seccompiler = { version = "0.4.0" } secp256k1 = { version = "0.28.0", default-features = false } secrecy = { version = "0.8.0", default-features = false } +send_wrapper = { version = "0.6.0" } serde = { version = "1.0.214", default-features = false } serde-big-array = { version = "0.3.2" } serde_derive = { version = "1.0.117" } @@ -1459,8 +1494,11 @@ shlex = { version = "1.3.0" } simple-mermaid = { version = "0.1.1" } slotmap = { version = "1.0" } smallvec = { version = "1.11.0", default-features = false } +smoldot = { version = "0.20.0", default-features = false } +smoldot-light = { version = "0.18.0", default-features = false } snowpezbridge-runtime-common = { path = "pezbridges/snowbridge/runtime/runtime-common", default-features = false } soketto = { version = "0.8.0" } +sp-core = { version = "38.1.0" } spinners = { version = "4.1.1" } sqlx = { version = "0.8.2" } ss58-registry = { path = "vendor/ss58-registry", package = "pezkuwi-ss58-registry", default-features = false } @@ -1480,6 +1518,7 @@ pezkuwi-subxt-rpcs = { path = "vendor/pezkuwi-subxt/rpcs", default-features = fa pezkuwi-subxt-signer = { path = "vendor/pezkuwi-subxt/signer", default-features = false } pezkuwi-subxt-utils-fetchmetadata = { path = "vendor/pezkuwi-subxt/utils/fetch-metadata", default-features = false } pezkuwi-subxt-utils-stripmetadata = { path = "vendor/pezkuwi-subxt/utils/strip-metadata" } +support = { package = "zombienet-support", path = "vendor/pezkuwi-zombienet-sdk/crates/support" } syn = { version = "2.0.87" } sysinfo = { version = "0.30" } tar = { version = "0.4" } @@ -1532,17 +1571,23 @@ twox-hash = { version = "1.6.3", default-features = false } txtesttool = { path = "bizinikiwi/utils/txtesttool", default-features = false, package = "bizinikiwi-txtesttool" } unsigned-varint = { version = "0.7.2" } url = { version = "2.5.4" } +uuid = { version = "1.4" } verifiable = { version = "0.1", default-features = false } void = { version = "1.0.2" } w3f-bls = { version = "0.1.9", default-features = false } wait-timeout = { version = "0.2" } walkdir = { version = "2.5.0" } +wasm-bindgen = { version = "0.2.93" } +wasm-bindgen-futures = { version = "0.4.43" } +wasm-bindgen-test = { version = "0.3.24" } wasm-instrument = { version = "0.4", default-features = false } wasm-opt = { version = "0.116" } wasm-timer = { version = "0.2.5" } wasmi = { version = "0.32.3", default-features = false } wasmtime = { version = "35.0.0", default-features = false } wat = { version = "1.0.0" } +web-sys = { version = "0.3.70" } +web-time = { version = "1.1", default-features = false } x25519-dalek = { version = "2.0" } xcm = { path = "pezkuwi/xcm", default-features = false, package = "pezstaging-xcm" } xcm-builder = { path = "pezkuwi/xcm/xcm-builder", default-features = false, package = "pezstaging-xcm-builder" } diff --git a/bizinikiwi/pezframe/pezframe-metadata/src/v14.rs b/bizinikiwi/pezframe/pezframe-metadata/src/v14.rs index ad2bcfaf..260d77e1 100644 --- a/bizinikiwi/pezframe/pezframe-metadata/src/v14.rs +++ b/bizinikiwi/pezframe/pezframe-metadata/src/v14.rs @@ -64,12 +64,7 @@ impl RuntimeMetadataV14 { let pezpallets = registry.map_into_portable(pezpallets); let extrinsic = extrinsic.into_portable(&mut registry); let ty = registry.register_type(&runtime_type); - Self { - types: registry.into(), - pezpallets, - extrinsic, - ty, - } + Self { types: registry.into(), pezpallets, extrinsic, ty } } } @@ -298,11 +293,7 @@ impl IntoPortable for StorageEntryType { fn into_portable(self, registry: &mut Registry) -> Self::Output { match self { Self::Plain(plain) => StorageEntryType::Plain(registry.register_type(&plain)), - Self::Map { - hashers, - key, - value, - } => StorageEntryType::Map { + Self::Map { hashers, key, value } => StorageEntryType::Map { hashers, key: registry.register_type(&key), value: registry.register_type(&value), @@ -328,9 +319,7 @@ impl IntoPortable for PezpalletCallMetadata { type Output = PezpalletCallMetadata; fn into_portable(self, registry: &mut Registry) -> Self::Output { - PezpalletCallMetadata { - ty: registry.register_type(&self.ty), - } + PezpalletCallMetadata { ty: registry.register_type(&self.ty) } } } @@ -353,9 +342,7 @@ impl IntoPortable for PezpalletEventMetadata { type Output = PezpalletEventMetadata; fn into_portable(self, registry: &mut Registry) -> Self::Output { - PezpalletEventMetadata { - ty: registry.register_type(&self.ty), - } + PezpalletEventMetadata { ty: registry.register_type(&self.ty) } } } @@ -411,9 +398,7 @@ impl IntoPortable for PezpalletErrorMetadata { type Output = PezpalletErrorMetadata; fn into_portable(self, registry: &mut Registry) -> Self::Output { - PezpalletErrorMetadata { - ty: registry.register_type(&self.ty), - } + PezpalletErrorMetadata { ty: registry.register_type(&self.ty) } } } diff --git a/bizinikiwi/pezframe/pezframe-metadata/src/v15.rs b/bizinikiwi/pezframe/pezframe-metadata/src/v15.rs index d781e0bf..9742988f 100644 --- a/bizinikiwi/pezframe/pezframe-metadata/src/v15.rs +++ b/bizinikiwi/pezframe/pezframe-metadata/src/v15.rs @@ -27,9 +27,9 @@ use scale_info::{ }; pub use super::v14::{ - PezpalletCallMetadata, PezpalletConstantMetadata, PezpalletErrorMetadata, PezpalletEventMetadata, - PezpalletStorageMetadata, StorageEntryMetadata, StorageEntryModifier, StorageEntryType, - StorageHasher, + PezpalletCallMetadata, PezpalletConstantMetadata, PezpalletErrorMetadata, + PezpalletEventMetadata, PezpalletStorageMetadata, StorageEntryMetadata, StorageEntryModifier, + StorageEntryType, StorageHasher, }; /// Latest runtime metadata @@ -82,15 +82,7 @@ impl RuntimeMetadataV15 { let outer_enums = outer_enums.into_portable(&mut registry); let custom = custom.into_portable(&mut registry); - Self { - types: registry.into(), - pezpallets, - extrinsic, - ty, - apis, - outer_enums, - custom, - } + Self { types: registry.into(), pezpallets, extrinsic, ty, apis, outer_enums, custom } } } @@ -343,10 +335,7 @@ impl IntoPortable for CustomValueMetadata { type Output = CustomValueMetadata; fn into_portable(self, registry: &mut Registry) -> Self::Output { - CustomValueMetadata { - ty: registry.register_type(&self.ty), - value: self.value, - } + CustomValueMetadata { ty: registry.register_type(&self.ty), value: self.value } } } diff --git a/bizinikiwi/pezframe/pezframe-metadata/src/v16.rs b/bizinikiwi/pezframe/pezframe-metadata/src/v16.rs index 5c216fab..28fdbe36 100644 --- a/bizinikiwi/pezframe/pezframe-metadata/src/v16.rs +++ b/bizinikiwi/pezframe/pezframe-metadata/src/v16.rs @@ -27,7 +27,7 @@ use scale_info::{ }; // These types have not changed, so we re-export from our v14/v15 definitions: -pub use super::v14::{StorageEntryModifier, StorageEntryType, StorageHasher, StorageEntryMetadata}; +pub use super::v14::{StorageEntryMetadata, StorageEntryModifier, StorageEntryType, StorageHasher}; pub use super::v15::{CustomMetadata, CustomValueMetadata, OuterEnums}; /// The metadata for a method or function parameter. This is identical to @@ -80,14 +80,7 @@ impl RuntimeMetadataV16 { let outer_enums = outer_enums.into_portable(&mut registry); let custom = custom.into_portable(&mut registry); - Self { - types: registry.into(), - pezpallets, - extrinsic, - apis, - outer_enums, - custom, - } + Self { types: registry.into(), pezpallets, extrinsic, apis, outer_enums, custom } } } @@ -528,7 +521,7 @@ impl IntoPortable for ItemDeprecationInfo { let note = note.into_portable(registry); let since = since.map(|x| x.into_portable(registry)); ItemDeprecationInfo::Deprecated { note, since } - } + }, } } } @@ -565,10 +558,7 @@ impl IntoPortable for EnumDeprecationInfo { type Output = EnumDeprecationInfo; fn into_portable(self, registry: &mut Registry) -> Self::Output { - let entries = self - .0 - .into_iter() - .map(|(k, entry)| (k, entry.into_portable(registry))); + let entries = self.0.into_iter().map(|(k, entry)| (k, entry.into_portable(registry))); EnumDeprecationInfo(entries.collect()) } } @@ -606,7 +596,7 @@ impl IntoPortable for VariantDeprecationInfo { let note = note.into_portable(registry); let since = since.map(|x| x.into_portable(registry)); VariantDeprecationInfo::Deprecated { note, since } - } + }, Self::DeprecatedWithoutNote => VariantDeprecationInfo::DeprecatedWithoutNote, } } diff --git a/umbrella/Cargo.toml b/umbrella/Cargo.toml index d42bc035..2345920e 100644 --- a/umbrella/Cargo.toml +++ b/umbrella/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "pezkuwi-sdk" +version = "0.1.0" description = "Pezkuwi SDK umbrella crate." license = "Apache-2.0" @@ -45,6 +46,7 @@ std = [ "pezframe-election-provider-support?/std", "pezframe-executive?/std", "pezframe-metadata-hash-extension?/std", + "pezframe-metadata?/std", "pezframe-support-procedural?/std", "pezframe-support?/std", "pezframe-system-benchmarking?/std", @@ -56,6 +58,10 @@ std = [ "pezkuwi-runtime-metrics?/std", "pezkuwi-runtime-teyrchains?/std", "pezkuwi-sdk-frame?/std", + "pezkuwi-ss58-registry?/std", + "pezkuwi-subxt-core?/std", + "pezkuwi-subxt-metadata?/std", + "pezkuwi-subxt-signer?/std", "pezkuwi-teyrchain-primitives?/std", "pezpallet-alliance?/std", "pezpallet-asset-conversion-ops?/std", @@ -139,7 +145,6 @@ std = [ "pezpallet-remark?/std", "pezpallet-revive?/std", "pezpallet-root-offences?/std", - "pezpallet-root-testing?/std", "pezpallet-safe-mode?/std", "pezpallet-salary?/std", "pezpallet-scheduler?/std", @@ -205,7 +210,6 @@ std = [ "pezsp-npos-elections?/std", "pezsp-offchain?/std", "pezsp-runtime-interface?/std", - "pezsp-runtime?/std", "pezsp-session?/std", "pezsp-staking?/std", "pezsp-state-machine?/std", @@ -432,7 +436,6 @@ runtime-benchmarks = [ "pezpallet-remark?/runtime-benchmarks", "pezpallet-revive?/runtime-benchmarks", "pezpallet-root-offences?/runtime-benchmarks", - "pezpallet-root-testing?/runtime-benchmarks", "pezpallet-safe-mode?/runtime-benchmarks", "pezpallet-salary?/runtime-benchmarks", "pezpallet-scheduler?/runtime-benchmarks", @@ -531,7 +534,6 @@ runtime-benchmarks = [ "pezsp-npos-elections?/runtime-benchmarks", "pezsp-offchain?/runtime-benchmarks", "pezsp-runtime-interface?/runtime-benchmarks", - "pezsp-runtime?/runtime-benchmarks", "pezsp-session?/runtime-benchmarks", "pezsp-staking?/runtime-benchmarks", "pezsp-state-machine?/runtime-benchmarks", @@ -653,7 +655,6 @@ try-runtime = [ "pezpallet-remark?/try-runtime", "pezpallet-revive?/try-runtime", "pezpallet-root-offences?/try-runtime", - "pezpallet-root-testing?/try-runtime", "pezpallet-safe-mode?/try-runtime", "pezpallet-salary?/try-runtime", "pezpallet-scheduler?/try-runtime", @@ -685,11 +686,12 @@ try-runtime = [ "pezpallet-xcm?/try-runtime", "pezstaging-teyrchain-info?/try-runtime", "teyrchains-common?/try-runtime", - "pezsp-runtime?/try-runtime" ] serde = [ "bp-pezkuwi-core?/serde", "pezframe-benchmarking?/serde", + "pezframe-metadata?/serde", + "pezkuwi-subxt-signer?/serde", "pezpallet-asset-tx-payment?/serde", "pezpallet-beefy-mmr?/serde", "pezpallet-beefy?/serde", @@ -724,7 +726,6 @@ serde = [ "pezsp-storage?/serde", "pezsp-version?/serde", "pezsp-weights?/serde", - "pezsp-runtime?/serde" ] experimental = [ "pezframe-support-procedural?/experimental", @@ -777,6 +778,7 @@ runtime-full = [ "pezframe-election-provider-solution-type", "pezframe-election-provider-support", "pezframe-executive", + "pezframe-metadata", "pezframe-metadata-hash-extension", "pezframe-support", "pezframe-support-procedural", @@ -790,6 +792,11 @@ runtime-full = [ "pezkuwi-runtime-metrics", "pezkuwi-runtime-teyrchains", "pezkuwi-sdk-frame", + "pezkuwi-ss58-registry", + "pezkuwi-subxt-core", + "pezkuwi-subxt-macro", + "pezkuwi-subxt-metadata", + "pezkuwi-subxt-signer", "pezkuwi-teyrchain-primitives", "pezpallet-alliance", "pezpallet-asset-conversion", @@ -876,7 +883,6 @@ runtime-full = [ "pezpallet-revive-proc-macro", "pezpallet-revive-uapi", "pezpallet-root-offences", - "pezpallet-root-testing", "pezpallet-safe-mode", "pezpallet-salary", "pezpallet-scheduler", @@ -975,6 +981,7 @@ runtime = [ "pezframe-election-provider-solution-type", "pezframe-election-provider-support", "pezframe-executive", + "pezframe-metadata", "pezframe-metadata-hash-extension", "pezframe-support", "pezframe-support-procedural", @@ -984,6 +991,7 @@ runtime = [ "pezframe-system-rpc-runtime-api", "pezkuwi-sdk-frame", "pezkuwi-sdk-frame?/runtime", + "pezkuwi-subxt?/runtime", ] node = [ "asset-test-pezutils", @@ -1061,6 +1069,12 @@ node = [ "pezkuwi-service", "pezkuwi-statement-distribution", "pezkuwi-statement-table", + "pezkuwi-subxt", + "pezkuwi-subxt-codegen", + "pezkuwi-subxt-lightclient", + "pezkuwi-subxt-rpcs", + "pezkuwi-subxt-utils-fetchmetadata", + "pezkuwi-subxt-utils-stripmetadata", "pezmmr-gadget", "pezmmr-rpc", "pezpallet-contracts-mock-network", @@ -1133,6 +1147,12 @@ node = [ "teyrchains-runtimes-test-utils", "xcm-pez-emulator", "xcm-pez-simulator", + "zombienet-configuration", + "zombienet-orchestrator", + "zombienet-prom-metrics-parser", + "zombienet-provider", + "zombienet-sdk", + "zombienet-support", ] tuples-96 = [ "pezframe-support-procedural?/tuples-96", @@ -1346,6 +1366,11 @@ default-features = false optional = true path = "../bizinikiwi/pezframe/executive" +[dependencies.pezframe-metadata] +default-features = false +optional = true +path = "../bizinikiwi/pezframe/pezframe-metadata" + [dependencies.pezframe-metadata-hash-extension] default-features = false optional = true @@ -1411,6 +1436,31 @@ default-features = false optional = true path = "../bizinikiwi/pezframe" +[dependencies.pezkuwi-ss58-registry] +default-features = false +optional = true +path = "../vendor/ss58-registry" + +[dependencies.pezkuwi-subxt-core] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/core" + +[dependencies.pezkuwi-subxt-macro] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/macro" + +[dependencies.pezkuwi-subxt-metadata] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/metadata" + +[dependencies.pezkuwi-subxt-signer] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/signer" + [dependencies.pezkuwi-teyrchain-primitives] default-features = false optional = true @@ -1841,11 +1891,6 @@ default-features = false optional = true path = "../bizinikiwi/pezframe/root-offences" -[dependencies.pezpallet-root-testing] -default-features = false -optional = true -path = "../bizinikiwi/pezframe/root-testing" - [dependencies.pezpallet-safe-mode] default-features = false optional = true @@ -2176,11 +2221,6 @@ default-features = false optional = true path = "../bizinikiwi/primitives/offchain" -[dependencies.pezsp-runtime] -default-features = false -optional = true -path = "../bizinikiwi/primitives/runtime" - [dependencies.pezsp-runtime-interface] default-features = false optional = true @@ -2681,6 +2721,36 @@ default-features = false optional = true path = "../pezkuwi/statement-table" +[dependencies.pezkuwi-subxt] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/subxt" + +[dependencies.pezkuwi-subxt-codegen] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/codegen" + +[dependencies.pezkuwi-subxt-lightclient] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/lightclient" + +[dependencies.pezkuwi-subxt-rpcs] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/rpcs" + +[dependencies.pezkuwi-subxt-utils-fetchmetadata] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/utils/fetch-metadata" + +[dependencies.pezkuwi-subxt-utils-stripmetadata] +default-features = false +optional = true +path = "../vendor/pezkuwi-subxt/utils/strip-metadata" + [dependencies.pezmmr-gadget] default-features = false optional = true @@ -3036,6 +3106,36 @@ default-features = false optional = true path = "../pezkuwi/xcm/xcm-pez-simulator" +[dependencies.zombienet-configuration] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/configuration" + +[dependencies.zombienet-orchestrator] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/orchestrator" + +[dependencies.zombienet-prom-metrics-parser] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/prom-metrics-parser" + +[dependencies.zombienet-provider] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/provider" + +[dependencies.zombienet-sdk] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/sdk" + +[dependencies.zombienet-support] +default-features = false +optional = true +path = "../vendor/pezkuwi-zombienet-sdk/crates/support" + [package.metadata.docs.rs] features = ["node", "runtime-full"] targets = ["x86_64-unknown-linux-gnu"] diff --git a/umbrella/src/lib.rs b/umbrella/src/lib.rs index 647a431a..1f1a2d67 100644 --- a/umbrella/src/lib.rs +++ b/umbrella/src/lib.rs @@ -51,8 +51,7 @@ pub use bizinikiwi_rpc_client; #[cfg(feature = "bizinikiwi-state-trie-migration-rpc")] pub use bizinikiwi_state_trie_migration_rpc; -/// Bizinikiwi utility: A library and CLI tool for sending transactions to Pezkuwi blockchain, -/// enabling developers to test and monitor transaction scenarios. +/// Bizinikiwi utility: A library and CLI tool for sending transactions to Pezkuwi blockchain, enabling developers to test and monitor transaction scenarios. #[cfg(feature = "bizinikiwi-txtesttool")] pub use bizinikiwi_txtesttool; @@ -96,8 +95,7 @@ pub use bp_xcm_bridge_hub_router; #[cfg(feature = "bridge-hub-common")] pub use bridge_hub_common; -/// An externalities provided environment that can load itself from remote nodes or cached -/// files. +/// An externalities provided environment that can load itself from remote nodes or cached files. #[cfg(feature = "frame-remote-externalities")] pub use frame_remote_externalities; @@ -105,8 +103,7 @@ pub use frame_remote_externalities; #[cfg(feature = "pez-ethereum-standards")] pub use pez_ethereum_standards; -/// Utility library for managing tree-like ordered data with logic for pruning the tree while -/// finalizing nodes. +/// Utility library for managing tree-like ordered data with logic for pruning the tree while finalizing nodes. #[cfg(feature = "pez-fork-tree")] pub use pez_fork_tree; @@ -118,8 +115,7 @@ pub use pez_generate_bags; #[cfg(feature = "pez-slot-range-helper")] pub use pez_slot_range_helper; -/// Generate and restore keys for Bizinikiwi based chains such as Pezkuwi, Kusama and a growing -/// number of teyrchains and Bizinikiwi based projects. +/// Generate and restore keys for Bizinikiwi based chains such as Pezkuwi, Kusama and a growing number of teyrchains and Bizinikiwi based projects. #[cfg(feature = "pez-subkey")] pub use pez_subkey; @@ -127,8 +123,7 @@ pub use pez_subkey; #[cfg(feature = "pez-tracing-gum")] pub use pez_tracing_gum; -/// Generate an overseer including builder pattern and message wrapper from a single annotated -/// struct definition. +/// Generate an overseer including builder pattern and message wrapper from a single annotated struct definition. #[cfg(feature = "pez-tracing-gum-proc-macro")] pub use pez_tracing_gum_proc_macro; @@ -140,8 +135,7 @@ pub use pezbp_runtime; #[cfg(feature = "pezbridge-hub-test-utils")] pub use pezbridge_hub_test_utils; -/// Common types and functions that may be used by bizinikiwi-based runtimes of all bridged -/// chains. +/// Common types and functions that may be used by bizinikiwi-based runtimes of all bridged chains. #[cfg(feature = "pezbridge-runtime-common")] pub use pezbridge_runtime_common; @@ -185,8 +179,7 @@ pub use pezcumulus_client_pov_recovery; #[cfg(feature = "pezcumulus-client-service")] pub use pezcumulus_client_service; -/// Inherent that needs to be present in every teyrchain block. Contains messages and a relay -/// chain storage-proof. +/// Inherent that needs to be present in every teyrchain block. Contains messages and a relay chain storage-proof. #[cfg(feature = "pezcumulus-client-teyrchain-inherent")] pub use pezcumulus_client_teyrchain_inherent; @@ -246,8 +239,7 @@ pub use pezcumulus_primitives_proof_size_hostfunction; #[cfg(feature = "pezcumulus-primitives-storage-weight-reclaim")] pub use pezcumulus_primitives_storage_weight_reclaim; -/// Inherent that needs to be present in every teyrchain block. Contains messages and a relay -/// chain storage-proof. +/// Inherent that needs to be present in every teyrchain block. Contains messages and a relay chain storage-proof. #[cfg(feature = "pezcumulus-primitives-teyrchain-inherent")] pub use pezcumulus_primitives_teyrchain_inherent; @@ -303,6 +295,10 @@ pub use pezframe_election_provider_support; #[cfg(feature = "pezframe-executive")] pub use pezframe_executive; +/// Metadata types for Kurdistan SDK runtimes. +#[cfg(feature = "pezframe-metadata")] +pub use pezframe_metadata; + /// FRAME signed extension for verifying the metadata hash. #[cfg(feature = "pezframe-metadata-hash-extension")] pub use pezframe_metadata_hash_extension; @@ -335,23 +331,19 @@ pub use pezframe_system_benchmarking; #[cfg(feature = "pezframe-system-rpc-runtime-api")] pub use pezframe_system_rpc_runtime_api; -/// Pezkuwi Approval Distribution subsystem for the distribution of assignments and approvals -/// for approval checks on candidates over the network. +/// Pezkuwi Approval Distribution subsystem for the distribution of assignments and approvals for approval checks on candidates over the network. #[cfg(feature = "pezkuwi-approval-distribution")] pub use pezkuwi_approval_distribution; -/// Pezkuwi Bitfiled Distribution subsystem, which gossips signed availability bitfields used -/// to compactly determine which backed candidates are available or not based on a 2/3+ quorum. +/// Pezkuwi Bitfiled Distribution subsystem, which gossips signed availability bitfields used to compactly determine which backed candidates are available or not based on a 2/3+ quorum. #[cfg(feature = "pezkuwi-availability-bitfield-distribution")] pub use pezkuwi_availability_bitfield_distribution; -/// The Availability Distribution subsystem. Requests the required availability data. Also -/// distributes availability data and chunks to requesters. +/// The Availability Distribution subsystem. Requests the required availability data. Also distributes availability data and chunks to requesters. #[cfg(feature = "pezkuwi-availability-distribution")] pub use pezkuwi_availability_distribution; -/// The Availability Recovery subsystem. Handles requests for recovering the availability data -/// of included candidates. +/// The Availability Recovery subsystem. Handles requests for recovering the availability data of included candidates. #[cfg(feature = "pezkuwi-availability-recovery")] pub use pezkuwi_availability_recovery; @@ -367,8 +359,7 @@ pub use pezkuwi_collator_protocol; #[cfg(feature = "pezkuwi-core-primitives")] pub use pezkuwi_core_primitives; -/// Pezkuwi Dispute Distribution subsystem, which ensures all concerned validators are aware of -/// a dispute and have the relevant votes. +/// Pezkuwi Dispute Distribution subsystem, which ensures all concerned validators are aware of a dispute and have the relevant votes. #[cfg(feature = "pezkuwi-dispute-distribution")] pub use pezkuwi_dispute_distribution; @@ -376,8 +367,7 @@ pub use pezkuwi_dispute_distribution; #[cfg(feature = "pezkuwi-erasure-coding")] pub use pezkuwi_erasure_coding; -/// Pezkuwi Gossip Support subsystem. Responsible for keeping track of session changes and -/// issuing a connection request to the relevant validators on every new session. +/// Pezkuwi Gossip Support subsystem. Responsible for keeping track of session changes and issuing a connection request to the relevant validators on every new session. #[cfg(feature = "pezkuwi-gossip-support")] pub use pezkuwi_gossip_support; @@ -397,13 +387,11 @@ pub use pezkuwi_node_core_approval_voting; #[cfg(feature = "pezkuwi-node-core-approval-voting-parallel")] pub use pezkuwi_node_core_approval_voting_parallel; -/// The Availability Store subsystem. Wrapper over the DB that stores availability data and -/// chunks. +/// The Availability Store subsystem. Wrapper over the DB that stores availability data and chunks. #[cfg(feature = "pezkuwi-node-core-av-store")] pub use pezkuwi_node_core_av_store; -/// The Candidate Backing Subsystem. Tracks teyrchain candidates that can be backed, as well as -/// the issuance of statements about candidates. +/// The Candidate Backing Subsystem. Tracks teyrchain candidates that can be backed, as well as the issuance of statements about candidates. #[cfg(feature = "pezkuwi-node-core-backing")] pub use pezkuwi_node_core_backing; @@ -411,13 +399,11 @@ pub use pezkuwi_node_core_backing; #[cfg(feature = "pezkuwi-node-core-bitfield-signing")] pub use pezkuwi_node_core_bitfield_signing; -/// Pezkuwi crate that implements the Candidate Validation subsystem. Handles requests to -/// validate candidates according to a PVF. +/// Pezkuwi crate that implements the Candidate Validation subsystem. Handles requests to validate candidates according to a PVF. #[cfg(feature = "pezkuwi-node-core-candidate-validation")] pub use pezkuwi_node_core_candidate_validation; -/// The Chain API subsystem provides access to chain related utility functions like block -/// number to hash conversions. +/// The Chain API subsystem provides access to chain related utility functions like block number to hash conversions. #[cfg(feature = "pezkuwi-node-core-chain-api")] pub use pezkuwi_node_core_chain_api; @@ -433,33 +419,27 @@ pub use pezkuwi_node_core_dispute_coordinator; #[cfg(feature = "pezkuwi-node-core-prospective-teyrchains")] pub use pezkuwi_node_core_prospective_teyrchains; -/// Responsible for assembling a relay chain block from a set of available teyrchain -/// candidates. +/// Responsible for assembling a relay chain block from a set of available teyrchain candidates. #[cfg(feature = "pezkuwi-node-core-provisioner")] pub use pezkuwi_node_core_provisioner; -/// Pezkuwi crate that implements the PVF validation host. Responsible for coordinating -/// preparation and execution of PVFs. +/// Pezkuwi crate that implements the PVF validation host. Responsible for coordinating preparation and execution of PVFs. #[cfg(feature = "pezkuwi-node-core-pvf")] pub use pezkuwi_node_core_pvf; -/// Pezkuwi crate that implements the PVF pre-checking subsystem. Responsible for checking and -/// voting for PVFs that are pending approval. +/// Pezkuwi crate that implements the PVF pre-checking subsystem. Responsible for checking and voting for PVFs that are pending approval. #[cfg(feature = "pezkuwi-node-core-pvf-checker")] pub use pezkuwi_node_core_pvf_checker; -/// Pezkuwi crate that contains functionality related to PVFs that is shared by the PVF host -/// and the PVF workers. +/// Pezkuwi crate that contains functionality related to PVFs that is shared by the PVF host and the PVF workers. #[cfg(feature = "pezkuwi-node-core-pvf-common")] pub use pezkuwi_node_core_pvf_common; -/// Pezkuwi crate that contains the logic for executing PVFs. Used by the -/// pezkuwi-execute-worker binary. +/// Pezkuwi crate that contains the logic for executing PVFs. Used by the pezkuwi-execute-worker binary. #[cfg(feature = "pezkuwi-node-core-pvf-execute-worker")] pub use pezkuwi_node_core_pvf_execute_worker; -/// Pezkuwi crate that contains the logic for preparing PVFs. Used by the -/// pezkuwi-prepare-worker binary. +/// Pezkuwi crate that contains the logic for preparing PVFs. Used by the pezkuwi-prepare-worker binary. #[cfg(feature = "pezkuwi-node-core-pvf-prepare-worker")] pub use pezkuwi_node_core_pvf_prepare_worker; @@ -535,6 +515,10 @@ pub use pezkuwi_sdk_frame; #[cfg(feature = "pezkuwi-service")] pub use pezkuwi_service; +/// Registry of known SS58 address types - PezkuwiChain fork. +#[cfg(feature = "pezkuwi-ss58-registry")] +pub use pezkuwi_ss58_registry; + /// Statement Distribution Subsystem. #[cfg(feature = "pezkuwi-statement-distribution")] pub use pezkuwi_statement_distribution; @@ -543,6 +527,46 @@ pub use pezkuwi_statement_distribution; #[cfg(feature = "pezkuwi-statement-table")] pub use pezkuwi_statement_table; +/// Submit extrinsics (transactions) to a Pezkuwi/Bizinikiwi node via RPC. +#[cfg(feature = "pezkuwi-subxt")] +pub use pezkuwi_subxt; + +/// Generate an API for interacting with a Pezkuwi/Bizinikiwi node from FRAME metadata. +#[cfg(feature = "pezkuwi-subxt-codegen")] +pub use pezkuwi_subxt_codegen; + +/// A no-std compatible subset of Subxt's functionality. +#[cfg(feature = "pezkuwi-subxt-core")] +pub use pezkuwi_subxt_core; + +/// Light Client for chain interaction. +#[cfg(feature = "pezkuwi-subxt-lightclient")] +pub use pezkuwi_subxt_lightclient; + +/// Generate types and helpers for interacting with Bizinikiwi runtimes. +#[cfg(feature = "pezkuwi-subxt-macro")] +pub use pezkuwi_subxt_macro; + +/// Command line utilities for checking metadata compatibility between nodes. +#[cfg(feature = "pezkuwi-subxt-metadata")] +pub use pezkuwi_subxt_metadata; + +/// Make RPC calls to Bizinikiwi based nodes. +#[cfg(feature = "pezkuwi-subxt-rpcs")] +pub use pezkuwi_subxt_rpcs; + +/// Sign extrinsics to be submitted by Subxt. +#[cfg(feature = "pezkuwi-subxt-signer")] +pub use pezkuwi_subxt_signer; + +/// subxt utility to fetch metadata. +#[cfg(feature = "pezkuwi-subxt-utils-fetchmetadata")] +pub use pezkuwi_subxt_utils_fetchmetadata; + +/// subxt utility to strip metadata. +#[cfg(feature = "pezkuwi-subxt-utils-stripmetadata")] +pub use pezkuwi_subxt_utils_stripmetadata; + /// Types and utilities for creating and working with teyrchains. #[cfg(feature = "pezkuwi-teyrchain-primitives")] pub use pezkuwi_teyrchain_primitives; @@ -615,8 +639,7 @@ pub use pezpallet_authority_discovery; #[cfg(feature = "pezpallet-authorship")] pub use pezpallet_authorship; -/// Consensus extension module for BABE consensus. Collects on-chain randomness from VRF -/// outputs and manages epoch transitions. +/// Consensus extension module for BABE consensus. Collects on-chain randomness from VRF outputs and manages epoch transitions. #[cfg(feature = "pezpallet-babe")] pub use pezpallet_babe; @@ -640,8 +663,7 @@ pub use pezpallet_beefy_mmr; #[cfg(feature = "pezpallet-bounties")] pub use pezpallet_bounties; -/// Module implementing GRANDPA on-chain light client used for bridging consensus of -/// bizinikiwi-based chains. +/// Module implementing GRANDPA on-chain light client used for bridging consensus of bizinikiwi-based chains. #[cfg(feature = "pezpallet-bridge-grandpa")] pub use pezpallet_bridge_grandpa; @@ -669,8 +691,7 @@ pub use pezpallet_child_bounties; #[cfg(feature = "pezpallet-collator-selection")] pub use pezpallet_collator_selection; -/// Collective system: Members of a set of account IDs can make their collective feelings known -/// through dispatched calls from one of two specialized origins. +/// Collective system: Members of a set of account IDs can make their collective feelings known through dispatched calls from one of two specialized origins. #[cfg(feature = "pezpallet-collective")] pub use pezpallet_collective; @@ -870,8 +891,7 @@ pub use pezpallet_preimage; #[cfg(feature = "pezpallet-proxy")] pub use pezpallet_proxy; -/// Ranked collective system: Members of a set of account IDs can make their collective -/// feelings known through dispatched calls from one of two specialized origins. +/// Ranked collective system: Members of a set of account IDs can make their collective feelings known through dispatched calls from one of two specialized origins. #[cfg(feature = "pezpallet-ranked-collective")] pub use pezpallet_ranked_collective; @@ -903,10 +923,6 @@ pub use pezpallet_revive_uapi; #[cfg(feature = "pezpallet-root-offences")] pub use pezpallet_root_offences; -/// FRAME root testing pezpallet. -#[cfg(feature = "pezpallet-root-testing")] -pub use pezpallet_root_testing; - /// FRAME safe-mode pezpallet. #[cfg(feature = "pezpallet-safe-mode")] pub use pezpallet_safe_mode; @@ -931,8 +947,7 @@ pub use pezpallet_session; #[cfg(feature = "pezpallet-session-benchmarking")] pub use pezpallet_session_benchmarking; -/// Pallet to skip payments for calls annotated with `feeless_if` if the respective conditions -/// are satisfied. +/// Pallet to skip payments for calls annotated with `feeless_if` if the respective conditions are satisfied. #[cfg(feature = "pezpallet-skip-feeless-payment")] pub use pezpallet_skip_feeless_payment; @@ -948,13 +963,11 @@ pub use pezpallet_staking; #[cfg(feature = "pezpallet-staking-async")] pub use pezpallet_staking_async; -/// Pallet handling the communication with staking-rc-client. It's role is to glue the staking -/// pezpallet (on AssetHub chain) and session pezpallet (on Relay Chain) in a transparent way. +/// Pallet handling the communication with staking-rc-client. It's role is to glue the staking pezpallet (on AssetHub chain) and session pezpallet (on Relay Chain) in a transparent way. #[cfg(feature = "pezpallet-staking-async-ah-client")] pub use pezpallet_staking_async_ah_client; -/// Pallet handling the communication with staking-ah-client. It's role is to glue the staking -/// pezpallet (on AssetHub chain) and session pezpallet (on Relay Chain) in a transparent way. +/// Pallet handling the communication with staking-ah-client. It's role is to glue the staking pezpallet (on AssetHub chain) and session pezpallet (on Relay Chain) in a transparent way. #[cfg(feature = "pezpallet-staking-async-rc-client")] pub use pezpallet_staking_async_rc_client; @@ -1230,8 +1243,7 @@ pub use pezsc_rpc_spec_v2; #[cfg(feature = "pezsc-runtime-utilities")] pub use pezsc_runtime_utilities; -/// Bizinikiwi service. Starts a thread that spins up the network, client, and extrinsic pool. -/// Manages communication between them. +/// Bizinikiwi service. Starts a thread that spins up the network, client, and extrinsic pool. Manages communication between them. #[cfg(feature = "pezsc-service")] pub use pezsc_service; @@ -1343,8 +1355,7 @@ pub use pezsp_core; #[cfg(feature = "pezsp-core-hashing")] pub use pezsp_core_hashing; -/// Procedural macros for calculating static hashes (deprecated in favor of -/// `pezsp-crypto-hashing-proc-macro`). +/// Procedural macros for calculating static hashes (deprecated in favor of `pezsp-crypto-hashing-proc-macro`). #[cfg(feature = "pezsp-core-hashing-proc-macro")] pub use pezsp_core_hashing_proc_macro; @@ -1428,8 +1439,7 @@ pub use pezsp_rpc; #[cfg(feature = "pezsp-runtime-interface")] pub use pezsp_runtime_interface; -/// This crate provides procedural macros for usage within the context of the Bizinikiwi -/// runtime interface. +/// This crate provides procedural macros for usage within the context of the Bizinikiwi runtime interface. #[cfg(feature = "pezsp-runtime-interface-proc-macro")] pub use pezsp_runtime_interface_proc_macro; @@ -1437,8 +1447,7 @@ pub use pezsp_runtime_interface_proc_macro; #[cfg(feature = "pezsp-session")] pub use pezsp_session; -/// A crate which contains primitives that are useful for implementation that uses staking -/// approaches in general. Definitions related to sessions, slashing, etc go here. +/// A crate which contains primitives that are useful for implementation that uses staking approaches in general. Definitions related to sessions, slashing, etc go here. #[cfg(feature = "pezsp-staking")] pub use pezsp_staking; @@ -1450,8 +1459,7 @@ pub use pezsp_state_machine; #[cfg(feature = "pezsp-statement-store")] pub use pezsp_statement_store; -/// Lowest-abstraction level for the Bizinikiwi runtime: just exports useful primitives from -/// std or client/alloc to be used with any code that depends on the runtime. +/// Lowest-abstraction level for the Bizinikiwi runtime: just exports useful primitives from std or client/alloc to be used with any code that depends on the runtime. #[cfg(feature = "pezsp-std")] pub use pezsp_std; @@ -1479,8 +1487,7 @@ pub use pezsp_transaction_storage_proof; #[cfg(feature = "pezsp-trie")] pub use pezsp_trie; -/// Version module for the Bizinikiwi runtime; Provides a function that returns the runtime -/// version. +/// Version module for the Bizinikiwi runtime; Provides a function that returns the runtime version. #[cfg(feature = "pezsp-version")] pub use pezsp_version; @@ -1496,8 +1503,7 @@ pub use pezsp_wasm_interface; #[cfg(feature = "pezsp-weights")] pub use pezsp_weights; -/// Utility for building chain-specification files for Bizinikiwi-based runtimes based on -/// `pezsp-genesis-builder`. +/// Utility for building chain-specification files for Bizinikiwi-based runtimes based on `pezsp-genesis-builder`. #[cfg(feature = "pezstaging-chain-spec-builder")] pub use pezstaging_chain_spec_builder; @@ -1552,3 +1558,27 @@ pub use xcm_pez_simulator; /// XCM runtime APIs. #[cfg(feature = "xcm-runtime-pezapis")] pub use xcm_runtime_pezapis; + +/// Zombienet sdk config builder, allow to build a network configuration. +#[cfg(feature = "zombienet-configuration")] +pub use zombienet_configuration; + +/// Zombienet Orchestrator, drive network spwan through providers. +#[cfg(feature = "zombienet-orchestrator")] +pub use zombienet_orchestrator; + +/// Prometheus metric parser, parse metrics provided by internal prometheus server. +#[cfg(feature = "zombienet-prom-metrics-parser")] +pub use zombienet_prom_metrics_parser; + +/// Zombienet provider, implement the logic to run the nodes in the native provider. +#[cfg(feature = "zombienet-provider")] +pub use zombienet_provider; + +/// Zombienet SDK, entrypoint for using zombienet. +#[cfg(feature = "zombienet-sdk")] +pub use zombienet_sdk; + +/// Support crates with common traits/structs and helpers. +#[cfg(feature = "zombienet-support")] +pub use zombienet_support; diff --git a/vendor/pezkuwi-subxt/codegen/src/api/calls.rs b/vendor/pezkuwi-subxt/codegen/src/api/calls.rs index d6fb0508..e8444824 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/calls.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/calls.rs @@ -8,8 +8,8 @@ use pezkuwi_subxt_metadata::PalletMetadata; use proc_macro2::TokenStream as TokenStream2; use quote::{format_ident, quote}; use scale_typegen::{ + typegen::ir::{type_ir::CompositeIRKind, ToTokensWithSettings}, TypeGenerator, - typegen::ir::{ToTokensWithSettings, type_ir::CompositeIRKind}, }; /// Generate calls from the provided pallet's metadata. Each call returns a `StaticPayload` diff --git a/vendor/pezkuwi-subxt/codegen/src/api/constants.rs b/vendor/pezkuwi-subxt/codegen/src/api/constants.rs index d8b021b5..69ec469d 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/constants.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/constants.rs @@ -6,7 +6,7 @@ use heck::ToSnakeCase as _; use pezkuwi_subxt_metadata::PalletMetadata; use proc_macro2::TokenStream as TokenStream2; use quote::{format_ident, quote}; -use scale_typegen::{TypeGenerator, typegen::ir::ToTokensWithSettings}; +use scale_typegen::{typegen::ir::ToTokensWithSettings, TypeGenerator}; use super::CodegenError; diff --git a/vendor/pezkuwi-subxt/codegen/src/api/custom_values.rs b/vendor/pezkuwi-subxt/codegen/src/api/custom_values.rs index 7fad41ba..2f2cea9f 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/custom_values.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/custom_values.rs @@ -4,7 +4,7 @@ use heck::ToSnakeCase as _; use pezkuwi_subxt_metadata::{CustomValueMetadata, Metadata}; -use scale_typegen::{TypeGenerator, typegen::ir::ToTokensWithSettings}; +use scale_typegen::{typegen::ir::ToTokensWithSettings, TypeGenerator}; use std::collections::HashSet; use proc_macro2::TokenStream as TokenStream2; diff --git a/vendor/pezkuwi-subxt/codegen/src/api/events.rs b/vendor/pezkuwi-subxt/codegen/src/api/events.rs index 66816e4a..ba1c38fe 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/events.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/events.rs @@ -6,7 +6,7 @@ use super::CodegenError; use pezkuwi_subxt_metadata::PalletMetadata; use proc_macro2::TokenStream as TokenStream2; use quote::quote; -use scale_typegen::{TypeGenerator, typegen::ir::ToTokensWithSettings}; +use scale_typegen::{typegen::ir::ToTokensWithSettings, TypeGenerator}; /// Generate events from the provided pallet metadata. /// diff --git a/vendor/pezkuwi-subxt/codegen/src/api/mod.rs b/vendor/pezkuwi-subxt/codegen/src/api/mod.rs index 3536c290..c5462fb7 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/mod.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/mod.rs @@ -15,17 +15,17 @@ mod storage; use pezkuwi_subxt_metadata::Metadata; use scale_typegen::{ - TypeGenerator, typegen::{ ir::{ - ToTokensWithSettings, type_ir::{CompositeFieldIR, CompositeIR, CompositeIRKind}, + ToTokensWithSettings, }, type_params::TypeParameters, type_path::TypePath, }, + TypeGenerator, }; -use syn::{Ident, parse_quote}; +use syn::{parse_quote, Ident}; use crate::{ api::custom_values::generate_custom_values, error::CodegenError, ir, subxt_type_gen_settings, @@ -438,16 +438,18 @@ pub fn generate_type_alias_mod( CompositeIRKind::NoFields => { return quote!(); // no types mod generated for unit structs. }, - CompositeIRKind::Named(named) => + CompositeIRKind::Named(named) => { for (name, field) in named.iter_mut() { let alias_name = format_ident!("{}", name.to_string().to_upper_camel_case()); modify_field_to_be_type_alias(field, alias_name); - }, - CompositeIRKind::Unnamed(unnamed) => + } + }, + CompositeIRKind::Unnamed(unnamed) => { for (i, field) in unnamed.iter_mut().enumerate() { let alias_name = format_ident!("Field{}", i); modify_field_to_be_type_alias(field, alias_name); - }, + } + }, }; let types_mod_ident = type_gen.types_mod_ident(); diff --git a/vendor/pezkuwi-subxt/codegen/src/api/pallet_view_functions.rs b/vendor/pezkuwi-subxt/codegen/src/api/pallet_view_functions.rs index 0340fa4c..3d19492b 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/pallet_view_functions.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/pallet_view_functions.rs @@ -8,7 +8,7 @@ use crate::CodegenError; use pezkuwi_subxt_metadata::{PalletMetadata, ViewFunctionMetadata}; use proc_macro2::TokenStream as TokenStream2; use quote::{format_ident, quote}; -use scale_typegen::{TypeGenerator, typegen::ir::ToTokensWithSettings}; +use scale_typegen::{typegen::ir::ToTokensWithSettings, TypeGenerator}; use std::collections::HashSet; pub fn generate_pallet_view_functions( diff --git a/vendor/pezkuwi-subxt/codegen/src/api/runtime_apis.rs b/vendor/pezkuwi-subxt/codegen/src/api/runtime_apis.rs index 4a8495e1..2c6bbda3 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/runtime_apis.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/runtime_apis.rs @@ -7,7 +7,7 @@ use std::collections::HashSet; use heck::{ToSnakeCase as _, ToUpperCamelCase as _}; use pezkuwi_subxt_metadata::{Metadata, RuntimeApiMetadata}; -use scale_typegen::{TypeGenerator, typegen::ir::ToTokensWithSettings}; +use scale_typegen::{typegen::ir::ToTokensWithSettings, TypeGenerator}; use proc_macro2::TokenStream as TokenStream2; use quote::{format_ident, quote}; diff --git a/vendor/pezkuwi-subxt/codegen/src/api/storage.rs b/vendor/pezkuwi-subxt/codegen/src/api/storage.rs index 606fbcbe..a17b624a 100644 --- a/vendor/pezkuwi-subxt/codegen/src/api/storage.rs +++ b/vendor/pezkuwi-subxt/codegen/src/api/storage.rs @@ -172,7 +172,7 @@ fn generate_storage_entry_fns( mod tests { use frame_metadata::v15; use pezkuwi_subxt_metadata::Metadata; - use scale_info::{MetaType, meta_type}; + use scale_info::{meta_type, MetaType}; // TODO: Think about adding tests for storage codegen which can use this sort of function. #[allow(dead_code)] diff --git a/vendor/pezkuwi-subxt/codegen/src/lib.rs b/vendor/pezkuwi-subxt/codegen/src/lib.rs index 0d82d298..e71ca1ea 100644 --- a/vendor/pezkuwi-subxt/codegen/src/lib.rs +++ b/vendor/pezkuwi-subxt/codegen/src/lib.rs @@ -19,8 +19,8 @@ use getrandom as _; use api::RuntimeGenerator; use proc_macro2::TokenStream as TokenStream2; use scale_typegen::{ + typegen::settings::{substitutes::absolute_path, AllocCratePath}, DerivesRegistry, TypeGeneratorSettings, TypeSubstitutes, TypegenError, - typegen::settings::{AllocCratePath, substitutes::absolute_path}, }; use std::collections::HashMap; use syn::parse_quote; diff --git a/vendor/pezkuwi-subxt/core/Cargo.toml b/vendor/pezkuwi-subxt/core/Cargo.toml index 2f96e8e6..434118b3 100644 --- a/vendor/pezkuwi-subxt/core/Cargo.toml +++ b/vendor/pezkuwi-subxt/core/Cargo.toml @@ -30,6 +30,11 @@ std = [ "serde/std", "serde_json/std", "tracing/std", + "bitvec/std", + "blake2/std", + "frame-decode/std", + "keccak-hash/std", + "pezkuwi-subxt-signer/std" ] [dependencies] diff --git a/vendor/pezkuwi-subxt/core/src/blocks/extrinsic_transaction_extensions.rs b/vendor/pezkuwi-subxt/core/src/blocks/extrinsic_transaction_extensions.rs index 2d5c8124..609b274f 100644 --- a/vendor/pezkuwi-subxt/core/src/blocks/extrinsic_transaction_extensions.rs +++ b/vendor/pezkuwi-subxt/core/src/blocks/extrinsic_transaction_extensions.rs @@ -3,13 +3,13 @@ // see LICENSE for license details. use crate::{ - Metadata, config::{ - Config, TransactionExtension, transaction_extensions::{ChargeAssetTxPayment, ChargeTransactionPayment, CheckNonce}, + Config, TransactionExtension, }, dynamic::Value, error::ExtrinsicError, + Metadata, }; use alloc::borrow::ToOwned; use frame_decode::extrinsics::ExtrinsicExtensions; diff --git a/vendor/pezkuwi-subxt/core/src/blocks/extrinsics.rs b/vendor/pezkuwi-subxt/core/src/blocks/extrinsics.rs index cbbd88f2..493b2dc5 100644 --- a/vendor/pezkuwi-subxt/core/src/blocks/extrinsics.rs +++ b/vendor/pezkuwi-subxt/core/src/blocks/extrinsics.rs @@ -3,10 +3,10 @@ // see LICENSE for license details. use crate::{ - Metadata, blocks::extrinsic_transaction_extensions::ExtrinsicTransactionExtensions, config::{Config, HashFor, Hasher}, error::{ExtrinsicDecodeErrorAt, ExtrinsicDecodeErrorAtReason, ExtrinsicError}, + Metadata, }; use alloc::{sync::Arc, vec::Vec}; use frame_decode::extrinsics::Extrinsic; @@ -284,8 +284,8 @@ where /// Attempt to decode these [`ExtrinsicDetails`] into a type representing the extrinsic fields. /// Such types are exposed in the codegen as `pallet_name::calls::types::CallName` types. pub fn as_extrinsic(&self) -> Result, ExtrinsicError> { - if self.decoded_info().pallet_name() == E::PALLET && - self.decoded_info().call_name() == E::CALL + if self.decoded_info().pallet_name() == E::PALLET + && self.decoded_info().call_name() == E::CALL { let mut fields = self.decoded_info().call_data().map(|d| { let name = if d.name().is_empty() { None } else { Some(d.name()) }; @@ -340,13 +340,13 @@ mod tests { use assert_matches::assert_matches; use codec::{Decode, Encode}; use frame_metadata::{ - RuntimeMetadataPrefixed, v15::{ CustomMetadata, ExtrinsicMetadata, OuterEnums, PalletCallMetadata, PalletMetadata, RuntimeMetadataV15, }, + RuntimeMetadataPrefixed, }; - use scale_info::{TypeInfo, meta_type}; + use scale_info::{meta_type, TypeInfo}; use scale_value::Value; // Extrinsic needs to contain at least the generic type parameter "Call" diff --git a/vendor/pezkuwi-subxt/core/src/blocks/mod.rs b/vendor/pezkuwi-subxt/core/src/blocks/mod.rs index 886098f0..85e1697e 100644 --- a/vendor/pezkuwi-subxt/core/src/blocks/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/blocks/mod.rs @@ -69,7 +69,7 @@ mod extrinsics; mod static_extrinsic; pub use crate::error::ExtrinsicError; -use crate::{Metadata, config::Config, error::ExtrinsicDecodeErrorAt}; +use crate::{config::Config, error::ExtrinsicDecodeErrorAt, Metadata}; use alloc::vec::Vec; pub use extrinsic_transaction_extensions::{ ExtrinsicTransactionExtension, ExtrinsicTransactionExtensions, diff --git a/vendor/pezkuwi-subxt/core/src/client.rs b/vendor/pezkuwi-subxt/core/src/client.rs index 968b8711..b1befcad 100644 --- a/vendor/pezkuwi-subxt/core/src/client.rs +++ b/vendor/pezkuwi-subxt/core/src/client.rs @@ -5,8 +5,8 @@ //! A couple of client types that we use elsewhere. use crate::{ - Metadata, config::{Config, HashFor}, + Metadata, }; use derive_where::derive_where; diff --git a/vendor/pezkuwi-subxt/core/src/config/default_extrinsic_params.rs b/vendor/pezkuwi-subxt/core/src/config/default_extrinsic_params.rs index d1aa9ebd..f59f6ba0 100644 --- a/vendor/pezkuwi-subxt/core/src/config/default_extrinsic_params.rs +++ b/vendor/pezkuwi-subxt/core/src/config/default_extrinsic_params.rs @@ -4,7 +4,7 @@ use crate::config::transaction_extensions::CheckMortalityParams; -use super::{Config, ExtrinsicParams, HashFor, transaction_extensions}; +use super::{transaction_extensions, Config, ExtrinsicParams, HashFor}; /// The default [`super::ExtrinsicParams`] implementation understands common signed extensions /// and how to apply them to a given chain. diff --git a/vendor/pezkuwi-subxt/core/src/config/mod.rs b/vendor/pezkuwi-subxt/core/src/config/mod.rs index 523f5608..e191a1fb 100644 --- a/vendor/pezkuwi-subxt/core/src/config/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/config/mod.rs @@ -11,8 +11,8 @@ mod default_extrinsic_params; mod extrinsic_params; -pub mod pezkuwi; pub mod bizinikiwi; +pub mod pezkuwi; pub mod transaction_extensions; use codec::{Decode, Encode}; @@ -20,12 +20,14 @@ use core::fmt::Debug; use pezkuwi_subxt_metadata::Metadata; use scale_decode::DecodeAsType; use scale_encode::EncodeAsType; -use serde::{Serialize, de::DeserializeOwned}; +use serde::{de::DeserializeOwned, Serialize}; +pub use bizinikiwi::{ + BizinikiwConfig, BizinikiwiExtrinsicParams, BizinikiwiExtrinsicParamsBuilder, +}; pub use default_extrinsic_params::{DefaultExtrinsicParams, DefaultExtrinsicParamsBuilder}; pub use extrinsic_params::{ExtrinsicParams, ExtrinsicParamsEncoder}; pub use pezkuwi::{PezkuwiConfig, PezkuwiExtrinsicParams, PezkuwiExtrinsicParamsBuilder}; -pub use bizinikiwi::{BizinikiwConfig, BizinikiwiExtrinsicParams, BizinikiwiExtrinsicParamsBuilder}; pub use transaction_extensions::TransactionExtension; /// Runtime types. diff --git a/vendor/pezkuwi-subxt/core/src/config/transaction_extensions.rs b/vendor/pezkuwi-subxt/core/src/config/transaction_extensions.rs index 58e334e1..dd98f822 100644 --- a/vendor/pezkuwi-subxt/core/src/config/transaction_extensions.rs +++ b/vendor/pezkuwi-subxt/core/src/config/transaction_extensions.rs @@ -398,13 +398,14 @@ impl CheckMortalityParams { impl Params for CheckMortalityParams { fn inject_block(&mut self, from_block_n: u64, from_block_hash: HashFor) { match &self.0 { - CheckMortalityParamsInner::MortalForBlocks(n) | - CheckMortalityParamsInner::MortalForBlocksOrImmortalIfNotPossible(n) => + CheckMortalityParamsInner::MortalForBlocks(n) + | CheckMortalityParamsInner::MortalForBlocksOrImmortalIfNotPossible(n) => { self.0 = CheckMortalityParamsInner::MortalFromBlock { for_n_blocks: *n, from_block_n, from_block_hash, - }, + } + }, _ => { // Don't change anything if explicit Immortal or explicit block set. }, @@ -670,10 +671,10 @@ fn is_type_empty(type_id: u32, types: &scale_info::PortableRegistry) -> bool { TypeDef::Array(a) => a.len == 0 || is_type_empty(a.type_param.id, types), TypeDef::Tuple(t) => t.fields.iter().all(|f| is_type_empty(f.id, types)), // Explicitly list these in case any additions are made in the future. - TypeDef::BitSequence(_) | - TypeDef::Variant(_) | - TypeDef::Sequence(_) | - TypeDef::Compact(_) | - TypeDef::Primitive(_) => false, + TypeDef::BitSequence(_) + | TypeDef::Variant(_) + | TypeDef::Sequence(_) + | TypeDef::Compact(_) + | TypeDef::Primitive(_) => false, } } diff --git a/vendor/pezkuwi-subxt/core/src/constants/mod.rs b/vendor/pezkuwi-subxt/core/src/constants/mod.rs index 1b97b059..fe1d75bc 100644 --- a/vendor/pezkuwi-subxt/core/src/constants/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/constants/mod.rs @@ -40,7 +40,7 @@ pub mod address; -use crate::{Metadata, error::ConstantError}; +use crate::{error::ConstantError, Metadata}; use address::Address; use alloc::{borrow::ToOwned, string::ToString, vec::Vec}; use frame_decode::constants::ConstantTypeInfo; diff --git a/vendor/pezkuwi-subxt/core/src/custom_values/mod.rs b/vendor/pezkuwi-subxt/core/src/custom_values/mod.rs index 5d378423..713d1d37 100644 --- a/vendor/pezkuwi-subxt/core/src/custom_values/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/custom_values/mod.rs @@ -32,7 +32,7 @@ pub mod address; -use crate::{Metadata, error::CustomValueError, utils::Maybe}; +use crate::{error::CustomValueError, utils::Maybe, Metadata}; use address::Address; use alloc::vec::Vec; use frame_decode::custom_values::CustomValueTypeInfo; @@ -99,7 +99,7 @@ mod tests { use alloc::collections::BTreeMap; use codec::Encode; use scale_decode::DecodeAsType; - use scale_info::{TypeInfo, form::PortableForm}; + use scale_info::{form::PortableForm, TypeInfo}; use alloc::{borrow::ToOwned, string::String, vec}; diff --git a/vendor/pezkuwi-subxt/core/src/events.rs b/vendor/pezkuwi-subxt/core/src/events.rs index 573ccdfe..0caa9811 100644 --- a/vendor/pezkuwi-subxt/core/src/events.rs +++ b/vendor/pezkuwi-subxt/core/src/events.rs @@ -46,9 +46,9 @@ use pezkuwi_subxt_metadata::PalletMetadata; use scale_decode::{DecodeAsFields, DecodeAsType}; use crate::{ - Metadata, config::{Config, HashFor}, error::EventsError, + Metadata, }; /// Create a new [`Events`] instance from the given bytes. @@ -466,16 +466,16 @@ pub struct EventMetadataDetails<'a> { #[cfg(test)] pub(crate) mod test_utils { use super::*; - use crate::config::{HashFor, BizinikiwConfig}; + use crate::config::{BizinikiwConfig, HashFor}; use codec::Encode; use frame_metadata::{ - RuntimeMetadataPrefixed, v15::{ CustomMetadata, ExtrinsicMetadata, OuterEnums, PalletEventMetadata, PalletMetadata, RuntimeMetadataV15, }, + RuntimeMetadataPrefixed, }; - use scale_info::{TypeInfo, meta_type}; + use scale_info::{meta_type, TypeInfo}; /// An "outer" events enum containing exactly one event. #[derive( @@ -611,7 +611,7 @@ pub(crate) mod test_utils { #[cfg(test)] mod tests { use super::{ - test_utils::{AllEvents, EventRecord, event_record, events, events_raw}, + test_utils::{event_record, events, events_raw, AllEvents, EventRecord}, *, }; use crate::{config::BizinikiwConfig, events::Phase}; diff --git a/vendor/pezkuwi-subxt/core/src/runtime_api/mod.rs b/vendor/pezkuwi-subxt/core/src/runtime_api/mod.rs index 8605e86e..ca87eee4 100644 --- a/vendor/pezkuwi-subxt/core/src/runtime_api/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/runtime_api/mod.rs @@ -43,7 +43,7 @@ pub mod payload; -use crate::{Metadata, error::RuntimeApiError}; +use crate::{error::RuntimeApiError, Metadata}; use alloc::{ format, string::{String, ToString}, @@ -75,7 +75,11 @@ pub fn validate(payload: P, metadata: &Metadata) -> Result<(), Runti method_name: method_name.to_string(), })?; - if hash != api_method.hash() { Err(RuntimeApiError::IncompatibleCodegen) } else { Ok(()) } + if hash != api_method.hash() { + Err(RuntimeApiError::IncompatibleCodegen) + } else { + Ok(()) + } } /// Return the name of the runtime API call from the payload. diff --git a/vendor/pezkuwi-subxt/core/src/storage/mod.rs b/vendor/pezkuwi-subxt/core/src/storage/mod.rs index 3271f21d..62f7cfe7 100644 --- a/vendor/pezkuwi-subxt/core/src/storage/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/storage/mod.rs @@ -53,12 +53,12 @@ mod storage_value; pub mod address; -use crate::{Metadata, error::StorageError}; +use crate::{error::StorageError, Metadata}; use address::Address; use alloc::string::ToString; pub use prefix_of::{EqualOrPrefixOf, PrefixOf}; -pub use storage_entry::{StorageEntry, entry}; +pub use storage_entry::{entry, StorageEntry}; pub use storage_key::{StorageHasher, StorageKey, StorageKeyPart}; pub use storage_key_value::StorageKeyValue; pub use storage_value::StorageValue; @@ -86,5 +86,9 @@ pub fn validate(address: Addr, metadata: &Metadata) -> Result<(), } })?; - if storage_hash != hash { Err(StorageError::IncompatibleCodegen) } else { Ok(()) } + if storage_hash != hash { + Err(StorageError::IncompatibleCodegen) + } else { + Ok(()) + } } diff --git a/vendor/pezkuwi-subxt/core/src/storage/storage_entry.rs b/vendor/pezkuwi-subxt/core/src/storage/storage_entry.rs index 443499d9..7ab64549 100644 --- a/vendor/pezkuwi-subxt/core/src/storage/storage_entry.rs +++ b/vendor/pezkuwi-subxt/core/src/storage/storage_entry.rs @@ -2,7 +2,7 @@ // This file is dual-licensed as Apache-2.0 or GPL-3.0. // see LICENSE for license details. -use super::{PrefixOf, StorageKeyValue, StorageValue, address::Address}; +use super::{address::Address, PrefixOf, StorageKeyValue, StorageValue}; use crate::{error::StorageError, utils::YesMaybe}; use alloc::{sync::Arc, vec::Vec}; use frame_decode::storage::{IntoEncodableValues, StorageInfo}; diff --git a/vendor/pezkuwi-subxt/core/src/tx/mod.rs b/vendor/pezkuwi-subxt/core/src/tx/mod.rs index 31cc6bcc..7fc76c53 100644 --- a/vendor/pezkuwi-subxt/core/src/tx/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/tx/mod.rs @@ -60,10 +60,10 @@ pub mod payload; pub mod signer; use crate::{ - Metadata, config::{Config, ExtrinsicParams, ExtrinsicParamsEncoder, HashFor, Hasher}, error::ExtrinsicError, utils::Encoded, + Metadata, }; use alloc::{borrow::Cow, string::ToString, vec::Vec}; use codec::{Compact, Encode}; @@ -95,7 +95,11 @@ pub fn validate(call: &Call, metadata: &Metadata) -> Result<(), E call_name: call_name.to_string(), })?; - if details.hash != expected_hash { Err(ExtrinsicError::IncompatibleCodegen) } else { Ok(()) } + if details.hash != expected_hash { + Err(ExtrinsicError::IncompatibleCodegen) + } else { + Ok(()) + } } /// Returns the suggested transaction versions to build for a given chain, or an error @@ -252,7 +256,11 @@ impl PartialTransactionV4 { self.additional_and_extra_params.encode_signer_payload_value_to(&mut bytes); self.additional_and_extra_params.encode_implicit_to(&mut bytes); - if bytes.len() > 256 { f(Cow::Borrowed(&blake2_256(&bytes))) } else { f(Cow::Owned(bytes)) } + if bytes.len() > 256 { + f(Cow::Borrowed(&blake2_256(&bytes))) + } else { + f(Cow::Owned(bytes)) + } } /// Return the V4 signer payload for this extrinsic. These are the bytes that must diff --git a/vendor/pezkuwi-subxt/core/src/tx/payload.rs b/vendor/pezkuwi-subxt/core/src/tx/payload.rs index 931f571f..8561392c 100644 --- a/vendor/pezkuwi-subxt/core/src/tx/payload.rs +++ b/vendor/pezkuwi-subxt/core/src/tx/payload.rs @@ -5,7 +5,7 @@ //! This module contains the trait and types used to represent //! transactions that can be submitted. -use crate::{Metadata, error::ExtrinsicError}; +use crate::{error::ExtrinsicError, Metadata}; use alloc::{ borrow::Cow, boxed::Box, diff --git a/vendor/pezkuwi-subxt/core/src/utils/bits.rs b/vendor/pezkuwi-subxt/core/src/utils/bits.rs index 245dd574..22556f86 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/bits.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/bits.rs @@ -8,8 +8,8 @@ use alloc::{vec, vec::Vec}; use codec::{Compact, Input}; use core::marker::PhantomData; use scale_bits::{ - Bits, scale::format::{Format, OrderFormat, StoreFormat}, + Bits, }; use scale_decode::{IntoVisitor, TypeResolver}; diff --git a/vendor/pezkuwi-subxt/core/src/utils/era.rs b/vendor/pezkuwi-subxt/core/src/utils/era.rs index 9bf2f14d..6095dbfd 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/era.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/era.rs @@ -5,12 +5,12 @@ use alloc::{format, vec::Vec}; use codec::{Decode, Encode}; use scale_decode::{ - IntoVisitor, TypeResolver, Visitor, ext::scale_type_resolver, visitor::{ - TypeIdFor, types::{Composite, Variant}, + TypeIdFor, }, + IntoVisitor, TypeResolver, Visitor, }; use scale_encode::EncodeAsType; @@ -81,8 +81,8 @@ impl codec::Encode for Era { Self::Immortal => output.push_byte(0), Self::Mortal { period, phase } => { let quantize_factor = (*period >> 12).max(1); - let encoded = (period.trailing_zeros() - 1).clamp(1, 15) as u16 | - ((phase / quantize_factor) << 4) as u16; + let encoded = (period.trailing_zeros() - 1).clamp(1, 15) as u16 + | ((phase / quantize_factor) << 4) as u16; encoded.encode_to(output); }, } diff --git a/vendor/pezkuwi-subxt/core/src/utils/static_type.rs b/vendor/pezkuwi-subxt/core/src/utils/static_type.rs index 520146e6..e2f1a5d2 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/static_type.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/static_type.rs @@ -3,7 +3,7 @@ // see LICENSE for license details. use codec::{Decode, Encode}; -use scale_decode::{IntoVisitor, TypeResolver, Visitor, visitor::DecodeAsTypeResult}; +use scale_decode::{visitor::DecodeAsTypeResult, IntoVisitor, TypeResolver, Visitor}; use scale_encode::EncodeAsType; use alloc::vec::Vec; @@ -45,7 +45,7 @@ impl Visitor for StaticDecodeAsTypeVisitor { _type_id: R::TypeId, _types: &'info R, ) -> DecodeAsTypeResult, Self::Error>> { - use scale_decode::{Error, visitor::DecodeError}; + use scale_decode::{visitor::DecodeError, Error}; let decoded = T::decode(input) .map(Static) .map_err(|e| Error::new(DecodeError::CodecError(e).into())); diff --git a/vendor/pezkuwi-subxt/core/src/utils/unchecked_extrinsic.rs b/vendor/pezkuwi-subxt/core/src/utils/unchecked_extrinsic.rs index cceb9176..2bf38eba 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/unchecked_extrinsic.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/unchecked_extrinsic.rs @@ -12,7 +12,7 @@ use core::marker::PhantomData; use codec::{Decode, Encode}; -use scale_decode::{DecodeAsType, IntoVisitor, TypeResolver, Visitor, visitor::DecodeAsTypeResult}; +use scale_decode::{visitor::DecodeAsTypeResult, DecodeAsType, IntoVisitor, TypeResolver, Visitor}; use super::{Encoded, Static}; use alloc::vec::Vec; @@ -32,7 +32,7 @@ impl UncheckedExtrinsic &[u8] { - self.0.0.0.as_slice() + self.0 .0 .0.as_slice() } } @@ -75,7 +75,7 @@ impl From { fn from(bytes: UncheckedExtrinsic) -> Self { - bytes.0.0.0 + bytes.0 .0 .0 } } @@ -106,8 +106,8 @@ impl IntoVisitor type AnyVisitor = UncheckedExtrinsicDecodeAsTypeVisitor; - fn into_visitor() - -> UncheckedExtrinsicDecodeAsTypeVisitor { + fn into_visitor( + ) -> UncheckedExtrinsicDecodeAsTypeVisitor { UncheckedExtrinsicDecodeAsTypeVisitor(PhantomData) } } diff --git a/vendor/pezkuwi-subxt/core/src/utils/wrapper_opaque.rs b/vendor/pezkuwi-subxt/core/src/utils/wrapper_opaque.rs index a8dfeeaf..2ecf0135 100644 --- a/vendor/pezkuwi-subxt/core/src/utils/wrapper_opaque.rs +++ b/vendor/pezkuwi-subxt/core/src/utils/wrapper_opaque.rs @@ -5,7 +5,7 @@ use super::PhantomDataSendSync; use codec::{Compact, Decode, DecodeAll, Encode}; use derive_where::derive_where; -use scale_decode::{IntoVisitor, TypeResolver, Visitor, ext::scale_type_resolver::visitor}; +use scale_decode::{ext::scale_type_resolver::visitor, IntoVisitor, TypeResolver, Visitor}; use scale_encode::EncodeAsType; use alloc::{format, vec::Vec}; @@ -108,9 +108,12 @@ impl Visitor for WrapperKeepOpaqueVisitor { }; if value.name() != Some("WrapperKeepOpaque") { - return Err(Error::new(ErrorKind::VisitorDecodeError(DecodeError::TypeResolvingError( - format!("Expected a type named 'WrapperKeepOpaque', got: {:?}", value.name()), - )))); + return Err(Error::new(ErrorKind::VisitorDecodeError( + DecodeError::TypeResolvingError(format!( + "Expected a type named 'WrapperKeepOpaque', got: {:?}", + value.name() + )), + ))); } if value.remaining() != 2 { @@ -159,7 +162,7 @@ mod test { impl scale_info::TypeInfo for WrapperKeepOpaque { type Identity = Self; fn type_info() -> scale_info::Type { - use scale_info::{Path, Type, TypeParameter, build::Fields, meta_type}; + use scale_info::{build::Fields, meta_type, Path, Type, TypeParameter}; Type::builder() .path(Path::new("WrapperKeepOpaque", module_path!())) diff --git a/vendor/pezkuwi-subxt/core/src/view_functions/mod.rs b/vendor/pezkuwi-subxt/core/src/view_functions/mod.rs index 58d2d3a9..2c80ef32 100644 --- a/vendor/pezkuwi-subxt/core/src/view_functions/mod.rs +++ b/vendor/pezkuwi-subxt/core/src/view_functions/mod.rs @@ -7,7 +7,7 @@ pub mod payload; -use crate::{Metadata, error::ViewFunctionError}; +use crate::{error::ViewFunctionError, Metadata}; use alloc::{string::ToString, vec::Vec}; use payload::Payload; use scale_decode::IntoVisitor; @@ -33,7 +33,11 @@ pub fn validate(payload: P, metadata: &Metadata) -> Result<(), ViewF function_name: function_name.to_string(), })?; - if hash != view_function.hash() { Err(ViewFunctionError::IncompatibleCodegen) } else { Ok(()) } + if hash != view_function.hash() { + Err(ViewFunctionError::IncompatibleCodegen) + } else { + Ok(()) + } } /// The name of the Runtime API call which can execute diff --git a/vendor/pezkuwi-subxt/lightclient/src/background.rs b/vendor/pezkuwi-subxt/lightclient/src/background.rs index cdf61d6e..5ce673d4 100644 --- a/vendor/pezkuwi-subxt/lightclient/src/background.rs +++ b/vendor/pezkuwi-subxt/lightclient/src/background.rs @@ -2,8 +2,8 @@ // This file is dual-licensed as Apache-2.0 or GPL-3.0. // see LICENSE for license details. -use crate::{JsonRpcError, LightClientRpcError, rpc::RpcResponse, shared_client::SharedClient}; -use futures::{FutureExt, stream::StreamExt}; +use crate::{rpc::RpcResponse, shared_client::SharedClient, JsonRpcError, LightClientRpcError}; +use futures::{stream::StreamExt, FutureExt}; use serde_json::value::RawValue; use smoldot_light::platform::PlatformRef; use std::{collections::HashMap, str::FromStr}; diff --git a/vendor/pezkuwi-subxt/lightclient/src/platform/mod.rs b/vendor/pezkuwi-subxt/lightclient/src/platform/mod.rs index c13178ab..32ac5ea1 100644 --- a/vendor/pezkuwi-subxt/lightclient/src/platform/mod.rs +++ b/vendor/pezkuwi-subxt/lightclient/src/platform/mod.rs @@ -11,7 +11,7 @@ mod wasm_platform; #[cfg(feature = "web")] mod wasm_socket; -pub use helpers::{DefaultPlatform, build_platform}; +pub use helpers::{build_platform, DefaultPlatform}; #[cfg(feature = "native")] mod helpers { diff --git a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_helpers.rs b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_helpers.rs index aae06d4a..ce535370 100644 --- a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_helpers.rs +++ b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_helpers.rs @@ -8,7 +8,7 @@ use super::wasm_socket::WasmSocket; use core::time::Duration; -use futures_util::{FutureExt, future}; +use futures_util::{future, FutureExt}; pub fn now_from_unix_epoch() -> Duration { web_time::SystemTime::now() diff --git a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_platform.rs b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_platform.rs index d89d46b1..fbb7b32e 100644 --- a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_platform.rs +++ b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_platform.rs @@ -89,9 +89,9 @@ impl PlatformRef for SubxtPlatform { fn supports_connection_type(&self, connection_type: ConnectionType) -> bool { let result = matches!( connection_type, - ConnectionType::WebSocketIpv4 { .. } | - ConnectionType::WebSocketIpv6 { .. } | - ConnectionType::WebSocketDns { .. } + ConnectionType::WebSocketIpv4 { .. } + | ConnectionType::WebSocketIpv6 { .. } + | ConnectionType::WebSocketDns { .. } ); tracing::trace!( diff --git a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_socket.rs b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_socket.rs index ebd2ca61..984a5b1b 100644 --- a/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_socket.rs +++ b/vendor/pezkuwi-subxt/lightclient/src/platform/wasm_socket.rs @@ -4,7 +4,7 @@ use futures::{io, prelude::*}; use send_wrapper::SendWrapper; -use wasm_bindgen::{JsCast, prelude::*}; +use wasm_bindgen::{prelude::*, JsCast}; use std::{ collections::VecDeque, diff --git a/vendor/pezkuwi-subxt/macro/src/lib.rs b/vendor/pezkuwi-subxt/macro/src/lib.rs index cd2260e5..e43d7518 100644 --- a/vendor/pezkuwi-subxt/macro/src/lib.rs +++ b/vendor/pezkuwi-subxt/macro/src/lib.rs @@ -5,7 +5,7 @@ //! Subxt macro for generating Bizinikiwi runtime interfaces. use codec::Decode; -use darling::{FromMeta, ast::NestedMeta}; +use darling::{ast::NestedMeta, FromMeta}; use pezkuwi_subxt_codegen::{CodegenBuilder, CodegenError, Metadata}; use proc_macro::TokenStream; use proc_macro_error2::{abort_call_site, proc_macro_error}; @@ -261,7 +261,7 @@ fn fetch_metadata( }, #[cfg(feature = "runtime-metadata-insecure-url")] (None, Some(url_string)) => { - use pezkuwi_subxt_utils_fetchmetadata::{MetadataVersion, Url, from_url_blocking}; + use pezkuwi_subxt_utils_fetchmetadata::{from_url_blocking, MetadataVersion, Url}; let url = Url::parse(url_string).unwrap_or_else(|_| { abort_call_site!("Cannot download metadata; invalid url: {}", url_string) diff --git a/vendor/pezkuwi-subxt/metadata/Cargo.toml b/vendor/pezkuwi-subxt/metadata/Cargo.toml index 9ab128d3..45f29726 100644 --- a/vendor/pezkuwi-subxt/metadata/Cargo.toml +++ b/vendor/pezkuwi-subxt/metadata/Cargo.toml @@ -15,7 +15,14 @@ description = "Command line utilities for checking metadata compatibility betwee [features] default = ["legacy", "std"] -std = ["frame-metadata/std", "scale-info/std"] +std = [ + "frame-metadata/std", + "scale-info/std", + "bitvec/std", + "frame-decode/std", + "codec/std", + "pezsp-crypto-hashing/std" +] # Enable decoding of legacy metadata, too. # std required by frame-metadata to decode >( // Non-compliant paths are converted to our default path let non_compliant_path = path[0..path.len() - 1].iter().any(|&p| { - p.is_empty() || - p.starts_with(|c: char| !c.is_ascii_alphabetic()) || - p.contains(|c: char| !c.is_ascii_alphanumeric() || c.is_ascii_uppercase()) + p.is_empty() + || p.starts_with(|c: char| !c.is_ascii_alphabetic()) + || p.contains(|c: char| !c.is_ascii_alphanumeric() || c.is_ascii_uppercase()) }); if non_compliant_path { let last = *path.last().unwrap(); diff --git a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs index f67343fc..24b17910 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/legacy/tests.rs @@ -432,16 +432,21 @@ fn codegen_works() { }; match &metadata { - RuntimeMetadata::V9(m) => - pezkuwi_subxt_codegen::Metadata::from_v9(m, &types_for_spec), - RuntimeMetadata::V10(m) => - pezkuwi_subxt_codegen::Metadata::from_v10(m, &types_for_spec), - RuntimeMetadata::V11(m) => - pezkuwi_subxt_codegen::Metadata::from_v11(m, &types_for_spec), - RuntimeMetadata::V12(m) => - pezkuwi_subxt_codegen::Metadata::from_v12(m, &types_for_spec), - RuntimeMetadata::V13(m) => - pezkuwi_subxt_codegen::Metadata::from_v13(m, &types_for_spec), + RuntimeMetadata::V9(m) => { + pezkuwi_subxt_codegen::Metadata::from_v9(m, &types_for_spec) + }, + RuntimeMetadata::V10(m) => { + pezkuwi_subxt_codegen::Metadata::from_v10(m, &types_for_spec) + }, + RuntimeMetadata::V11(m) => { + pezkuwi_subxt_codegen::Metadata::from_v11(m, &types_for_spec) + }, + RuntimeMetadata::V12(m) => { + pezkuwi_subxt_codegen::Metadata::from_v12(m, &types_for_spec) + }, + RuntimeMetadata::V13(m) => { + pezkuwi_subxt_codegen::Metadata::from_v13(m, &types_for_spec) + }, _ => panic!("Metadata version {} not expected", metadata.version()), } .expect("Could not convert to pezkuwi_subxt_metadata::Metadata") diff --git a/vendor/pezkuwi-subxt/metadata/src/from/mod.rs b/vendor/pezkuwi-subxt/metadata/src/from/mod.rs index 93acf332..c00f035c 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/mod.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/mod.rs @@ -53,34 +53,48 @@ impl TryFrom for crate::Metadata { fn try_from(value: frame_metadata::RuntimeMetadataPrefixed) -> Result { match value.1 { - frame_metadata::RuntimeMetadata::V0(_) => - Err(TryFromError::UnsupportedMetadataVersion(0)), - frame_metadata::RuntimeMetadata::V1(_) => - Err(TryFromError::UnsupportedMetadataVersion(1)), - frame_metadata::RuntimeMetadata::V2(_) => - Err(TryFromError::UnsupportedMetadataVersion(2)), - frame_metadata::RuntimeMetadata::V3(_) => - Err(TryFromError::UnsupportedMetadataVersion(3)), - frame_metadata::RuntimeMetadata::V4(_) => - Err(TryFromError::UnsupportedMetadataVersion(4)), - frame_metadata::RuntimeMetadata::V5(_) => - Err(TryFromError::UnsupportedMetadataVersion(5)), - frame_metadata::RuntimeMetadata::V6(_) => - Err(TryFromError::UnsupportedMetadataVersion(6)), - frame_metadata::RuntimeMetadata::V7(_) => - Err(TryFromError::UnsupportedMetadataVersion(7)), - frame_metadata::RuntimeMetadata::V8(_) => - Err(TryFromError::UnsupportedMetadataVersion(8)), - frame_metadata::RuntimeMetadata::V9(_) => - Err(TryFromError::UnsupportedMetadataVersion(9)), - frame_metadata::RuntimeMetadata::V10(_) => - Err(TryFromError::UnsupportedMetadataVersion(10)), - frame_metadata::RuntimeMetadata::V11(_) => - Err(TryFromError::UnsupportedMetadataVersion(11)), - frame_metadata::RuntimeMetadata::V12(_) => - Err(TryFromError::UnsupportedMetadataVersion(12)), - frame_metadata::RuntimeMetadata::V13(_) => - Err(TryFromError::UnsupportedMetadataVersion(13)), + frame_metadata::RuntimeMetadata::V0(_) => { + Err(TryFromError::UnsupportedMetadataVersion(0)) + }, + frame_metadata::RuntimeMetadata::V1(_) => { + Err(TryFromError::UnsupportedMetadataVersion(1)) + }, + frame_metadata::RuntimeMetadata::V2(_) => { + Err(TryFromError::UnsupportedMetadataVersion(2)) + }, + frame_metadata::RuntimeMetadata::V3(_) => { + Err(TryFromError::UnsupportedMetadataVersion(3)) + }, + frame_metadata::RuntimeMetadata::V4(_) => { + Err(TryFromError::UnsupportedMetadataVersion(4)) + }, + frame_metadata::RuntimeMetadata::V5(_) => { + Err(TryFromError::UnsupportedMetadataVersion(5)) + }, + frame_metadata::RuntimeMetadata::V6(_) => { + Err(TryFromError::UnsupportedMetadataVersion(6)) + }, + frame_metadata::RuntimeMetadata::V7(_) => { + Err(TryFromError::UnsupportedMetadataVersion(7)) + }, + frame_metadata::RuntimeMetadata::V8(_) => { + Err(TryFromError::UnsupportedMetadataVersion(8)) + }, + frame_metadata::RuntimeMetadata::V9(_) => { + Err(TryFromError::UnsupportedMetadataVersion(9)) + }, + frame_metadata::RuntimeMetadata::V10(_) => { + Err(TryFromError::UnsupportedMetadataVersion(10)) + }, + frame_metadata::RuntimeMetadata::V11(_) => { + Err(TryFromError::UnsupportedMetadataVersion(11)) + }, + frame_metadata::RuntimeMetadata::V12(_) => { + Err(TryFromError::UnsupportedMetadataVersion(12)) + }, + frame_metadata::RuntimeMetadata::V13(_) => { + Err(TryFromError::UnsupportedMetadataVersion(13)) + }, frame_metadata::RuntimeMetadata::V14(m) => m.try_into(), frame_metadata::RuntimeMetadata::V15(m) => m.try_into(), frame_metadata::RuntimeMetadata::V16(m) => m.try_into(), diff --git a/vendor/pezkuwi-subxt/metadata/src/from/v14.rs b/vendor/pezkuwi-subxt/metadata/src/from/v14.rs index 8673c4dd..1dd2a982 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/v14.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/v14.rs @@ -5,9 +5,9 @@ use super::TryFromError; use crate::{ + utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, ConstantMetadata, CustomMetadataInner, ExtrinsicMetadata, Metadata, OuterEnumsMetadata, PalletMetadataInner, StorageEntryMetadata, StorageMetadata, TransactionExtensionMetadataInner, - utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, }; use alloc::{borrow::ToOwned, collections::BTreeMap, format, string::String, vec, vec::Vec}; use frame_decode::storage::StorageTypeInfo; diff --git a/vendor/pezkuwi-subxt/metadata/src/from/v15.rs b/vendor/pezkuwi-subxt/metadata/src/from/v15.rs index 0093a5d5..cfd9ba28 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/v15.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/v15.rs @@ -5,10 +5,10 @@ use super::TryFromError; use crate::{ + utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, ConstantMetadata, ExtrinsicMetadata, Metadata, OuterEnumsMetadata, PalletMetadataInner, RuntimeApiMetadataInner, RuntimeApiMethodMetadataInner, StorageEntryMetadata, StorageMetadata, TransactionExtensionMetadataInner, - utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, }; use alloc::{collections::BTreeMap, vec, vec::Vec}; use frame_decode::{runtime_apis::RuntimeApiTypeInfo, storage::StorageTypeInfo}; diff --git a/vendor/pezkuwi-subxt/metadata/src/from/v16.rs b/vendor/pezkuwi-subxt/metadata/src/from/v16.rs index ee0272dc..3bfc5eda 100644 --- a/vendor/pezkuwi-subxt/metadata/src/from/v16.rs +++ b/vendor/pezkuwi-subxt/metadata/src/from/v16.rs @@ -5,10 +5,10 @@ use super::TryFromError; use crate::{ + utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, ConstantMetadata, ExtrinsicMetadata, Metadata, OuterEnumsMetadata, PalletMetadataInner, RuntimeApiMetadataInner, RuntimeApiMethodMetadataInner, StorageEntryMetadata, StorageMetadata, TransactionExtensionMetadataInner, ViewFunctionMetadataInner, - utils::{ordered_map::OrderedMap, variant_index::VariantIndex}, }; use frame_decode::{ runtime_apis::RuntimeApiTypeInfo, storage::StorageTypeInfo, diff --git a/vendor/pezkuwi-subxt/metadata/src/lib.rs b/vendor/pezkuwi-subxt/metadata/src/lib.rs index 7250532c..a412f519 100644 --- a/vendor/pezkuwi-subxt/metadata/src/lib.rs +++ b/vendor/pezkuwi-subxt/metadata/src/lib.rs @@ -43,15 +43,15 @@ use frame_decode::{ }; use hashbrown::HashMap; -use scale_info::{PortableRegistry, Variant, form::PortableForm}; +use scale_info::{form::PortableForm, PortableRegistry, Variant}; use utils::{ ordered_map::OrderedMap, - validation::{HASH_LEN, get_custom_value_hash}, + validation::{get_custom_value_hash, HASH_LEN}, variant_index::VariantIndex, }; pub use frame_decode::storage::StorageHasher; -pub use from::{SUPPORTED_METADATA_VERSIONS, TryFromError}; +pub use from::{TryFromError, SUPPORTED_METADATA_VERSIONS}; pub use utils::validation::MetadataHasher; #[cfg(feature = "legacy")] diff --git a/vendor/pezkuwi-subxt/metadata/src/utils/validation.rs b/vendor/pezkuwi-subxt/metadata/src/utils/validation.rs index dc5eb56a..05d35514 100644 --- a/vendor/pezkuwi-subxt/metadata/src/utils/validation.rs +++ b/vendor/pezkuwi-subxt/metadata/src/utils/validation.rs @@ -10,7 +10,7 @@ use crate::{ }; use alloc::vec::Vec; use hashbrown::HashMap; -use scale_info::{Field, PortableRegistry, TypeDef, TypeDefVariant, Variant, form::PortableForm}; +use scale_info::{form::PortableForm, Field, PortableRegistry, TypeDef, TypeDefVariant, Variant}; // The number of bytes our `hash` function produces. pub(crate) const HASH_LEN: usize = 32; @@ -115,7 +115,11 @@ fn get_type_def_variant_hash( .as_ref() .map(|only_these_variants| only_these_variants.contains(&var.name.as_str())) .unwrap_or(true); - if should_hash { xor(bytes, get_variant_hash(registry, var, cache)) } else { bytes } + if should_hash { + xor(bytes, get_variant_hash(registry, var, cache)) + } else { + bytes + } }); concat_and_hash2(&variant_id_bytes, &variant_field_bytes) } @@ -521,7 +525,11 @@ impl<'a> MetadataHasher<'a> { .unwrap_or(true); // We don't care what order the pallets are seen in, so XOR their // hashes together to be order independent. - if should_hash { xor(bytes, get_pallet_hash(pallet)) } else { bytes } + if should_hash { + xor(bytes, get_pallet_hash(pallet)) + } else { + bytes + } }); let apis_hash = metadata.runtime_api_traits().fold([0u8; HASH_LEN], |bytes, api| { @@ -534,7 +542,11 @@ impl<'a> MetadataHasher<'a> { .unwrap_or(true); // We don't care what order the runtime APIs are seen in, so XOR their // hashes together to be order independent. - if should_hash { xor(bytes, get_runtime_apis_hash(api)) } else { bytes } + if should_hash { + xor(bytes, get_runtime_apis_hash(api)) + } else { + bytes + } }); let outer_enums_hash = concat_and_hash3( @@ -566,7 +578,7 @@ mod tests { use super::*; use bitvec::{order::Lsb0, vec::BitVec}; use frame_metadata::v15; - use scale_info::{Registry, meta_type}; + use scale_info::{meta_type, Registry}; // Define recursive types. #[allow(dead_code)] diff --git a/vendor/pezkuwi-subxt/metadata/src/utils/variant_index.rs b/vendor/pezkuwi-subxt/metadata/src/utils/variant_index.rs index c7aab5de..5003e39c 100644 --- a/vendor/pezkuwi-subxt/metadata/src/utils/variant_index.rs +++ b/vendor/pezkuwi-subxt/metadata/src/utils/variant_index.rs @@ -4,7 +4,7 @@ use alloc::{borrow::ToOwned, string::String}; use hashbrown::HashMap; -use scale_info::{PortableRegistry, TypeDef, Variant, form::PortableForm}; +use scale_info::{form::PortableForm, PortableRegistry, TypeDef, Variant}; /// Given some type ID and type registry, build a couple of /// indexes to look up variants by index or name. If the ID provided diff --git a/vendor/pezkuwi-subxt/rpcs/src/client/mod.rs b/vendor/pezkuwi-subxt/rpcs/src/client/mod.rs index 89ffd6c7..fec4587d 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/client/mod.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/client/mod.rs @@ -51,5 +51,5 @@ pub use round_robin_rpc_client::RoundRobinRpcClient; mod rpc_client; mod rpc_client_t; -pub use rpc_client::{RpcClient, RpcParams, RpcSubscription, rpc_params}; +pub use rpc_client::{rpc_params, RpcClient, RpcParams, RpcSubscription}; pub use rpc_client_t::{RawRpcFuture, RawRpcSubscription, RawValue, RpcClientT}; diff --git a/vendor/pezkuwi-subxt/rpcs/src/client/round_robin_rpc_client.rs b/vendor/pezkuwi-subxt/rpcs/src/client/round_robin_rpc_client.rs index 95cebecc..2557a54c 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/client/round_robin_rpc_client.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/client/round_robin_rpc_client.rs @@ -28,8 +28,8 @@ use super::{RawRpcFuture, RawRpcSubscription, RpcClientT}; use std::sync::{ - Arc, atomic::{AtomicUsize, Ordering}, + Arc, }; /// A simple RPC client which is provided a set of clients on initialization and diff --git a/vendor/pezkuwi-subxt/rpcs/src/client/rpc_client.rs b/vendor/pezkuwi-subxt/rpcs/src/client/rpc_client.rs index 9df6219f..75965762 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/client/rpc_client.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/client/rpc_client.rs @@ -5,7 +5,7 @@ use super::{RawRpcSubscription, RpcClientT}; use crate::Error; use futures::{Stream, StreamExt}; -use serde::{Serialize, de::DeserializeOwned}; +use serde::{de::DeserializeOwned, Serialize}; use serde_json::value::RawValue; use std::{pin::Pin, sync::Arc, task::Poll}; diff --git a/vendor/pezkuwi-subxt/rpcs/src/methods/chain_head.rs b/vendor/pezkuwi-subxt/rpcs/src/methods/chain_head.rs index 0fe45ed1..d05c9c76 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/methods/chain_head.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/methods/chain_head.rs @@ -7,8 +7,8 @@ //! methods exposed here. use crate::{ + client::{rpc_params, RpcClient, RpcSubscription}, Error, Hash, RpcConfig, - client::{RpcClient, RpcSubscription, rpc_params}, }; use derive_where::derive_where; use futures::{Stream, StreamExt}; @@ -891,10 +891,10 @@ impl Stream for TransactionSubscription { if let Poll::Ready(Some(Ok(res))) = &res { if matches!( res, - TransactionStatus::Dropped { .. } | - TransactionStatus::Error { .. } | - TransactionStatus::Invalid { .. } | - TransactionStatus::Finalized { .. } + TransactionStatus::Dropped { .. } + | TransactionStatus::Error { .. } + | TransactionStatus::Invalid { .. } + | TransactionStatus::Finalized { .. } ) { // No more events will occur after these ones. self.done = true diff --git a/vendor/pezkuwi-subxt/rpcs/src/methods/legacy.rs b/vendor/pezkuwi-subxt/rpcs/src/methods/legacy.rs index 62f0d753..d4f5dc65 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/methods/legacy.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/methods/legacy.rs @@ -5,8 +5,8 @@ //! An interface to call the raw legacy RPC methods. use crate::{ + client::{rpc_params, RpcClient, RpcSubscription}, Error, RpcConfig, - client::{RpcClient, RpcSubscription, rpc_params}, }; use codec::Decode; use derive_where::derive_where; diff --git a/vendor/pezkuwi-subxt/rpcs/src/utils.rs b/vendor/pezkuwi-subxt/rpcs/src/utils.rs index bc460227..8484dc65 100644 --- a/vendor/pezkuwi-subxt/rpcs/src/utils.rs +++ b/vendor/pezkuwi-subxt/rpcs/src/utils.rs @@ -26,5 +26,9 @@ pub fn url_is_secure(url: &str) -> Result { /// Validates, that the given Url is secure ("https" or "wss" scheme) or is referring to localhost. pub fn validate_url_is_secure(url: &str) -> Result<(), Error> { - if !url_is_secure(url)? { Err(Error::InsecureUrl(url.into())) } else { Ok(()) } + if !url_is_secure(url)? { + Err(Error::InsecureUrl(url.into())) + } else { + Ok(()) + } } diff --git a/vendor/pezkuwi-subxt/signer/Cargo.toml b/vendor/pezkuwi-subxt/signer/Cargo.toml index 4a136bd2..67e833a0 100644 --- a/vendor/pezkuwi-subxt/signer/Cargo.toml +++ b/vendor/pezkuwi-subxt/signer/Cargo.toml @@ -29,6 +29,16 @@ std = [ "serde?/std", "serde_json?/std", "sha2/std", + "bip32?/std", + "getrandom?/std", + "hex/std", + "keccak-hash?/std", + "codec/std", + "pezkuwi-subxt-core?/std", + "pezsp-core/std", + "pezsp-crypto-hashing/std", + "pezsp-keyring/std", + "zeroize/std" ] # Pick the signer implementation(s) you need by enabling the diff --git a/vendor/pezkuwi-subxt/signer/src/crypto/derive_junction.rs b/vendor/pezkuwi-subxt/signer/src/crypto/derive_junction.rs index bfdbe4a9..38e5230a 100644 --- a/vendor/pezkuwi-subxt/signer/src/crypto/derive_junction.rs +++ b/vendor/pezkuwi-subxt/signer/src/crypto/derive_junction.rs @@ -94,6 +94,10 @@ impl> From for DeriveJunction { DeriveJunction::soft(code) }; - if hard { res.harden() } else { res } + if hard { + res.harden() + } else { + res + } } } diff --git a/vendor/pezkuwi-subxt/signer/src/crypto/mod.rs b/vendor/pezkuwi-subxt/signer/src/crypto/mod.rs index 0aebafbc..8eba1cf9 100644 --- a/vendor/pezkuwi-subxt/signer/src/crypto/mod.rs +++ b/vendor/pezkuwi-subxt/signer/src/crypto/mod.rs @@ -12,7 +12,7 @@ mod secret_uri; mod seed_from_entropy; pub use derive_junction::DeriveJunction; -pub use secret_uri::{DEV_PHRASE, SecretUri, SecretUriError}; +pub use secret_uri::{SecretUri, SecretUriError, DEV_PHRASE}; #[cfg(any(feature = "sr25519", feature = "ecdsa"))] pub use seed_from_entropy::seed_from_entropy; diff --git a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs index ac306f23..a295c406 100644 --- a/vendor/pezkuwi-subxt/signer/src/ecdsa.rs +++ b/vendor/pezkuwi-subxt/signer/src/ecdsa.rs @@ -5,10 +5,10 @@ //! An ecdsa keypair implementation. use codec::Encode; -use crate::crypto::{DeriveJunction, SecretUri, seed_from_entropy}; +use crate::crypto::{seed_from_entropy, DeriveJunction, SecretUri}; use core::str::FromStr; use hex::FromHex; -use secp256k1::{Message, Secp256k1, SecretKey, ecdsa::RecoverableSignature}; +use secp256k1::{ecdsa::RecoverableSignature, Message, Secp256k1, SecretKey}; use secrecy::ExposeSecret; use thiserror::Error as DeriveError; @@ -135,9 +135,10 @@ impl Keypair { for junction in junctions { match junction { DeriveJunction::Soft(_) => return Err(Error::SoftJunction), - DeriveJunction::Hard(junction_bytes) => + DeriveJunction::Hard(junction_bytes) => { acc = ("Secp256k1HDKD", acc, junction_bytes) - .using_encoded(pezsp_crypto_hashing::blake2_256), + .using_encoded(pezsp_crypto_hashing::blake2_256) + }, } } Self::from_secret_key(acc) diff --git a/vendor/pezkuwi-subxt/signer/src/eth.rs b/vendor/pezkuwi-subxt/signer/src/eth.rs index c5047750..81b42eda 100644 --- a/vendor/pezkuwi-subxt/signer/src/eth.rs +++ b/vendor/pezkuwi-subxt/signer/src/eth.rs @@ -106,7 +106,7 @@ impl Keypair { /// Obtain the [`eth::PublicKey`] of this keypair. pub fn public_key(&self) -> PublicKey { - let uncompressed = self.0.0.public_key().serialize_uncompressed(); + let uncompressed = self.0 .0.public_key().serialize_uncompressed(); PublicKey(uncompressed) } @@ -576,7 +576,7 @@ mod test { for (case_idx, (keypair, exp_account_id, exp_priv_key)) in cases.into_iter().enumerate() { let act_account_id = keypair.public_key().to_account_id().checksum(); - let act_priv_key = format!("0x{}", &keypair.0.0.display_secret()); + let act_priv_key = format!("0x{}", &keypair.0 .0.display_secret()); assert_eq!(exp_account_id, act_account_id, "account ID mismatch in {case_idx}"); assert_eq!(exp_priv_key, act_priv_key, "private key mismatch in {case_idx}"); diff --git a/vendor/pezkuwi-subxt/signer/src/lib.rs b/vendor/pezkuwi-subxt/signer/src/lib.rs index 8e09f1b3..862dcc17 100644 --- a/vendor/pezkuwi-subxt/signer/src/lib.rs +++ b/vendor/pezkuwi-subxt/signer/src/lib.rs @@ -52,4 +52,4 @@ pub use secrecy::{ExposeSecret, SecretString}; // SecretUri's can be parsed from strings and used to generate key pairs. // DeriveJunctions are the "path" part of these SecretUris. -pub use crypto::{DEV_PHRASE, DeriveJunction, SecretUri, SecretUriError}; +pub use crypto::{DeriveJunction, SecretUri, SecretUriError, DEV_PHRASE}; diff --git a/vendor/pezkuwi-subxt/signer/src/pezkuwi_js_compat.rs b/vendor/pezkuwi-subxt/signer/src/pezkuwi_js_compat.rs index 70b1a37b..563e2ecd 100644 --- a/vendor/pezkuwi-subxt/signer/src/pezkuwi_js_compat.rs +++ b/vendor/pezkuwi-subxt/signer/src/pezkuwi_js_compat.rs @@ -6,8 +6,8 @@ use base64::Engine; use crypto_secretbox::{ - Key, Nonce, XSalsa20Poly1305, aead::{Aead, KeyInit}, + Key, Nonce, XSalsa20Poly1305, }; use pezkuwi_subxt_core::utils::AccountId32; use serde::Deserialize; @@ -86,11 +86,11 @@ impl KeyringPairJson { fn decrypt(self, password: &str) -> Result { // Check encoding. // https://github.com/pezkuwi-js/common/blob/37fa211fdb141d4f6eb32e8f377a4651ed2d9068/packages/keyring/src/keyring.ts#L166 - if self.encoding.version != "3" || - !self.encoding.content.contains(&"pkcs8".to_owned()) || - !self.encoding.content.contains(&"sr25519".to_owned()) || - !self.encoding.r#type.contains(&"scrypt".to_owned()) || - !self.encoding.r#type.contains(&"xsalsa20-poly1305".to_owned()) + if self.encoding.version != "3" + || !self.encoding.content.contains(&"pkcs8".to_owned()) + || !self.encoding.content.contains(&"sr25519".to_owned()) + || !self.encoding.r#type.contains(&"scrypt".to_owned()) + || !self.encoding.r#type.contains(&"xsalsa20-poly1305".to_owned()) { return Err(Error::UnsupportedEncoding); } @@ -139,8 +139,8 @@ impl KeyringPairJson { let div = &plaintext[80..85]; let public_key = &plaintext[85..117]; - if header != [48, 83, 2, 1, 1, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32] || - div != [161, 35, 3, 33, 0] + if header != [48, 83, 2, 1, 1, 48, 5, 6, 3, 43, 101, 112, 4, 34, 4, 32] + || div != [161, 35, 3, 33, 0] { return Err(Error::InvalidKeys); } @@ -149,8 +149,8 @@ impl KeyringPairJson { let keypair = sr25519::Keypair::from_ed25519_bytes(secret_key)?; // Ensure keys are correct. - if keypair.public_key().0 != public_key || - keypair.public_key().to_account_id() != self.address + if keypair.public_key().0 != public_key + || keypair.public_key().to_account_id() != self.address { return Err(Error::InvalidKeys); } diff --git a/vendor/pezkuwi-subxt/signer/src/sr25519.rs b/vendor/pezkuwi-subxt/signer/src/sr25519.rs index 35472d48..7c28a2d2 100644 --- a/vendor/pezkuwi-subxt/signer/src/sr25519.rs +++ b/vendor/pezkuwi-subxt/signer/src/sr25519.rs @@ -10,12 +10,12 @@ use core::str::FromStr; -use crate::crypto::{DeriveJunction, SecretUri, seed_from_entropy}; +use crate::crypto::{seed_from_entropy, DeriveJunction, SecretUri}; use hex::FromHex; use schnorrkel::{ - ExpansionMode, MiniSecretKey, derive::{ChainCode, Derivation}, + ExpansionMode, MiniSecretKey, }; use secrecy::ExposeSecret; @@ -283,9 +283,9 @@ mod subxt_compat { use super::*; use pezkuwi_subxt_core::{ - Config, tx::signer::Signer as SignerT, utils::{AccountId32, MultiAddress, MultiSignature}, + Config, }; impl From for MultiSignature { diff --git a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs index d42531e0..8584e944 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/bizinikiwi_compat_signer.rs @@ -6,8 +6,8 @@ #![allow(missing_docs, unused)] -use sp_core::{Pair as _, sr25519}; -use pezkuwi_subxt::{Config, OnlineClient, PezkuwiConfig, config::bizinikiwi::MultiAddress}; +use pezkuwi_subxt::{config::bizinikiwi::MultiAddress, Config, OnlineClient, PezkuwiConfig}; +use sp_core::{sr25519, Pair as _}; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod pezkuwi {} @@ -16,14 +16,14 @@ pub mod pezkuwi {} /// and that PezkuwiConfig is the runtime configuration. mod pair_signer { use super::*; - use sp_runtime::{ - MultiSignature as SpMultiSignature, - traits::{IdentifyAccount, Verify}, - }; use pezkuwi_subxt::{ config::bizinikiwi::{AccountId32, MultiSignature}, tx::Signer, }; + use sp_runtime::{ + traits::{IdentifyAccount, Verify}, + MultiSignature as SpMultiSignature, + }; /// A [`Signer`] implementation for [`sp_core::sr25519::Pair`]. #[derive(Clone)] diff --git a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs index 9cae4ba4..3fbaa044 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/block_decoding_static.rs @@ -1,7 +1,7 @@ #![allow(missing_docs)] use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, utils::{AccountId32, MultiAddress}, + OnlineClient, PezkuwiConfig, }; use codec::Decode; @@ -55,5 +55,9 @@ async fn main() -> Result<(), Box> { } fn display_address(addr: &MultiAddress) -> String { - if let MultiAddress::Id(id32) = addr { format!("{id32}") } else { "MultiAddress::...".into() } + if let MultiAddress::Id(id32) = addr { + format!("{id32}") + } else { + "MultiAddress::...".into() + } } diff --git a/vendor/pezkuwi-subxt/subxt/examples/constants_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/constants_dynamic.rs index 84275267..4373e014 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/constants_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/constants_dynamic.rs @@ -1,5 +1,5 @@ #![allow(missing_docs)] -use pezkuwi_subxt::{OnlineClient, PezkuwiConfig, dynamic::Value}; +use pezkuwi_subxt::{dynamic::Value, OnlineClient, PezkuwiConfig}; #[tokio::main] async fn main() -> Result<(), Box> { diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs index 6ca7d69e..0403e15b 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_basic.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] use futures::StreamExt; -use pezkuwi_subxt::{PezkuwiConfig, client::OnlineClient, lightclient::LightClient}; +use pezkuwi_subxt::{client::OnlineClient, lightclient::LightClient, PezkuwiConfig}; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs index 7b876fe0..3fb488b5 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/light_client_local_node.rs @@ -1,11 +1,11 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{ - PezkuwiConfig, client::OnlineClient, lightclient::{ChainConfig, LightClient}, utils::fetch_chainspec_from_rpc_node, + PezkuwiConfig, }; +use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs index 38659082..f6dee0a6 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/rpc_legacy.rs @@ -1,10 +1,10 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, backend::{legacy::LegacyRpcMethods, rpc::RpcClient}, config::DefaultExtrinsicParamsBuilder as Params, + OnlineClient, PezkuwiConfig, }; +use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod pezkuwi {} diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs index e2ab296b..3b404ff0 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_dynamic.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] +use pezkuwi_subxt::{config::PezkuwiConfig, utils::AccountId32, OnlineClient}; use pezkuwi_subxt_signer::sr25519::dev; -use pezkuwi_subxt::{OnlineClient, config::PezkuwiConfig, utils::AccountId32}; #[tokio::main] async fn main() -> Result<(), Box> { @@ -13,8 +13,11 @@ async fn main() -> Result<(), Box> { // but since we know the input + return types we can pass them directly. // There is one input argument, so the inputs are a tuple of one element. let account: AccountId32 = dev::alice().public_key().into(); - let runtime_api_call = - pezkuwi_subxt::dynamic::runtime_api_call::<_, u64>("AccountNonceApi", "account_nonce", (account,)); + let runtime_api_call = pezkuwi_subxt::dynamic::runtime_api_call::<_, u64>( + "AccountNonceApi", + "account_nonce", + (account,), + ); // Submit the call to get back a result. let nonce = api.runtime_api().at_latest().await?.call(runtime_api_call).await?; diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs index b4f6ec74..4c30f650 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_raw.rs @@ -1,10 +1,10 @@ #![allow(missing_docs)] use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, ext::{ codec::{Compact, Decode}, frame_metadata::RuntimeMetadataPrefixed, }, + OnlineClient, PezkuwiConfig, }; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs index 97c21efd..6e9a4eff 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/runtime_apis_static.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] +use pezkuwi_subxt::{config::PezkuwiConfig, OnlineClient}; use pezkuwi_subxt_signer::sr25519::dev; -use pezkuwi_subxt::{OnlineClient, config::PezkuwiConfig}; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod pezkuwi {} diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_client_custom_rpc.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_client_custom_rpc.rs index 8438241e..0bb6fcb9 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_client_custom_rpc.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_client_custom_rpc.rs @@ -1,13 +1,13 @@ #![allow(missing_docs)] +use pezkuwi_subxt::{ + backend::rpc::{RawRpcFuture, RawRpcSubscription, RawValue, RpcClient, RpcClientT}, + OnlineClient, PezkuwiConfig, +}; use std::{ fmt::Write, pin::Pin, sync::{Arc, Mutex}, }; -use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, - backend::rpc::{RawRpcFuture, RawRpcSubscription, RawValue, RpcClient, RpcClientT}, -}; // A dummy RPC client that doesn't actually handle requests properly // at all, but instead just logs what requests to it were made. diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs index 1cff0981..66736b53 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_client_offline.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] use pezkuwi_subxt::{ - OfflineClient, config::PezkuwiConfig, ext::codec::Decode, metadata::Metadata, utils::H256, + config::PezkuwiConfig, ext::codec::Decode, metadata::Metadata, utils::H256, OfflineClient, }; #[tokio::main] diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs index 7e2d9ef7..3f4b6ee3 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_assethub.rs @@ -1,8 +1,8 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::config::{ - Config, DefaultExtrinsicParams, DefaultExtrinsicParamsBuilder, PezkuwiConfig, BizinikiwConfig, + BizinikiwConfig, Config, DefaultExtrinsicParams, DefaultExtrinsicParamsBuilder, PezkuwiConfig, }; +use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt( runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale", diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs index dd856e76..86c564eb 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_custom.rs @@ -1,13 +1,13 @@ #![allow(missing_docs)] use codec::Encode; -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{ client::ClientState, config::{ - Config, ExtrinsicParams, ExtrinsicParamsEncoder, ExtrinsicParamsError, HashFor, - transaction_extensions::Params, + transaction_extensions::Params, Config, ExtrinsicParams, ExtrinsicParamsEncoder, + ExtrinsicParamsError, HashFor, }, }; +use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_full.scale")] pub mod runtime {} diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs index 3b986729..bce6fea7 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_config_transaction_extension.rs @@ -1,15 +1,15 @@ #![allow(missing_docs)] use codec::Encode; -use pezkuwi_subxt_signer::sr25519::dev; -use scale_encode::EncodeAsType; -use scale_info::PortableRegistry; use pezkuwi_subxt::{ client::ClientState, config::{ - Config, DefaultExtrinsicParamsBuilder, ExtrinsicParams, ExtrinsicParamsEncoder, - ExtrinsicParamsError, transaction_extensions, + transaction_extensions, Config, DefaultExtrinsicParamsBuilder, ExtrinsicParams, + ExtrinsicParamsEncoder, ExtrinsicParamsError, }, }; +use pezkuwi_subxt_signer::sr25519::dev; +use scale_encode::EncodeAsType; +use scale_info::PortableRegistry; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod runtime {} diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs index 7f88c3f2..d25bee58 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_reconnecting_rpc_client.rs @@ -10,8 +10,8 @@ use std::time::Duration; use futures::StreamExt; use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, backend::rpc::reconnecting_rpc_client::{ExponentialBackoff, RpcClient}, + OnlineClient, PezkuwiConfig, }; // Generate an interface that we can use from the node's metadata. diff --git a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs index 8bed2878..e5aeb5f2 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/setup_rpc_chainhead_backend.rs @@ -4,11 +4,11 @@ use futures::StreamExt; use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, backend::{ chain_head::{ChainHeadBackend, ChainHeadBackendBuilder}, rpc::RpcClient, }, + OnlineClient, PezkuwiConfig, }; // Generate an interface that we can use from the node's metadata. diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs index d2858597..76f073ca 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; +use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs index 7db05423..5e991a2c 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_fetch_dynamic.rs @@ -1,10 +1,10 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, dynamic::{At, Value}, utils::AccountId32, + OnlineClient, PezkuwiConfig, }; +use pezkuwi_subxt_signer::sr25519::dev; #[tokio::main] async fn main() -> Result<(), Box> { @@ -16,7 +16,8 @@ async fn main() -> Result<(), Box> { // to access a value; an AccountId32. In this example we don't know the // return type and so we set it to `Value`, which anything can decode into. let account: AccountId32 = dev::alice().public_key().into(); - let storage_query = pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account"); + let storage_query = + pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account"); // Use that query to access a storage entry, fetch a result and decode the value. let client_at = api.storage().at_latest().await?; diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs index cb6a2e11..6b312b91 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating.rs @@ -1,5 +1,5 @@ #![allow(missing_docs)] -use pezkuwi_subxt::{OnlineClient, PezkuwiConfig, ext::futures::StreamExt}; +use pezkuwi_subxt::{ext::futures::StreamExt, OnlineClient, PezkuwiConfig}; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating_dynamic.rs b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating_dynamic.rs index a0e33e4e..78055f03 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/storage_iterating_dynamic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/storage_iterating_dynamic.rs @@ -1,9 +1,9 @@ #![allow(missing_docs)] use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, dynamic::{At, Value}, ext::futures::StreamExt, utils::AccountId32, + OnlineClient, PezkuwiConfig, }; #[tokio::main] @@ -15,7 +15,8 @@ async fn main() -> Result<(), Box> { // here, we assume that there is one value to provide at this entry // to access a value; an AccountId32. In this example we don't know the // return type and so we set it to `Value`, which anything can decode into. - let storage_query = pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account"); + let storage_query = + pezkuwi_subxt::dynamic::storage::<(AccountId32,), Value>("System", "Account"); // Use that query to access a storage entry, iterate over it and decode values. let client_at = api.storage().at_latest().await?; diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs index 08e379b1..56993482 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_basic.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; +use pezkuwi_subxt_signer::sr25519::dev; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_basic_frontier.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_basic_frontier.rs index 348d057d..13d7e2a9 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_basic_frontier.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_basic_frontier.rs @@ -5,9 +5,9 @@ #![allow(missing_docs)] -use pezkuwi_subxt_core::utils::AccountId20; -use pezkuwi_subxt_signer::eth::{Signature, dev}; use pezkuwi_subxt::OnlineClient; +use pezkuwi_subxt_core::utils::AccountId20; +use pezkuwi_subxt_signer::eth::{dev, Signature}; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/frontier_metadata_small.scale")] mod eth_runtime {} @@ -19,8 +19,10 @@ impl pezkuwi_subxt::Config for EthRuntimeConfig { type Address = AccountId20; type Signature = Signature; type Hasher = pezkuwi_subxt::config::bizinikiwi::BlakeTwo256; - type Header = - pezkuwi_subxt::config::bizinikiwi::BizinikiwiHeader; + type Header = pezkuwi_subxt::config::bizinikiwi::BizinikiwiHeader< + u32, + pezkuwi_subxt::config::bizinikiwi::BlakeTwo256, + >; type ExtrinsicParams = pezkuwi_subxt::config::BizinikiwiExtrinsicParams; type AssetId = u32; } diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs index d09bb73a..941098ff 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_boxed.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; +use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod pezkuwi {} @@ -36,7 +36,7 @@ fn remark() -> Box { } fn dynamic_remark() -> Box { - use pezkuwi_subxt::dynamic::{Value, tx}; + use pezkuwi_subxt::dynamic::{tx, Value}; let tx_payload = tx("System", "remark", vec![Value::from_bytes("Hello")]); Box::new(tx_payload) diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs index 60574744..a37fa539 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_partial.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{OnlineClient, PezkuwiConfig}; +use pezkuwi_subxt_signer::sr25519::dev; type BoxedError = Box; diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs index 9ef5cfd8..88649850 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_status_stream.rs @@ -1,6 +1,6 @@ #![allow(missing_docs)] +use pezkuwi_subxt::{tx::TxStatus, OnlineClient, PezkuwiConfig}; use pezkuwi_subxt_signer::sr25519::dev; -use pezkuwi_subxt::{OnlineClient, PezkuwiConfig, tx::TxStatus}; // Generate an interface that we can use from the node's metadata. #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] diff --git a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs index 1d83f303..45a729a8 100644 --- a/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs +++ b/vendor/pezkuwi-subxt/subxt/examples/tx_with_params.rs @@ -1,8 +1,8 @@ #![allow(missing_docs)] -use pezkuwi_subxt_signer::sr25519::dev; use pezkuwi_subxt::{ - OnlineClient, PezkuwiConfig, config::pezkuwi::PezkuwiExtrinsicParamsBuilder as Params, + config::pezkuwi::PezkuwiExtrinsicParamsBuilder as Params, OnlineClient, PezkuwiConfig, }; +use pezkuwi_subxt_signer::sr25519::dev; #[pezkuwi_subxt::subxt(runtime_metadata_path = "../artifacts/pezkuwi_metadata_small.scale")] pub mod pezkuwi {} diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream.rs b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream.rs index 59eb19ef..0611a5a5 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream.rs @@ -227,8 +227,8 @@ pub(super) mod test_utils { BestBlockChanged, Finalized, Initialized, NewBlock, }; use std::sync::{ - Arc, atomic::{AtomicUsize, Ordering}, + Arc, }; /// Given some events, returns a follow stream getter that we can use in diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_driver.rs b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_driver.rs index 82a34bb5..9814b46a 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_driver.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_driver.rs @@ -297,10 +297,12 @@ impl Shared { .collect(); shared.block_events_for_new_subscriptions.retain(|ev| match ev { - FollowEvent::NewBlock(new_block_ev) => - !to_remove.contains(&new_block_ev.block_hash.hash()), - FollowEvent::BestBlockChanged(best_block_ev) => - !to_remove.contains(&best_block_ev.best_block_hash.hash()), + FollowEvent::NewBlock(new_block_ev) => { + !to_remove.contains(&new_block_ev.block_hash.hash()) + }, + FollowEvent::BestBlockChanged(best_block_ev) => { + !to_remove.contains(&best_block_ev.best_block_hash.hash()) + }, _ => true, }); }, diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_unpin.rs b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_unpin.rs index cf95540d..d1426b76 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_unpin.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/follow_stream_unpin.rs @@ -2,7 +2,7 @@ // This file is dual-licensed as Apache-2.0 or GPL-3.0. // see LICENSE for license details. -use super::{ChainHeadRpcMethods, follow_stream::FollowStream}; +use super::{follow_stream::FollowStream, ChainHeadRpcMethods}; use crate::{ config::{Config, Hash, HashFor}, error::BackendError, @@ -229,20 +229,27 @@ impl Stream for FollowStreamUnpin { FollowStreamMsg::Event(FollowEvent::Stop) }, // These events aren't interesting; we just forward them on: - FollowStreamMsg::Event(FollowEvent::OperationBodyDone(details)) => - FollowStreamMsg::Event(FollowEvent::OperationBodyDone(details)), - FollowStreamMsg::Event(FollowEvent::OperationCallDone(details)) => - FollowStreamMsg::Event(FollowEvent::OperationCallDone(details)), - FollowStreamMsg::Event(FollowEvent::OperationStorageItems(details)) => - FollowStreamMsg::Event(FollowEvent::OperationStorageItems(details)), - FollowStreamMsg::Event(FollowEvent::OperationWaitingForContinue(details)) => - FollowStreamMsg::Event(FollowEvent::OperationWaitingForContinue(details)), - FollowStreamMsg::Event(FollowEvent::OperationStorageDone(details)) => - FollowStreamMsg::Event(FollowEvent::OperationStorageDone(details)), - FollowStreamMsg::Event(FollowEvent::OperationInaccessible(details)) => - FollowStreamMsg::Event(FollowEvent::OperationInaccessible(details)), - FollowStreamMsg::Event(FollowEvent::OperationError(details)) => - FollowStreamMsg::Event(FollowEvent::OperationError(details)), + FollowStreamMsg::Event(FollowEvent::OperationBodyDone(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationBodyDone(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationCallDone(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationCallDone(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationStorageItems(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationStorageItems(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationWaitingForContinue(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationWaitingForContinue(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationStorageDone(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationStorageDone(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationInaccessible(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationInaccessible(details)) + }, + FollowStreamMsg::Event(FollowEvent::OperationError(details)) => { + FollowStreamMsg::Event(FollowEvent::OperationError(details)) + }, }; // Return our event. @@ -352,8 +359,8 @@ impl FollowStreamUnpin { let mut blocks_to_unpin = vec![]; for (hash, details) in &self.pinned { - if rel_block_age.saturating_sub(details.rel_block_age) >= self.max_block_life || - (unpin_flags.contains(hash) && details.can_be_unpinned) + if rel_block_age.saturating_sub(details.rel_block_age) >= self.max_block_life + || (unpin_flags.contains(hash) && details.can_be_unpinned) { // The block is too old, or it's been flagged to be unpinned and won't be in a // future backend event, so we can unpin it for real now. @@ -460,7 +467,7 @@ impl Drop for BlockRef { #[cfg(test)] pub(super) mod test_utils { use super::{ - super::follow_stream::{FollowStream, test_utils::test_stream_getter}, + super::follow_stream::{test_utils::test_stream_getter, FollowStream}, *, }; use crate::config::bizinikiwi::H256; diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/mod.rs b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/mod.rs index 83bef67c..3ba928af 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/chain_head/mod.rs @@ -19,21 +19,21 @@ mod storage_items; use self::follow_stream_driver::FollowStreamFinalizedHeads; use crate::{ backend::{ - Backend, BlockRef, BlockRefT, RuntimeVersion, StorageResponse, StreamOf, StreamOfResults, - TransactionStatus, utils::retry, + utils::retry, Backend, BlockRef, BlockRefT, RuntimeVersion, StorageResponse, StreamOf, + StreamOfResults, TransactionStatus, }, config::{Config, Hash, HashFor}, error::{BackendError, RpcError}, }; use async_trait::async_trait; use follow_stream_driver::{FollowStreamDriver, FollowStreamDriverHandle}; -use futures::{Stream, StreamExt, future::Either}; +use futures::{future::Either, Stream, StreamExt}; use pezkuwi_subxt_rpcs::{ - RpcClient, methods::chain_head::{ FollowEvent, MethodResponse, RuntimeEvent, StorageQuery, StorageQueryType, StorageResultType, }, + RpcClient, }; use std::{collections::HashMap, task::Poll}; use storage_items::StorageItems; @@ -432,8 +432,9 @@ impl Backend for ChainHeadBackend { .events() .filter_map(|ev| { let out = match ev { - FollowEvent::Initialized(init) => - init.finalized_block_hashes.last().map(|b| b.clone().into()), + FollowEvent::Initialized(init) => { + init.finalized_block_hashes.last().map(|b| b.clone().into()) + }, _ => None, }; std::future::ready(out) @@ -597,22 +598,28 @@ impl Backend for ChainHeadBackend { match tx_status { RpcTransactionStatus::Validated => TransactionStatus::Validated, RpcTransactionStatus::Broadcasted => TransactionStatus::Broadcasted, - RpcTransactionStatus::BestChainBlockIncluded { block: None } => - TransactionStatus::NoLongerInBestBlock, - RpcTransactionStatus::BestChainBlockIncluded { block: Some(block) } => + RpcTransactionStatus::BestChainBlockIncluded { block: None } => { + TransactionStatus::NoLongerInBestBlock + }, + RpcTransactionStatus::BestChainBlockIncluded { block: Some(block) } => { TransactionStatus::InBestBlock { hash: BlockRef::from_hash(block.hash), - }, - RpcTransactionStatus::Finalized { block } => + } + }, + RpcTransactionStatus::Finalized { block } => { TransactionStatus::InFinalizedBlock { hash: BlockRef::from_hash(block.hash), - }, - RpcTransactionStatus::Error { error } => - TransactionStatus::Error { message: error }, - RpcTransactionStatus::Invalid { error } => - TransactionStatus::Invalid { message: error }, - RpcTransactionStatus::Dropped { error } => - TransactionStatus::Dropped { message: error }, + } + }, + RpcTransactionStatus::Error { error } => { + TransactionStatus::Error { message: error } + }, + RpcTransactionStatus::Invalid { error } => { + TransactionStatus::Invalid { message: error } + }, + RpcTransactionStatus::Dropped { error } => { + TransactionStatus::Dropped { message: error } + }, } }) .map_err(Into::into) @@ -782,15 +789,19 @@ impl Backend for ChainHeadBackend { }; TransactionStatus::InBestBlock { hash: block_ref } }, - RpcTransactionStatus::BestChainBlockIncluded { block: None } => - TransactionStatus::NoLongerInBestBlock, + RpcTransactionStatus::BestChainBlockIncluded { block: None } => { + TransactionStatus::NoLongerInBestBlock + }, RpcTransactionStatus::Broadcasted => TransactionStatus::Broadcasted, - RpcTransactionStatus::Dropped { error, .. } => - TransactionStatus::Dropped { message: error }, - RpcTransactionStatus::Error { error } => - TransactionStatus::Error { message: error }, - RpcTransactionStatus::Invalid { error } => - TransactionStatus::Invalid { message: error }, + RpcTransactionStatus::Dropped { error, .. } => { + TransactionStatus::Dropped { message: error } + }, + RpcTransactionStatus::Error { error } => { + TransactionStatus::Error { message: error } + }, + RpcTransactionStatus::Invalid { error } => { + TransactionStatus::Invalid { message: error } + }, RpcTransactionStatus::Validated => TransactionStatus::Validated, }; return Poll::Ready(Some(Ok(tx_progress_ev))); diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/legacy.rs b/vendor/pezkuwi-subxt/subxt/src/backend/legacy.rs index 62aa1766..ee363b75 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/legacy.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/legacy.rs @@ -8,15 +8,15 @@ use self::rpc_methods::TransactionStatus as RpcTransactionStatus; use crate::{ backend::{ + utils::{retry, retry_stream}, Backend, BlockRef, RuntimeVersion, StorageResponse, StreamOf, StreamOfResults, TransactionStatus, - utils::{retry, retry_stream}, }, config::{Config, HashFor, Header}, error::BackendError, }; use async_trait::async_trait; -use futures::{Future, FutureExt, Stream, StreamExt, TryStreamExt, future, future::Either, stream}; +use futures::{future, future::Either, stream, Future, FutureExt, Stream, StreamExt, TryStreamExt}; use pezkuwi_subxt_rpcs::RpcClient; use std::{ collections::VecDeque, @@ -360,10 +360,10 @@ impl Backend for LegacyBackend { let sub = self.methods.author_submit_and_watch_extrinsic(extrinsic).await?; let sub = sub.filter_map(|r| { - let mapped = r - .map_err(|e| e.into()) - .map(|tx| { - match tx { + let mapped = + r.map_err(|e| e.into()) + .map(|tx| { + match tx { // We ignore these because they don't map nicely to the new API. They don't // signal "end states" so this should be fine. RpcTransactionStatus::Future => None, @@ -394,8 +394,8 @@ impl Backend for LegacyBackend { .into(), }), } - }) - .transpose(); + }) + .transpose(); future::ready(mapped) }); @@ -504,8 +504,8 @@ impl Stream for StorageFetchDescendantKeysStream { match keys { Ok(mut keys) => { - if this.pagination_start_key.is_some() && - keys.first() == this.pagination_start_key.as_ref() + if this.pagination_start_key.is_some() + && keys.first() == this.pagination_start_key.as_ref() { // Currently, Smoldot returns the "start key" as the first key in the // input (see https://github.com/smol-dot/smoldot/issues/1692), whereas Bizinikiwi doesn't. diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs index 39f542dd..75dede66 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/mod.rs @@ -25,9 +25,8 @@ use std::{pin::Pin, sync::Arc}; /// [`crate::ext::pezkuwi_subxt_rpcs`]. pub mod rpc { pub use pezkuwi_subxt_rpcs::{ - RpcClient, RpcClientT, client::{RawRpcFuture, RawRpcSubscription, RawValue, RpcParams}, - rpc_params, + rpc_params, RpcClient, RpcClientT, }; crate::macros::cfg_reconnecting_rpc_client! { @@ -123,7 +122,7 @@ pub trait Backend: sealed::Sealed + Send + Sync + 'static { /// A stream of all new runtime versions as they occur. async fn stream_runtime_version(&self) - -> Result, BackendError>; + -> Result, BackendError>; /// A stream of all new block headers as they arrive. async fn stream_all_block_headers( @@ -390,10 +389,10 @@ mod test { use crate::backend::StorageResponse; use core::convert::Infallible; use futures::StreamExt; - use pezkuwi_subxt_core::{Config, config::DefaultExtrinsicParams}; + use pezkuwi_subxt_core::{config::DefaultExtrinsicParams, Config}; use pezkuwi_subxt_rpcs::client::{ - MockRpcClient, mock_rpc_client::{Json, MockRpcClientBuilder}, + MockRpcClient, }; use primitive_types::H256; use rpc::RpcClientT; @@ -429,7 +428,7 @@ mod test { mod legacy { use super::*; use crate::{ - backend::legacy::{LegacyBackend, rpc_methods::RuntimeVersion}, + backend::legacy::{rpc_methods::RuntimeVersion, LegacyBackend}, error::RpcError, }; @@ -688,7 +687,7 @@ mod test { I: IntoIterator + Send, I::IntoIter: Send + Sync + 'static, { - use pezkuwi_subxt_rpcs::{Error, UserError, client::mock_rpc_client::AndThen}; + use pezkuwi_subxt_rpcs::{client::mock_rpc_client::AndThen, Error, UserError}; let recv = Arc::new(tokio::sync::Mutex::new(recv)); let mut ids = ids.into_iter(); @@ -824,13 +823,11 @@ mod test { .await .unwrap(); - assert!( - response - .next() - .await - .unwrap() - .is_err_and(|e| matches!(e, BackendError::Other(e) if e == "error")) - ); + assert!(response + .next() + .await + .unwrap() + .is_err_and(|e| matches!(e, BackendError::Other(e) if e == "error"))); assert!(response.next().await.is_none()); } diff --git a/vendor/pezkuwi-subxt/subxt/src/backend/utils.rs b/vendor/pezkuwi-subxt/subxt/src/backend/utils.rs index 186ae163..29315202 100644 --- a/vendor/pezkuwi-subxt/subxt/src/backend/utils.rs +++ b/vendor/pezkuwi-subxt/subxt/src/backend/utils.rs @@ -2,7 +2,7 @@ use super::{StreamOf, StreamOfResults}; use crate::error::BackendError; -use futures::{FutureExt, Stream, StreamExt, future::BoxFuture}; +use futures::{future::BoxFuture, FutureExt, Stream, StreamExt}; use std::{future::Future, pin::Pin, task::Poll}; /// Resubscribe callback. diff --git a/vendor/pezkuwi-subxt/subxt/src/blocks/extrinsic_types.rs b/vendor/pezkuwi-subxt/subxt/src/blocks/extrinsic_types.rs index 8a9c9e68..fe58a211 100644 --- a/vendor/pezkuwi-subxt/subxt/src/blocks/extrinsic_types.rs +++ b/vendor/pezkuwi-subxt/subxt/src/blocks/extrinsic_types.rs @@ -3,7 +3,7 @@ // see LICENSE for license details. use crate::{ - blocks::block_types::{CachedEvents, get_events}, + blocks::block_types::{get_events, CachedEvents}, client::{OfflineClientT, OnlineClientT}, config::{Config, HashFor}, error::{EventsError, ExtrinsicDecodeErrorAt, ExtrinsicError}, diff --git a/vendor/pezkuwi-subxt/subxt/src/book/mod.rs b/vendor/pezkuwi-subxt/subxt/src/book/mod.rs index dc225dd0..f8ec26f3 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/mod.rs @@ -67,7 +67,7 @@ //! ```rust,ignore #![doc = include_str!("../../examples/tx_basic.rs")] //! ``` -//! +//! //! This example assumes that a Pezkuwi node is running locally (Subxt endeavors to support all //! recent releases). Typically, to use Subxt to talk to some custom Bizinikiwi node (for example a //! parachain node), you'll want to: diff --git a/vendor/pezkuwi-subxt/subxt/src/book/setup/client.rs b/vendor/pezkuwi-subxt/subxt/src/book/setup/client.rs index 02f2f2aa..3f09821f 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/setup/client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/setup/client.rs @@ -45,7 +45,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/setup_client_custom_rpc.rs")] //! ``` -//! +//! //! ### Creating an [`crate::OfflineClient`]: //! ```rust,ignore #![doc = include_str!("../../../examples/setup_client_offline.rs")] diff --git a/vendor/pezkuwi-subxt/subxt/src/book/setup/config.rs b/vendor/pezkuwi-subxt/subxt/src/book/setup/config.rs index 2756e0cb..de825e9f 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/setup/config.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/setup/config.rs @@ -161,7 +161,7 @@ //! ```rust,ignore #![doc = include_str ! ("../../../examples/setup_config_transaction_extension.rs")] //! ``` -//! +//! //! ### Implementing [`crate::config::ExtrinsicParams`] from scratch //! //! Alternately, you are free to implement [`crate::config::ExtrinsicParams`] entirely from scratch if you know exactly what "extra" and @@ -171,7 +171,7 @@ //! ```rust,ignore #![doc = include_str ! ("../../../examples/setup_config_custom.rs")] //! ``` -//! +//! //! ### Using a type from the metadata as a config parameter //! //! You can also use types that are generated from chain metadata as type parameters of the Config trait. diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/blocks.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/blocks.rs index 8ef13b0c..0fdb2fa4 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/blocks.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/blocks.rs @@ -58,7 +58,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/blocks_subscribing.rs")] //! ``` -//! +//! //! ### Statically decode the extrinsic into [a specific pallet call](crate::blocks::ExtrinsicDetails::as_extrinsic()) //! //! This is useful if you are expecting a specific extrinsic to be part of some block. If the extrinsic you try to decode @@ -73,7 +73,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/block_decoding_static.rs")] //! ``` -//! +//! //! ### Dynamically decode the extrinsic //! //! Sometimes you might use subxt with metadata that is not known at compile time. In this case, you do not @@ -87,7 +87,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/block_decoding_dynamic.rs")] //! ``` -//! +//! //! ## Decoding transaction extensions //! //! Extrinsics can contain transaction extensions. The transaction extensions can be different across chains. diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/constants.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/constants.rs index ae43e071..3fdf4a51 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/constants.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/constants.rs @@ -46,7 +46,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/constants_static.rs")] //! ``` -//! +//! //! And here's one using a dynamic query: //! ```rust,ignore #![doc = include_str!("../../../examples/constants_dynamic.rs")] diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/light_client.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/light_client.rs index 4438a32c..e506fb42 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/light_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/light_client.rs @@ -33,7 +33,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/light_client_basic.rs")] //! ``` -//! +//! //! ### Connecting to a local node //! //! This example connects to a local chain and submits a transaction. To run this, you first need @@ -41,7 +41,7 @@ //! ```text //! pezkuwi --dev --node-key 0000000000000000000000000000000000000000000000000000000000000001 //! ``` -//! +//! //! Then, the following code will download a chain spec from this local node, alter the bootnodes //! to point only to the local node, and then submit a transaction through it. //! ```rust,ignore diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/runtime_apis.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/runtime_apis.rs index a5582c61..cb6b4891 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/runtime_apis.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/runtime_apis.rs @@ -58,7 +58,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/runtime_apis_static.rs")] //! ``` -//! +//! //! ### Making a dynamic Runtime API call //! //! If you'd prefer to construct the call at runtime, you can do this using the @@ -66,7 +66,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/runtime_apis_dynamic.rs")] //! ``` -//! +//! //! ### Making a raw call //! //! This is generally discouraged in favour of one of the above, but may be necessary (especially if diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/storage.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/storage.rs index 1e88b0c4..36c3bdd7 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/storage.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/storage.rs @@ -57,14 +57,14 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/storage_fetch.rs")] //! ``` -//! +//! //! For completeness, below is an example using a dynamic query instead. Dynamic queries can define the types that //! they wish to accept inputs and decode the return value into ([`crate::dynamic::Value`] can be used here anywhere we //! are not sure of the specific types). //! ```rust,ignore #![doc = include_str!("../../../examples/storage_fetch_dynamic.rs")] //! ``` -//! +//! //! ### Iterating storage entries //! //! Many storage entries are maps of values; as well as fetching individual values, it's possible to @@ -72,7 +72,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/storage_iterating.rs")] //! ``` -//! +//! //! Here's the same logic but using dynamically constructed values instead: //! ```rust,ignore #![doc = include_str!("../../../examples/storage_iterating_dynamic.rs")] diff --git a/vendor/pezkuwi-subxt/subxt/src/book/usage/transactions.rs b/vendor/pezkuwi-subxt/subxt/src/book/usage/transactions.rs index c4403f92..04db038f 100644 --- a/vendor/pezkuwi-subxt/subxt/src/book/usage/transactions.rs +++ b/vendor/pezkuwi-subxt/subxt/src/book/usage/transactions.rs @@ -162,7 +162,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/tx_basic.rs")] //! ``` -//! +//! //! ### Providing transaction parameters //! //! If you'd like to provide parameters (such as mortality) to the transaction, you can use @@ -170,7 +170,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/tx_with_params.rs")] //! ``` -//! +//! //! This example doesn't wait for the transaction to be included in a block; it just submits it and //! hopes for the best! //! @@ -180,7 +180,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/tx_boxed.rs")] //! ``` -//! +//! //! ### Custom handling of transaction status updates //! //! If you'd like more control or visibility over exactly which status updates are being emitted for @@ -188,7 +188,7 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/tx_status_stream.rs")] //! ``` -//! +//! //! ### Signing transactions externally //! //! Subxt also allows you to get hold of the signer payload and hand that off to something else to be @@ -196,6 +196,6 @@ //! ```rust,ignore #![doc = include_str!("../../../examples/tx_partial.rs")] //! ``` -//! +//! //! Take a look at the API docs for [`crate::tx::TxProgress`], [`crate::tx::TxStatus`] and //! [`crate::tx::TxInBlock`] for more options. diff --git a/vendor/pezkuwi-subxt/subxt/src/client/offline_client.rs b/vendor/pezkuwi-subxt/subxt/src/client/offline_client.rs index 8b5d5bd9..eb96b0c6 100644 --- a/vendor/pezkuwi-subxt/subxt/src/client/offline_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/client/offline_client.rs @@ -3,7 +3,6 @@ // see LICENSE for license details. use crate::{ - Metadata, blocks::BlocksClient, config::{Config, HashFor}, constants::ConstantsClient, @@ -13,6 +12,7 @@ use crate::{ storage::StorageClient, tx::TxClient, view_functions::ViewFunctionsClient, + Metadata, }; use derive_where::derive_where; diff --git a/vendor/pezkuwi-subxt/subxt/src/client/online_client.rs b/vendor/pezkuwi-subxt/subxt/src/client/online_client.rs index 8b5308f4..0da437ea 100644 --- a/vendor/pezkuwi-subxt/subxt/src/client/online_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/client/online_client.rs @@ -4,8 +4,7 @@ use super::{OfflineClient, OfflineClientT}; use crate::{ - Metadata, - backend::{Backend, BackendExt, StreamOfResults, legacy::LegacyBackend, rpc::RpcClient}, + backend::{legacy::LegacyBackend, rpc::RpcClient, Backend, BackendExt, StreamOfResults}, blocks::{BlockRef, BlocksClient}, config::{Config, HashFor}, constants::ConstantsClient, @@ -16,9 +15,10 @@ use crate::{ storage::StorageClient, tx::TxClient, view_functions::ViewFunctionsClient, + Metadata, }; use derive_where::derive_where; -use futures::{TryFutureExt, future}; +use futures::{future, TryFutureExt}; use pezkuwi_subxt_core::client::{ClientState, RuntimeVersion}; use std::sync::{Arc, RwLock}; diff --git a/vendor/pezkuwi-subxt/subxt/src/constants/constants_client.rs b/vendor/pezkuwi-subxt/subxt/src/constants/constants_client.rs index 8c050918..067ba998 100644 --- a/vendor/pezkuwi-subxt/subxt/src/constants/constants_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/constants/constants_client.rs @@ -2,7 +2,7 @@ // This file is dual-licensed as Apache-2.0 or GPL-3.0. // see LICENSE for license details. -use crate::{Config, client::OfflineClientT, error::ConstantError}; +use crate::{client::OfflineClientT, error::ConstantError, Config}; use derive_where::derive_where; use pezkuwi_subxt_core::constants::address::Address; diff --git a/vendor/pezkuwi-subxt/subxt/src/constants/mod.rs b/vendor/pezkuwi-subxt/subxt/src/constants/mod.rs index 9034c50a..045893d0 100644 --- a/vendor/pezkuwi-subxt/subxt/src/constants/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/constants/mod.rs @@ -7,4 +7,4 @@ mod constants_client; pub use constants_client::ConstantsClient; -pub use pezkuwi_subxt_core::constants::address::{Address, DynamicAddress, StaticAddress, dynamic}; +pub use pezkuwi_subxt_core::constants::address::{dynamic, Address, DynamicAddress, StaticAddress}; diff --git a/vendor/pezkuwi-subxt/subxt/src/custom_values/custom_values_client.rs b/vendor/pezkuwi-subxt/subxt/src/custom_values/custom_values_client.rs index d28f57cf..1f1d1976 100644 --- a/vendor/pezkuwi-subxt/subxt/src/custom_values/custom_values_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/custom_values/custom_values_client.rs @@ -1,4 +1,4 @@ -use crate::{Config, client::OfflineClientT, error::CustomValueError}; +use crate::{client::OfflineClientT, error::CustomValueError, Config}; use derive_where::derive_where; use pezkuwi_subxt_core::custom_values::address::{Address, Maybe}; @@ -45,13 +45,13 @@ impl> CustomValuesClient { #[cfg(test)] mod tests { use crate::{ - Metadata, OfflineClient, BizinikiwConfig, custom_values::{self, CustomValuesClient}, + BizinikiwConfig, Metadata, OfflineClient, }; use codec::Encode; use pezkuwi_subxt_core::client::RuntimeVersion; use scale_decode::DecodeAsType; - use scale_info::{TypeInfo, form::PortableForm}; + use scale_info::{form::PortableForm, TypeInfo}; use std::collections::BTreeMap; #[derive(Debug, Clone, PartialEq, Eq, Encode, TypeInfo, DecodeAsType)] diff --git a/vendor/pezkuwi-subxt/subxt/src/custom_values/mod.rs b/vendor/pezkuwi-subxt/subxt/src/custom_values/mod.rs index ff0482b8..eb37b6ed 100644 --- a/vendor/pezkuwi-subxt/subxt/src/custom_values/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/custom_values/mod.rs @@ -8,5 +8,5 @@ mod custom_values_client; pub use custom_values_client::CustomValuesClient; pub use pezkuwi_subxt_core::custom_values::address::{ - Address, DynamicAddress, StaticAddress, dynamic, + dynamic, Address, DynamicAddress, StaticAddress, }; diff --git a/vendor/pezkuwi-subxt/subxt/src/error/dispatch_error.rs b/vendor/pezkuwi-subxt/subxt/src/error/dispatch_error.rs index 2d23cccf..a78de374 100644 --- a/vendor/pezkuwi-subxt/subxt/src/error/dispatch_error.rs +++ b/vendor/pezkuwi-subxt/subxt/src/error/dispatch_error.rs @@ -8,7 +8,7 @@ use super::{DispatchErrorDecodeError, ModuleErrorDecodeError, ModuleErrorDetailsError}; use crate::metadata::Metadata; use core::fmt::Debug; -use scale_decode::{DecodeAsType, TypeResolver, visitor::DecodeAsTypeResult}; +use scale_decode::{visitor::DecodeAsTypeResult, DecodeAsType, TypeResolver}; use std::{borrow::Cow, marker::PhantomData}; /// An error dispatching a transaction. diff --git a/vendor/pezkuwi-subxt/subxt/src/error/mod.rs b/vendor/pezkuwi-subxt/subxt/src/error/mod.rs index a05db903..97568641 100644 --- a/vendor/pezkuwi-subxt/subxt/src/error/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/error/mod.rs @@ -178,7 +178,9 @@ pub enum BackendError { MetadataVersionNotFound(u32), #[error("Backend error: Could not codec::Decode Runtime API response: {0}")] CouldNotScaleDecodeRuntimeResponse(codec::Error), - #[error("Backend error: Could not codec::Decode metadata bytes into pezkuwi_subxt::Metadata: {0}")] + #[error( + "Backend error: Could not codec::Decode metadata bytes into pezkuwi_subxt::Metadata: {0}" + )] CouldNotDecodeMetadata(codec::Error), // This is for errors in `Backend` implementations which aren't any of the "pre-defined" set // above: @@ -253,11 +255,11 @@ pub enum BlockError { impl BlockError { fn backend_error(&self) -> Option<&BackendError> { match self { - BlockError::CouldNotGetBlockHeader { reason: e, .. } | - BlockError::CouldNotGetLatestBlock(e) | - BlockError::CouldNotSubscribeToAllBlocks(e) | - BlockError::CouldNotSubscribeToBestBlocks(e) | - BlockError::CouldNotSubscribeToFinalizedBlocks(e) => Some(e), + BlockError::CouldNotGetBlockHeader { reason: e, .. } + | BlockError::CouldNotGetLatestBlock(e) + | BlockError::CouldNotSubscribeToAllBlocks(e) + | BlockError::CouldNotSubscribeToBestBlocks(e) + | BlockError::CouldNotSubscribeToFinalizedBlocks(e) => Some(e), _ => None, } } @@ -305,10 +307,10 @@ pub enum OnlineClientError { impl OnlineClientError { fn backend_error(&self) -> Option<&BackendError> { match self { - OnlineClientError::CannotGetLatestFinalizedBlock(e) | - OnlineClientError::CannotGetGenesisHash(e) | - OnlineClientError::CannotGetCurrentRuntimeVersion(e) | - OnlineClientError::CannotFetchMetadata(e) => Some(e), + OnlineClientError::CannotGetLatestFinalizedBlock(e) + | OnlineClientError::CannotGetGenesisHash(e) + | OnlineClientError::CannotGetCurrentRuntimeVersion(e) + | OnlineClientError::CannotFetchMetadata(e) => Some(e), _ => None, } } @@ -328,7 +330,9 @@ pub enum RuntimeUpdaterError { CannotGetNextRuntimeVersion(BackendError), #[error("Error subscribing to runtime updates: Cannot stream finalized blocks: {0}")] CannotStreamFinalizedBlocks(BackendError), - #[error("Error subscribing to runtime updates: Cannot get next finalized block in stream: {0}")] + #[error( + "Error subscribing to runtime updates: Cannot get next finalized block in stream: {0}" + )] CannotGetNextFinalizedBlock(BackendError), #[error("Cannot fetch new metadata for runtime update: {0}")] CannotFetchNewMetadata(BackendError), @@ -345,11 +349,11 @@ pub enum RuntimeUpdaterError { impl RuntimeUpdaterError { fn backend_error(&self) -> Option<&BackendError> { match self { - RuntimeUpdaterError::CannotStreamRuntimeVersion(e) | - RuntimeUpdaterError::CannotGetNextRuntimeVersion(e) | - RuntimeUpdaterError::CannotStreamFinalizedBlocks(e) | - RuntimeUpdaterError::CannotGetNextFinalizedBlock(e) | - RuntimeUpdaterError::CannotFetchNewMetadata(e) => Some(e), + RuntimeUpdaterError::CannotStreamRuntimeVersion(e) + | RuntimeUpdaterError::CannotGetNextRuntimeVersion(e) + | RuntimeUpdaterError::CannotStreamFinalizedBlocks(e) + | RuntimeUpdaterError::CannotGetNextFinalizedBlock(e) + | RuntimeUpdaterError::CannotFetchNewMetadata(e) => Some(e), _ => None, } } @@ -369,7 +373,9 @@ pub enum RuntimeUpdateeApplyError { #[derive(Debug, thiserror::Error)] #[allow(missing_docs)] pub enum RuntimeApiError { - #[error("Cannot access Runtime APIs at latest block: Cannot fetch latest finalized block: {0}")] + #[error( + "Cannot access Runtime APIs at latest block: Cannot fetch latest finalized block: {0}" + )] CannotGetLatestFinalizedBlock(BackendError), #[error("{0}")] OfflineError(#[from] CoreRuntimeApiError), @@ -380,8 +386,8 @@ pub enum RuntimeApiError { impl RuntimeApiError { fn backend_error(&self) -> Option<&BackendError> { match self { - RuntimeApiError::CannotGetLatestFinalizedBlock(e) | - RuntimeApiError::CannotCallApi(e) => Some(e), + RuntimeApiError::CannotGetLatestFinalizedBlock(e) + | RuntimeApiError::CannotCallApi(e) => Some(e), _ => None, } } @@ -403,8 +409,8 @@ pub enum EventsError { impl EventsError { fn backend_error(&self) -> Option<&BackendError> { match self { - EventsError::CannotGetLatestFinalizedBlock(e) | - EventsError::CannotFetchEventBytes(e) => Some(e), + EventsError::CannotGetLatestFinalizedBlock(e) + | EventsError::CannotFetchEventBytes(e) => Some(e), _ => None, } } @@ -456,12 +462,12 @@ pub enum ExtrinsicError { impl ExtrinsicError { fn backend_error(&self) -> Option<&BackendError> { match self { - ExtrinsicError::CannotGetBlockBody(e) | - ExtrinsicError::CannotGetLatestFinalizedBlock(e) | - ExtrinsicError::ErrorSubmittingTransaction(e) | - ExtrinsicError::TransactionStatusStreamError(e) | - ExtrinsicError::CannotGetFeeInfo(e) | - ExtrinsicError::CannotGetValidationInfo(e) => Some(e), + ExtrinsicError::CannotGetBlockBody(e) + | ExtrinsicError::CannotGetLatestFinalizedBlock(e) + | ExtrinsicError::ErrorSubmittingTransaction(e) + | ExtrinsicError::TransactionStatusStreamError(e) + | ExtrinsicError::CannotGetFeeInfo(e) + | ExtrinsicError::CannotGetValidationInfo(e) => Some(e), ExtrinsicError::AccountNonceError { reason, .. } => reason.backend_error(), _ => None, } @@ -486,8 +492,8 @@ pub enum ViewFunctionError { impl ViewFunctionError { fn backend_error(&self) -> Option<&BackendError> { match self { - ViewFunctionError::CannotGetLatestFinalizedBlock(e) | - ViewFunctionError::CannotCallApi(e) => Some(e), + ViewFunctionError::CannotGetLatestFinalizedBlock(e) + | ViewFunctionError::CannotCallApi(e) => Some(e), _ => None, } } @@ -565,8 +571,8 @@ impl TransactionEventsError { fn backend_error(&self) -> Option<&BackendError> { match self { TransactionEventsError::CannotFetchBlockBody { error, .. } => Some(error), - TransactionEventsError::CannotDecodeEventInBlock { error, .. } | - TransactionEventsError::CannotFetchEventsForTransaction { error, .. } => error.backend_error(), + TransactionEventsError::CannotDecodeEventInBlock { error, .. } + | TransactionEventsError::CannotFetchEventsForTransaction { error, .. } => error.backend_error(), _ => None, } } @@ -658,10 +664,10 @@ pub enum StorageError { impl StorageError { fn backend_error(&self) -> Option<&BackendError> { match self { - StorageError::CannotGetLatestFinalizedBlock(e) | - StorageError::CannotFetchValue(e) | - StorageError::CannotIterateValues(e) | - StorageError::StreamFailure(e) => Some(e), + StorageError::CannotGetLatestFinalizedBlock(e) + | StorageError::CannotFetchValue(e) + | StorageError::CannotIterateValues(e) + | StorageError::StreamFailure(e) => Some(e), _ => None, } } diff --git a/vendor/pezkuwi-subxt/subxt/src/events/events_type.rs b/vendor/pezkuwi-subxt/subxt/src/events/events_type.rs index 5c1372b7..a1d0d49d 100644 --- a/vendor/pezkuwi-subxt/subxt/src/events/events_type.rs +++ b/vendor/pezkuwi-subxt/subxt/src/events/events_type.rs @@ -1,7 +1,7 @@ use crate::{ - Metadata, config::{Config, HashFor}, error::EventsError, + Metadata, }; use derive_where::derive_where; use pezkuwi_subxt_core::events::{EventDetails as CoreEventDetails, Events as CoreEvents}; diff --git a/vendor/pezkuwi-subxt/subxt/src/events/mod.rs b/vendor/pezkuwi-subxt/subxt/src/events/mod.rs index 3c058099..1b49292d 100644 --- a/vendor/pezkuwi-subxt/subxt/src/events/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/events/mod.rs @@ -11,8 +11,8 @@ mod events_type; use crate::{client::OnlineClientT, error::EventsError}; use pezkuwi_subxt_core::{ - Metadata, config::{Config, HashFor}, + Metadata, }; pub use events_client::EventsClient; diff --git a/vendor/pezkuwi-subxt/subxt/src/lib.rs b/vendor/pezkuwi-subxt/subxt/src/lib.rs index 8103cf06..68e27979 100644 --- a/vendor/pezkuwi-subxt/subxt/src/lib.rs +++ b/vendor/pezkuwi-subxt/subxt/src/lib.rs @@ -8,7 +8,7 @@ //! ```rust,ignore #![doc = include_str!("../examples/tx_basic.rs")] //! ``` -//! +//! //! Take a look at [the Subxt guide](book) to learn more about how to use Subxt. #![cfg_attr(docsrs, feature(doc_cfg))] @@ -60,10 +60,10 @@ pub mod view_functions; pub mod config { pub use pezkuwi_subxt_core::{ config::{ - Config, DefaultExtrinsicParams, DefaultExtrinsicParamsBuilder, ExtrinsicParams, - ExtrinsicParamsEncoder, Hash, HashFor, Hasher, Header, PezkuwiConfig, - PezkuwiExtrinsicParams, BizinikiwConfig, BizinikiwiExtrinsicParams, - TransactionExtension, pezkuwi, bizinikiwi, transaction_extensions, + bizinikiwi, pezkuwi, transaction_extensions, BizinikiwConfig, + BizinikiwiExtrinsicParams, Config, DefaultExtrinsicParams, + DefaultExtrinsicParamsBuilder, ExtrinsicParams, ExtrinsicParamsEncoder, Hash, HashFor, + Hasher, Header, PezkuwiConfig, PezkuwiExtrinsicParams, TransactionExtension, }, error::ExtrinsicParamsError, }; @@ -88,7 +88,7 @@ cfg_unstable_light_client! { // but leave most types behind their respective modules. pub use crate::{ client::{OfflineClient, OnlineClient}, - config::{Config, PezkuwiConfig, BizinikiwConfig}, + config::{BizinikiwConfig, Config, PezkuwiConfig}, error::Error, metadata::Metadata, }; diff --git a/vendor/pezkuwi-subxt/subxt/src/runtime_api/mod.rs b/vendor/pezkuwi-subxt/subxt/src/runtime_api/mod.rs index 6be9388b..32536d55 100644 --- a/vendor/pezkuwi-subxt/subxt/src/runtime_api/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/runtime_api/mod.rs @@ -8,7 +8,7 @@ mod runtime_client; mod runtime_types; pub use pezkuwi_subxt_core::runtime_api::payload::{ - DynamicPayload, Payload, StaticPayload, dynamic, + dynamic, DynamicPayload, Payload, StaticPayload, }; pub use runtime_client::RuntimeApiClient; pub use runtime_types::RuntimeApi; diff --git a/vendor/pezkuwi-subxt/subxt/src/storage/mod.rs b/vendor/pezkuwi-subxt/subxt/src/storage/mod.rs index a155a099..ecc1a653 100644 --- a/vendor/pezkuwi-subxt/subxt/src/storage/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/storage/mod.rs @@ -7,6 +7,6 @@ mod storage_client; mod storage_client_at; -pub use pezkuwi_subxt_core::storage::address::{Address, DynamicAddress, StaticAddress, dynamic}; +pub use pezkuwi_subxt_core::storage::address::{dynamic, Address, DynamicAddress, StaticAddress}; pub use storage_client::StorageClient; pub use storage_client_at::{StorageClientAt, StorageEntryClient, StorageKeyValue, StorageValue}; diff --git a/vendor/pezkuwi-subxt/subxt/src/storage/storage_client_at.rs b/vendor/pezkuwi-subxt/subxt/src/storage/storage_client_at.rs index 725dc0e7..bf9a6d84 100644 --- a/vendor/pezkuwi-subxt/subxt/src/storage/storage_client_at.rs +++ b/vendor/pezkuwi-subxt/subxt/src/storage/storage_client_at.rs @@ -11,9 +11,9 @@ use crate::{ use derive_where::derive_where; use futures::StreamExt; use pezkuwi_subxt_core::{ - Metadata, - storage::{PrefixOf, address::Address}, + storage::{address::Address, PrefixOf}, utils::{Maybe, Yes}, + Metadata, }; use std::marker::PhantomData; @@ -100,7 +100,7 @@ where key_parts: KeyParts, ) -> Result< impl futures::Stream, StorageError>> - + use<'_, Addr, Client, T, KeyParts>, + + use<'_, Addr, Client, T, KeyParts>, StorageError, > { let entry = pezkuwi_subxt_core::storage::entry(addr, &self.metadata)?; @@ -283,7 +283,7 @@ where key_parts: KeyParts, ) -> Result< impl futures::Stream, StorageError>> - + use<'atblock, Addr, Client, T, KeyParts>, + + use<'atblock, Addr, Client, T, KeyParts>, StorageError, > { iter(self.inner.clone(), &self.client, self.block_ref.hash(), key_parts).await @@ -357,7 +357,7 @@ async fn iter< key_parts: KeyParts, ) -> Result< impl futures::Stream, StorageError>> - + use<'atblock, Addr, Client, T, KeyParts>, + + use<'atblock, Addr, Client, T, KeyParts>, StorageError, > { let key_bytes = entry.iter_key(key_parts)?; diff --git a/vendor/pezkuwi-subxt/subxt/src/tx/mod.rs b/vendor/pezkuwi-subxt/subxt/src/tx/mod.rs index 8faed79c..38291314 100644 --- a/vendor/pezkuwi-subxt/subxt/src/tx/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/tx/mod.rs @@ -13,7 +13,7 @@ mod tx_client; mod tx_progress; pub use pezkuwi_subxt_core::tx::{ - payload::{DefaultPayload, DynamicPayload, Payload, dynamic}, + payload::{dynamic, DefaultPayload, DynamicPayload, Payload}, signer::{self, Signer}, }; pub use tx_client::{ diff --git a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs index 4718f131..a5e161fd 100644 --- a/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs +++ b/vendor/pezkuwi-subxt/subxt/src/tx/tx_client.rs @@ -12,7 +12,7 @@ use crate::{ }; use codec::{Compact, Decode, Encode}; use derive_where::derive_where; -use futures::future::{TryFutureExt, try_join}; +use futures::future::{try_join, TryFutureExt}; use pezkuwi_subxt_core::tx::TransactionVersion; /// A client for working with transactions. @@ -122,18 +122,20 @@ impl> TxClient { { let metadata = self.client.metadata(); let tx = match pezkuwi_subxt_core::tx::suggested_version(&metadata)? { - TransactionVersion::V4 => + TransactionVersion::V4 => { PartialTransactionInner::V4(pezkuwi_subxt_core::tx::create_v4_signed( call, &self.client.client_state(), params, - )?), - TransactionVersion::V5 => + )?) + }, + TransactionVersion::V5 => { PartialTransactionInner::V5(pezkuwi_subxt_core::tx::create_v5_general( call, &self.client.client_state(), params, - )?), + )?) + }, }; Ok(PartialTransaction { client: self.client.clone(), inner: tx }) @@ -419,10 +421,12 @@ where signature: &T::Signature, ) -> SubmittableTransaction { let tx = match &mut self.inner { - PartialTransactionInner::V4(tx) => - tx.sign_with_account_and_signature(account_id.clone(), signature), - PartialTransactionInner::V5(tx) => - tx.sign_with_account_and_signature(account_id, signature), + PartialTransactionInner::V4(tx) => { + tx.sign_with_account_and_signature(account_id.clone(), signature) + }, + PartialTransactionInner::V5(tx) => { + tx.sign_with_account_and_signature(account_id, signature) + }, }; SubmittableTransaction { client: self.client.clone(), inner: tx } @@ -509,22 +513,24 @@ where // If we get a bad status or error back straight away then error, else return the hash. match sub.next().await { Some(Ok(status)) => match status { - TransactionStatus::Validated | - TransactionStatus::Broadcasted | - TransactionStatus::InBestBlock { .. } | - TransactionStatus::NoLongerInBestBlock | - TransactionStatus::InFinalizedBlock { .. } => Ok(ext_hash), + TransactionStatus::Validated + | TransactionStatus::Broadcasted + | TransactionStatus::InBestBlock { .. } + | TransactionStatus::NoLongerInBestBlock + | TransactionStatus::InFinalizedBlock { .. } => Ok(ext_hash), TransactionStatus::Error { message } => Err( ExtrinsicError::TransactionStatusError(TransactionStatusError::Error(message)), ), - TransactionStatus::Invalid { message } => + TransactionStatus::Invalid { message } => { Err(ExtrinsicError::TransactionStatusError(TransactionStatusError::Invalid( message, - ))), - TransactionStatus::Dropped { message } => + ))) + }, + TransactionStatus::Dropped { message } => { Err(ExtrinsicError::TransactionStatusError(TransactionStatusError::Dropped( message, - ))), + ))) + }, }, Some(Err(e)) => Err(ExtrinsicError::TransactionStatusStreamError(e)), None => Err(ExtrinsicError::UnexpectedEndOfTransactionStatusStream), diff --git a/vendor/pezkuwi-subxt/subxt/src/tx/tx_progress.rs b/vendor/pezkuwi-subxt/subxt/src/tx/tx_progress.rs index 088ab6ec..5798ea25 100644 --- a/vendor/pezkuwi-subxt/subxt/src/tx/tx_progress.rs +++ b/vendor/pezkuwi-subxt/subxt/src/tx/tx_progress.rs @@ -347,11 +347,11 @@ mod test { use pezkuwi_subxt_core::client::RuntimeVersion; use crate::{ - BizinikiwConfig, backend::{StreamOfResults, TransactionStatus}, client::{OfflineClientT, OnlineClientT}, config::{Config, HashFor}, tx::TxProgress, + BizinikiwConfig, }; type MockTxProgress = TxProgress; diff --git a/vendor/pezkuwi-subxt/subxt/src/utils/mod.rs b/vendor/pezkuwi-subxt/subxt/src/utils/mod.rs index b788a783..6a094828 100644 --- a/vendor/pezkuwi-subxt/subxt/src/utils/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/utils/mod.rs @@ -5,9 +5,9 @@ //! Miscellaneous utility helpers. pub use pezkuwi_subxt_core::utils::{ - AccountId32, Encoded, Era, H160, H256, H512, KeyedVec, MultiAddress, MultiSignature, - PhantomDataSendSync, Static, UncheckedExtrinsic, WrapperKeepOpaque, Yes, bits, - strip_compact_prefix, to_hex, + bits, strip_compact_prefix, to_hex, AccountId32, Encoded, Era, KeyedVec, MultiAddress, + MultiSignature, PhantomDataSendSync, Static, UncheckedExtrinsic, WrapperKeepOpaque, Yes, H160, + H256, H512, }; pub use pezkuwi_subxt_rpcs::utils::url_is_secure; diff --git a/vendor/pezkuwi-subxt/subxt/src/view_functions/mod.rs b/vendor/pezkuwi-subxt/subxt/src/view_functions/mod.rs index c14e100c..5ee4e911 100644 --- a/vendor/pezkuwi-subxt/subxt/src/view_functions/mod.rs +++ b/vendor/pezkuwi-subxt/subxt/src/view_functions/mod.rs @@ -8,7 +8,7 @@ mod view_function_types; mod view_functions_client; pub use pezkuwi_subxt_core::view_functions::payload::{ - DynamicPayload, Payload, StaticPayload, dynamic, + dynamic, DynamicPayload, Payload, StaticPayload, }; pub use view_function_types::ViewFunctionsApi; pub use view_functions_client::ViewFunctionsClient; diff --git a/vendor/pezkuwi-subxt/utils/strip-metadata/src/lib.rs b/vendor/pezkuwi-subxt/utils/strip-metadata/src/lib.rs index 3949216c..fafb3923 100644 --- a/vendor/pezkuwi-subxt/utils/strip-metadata/src/lib.rs +++ b/vendor/pezkuwi-subxt/utils/strip-metadata/src/lib.rs @@ -147,15 +147,17 @@ impl IterateTypeIds for v14::RuntimeMetadataV14 { let pallet_types = self.pallets.iter_mut().flat_map(|pallet| { let pallet_call_types = pallet.calls.as_mut().into_iter().map(|calls| &mut calls.ty.id); - let pallet_storage_types = - pallet.storage.as_mut().into_iter().flat_map(|s| &mut s.entries).flat_map( - |storage_entry| match &mut storage_entry.ty { - v14::StorageEntryType::Plain(ty) => - Either::Left(core::iter::once(&mut ty.id)), - v14::StorageEntryType::Map { key, value, .. } => - Either::Right([&mut key.id, &mut value.id].into_iter()), + let pallet_storage_types = pallet + .storage + .as_mut() + .into_iter() + .flat_map(|s| &mut s.entries) + .flat_map(|storage_entry| match &mut storage_entry.ty { + v14::StorageEntryType::Plain(ty) => Either::Left(core::iter::once(&mut ty.id)), + v14::StorageEntryType::Map { key, value, .. } => { + Either::Right([&mut key.id, &mut value.id].into_iter()) }, - ); + }); let pallet_constant_types = pallet.constants.iter_mut().map(|constant| &mut constant.ty.id); @@ -193,15 +195,17 @@ impl IterateTypeIds for v15::RuntimeMetadataV15 { let pallet_types = self.pallets.iter_mut().flat_map(|pallet| { let pallet_call_types = pallet.calls.as_mut().into_iter().map(|calls| &mut calls.ty.id); - let pallet_storage_types = - pallet.storage.as_mut().into_iter().flat_map(|s| &mut s.entries).flat_map( - |storage_entry| match &mut storage_entry.ty { - v14::StorageEntryType::Plain(ty) => - Either::Left(core::iter::once(&mut ty.id)), - v14::StorageEntryType::Map { key, value, .. } => - Either::Right([&mut key.id, &mut value.id].into_iter()), + let pallet_storage_types = pallet + .storage + .as_mut() + .into_iter() + .flat_map(|s| &mut s.entries) + .flat_map(|storage_entry| match &mut storage_entry.ty { + v14::StorageEntryType::Plain(ty) => Either::Left(core::iter::once(&mut ty.id)), + v14::StorageEntryType::Map { key, value, .. } => { + Either::Right([&mut key.id, &mut value.id].into_iter()) }, - ); + }); let pallet_constant_types = pallet.constants.iter_mut().map(|constant| &mut constant.ty.id); @@ -267,15 +271,17 @@ impl IterateTypeIds for v16::RuntimeMetadataV16 { let pallet_types = self.pallets.iter_mut().flat_map(|pallet| { let pallet_call_types = pallet.calls.as_mut().into_iter().map(|calls| &mut calls.ty.id); - let pallet_storage_types = - pallet.storage.as_mut().into_iter().flat_map(|s| &mut s.entries).flat_map( - |storage_entry| match &mut storage_entry.ty { - v16::StorageEntryType::Plain(ty) => - Either::Left(core::iter::once(&mut ty.id)), - v16::StorageEntryType::Map { key, value, .. } => - Either::Right([&mut key.id, &mut value.id].into_iter()), + let pallet_storage_types = pallet + .storage + .as_mut() + .into_iter() + .flat_map(|s| &mut s.entries) + .flat_map(|storage_entry| match &mut storage_entry.ty { + v16::StorageEntryType::Plain(ty) => Either::Left(core::iter::once(&mut ty.id)), + v16::StorageEntryType::Map { key, value, .. } => { + Either::Right([&mut key.id, &mut value.id].into_iter()) }, - ); + }); let pallet_constant_types = pallet.constants.iter_mut().map(|constant| &mut constant.ty.id);