From 14f949d1e0618ed331bd0fbd3337439e2a3007b3 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 13 Feb 2023 17:43:31 +0000 Subject: [PATCH 1/4] `[ink_e2e]` update `subxt` and substrate dependencies --- crates/e2e/Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/e2e/Cargo.toml b/crates/e2e/Cargo.toml index c4741b1e912..622cc1a1fd1 100644 --- a/crates/e2e/Cargo.toml +++ b/crates/e2e/Cargo.toml @@ -30,14 +30,14 @@ tokio = { version = "1.18.2", features = ["rt-multi-thread"] } log = { version = "0.4" } env_logger = { version = "0.10" } scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "full"] } -subxt = "0.26.0" +subxt = "0.27.0" # Substrate -pallet-contracts-primitives = "12.0.0" -sp-core = "11.0.0" -sp-keyring = "12.0.0" -sp-runtime = "12.0.0" -sp-weights = "8.0.0" +pallet-contracts-primitives = "18.0.0" +sp-core = "16.0.0" +sp-keyring = "18.0.0" +sp-runtime = "18.0.0" +sp-weights = "14.0.0" [dev-dependencies] # Required for the doctest of `MessageBuilder::call` From 9b64984b06dcc2f3ab0e79c169db6d7a5af564cb Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 13 Feb 2023 17:45:28 +0000 Subject: [PATCH 2/4] Use git ref for contract-build dependency --- crates/e2e/macro/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 9fa931e054f..1f47a4cd677 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -20,7 +20,7 @@ proc-macro = true [dependencies] ink_ir = { version = "4.0.0-rc", path = "../../ink/ir" } -contract-build = "2.0.0-rc.1" +contract-build = { git = "https://github.com/paritytech/cargo-contract/", branch = "aj/update-subxt", package = "contract-build" } derive_more = "0.99.17" env_logger = "0.10.0" log = "0.4.17" From 62393d9c7df6c714aa85d437fe27f3fde07fb023 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 15 Feb 2023 15:39:45 +0000 Subject: [PATCH 3/4] Revert to crates.io contract-build --- crates/e2e/macro/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml index 1f47a4cd677..9fa931e054f 100644 --- a/crates/e2e/macro/Cargo.toml +++ b/crates/e2e/macro/Cargo.toml @@ -20,7 +20,7 @@ proc-macro = true [dependencies] ink_ir = { version = "4.0.0-rc", path = "../../ink/ir" } -contract-build = { git = "https://github.com/paritytech/cargo-contract/", branch = "aj/update-subxt", package = "contract-build" } +contract-build = "2.0.0-rc.1" derive_more = "0.99.17" env_logger = "0.10.0" log = "0.4.17" From b98d208d05718ac67c81da823a6e8e0aa76b098c Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 15 Feb 2023 15:47:01 +0000 Subject: [PATCH 4/4] Fix subxt::Config impl --- crates/e2e/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/e2e/src/lib.rs b/crates/e2e/src/lib.rs index 85913105325..aa1cf3bd74a 100644 --- a/crates/e2e/src/lib.rs +++ b/crates/e2e/src/lib.rs @@ -72,13 +72,12 @@ pub enum SubstrateConfig {} #[cfg(feature = "std")] impl subxt::Config for SubstrateConfig { type Index = u32; - type BlockNumber = u32; type Hash = sp_core::H256; type Hasher = subxt::config::substrate::BlakeTwo256; type AccountId = subxt::config::substrate::AccountId32; type Address = sp_runtime::MultiAddress; type Header = subxt::config::substrate::SubstrateHeader< - Self::BlockNumber, + u32, subxt::config::substrate::BlakeTwo256, >; type Signature = sp_runtime::MultiSignature;