From cc1400429712a36f77d4325f824062004dcde900 Mon Sep 17 00:00:00 2001
From: Andrew Jones <ascjones@gmail.com>
Date: Wed, 15 Feb 2023 15:54:21 +0000
Subject: [PATCH] `[ink_e2e]` update subxt and substrate dependencies (#1649)

* `[ink_e2e]` update `subxt` and substrate dependencies

* Use git ref for contract-build dependency

* Revert to crates.io contract-build

* Fix subxt::Config impl
---
 crates/e2e/Cargo.toml | 12 ++++++------
 crates/e2e/src/lib.rs |  3 +--
 2 files changed, 7 insertions(+), 8 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`
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<Self::AccountId, u32>;
     type Header = subxt::config::substrate::SubstrateHeader<
-        Self::BlockNumber,
+        u32,
         subxt::config::substrate::BlakeTwo256,
     >;
     type Signature = sp_runtime::MultiSignature;