Bump subxt from 0.34.0 to 0.35.0 (#1560)

use-ink · Apr 2, 2024 · dfd46c4 · dfd46c4
1 parent 4a77831
commit dfd46c4
Show file tree

Hide file tree

Showing 15 changed files with 631 additions and 609 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cargo-contract/Cargo.toml b/crates/cargo-contract/Cargo.toml
@@ -43,9 +43,9 @@ comfy-table = "7.1.0"
 
 # dependencies for extrinsics (deploying and calling a contract)
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-subxt = { version = "0.34.0", features = ["substrate-compat"] }
-sp-core = "30.0.0"
-sp-weights = "29.0.0"
+subxt = { version = "0.35.0", features = ["substrate-compat"] }
+sp-core = "31.0.0"
+sp-weights = "30.0.0"
 hex = "0.4.3"
 
 [build-dependencies]

diff --git a/crates/cargo-contract/src/cmd/call.rs b/crates/cargo-contract/src/cmd/call.rs
@@ -61,7 +61,10 @@ use contract_extrinsics::{
 use contract_transcode::Value;
 use sp_weights::Weight;
 use subxt::{
-    config::ExtrinsicParams,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -120,8 +123,10 @@ impl CallCommand {
     where
         <C as Config>::AccountId: IntoVisitor + FromStr + EncodeAsType,
         <<C as Config>::AccountId as FromStr>::Err: Display,
-        C::Balance: From<u128> + Display + Default + FromStr + Serialize + Debug,
-        <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+        C::Balance:
+            From<u128> + Display + Default + FromStr + Serialize + Debug + EncodeAsType,
+        <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+            From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
     {
         let contract = parse_account(&self.contract)
             .map_err(|e| anyhow::anyhow!("Failed to parse contract option: {}", e))?;
@@ -255,8 +260,9 @@ async fn pre_submit_dry_run_gas_estimate_call<C: Config + Environment, Signer>(
 where
     Signer: subxt::tx::Signer<C> + Clone,
     <C as Config>::AccountId: IntoVisitor + EncodeAsType,
-    C::Balance: Debug,
-    <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+    C::Balance: Debug + EncodeAsType,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
 {
     if skip_dry_run {
         return match (call_exec.gas_limit(), call_exec.proof_size()) {

diff --git a/crates/cargo-contract/src/cmd/instantiate.rs b/crates/cargo-contract/src/cmd/instantiate.rs
@@ -64,7 +64,10 @@ use std::{
     str::FromStr,
 };
 use subxt::{
-    config::ExtrinsicParams,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         codec::Decode,
         scale_decode::IntoVisitor,
@@ -131,8 +134,10 @@ impl InstantiateCommand {
         <C as SignerConfig<C>>::Signer: subxt::tx::Signer<C> + Clone + FromStr,
         <C as Config>::AccountId: IntoVisitor + FromStr + EncodeAsType + Decode + Display,
         <<C as Config>::AccountId as FromStr>::Err: Display,
-        C::Balance: From<u128> + Display + Default + FromStr + Serialize + Debug,
-        <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+        C::Balance:
+            From<u128> + Display + Default + FromStr + Serialize + Debug + EncodeAsType,
+        <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+            From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
         <C as Config>::Hash: From<[u8; 32]> + IntoVisitor + EncodeAsType,
     {
         let signer = C::Signer::from_str(&self.extrinsic_cli_opts.suri)
@@ -190,7 +195,7 @@ impl InstantiateCommand {
                 }
                 Err(object) => {
                     if self.output_json() {
-                        return Err(object);
+                        return Err(object)
                     } else {
                         name_value_println!("Result", object, MAX_KEY_COL_WIDTH);
                         display_contract_exec_result::<_, MAX_KEY_COL_WIDTH, _>(&result)?;
@@ -254,8 +259,9 @@ where
     C::Signer: subxt::tx::Signer<C> + Clone,
     <C as Config>::AccountId: IntoVisitor + Display + Decode,
     <C as Config>::Hash: IntoVisitor + EncodeAsType,
-    C::Balance: Serialize + Debug,
-    <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+    C::Balance: Serialize + Debug + EncodeAsType,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
 {
     if skip_dry_run {
         return match (instantiate_exec.args().gas_limit(), instantiate_exec.args().proof_size()) {
@@ -318,8 +324,9 @@ pub async fn display_result<C: Config + Environment + SignerConfig<C>>(
 where
     <C as Config>::AccountId: IntoVisitor + EncodeAsType + Display + Decode,
     <C as Config>::Hash: IntoVisitor + EncodeAsType,
-    C::Balance: Serialize + From<u128> + Display,
-    <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+    C::Balance: Serialize + From<u128> + Display + EncodeAsType,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
 {
     let events = DisplayEvents::from_events::<C, C>(
         &instantiate_exec_result.events,
@@ -353,8 +360,9 @@ pub fn print_default_instantiate_preview<C: Config + Environment + SignerConfig<
     C::Signer: subxt::tx::Signer<C> + Clone,
     <C as Config>::AccountId: IntoVisitor + EncodeAsType + Display + Decode,
     <C as Config>::Hash: IntoVisitor + EncodeAsType,
-    C::Balance: Serialize,
-    <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+    C::Balance: Serialize + EncodeAsType,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
 {
     name_value_println!(
         "Constructor",

diff --git a/crates/cargo-contract/src/cmd/remove.rs b/crates/cargo-contract/src/cmd/remove.rs
@@ -44,7 +44,10 @@ use contract_extrinsics::{
 use ink_env::Environment;
 use serde::Serialize;
 use subxt::{
-    config::ExtrinsicParams,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -84,9 +87,16 @@ impl RemoveCommand {
     where
         <C as Config>::AccountId: IntoVisitor + FromStr + EncodeAsType,
         <<C as Config>::AccountId as FromStr>::Err: Display,
-        C::Balance:
-            Into<u128> + From<u128> + Display + Default + FromStr + Serialize + Debug,
-        <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+        C::Balance: Into<u128>
+            + From<u128>
+            + Display
+            + Default
+            + FromStr
+            + Serialize
+            + Debug
+            + IntoVisitor,
+        <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+            From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
         <C as Config>::Hash: IntoVisitor + EncodeAsType + From<[u8; 32]>,
     {
         let signer = C::Signer::from_str(&self.extrinsic_cli_opts.suri)

diff --git a/crates/cargo-contract/src/cmd/upload.rs b/crates/cargo-contract/src/cmd/upload.rs
@@ -46,7 +46,10 @@ use contract_extrinsics::{
 use ink_env::Environment;
 use serde::Serialize;
 use subxt::{
-    config::ExtrinsicParams,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -84,9 +87,16 @@ impl UploadCommand {
     where
         <C as Config>::AccountId: IntoVisitor + FromStr + EncodeAsType,
         <<C as Config>::AccountId as FromStr>::Err: Display,
-        C::Balance:
-            Into<u128> + From<u128> + Display + Default + FromStr + Serialize + Debug,
-        <C::ExtrinsicParams as ExtrinsicParams<C>>::OtherParams: Default,
+        C::Balance: Into<u128>
+            + From<u128>
+            + Display
+            + Default
+            + FromStr
+            + Serialize
+            + Debug
+            + EncodeAsType,
+        <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+            From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
         <C as Config>::Hash: IntoVisitor + EncodeAsType + From<[u8; 32]>,
     {
         let signer = C::Signer::from_str(&self.extrinsic_cli_opts.suri)

diff --git a/crates/extrinsics/Cargo.toml b/crates/extrinsics/Cargo.toml
@@ -31,12 +31,12 @@ serde_json = "1.0.115"
 url = { version = "2.5.0", features = ["serde"] }
 rust_decimal = "1.35"
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-sp-core = "30.0.0"
-sp-runtime = "33.0.0"
-sp-weights = "29.0.0"
+sp-core = "31.0.0"
+sp-runtime = "34.0.0"
+sp-weights = "30.0.0"
 pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.3", features = ["scale"] }
 scale-info = "2.11.1"
-subxt = "0.34.0"
+subxt = "0.35.0"
 hex = "0.4.3"
 derivative = "2.2.0"
 ink_metadata = "5.0.0"
@@ -49,7 +49,7 @@ regex = "1.10.4"
 predicates = "3.1.0"
 tempfile = "3.10.1"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-subxt-signer = { version = "0.34.0", features = ["subxt", "sr25519"] }
+subxt-signer = { version = "0.35.0", features = ["subxt", "sr25519"] }
 
 [features]
 integration-tests = []

diff --git a/crates/extrinsics/src/call.rs b/crates/extrinsics/src/call.rs
@@ -41,6 +41,10 @@ use subxt::{
         rpc::RpcClient,
     },
     blocks::ExtrinsicEvents,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -165,8 +169,10 @@ pub struct CallExec<C: Config, E: Environment, Signer: Clone> {
 
 impl<C: Config, E: Environment, Signer> CallExec<C, E, Signer>
 where
-    <C::ExtrinsicParams as subxt::config::ExtrinsicParams<C>>::OtherParams: Default,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
     C::AccountId: EncodeAsType + IntoVisitor,
+    E::Balance: EncodeAsType,
     Signer: tx::Signer<C> + Clone,
 {
     /// Simulates a contract call without modifying the blockchain.

diff --git a/crates/extrinsics/src/contract_info.rs b/crates/extrinsics/src/contract_info.rs
@@ -31,12 +31,10 @@ use std::option::Option;
 use subxt::{
     backend::legacy::LegacyRpcMethods,
     dynamic::DecodedValueThunk,
-    error::DecodeError,
     ext::{
         scale_decode::{
             DecodeAsType,
             IntoVisitor,
-            Visitor,
         },
         scale_value::Value,
     },
@@ -79,7 +77,6 @@ pub async fn fetch_contract_info<C: Config, E: Environment>(
 where
     C::AccountId: AsRef<[u8]> + Display + IntoVisitor,
     C::Hash: IntoVisitor,
-    DecodeError: From<<<C::AccountId as IntoVisitor>::Visitor as Visitor>::Error>,
     E::Balance: IntoVisitor,
 {
     let best_block = get_best_block(rpc).await?;
@@ -122,7 +119,6 @@ impl<C: Config, E: Environment> ContractInfoRaw<C, E>
 where
     C::AccountId: IntoVisitor,
     C::Hash: IntoVisitor,
-    DecodeError: From<<<C::AccountId as IntoVisitor>::Visitor as Visitor>::Error>,
     E::Balance: IntoVisitor,
 {
     /// Create a new instance of `ContractInfoRaw` based on the provided contract and
@@ -314,8 +310,7 @@ where
 {
     let best_block = get_best_block(rpc).await?;
     let root_key =
-        subxt::dynamic::storage("Contracts", "ContractInfoOf", Vec::<()>::new())
-            .to_root_bytes();
+        subxt::dynamic::storage("Contracts", "ContractInfoOf", ()).to_root_bytes();
     let mut keys = client
         .storage()
         .at(best_block)

diff --git a/crates/extrinsics/src/contract_storage.rs b/crates/extrinsics/src/contract_storage.rs
@@ -64,11 +64,7 @@ use subxt::{
             RpcClient,
         },
     },
-    error::DecodeError,
-    ext::scale_decode::{
-        IntoVisitor,
-        Visitor,
-    },
+    ext::scale_decode::IntoVisitor,
     Config,
     OnlineClient,
 };
@@ -89,7 +85,6 @@ impl<C: Config, E: Environment> ContractStorage<C, E>
 where
     C::AccountId: AsRef<[u8]> + Display + IntoVisitor,
     C::Hash: IntoVisitor,
-    DecodeError: From<<<C::AccountId as IntoVisitor>::Visitor as Visitor>::Error>,
     E::Balance: IntoVisitor + Serialize,
 {
     pub fn new(rpc: ContractStorageRpc<C>) -> Self {
@@ -604,7 +599,6 @@ impl<C: Config> ContractStorageRpc<C>
 where
     C::AccountId: AsRef<[u8]> + Display + IntoVisitor,
     C::Hash: IntoVisitor,
-    DecodeError: From<<<C::AccountId as IntoVisitor>::Visitor as Visitor>::Error>,
 {
     /// Create a new instance of the ContractsRpc.
     pub async fn new(url: &url::Url) -> Result<Self> {

diff --git a/crates/extrinsics/src/instantiate.rs b/crates/extrinsics/src/instantiate.rs
@@ -58,7 +58,10 @@ use subxt::{
         rpc::RpcClient,
     },
     blocks::ExtrinsicEvents,
-    config,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -260,10 +263,11 @@ pub struct InstantiateExec<C: Config, E: Environment, Signer: Clone> {
 impl<C: Config, E: Environment, Signer> InstantiateExec<C, E, Signer>
 where
     C::AccountId: Decode,
-    <C::ExtrinsicParams as config::ExtrinsicParams<C>>::OtherParams: Default,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
     C::Hash: IntoVisitor + EncodeAsType,
     C::AccountId: IntoVisitor + Display,
-    E::Balance: Serialize,
+    E::Balance: Serialize + EncodeAsType,
     Signer: tx::Signer<C> + Clone,
 {
     /// Decodes the result of a simulated contract instantiation.

diff --git a/crates/extrinsics/src/lib.rs b/crates/extrinsics/src/lib.rs
@@ -55,7 +55,11 @@ use scale::{
 use subxt::{
     backend::legacy::LegacyRpcMethods,
     blocks,
-    config,
+    config::{
+        DefaultExtrinsicParams,
+        DefaultExtrinsicParamsBuilder,
+        ExtrinsicParams,
+    },
     tx,
     Config,
     OnlineClient,
@@ -149,14 +153,18 @@ where
     C: Config,
     Call: tx::TxPayload,
     Signer: tx::Signer<C>,
-    <C::ExtrinsicParams as config::ExtrinsicParams<C>>::OtherParams: Default,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
 {
     let account_id = Signer::account_id(signer);
     let account_nonce = get_account_nonce(client, rpc, &account_id).await?;
 
+    let params = DefaultExtrinsicParamsBuilder::new()
+        .nonce(account_nonce)
+        .build();
     let mut tx = client
         .tx()
-        .create_signed_with_nonce(call, signer, account_nonce, Default::default())?
+        .create_signed_offline(call, signer, params.into())?
         .submit_and_watch()
         .await?;
 

diff --git a/crates/extrinsics/src/remove.rs b/crates/extrinsics/src/remove.rs
@@ -33,7 +33,10 @@ use subxt::{
         rpc::RpcClient,
     },
     blocks::ExtrinsicEvents,
-    config,
+    config::{
+        DefaultExtrinsicParams,
+        ExtrinsicParams,
+    },
     ext::{
         scale_decode::IntoVisitor,
         scale_encode::EncodeAsType,
@@ -130,7 +133,8 @@ impl<C: Config, E: Environment, Signer> RemoveExec<C, E, Signer>
 where
     C::Hash: IntoVisitor + EncodeAsType,
     C::AccountId: IntoVisitor,
-    <C::ExtrinsicParams as config::ExtrinsicParams<C>>::OtherParams: Default,
+    <C::ExtrinsicParams as ExtrinsicParams<C>>::Params:
+        From<<DefaultExtrinsicParams<C> as ExtrinsicParams<C>>::Params>,
     Signer: tx::Signer<C> + Clone,
 {
     /// Removes a contract code from the blockchain.