Unverified Commit 99341da4 authored by dependabot[bot]'s avatar dependabot[bot] Committed by GitHub
Browse files

Bump subxt from 0.21.0 to 0.22.0 (#612)

* Bump subxt from 0.21.0 to 0.22.0

Bumps [subxt](https://github.com/paritytech/subxt) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/paritytech/subxt/releases)
- [Changelog](https://github.com/paritytech/subxt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/paritytech/subxt/compare/v0.21.0...v0.22.0

)

---
updated-dependencies:
- dependency-name: subxt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...
Signed-off-by: default avatardependabot[bot] <support@github.com>

* Fix errors

* Fmt

* Fmt with same version as CI nightly
Co-authored-by: default avatardependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Jones's avatarascjones <ascjones@gmail.com>
parent 23f62e93
Pipeline #199639 passed with stages
in 13 minutes and 57 seconds
...@@ -481,7 +481,7 @@ dependencies = [ ...@@ -481,7 +481,7 @@ dependencies = [
"hex", "hex",
"impl-serde", "impl-serde",
"ink_metadata", "ink_metadata",
"jsonrpsee 0.14.0", "jsonrpsee",
"log", "log",
"pallet-contracts-primitives", "pallet-contracts-primitives",
"parity-scale-codec", "parity-scale-codec",
...@@ -1322,57 +1322,18 @@ dependencies = [ ...@@ -1322,57 +1322,18 @@ dependencies = [
"itoa 1.0.2", "itoa 1.0.2",
] ]
[[package]]
name = "http-body"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
dependencies = [
"bytes",
"http",
"pin-project-lite",
]
[[package]] [[package]]
name = "httparse" name = "httparse"
version = "1.7.1" version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
[[package]]
name = "httpdate"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]] [[package]]
name = "humantime" name = "humantime"
version = "2.1.0" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.14.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
dependencies = [
"bytes",
"futures-channel",
"futures-core",
"futures-util",
"http",
"http-body",
"httparse",
"httpdate",
"itoa 1.0.2",
"pin-project-lite",
"tokio",
"tower-service",
"tracing",
"want",
]
[[package]] [[package]]
name = "ident_case" name = "ident_case"
version = "1.0.1" version = "1.0.1"
...@@ -1668,48 +1629,18 @@ dependencies = [ ...@@ -1668,48 +1629,18 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "jsonrpsee"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91dc760c341fa81173f9a434931aaf32baad5552b0230cc6c93e8fb7eaad4c19"
dependencies = [
"jsonrpsee-client-transport 0.10.1",
"jsonrpsee-core 0.10.1",
]
[[package]] [[package]]
name = "jsonrpsee" name = "jsonrpsee"
version = "0.14.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1" checksum = "11e017217fcd18da0a25296d3693153dd19c8a6aadab330b3595285d075385d1"
dependencies = [ dependencies = [
"jsonrpsee-core 0.14.0", "jsonrpsee-client-transport",
"jsonrpsee-types 0.14.0", "jsonrpsee-core",
"jsonrpsee-types",
"jsonrpsee-ws-client", "jsonrpsee-ws-client",
] ]
[[package]]
name = "jsonrpsee-client-transport"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "765f7a36d5087f74e3b3b47805c2188fef8eb54afcb587b078d9f8ebfe9c7220"
dependencies = [
"futures",
"http",
"jsonrpsee-core 0.10.1",
"jsonrpsee-types 0.10.1",
"pin-project",
"rustls-native-certs",
"soketto",
"thiserror",
"tokio",
"tokio-rustls",
"tokio-util",
"tracing",
"webpki-roots",
]
[[package]] [[package]]
name = "jsonrpsee-client-transport" name = "jsonrpsee-client-transport"
version = "0.14.0" version = "0.14.0"
...@@ -1718,8 +1649,8 @@ checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111" ...@@ -1718,8 +1649,8 @@ checksum = "ce395539a14d3ad4ec1256fde105abd36a2da25d578a291cabe98f45adfdb111"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http", "http",
"jsonrpsee-core 0.14.0", "jsonrpsee-core",
"jsonrpsee-types 0.14.0", "jsonrpsee-types",
"pin-project", "pin-project",
"rustls-native-certs", "rustls-native-certs",
"soketto", "soketto",
...@@ -1731,29 +1662,6 @@ dependencies = [ ...@@ -1731,29 +1662,6 @@ dependencies = [
"webpki-roots", "webpki-roots",
] ]
[[package]]
name = "jsonrpsee-core"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82ef77ecd20c2254d54f5da8c0738eacca61e6b6511268a8f2753e3148c6c706"
dependencies = [
"anyhow",
"arrayvec 0.7.2",
"async-trait",
"beef",
"futures-channel",
"futures-util",
"hyper",
"jsonrpsee-types 0.10.1",
"rustc-hash",
"serde",
"serde_json",
"soketto",
"thiserror",
"tokio",
"tracing",
]
[[package]] [[package]]
name = "jsonrpsee-core" name = "jsonrpsee-core"
version = "0.14.0" version = "0.14.0"
...@@ -1767,7 +1675,7 @@ dependencies = [ ...@@ -1767,7 +1675,7 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-timer", "futures-timer",
"futures-util", "futures-util",
"jsonrpsee-types 0.14.0", "jsonrpsee-types",
"rustc-hash", "rustc-hash",
"serde", "serde",
"serde_json", "serde_json",
...@@ -1776,20 +1684,6 @@ dependencies = [ ...@@ -1776,20 +1684,6 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "jsonrpsee-types"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38b6aa52f322cbf20c762407629b8300f39bcc0cf0619840d9252a2f65fd2dd9"
dependencies = [
"anyhow",
"beef",
"serde",
"serde_json",
"thiserror",
"tracing",
]
[[package]] [[package]]
name = "jsonrpsee-types" name = "jsonrpsee-types"
version = "0.14.0" version = "0.14.0"
...@@ -1810,9 +1704,9 @@ version = "0.14.0" ...@@ -1810,9 +1704,9 @@ version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a" checksum = "ee043cb5dd0d51d3eb93432e998d5bae797691a7b10ec4a325e036bcdb48c48a"
dependencies = [ dependencies = [
"jsonrpsee-client-transport 0.14.0", "jsonrpsee-client-transport",
"jsonrpsee-core 0.14.0", "jsonrpsee-core",
"jsonrpsee-types 0.14.0", "jsonrpsee-types",
] ]
[[package]] [[package]]
...@@ -3359,17 +3253,16 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" ...@@ -3359,17 +3253,16 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]] [[package]]
name = "subxt" name = "subxt"
version = "0.21.0" version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ab902b8d1bf5ecdc16c78e1f7fdef77665d5ce77004b2be1f6ac4b4f679d987" checksum = "e731c0245979a80f9090a89b43635e23f367f13a225695f286f307978db36f11"
dependencies = [ dependencies = [
"bitvec", "bitvec",
"derivative", "derivative",
"frame-metadata", "frame-metadata",
"futures", "futures",
"hex", "hex",
"jsonrpsee 0.10.1", "jsonrpsee",
"log",
"parity-scale-codec", "parity-scale-codec",
"parking_lot", "parking_lot",
"scale-info", "scale-info",
...@@ -3380,13 +3273,14 @@ dependencies = [ ...@@ -3380,13 +3273,14 @@ dependencies = [
"subxt-macro", "subxt-macro",
"subxt-metadata", "subxt-metadata",
"thiserror", "thiserror",
"tracing",
] ]
[[package]] [[package]]
name = "subxt-codegen" name = "subxt-codegen"
version = "0.21.0" version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ac3c4e3565338616f009bc40419f45fa7d9472a5717fa8cce129777c709d1a1" checksum = "4c9462b52d539cde2e0dbbd1c89d28079459ed790f42218c5bfc9d61c9575e32"
dependencies = [ dependencies = [
"darling", "darling",
"frame-metadata", "frame-metadata",
...@@ -3402,9 +3296,9 @@ dependencies = [ ...@@ -3402,9 +3296,9 @@ dependencies = [
[[package]] [[package]]
name = "subxt-macro" name = "subxt-macro"
version = "0.21.0" version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "078edfe8f06cb00848e2e64e923fe809f345042c3d7ec13edcd7f0e617656a9b" checksum = "38521809516f4c244b6f38ed13fc67ef6ada29a846fa26123a4206ff743f3461"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro-error", "proc-macro-error",
...@@ -3414,9 +3308,9 @@ dependencies = [ ...@@ -3414,9 +3308,9 @@ dependencies = [
[[package]] [[package]]
name = "subxt-metadata" name = "subxt-metadata"
version = "0.21.0" version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2819a10a1a13bd9645419f59ac9d7cc8deb51052566b9d0c2157354ea44513d5" checksum = "37b01bac35f2524ce590fa1438fb6c81a63df1b4c94f686be391afd8d02615b3"
dependencies = [ dependencies = [
"frame-metadata", "frame-metadata",
"parity-scale-codec", "parity-scale-codec",
...@@ -3621,12 +3515,6 @@ dependencies = [ ...@@ -3621,12 +3515,6 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "tower-service"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.34" version = "0.1.34"
...@@ -3725,12 +3613,6 @@ dependencies = [ ...@@ -3725,12 +3613,6 @@ dependencies = [
"hash-db", "hash-db",
] ]
[[package]]
name = "try-lock"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]] [[package]]
name = "twox-hash" name = "twox-hash"
version = "1.6.3" version = "1.6.3"
...@@ -3877,16 +3759,6 @@ dependencies = [ ...@@ -3877,16 +3759,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "want"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
dependencies = [
"log",
"try-lock",
]
[[package]] [[package]]
name = "wasi" name = "wasi"
version = "0.9.0+wasi-snapshot-preview1" version = "0.9.0+wasi-snapshot-preview1"
......
...@@ -53,7 +53,7 @@ async-std = { version = "1.12.0", features = ["attributes", "tokio1"] } ...@@ -53,7 +53,7 @@ async-std = { version = "1.12.0", features = ["attributes", "tokio1"] }
ink_metadata = { version = "3", features = ["derive"] } ink_metadata = { version = "3", features = ["derive"] }
sp-core = "6.0.0" sp-core = "6.0.0"
pallet-contracts-primitives = "6.0.0" pallet-contracts-primitives = "6.0.0"
subxt = "0.21.0" subxt = "0.22.0"
hex = "0.4.3" hex = "0.4.3"
jsonrpsee = { version = "0.14.0", features = ["ws-client"] } jsonrpsee = { version = "0.14.0", features = ["ws-client"] }
......
...@@ -184,7 +184,7 @@ impl CallCommand { ...@@ -184,7 +184,7 @@ impl CallCommand {
display_events( display_events(
&result, &result,
transcoder, transcoder,
api.client.metadata(), &api.client.metadata().read(),
&self.extrinsic_opts.verbosity()?, &self.extrinsic_opts.verbosity()?,
) )
} }
......
...@@ -285,9 +285,12 @@ impl<'a> Exec<'a> { ...@@ -285,9 +285,12 @@ impl<'a> Exec<'a> {
let result = wait_for_success_and_handle_error(tx_progress).await?; let result = wait_for_success_and_handle_error(tx_progress).await?;
let metadata = api.client.metadata(); display_events(
&result,
display_events(&result, &self.transcoder, metadata, &self.verbosity)?; &self.transcoder,
&api.client.metadata().read(),
&self.verbosity,
)?;
// The CodeStored event is only raised if the contract has not already been uploaded. // The CodeStored event is only raised if the contract has not already been uploaded.
let code_hash = result let code_hash = result
...@@ -319,8 +322,12 @@ impl<'a> Exec<'a> { ...@@ -319,8 +322,12 @@ impl<'a> Exec<'a> {
let result = wait_for_success_and_handle_error(tx_progress).await?; let result = wait_for_success_and_handle_error(tx_progress).await?;
let metadata = api.client.metadata(); display_events(
display_events(&result, &self.transcoder, metadata, &self.verbosity)?; &result,
&self.transcoder,
&api.client.metadata().read(),
&self.verbosity,
)?;
let instantiated = result let instantiated = result
.find_first::<api::contracts::events::Instantiated>()? .find_first::<api::contracts::events::Instantiated>()?
......
...@@ -230,7 +230,7 @@ pub fn display_contract_exec_result<R>( ...@@ -230,7 +230,7 @@ pub fn display_contract_exec_result<R>(
/// there could be a flag to wait for finality before reporting success. /// there could be a flag to wait for finality before reporting success.
async fn wait_for_success_and_handle_error<T>( async fn wait_for_success_and_handle_error<T>(
tx_progress: subxt::TransactionProgress<'_, T, RuntimeDispatchError, RuntimeEvent>, tx_progress: subxt::TransactionProgress<'_, T, RuntimeDispatchError, RuntimeEvent>,
) -> Result<subxt::TransactionEvents<'_, T, RuntimeEvent>> ) -> Result<subxt::TransactionEvents<T, RuntimeEvent>>
where where
T: Config, T: Config,
{ {
...@@ -248,10 +248,10 @@ async fn dry_run_error_details( ...@@ -248,10 +248,10 @@ async fn dry_run_error_details(
error: &RuntimeDispatchError, error: &RuntimeDispatchError,
) -> Result<String> { ) -> Result<String> {
let error = if let Some(error_data) = error.module_error_data() { let error = if let Some(error_data) = error.module_error_data() {
let details = api let metadata = api.client.metadata();
.client let locked_metadata = metadata.read();
.metadata() let details =
.error(error_data.pallet_index, error_data.error_index())?; locked_metadata.error(error_data.pallet_index, error_data.error_index())?;
format!( format!(
"ModuleError: {}::{}: {:?}", "ModuleError: {}::{}: {:?}",
details.pallet(), details.pallet(),
......
...@@ -162,7 +162,7 @@ impl UploadCommand { ...@@ -162,7 +162,7 @@ impl UploadCommand {
display_events( display_events(
&result, &result,
transcoder, transcoder,
api.client.metadata(), &api.client.metadata().read(),
&self.extrinsic_opts.verbosity()?, &self.extrinsic_opts.verbosity()?,
)?; )?;
......
...@@ -153,9 +153,7 @@ impl<'a> Encoder<'a> { ...@@ -153,9 +153,7 @@ impl<'a> Encoder<'a> {
} }
CompositeTypeFields::NoFields => Ok(()), CompositeTypeFields::NoFields => Ok(()),
CompositeTypeFields::Named(_) => { CompositeTypeFields::Named(_) => {
return Err(anyhow::anyhow!( Err(anyhow::anyhow!("Type is a struct requiring named fields"))
"Type is a struct requiring named fields"
))
} }
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment