Update povstats and subxt for correct max block size constants

Cargo.toml

@@ -15,10 +15,10 @@ contract-metadata = { package = "contract-metadata", git = "https://github.com/p
 serde = { version = "1.0.136", default-features = false, features = ["derive"] }
 serde_json = "1.0.79"
 clap = { version = "3.1.6", features = ["derive"] }
-subxt = { git =  "https://github.com/paritytech/subxt", package = "subxt", branch = "at-block-stats" }
+subxt = { git =  "https://github.com/paritytech/subxt", package = "subxt", branch = "master" }
 futures = "0.3.21"
 parity-wasm = "0.42.2"
-povstats = { git = "https://github.com/athei/povstats" }
+povstats = { git = "https://github.com/athei/povstats", branch = "master" }
 jsonrpsee = { version = "0.9.0", features = ["ws-client"] }
 pallet-contracts-primitives = "6.0.0"
 

macro/Cargo.toml

@@ -8,7 +8,7 @@ proc-macro = true
 
 [dependencies]
 heck = "0.4.0"
-subxt-codegen = { git =  "https://github.com/paritytech/subxt", package = "subxt-codegen", branch = "at-block-stats" }
+subxt-codegen = { git =  "https://github.com/paritytech/subxt", package = "subxt-codegen", branch = "master" }
 ink_metadata = "3.0.0-rc8"
 contract-metadata = "0.5.1"
 proc-macro2 = "1.0.36"

src/canvas/mod.rs

@@ -6,14 +6,14 @@ use futures::{future, TryStreamExt};
 use povstats::substrate as api;
 use sp_core::sr25519;
 use sp_keyring::AccountKeyring;
-use subxt::{DefaultConfig, DefaultExtra, PairSigner};
+use subxt::{DefaultConfig, PairSigner};
 use xts::ContractsApi;
 
 pub type Balance = u128;
 pub type Gas = u64;
 pub type AccountId = <DefaultConfig as subxt::Config>::AccountId;
 pub type Hash = <DefaultConfig as subxt::Config>::Hash;
-pub type Signer = PairSigner<DefaultConfig, DefaultExtra<DefaultConfig>, sr25519::Pair>;
+pub type Signer = PairSigner<DefaultConfig, sr25519::Pair>;
 
 /// Trait implemented by [`smart_bench_macro::contract`] for all contract constructors.
 pub trait InkConstructor: codec::Encode {

src/canvas/runner.rs

@@ -3,7 +3,6 @@ use codec::Encode;
 use color_eyre::eyre;
 use futures::{future, StreamExt, TryStream, TryStreamExt};
 use sp_runtime::traits::{BlakeTwo256, Hash as _};
-use subxt::Signer as _;
 
 pub const DEFAULT_STORAGE_DEPOSIT_LIMIT: Option<Balance> = None;
 
@@ -137,16 +136,16 @@ impl BenchRunner {
         while let Some(Ok(info)) = failed_or_instantiated_events.next().await {
             match info.event {
                 (Some(failed), None) => {
-                    let (pallet_idx, error_idx) =
-                        subxt::HasModuleError::module_error_indices(&failed.dispatch_error).ok_or(
+                    let error_data =
+                        subxt::HasModuleError::module_error_data(&failed.dispatch_error).ok_or(
                             eyre::eyre!("Failed to find error details for {:?},", failed),
                         )?;
                     let details = self
                         .api
                         .api
                         .client
                         .metadata()
-                        .error(pallet_idx, error_idx)?;
+                        .error(error_data.pallet_index, error_data.error_index())?;
                     return Err(eyre::eyre!(
                         "Instantiate Extrinsic Failed: {:?}",
                         details.description()

src/canvas/xts.rs

@@ -6,19 +6,20 @@ use jsonrpsee::{
 };
 use serde::Serialize;
 use sp_core::{Bytes, H256};
-use subxt::{rpc::NumberOrHex, DefaultConfig, DefaultExtra, Signer as _};
+use subxt::{rpc::NumberOrHex, DefaultConfig, PolkadotExtrinsicParams};
 
 const DRY_RUN_GAS_LIMIT: u64 = 500_000_000_000;
 
+type RuntimeApi = api::RuntimeApi<DefaultConfig, PolkadotExtrinsicParams<DefaultConfig>>;
+
 pub struct ContractsApi {
-    pub api: api::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>,
+    pub api: RuntimeApi,
     ws_client: WsClient,
 }
 
 impl ContractsApi {
     pub async fn new(client: subxt::Client<DefaultConfig>, url: &str) -> color_eyre::Result<Self> {
-        let api =
-            client.to_runtime_api::<api::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>>();
+        let api = client.to_runtime_api::<RuntimeApi>();
         let ws_client = WsClientBuilder::default().build(&url).await?;
         Ok(Self { api, ws_client })
     }
@@ -68,7 +69,7 @@ impl ContractsApi {
             .tx()
             .contracts()
             .instantiate_with_code(value, gas_limit, storage_deposit_limit, code, data, salt)
-            .sign_and_submit(signer)
+            .sign_and_submit_default(signer)
             .await?;
 
         Ok(tx_hash)
@@ -118,7 +119,7 @@ impl ContractsApi {
                 storage_deposit_limit,
                 data,
             )
-            .sign_and_submit(signer)
+            .sign_and_submit_default(signer)
             .await?;
 
         Ok(tx_hash)