diff --git a/Cargo.lock b/Cargo.lock index b99b4d9..f123518 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2102,9 +2102,9 @@ dependencies = [ "reqwest", "serde", "serde_json", - "subxt", - "subxt-macro", - "subxt-metadata", + "subxt 0.31.0", + "subxt-macro 0.30.1", + "subxt-metadata 0.30.1", "subxt-signer", "tar", "tokio", @@ -3141,6 +3141,17 @@ dependencies = [ "serde", ] +[[package]] +name = "scale-bits" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "036575c29af9b6e4866ffb7fa055dbf623fe7a9cc159b33786de6013a6969d89" +dependencies = [ + "parity-scale-codec 3.6.4", + "scale-info 2.9.0", + "serde", +] + [[package]] name = "scale-decode" version = "0.7.0" @@ -3149,13 +3160,28 @@ checksum = "f0459d00b0dbd2e765009924a78ef36b2ff7ba116292d732f00eb0ed8e465d15" dependencies = [ "parity-scale-codec 3.6.4", "primitive-types 0.12.1", - "scale-bits", - "scale-decode-derive", + "scale-bits 0.3.0", + "scale-decode-derive 0.7.0", "scale-info 2.9.0", "smallvec", "thiserror", ] +[[package]] +name = "scale-decode" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7789f5728e4e954aaa20cadcc370b99096fb8645fca3c9333ace44bb18f30095" +dependencies = [ + "derive_more", + "parity-scale-codec 3.6.4", + "primitive-types 0.12.1", + "scale-bits 0.4.0", + "scale-decode-derive 0.9.0", + "scale-info 2.9.0", + "smallvec", +] + [[package]] name = "scale-decode-derive" version = "0.7.0" @@ -3169,6 +3195,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-decode-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27873eb6005868f8cc72dcfe109fae664cf51223d35387bc2f28be4c28d94c47" +dependencies = [ + "darling 0.14.4", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "scale-encode" version = "0.3.0" @@ -3177,13 +3216,28 @@ checksum = "b0401b7cdae8b8aa33725f3611a051358d5b32887ecaa0fda5953a775b2d4d76" dependencies = [ "parity-scale-codec 3.6.4", "primitive-types 0.12.1", - "scale-bits", - "scale-encode-derive", + "scale-bits 0.3.0", + "scale-encode-derive 0.3.0", "scale-info 2.9.0", "smallvec", "thiserror", ] +[[package]] +name = "scale-encode" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d70cb4b29360105483fac1ed567ff95d65224a14dd275b6303ed0a654c78de5" +dependencies = [ + "derive_more", + "parity-scale-codec 3.6.4", + "primitive-types 0.12.1", + "scale-bits 0.4.0", + "scale-encode-derive 0.5.0", + "scale-info 2.9.0", + "smallvec", +] + [[package]] name = "scale-encode-derive" version = "0.3.0" @@ -3197,6 +3251,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "scale-encode-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "995491f110efdc6bea96d6a746140e32bfceb4ea47510750a5467295a4707a25" +dependencies = [ + "darling 0.14.4", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "scale-info" version = "1.0.0" @@ -3260,13 +3327,33 @@ dependencies = [ "either", "frame-metadata 15.1.0", "parity-scale-codec 3.6.4", - "scale-bits", - "scale-decode", - "scale-encode", + "scale-bits 0.3.0", + "scale-decode 0.7.0", + "scale-encode 0.3.0", "scale-info 2.9.0", "serde", "thiserror", - "yap", + "yap 0.10.0", +] + +[[package]] +name = "scale-value" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6538d1cc1af9c0baf401c57da8a6d4730ef582db0d330d2efa56ec946b5b0283" +dependencies = [ + "base58", + "blake2", + "derive_more", + "either", + "frame-metadata 15.1.0", + "parity-scale-codec 3.6.4", + "scale-bits 0.4.0", + "scale-decode 0.9.0", + "scale-encode 0.5.0", + "scale-info 2.9.0", + "serde", + "yap 0.11.0", ] [[package]] @@ -4090,6 +4177,36 @@ name = "subxt" version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ba02ada83ba2640c46e200a1758cc83ce876a16326d2c52ca5db41b7d6645ce" +dependencies = [ + "base58", + "blake2", + "derivative", + "either", + "frame-metadata 16.0.0", + "futures", + "hex", + "impl-serde 0.4.0", + "parity-scale-codec 3.6.4", + "primitive-types 0.12.1", + "scale-bits 0.3.0", + "scale-decode 0.7.0", + "scale-encode 0.3.0", + "scale-info 2.9.0", + "scale-value 0.10.0", + "serde", + "serde_json", + "sp-core-hashing 9.0.0", + "subxt-macro 0.30.1", + "subxt-metadata 0.30.1", + "thiserror", + "tracing", +] + +[[package]] +name = "subxt" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d140449e7d967b21b0ae386cdc6bd5933ade38613866bb40bb2c6df79638a4" dependencies = [ "base58", "blake2", @@ -4102,17 +4219,17 @@ dependencies = [ "jsonrpsee", "parity-scale-codec 3.6.4", "primitive-types 0.12.1", - "scale-bits", - "scale-decode", - "scale-encode", + "scale-bits 0.4.0", + "scale-decode 0.9.0", + "scale-encode 0.5.0", "scale-info 2.9.0", - "scale-value", + "scale-value 0.12.0", "serde", "serde_json", "sp-core-hashing 9.0.0", "subxt-lightclient", - "subxt-macro", - "subxt-metadata", + "subxt-macro 0.31.0", + "subxt-metadata 0.31.0", "thiserror", "tracing", ] @@ -4131,7 +4248,27 @@ dependencies = [ "proc-macro2", "quote", "scale-info 2.9.0", - "subxt-metadata", + "subxt-metadata 0.30.1", + "syn 2.0.28", + "thiserror", + "tokio", +] + +[[package]] +name = "subxt-codegen" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af52575d54de7b9528601788f2876b41965e3e473d137c9c61c1ac35aeeaa3b" +dependencies = [ + "frame-metadata 16.0.0", + "heck", + "hex", + "jsonrpsee", + "parity-scale-codec 3.6.4", + "proc-macro2", + "quote", + "scale-info 2.9.0", + "subxt-metadata 0.31.0", "syn 2.0.28", "thiserror", "tokio", @@ -4139,9 +4276,9 @@ dependencies = [ [[package]] name = "subxt-lightclient" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a235bedd0e460c110e5341d919ec3a27f9be3dd4c1c944daad8a9b54d396d" +checksum = "6aa72c1cb7e06772efa1476949c3f0e83718c79c1b2615eb510c076b012e9c84" dependencies = [ "futures", "futures-util", @@ -4162,7 +4299,19 @@ checksum = "cfda460cc5f701785973382c589e9bb12c23bb8d825bfc3ac547b7c672aba1c0" dependencies = [ "darling 0.20.3", "proc-macro-error", - "subxt-codegen", + "subxt-codegen 0.30.1", + "syn 2.0.28", +] + +[[package]] +name = "subxt-macro" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe9f7e2994a20ab9748a9a040a3fe96054faa219a60ed21af51b9ab9e5f7da6" +dependencies = [ + "darling 0.20.3", + "proc-macro-error", + "subxt-codegen 0.31.0", "syn 2.0.28", ] @@ -4179,6 +4328,19 @@ dependencies = [ "thiserror", ] +[[package]] +name = "subxt-metadata" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "880017c466f66af10e1c9b28cfa4cb2e4f59ab1bfe0b0f7250f7aca6e9d593b0" +dependencies = [ + "frame-metadata 16.0.0", + "parity-scale-codec 3.6.4", + "scale-info 2.9.0", + "sp-core-hashing 9.0.0", + "thiserror", +] + [[package]] name = "subxt-signer" version = "0.30.1" @@ -4196,7 +4358,7 @@ dependencies = [ "secrecy", "sha2 0.10.7", "sp-core-hashing 9.0.0", - "subxt", + "subxt 0.30.1", "thiserror", "zeroize", ] @@ -4688,7 +4850,7 @@ dependencies = [ "jsonrpsee-core", "libuptest", "maybe-async", - "subxt", + "subxt 0.31.0", "subxt-signer", "tokio", ] @@ -5060,6 +5222,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a7eb6d82a11e4d0b8e6bda8347169aff4ccd8235d039bba7c47482d977dcf7" +[[package]] +name = "yap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf" + [[package]] name = "zeroize" version = "1.6.0" diff --git a/examples/Cargo.toml b/examples/Cargo.toml index ef86eb2..1204757 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -15,4 +15,4 @@ jsonrpsee-core = "0.16.2" maybe-async = { version = "0.2.7" } async-trait = "0.1.68" subxt-signer = { version = "0.30.0"} -subxt = { version = "0.30.0"} \ No newline at end of file +subxt = { version = "0.31.0"} \ No newline at end of file diff --git a/libuptest/Cargo.toml b/libuptest/Cargo.toml index 38be492..f2645c0 100644 --- a/libuptest/Cargo.toml +++ b/libuptest/Cargo.toml @@ -42,7 +42,7 @@ version = "0.30.0" optional = true [dependencies.subxt] -version = "0.30.0" +version = "0.31.0" optional = true #git = "https://github.com/paritytech/subxt/"