Merge branch 'master' into hc-bump-substrate-deps

crates/e2e/Cargo.toml

@@ -20,7 +20,7 @@ ink = { version = "4.0.0-beta.1", path = "../ink" }
 ink_env = { version = "4.0.0-beta.1", path = "../env" }
 ink_primitives = { version = "4.0.0-beta.1", path = "../primitives" }
 
-contract-metadata = { version = "2.0.0-beta.1" }
+contract-metadata = { version = "2.0.0-rc" }
 funty = "2.0.0"
 impl-serde = { version = "0.3.1", default-features = false }
 jsonrpsee = { version = "0.16.0", features = ["ws-client"] }

crates/e2e/src/client.rs

@@ -31,6 +31,7 @@ use contract_metadata::ContractMetadata;
 use ink_env::Environment;
 use ink_primitives::MessageResult;
 
+use sp_core::Pair;
 use std::{
     collections::BTreeMap,
     fmt::Debug,
@@ -40,12 +41,22 @@ use std::{
 use subxt::{
     blocks::ExtrinsicEvents,
     config::ExtrinsicParams,
+    events::EventDetails,
+    ext::scale_value::{
+        Composite,
+        Value,
+        ValueDef,
+    },
     metadata::DecodeStaticType,
     storage::address::{
         StorageHasher,
         StorageMapKey,
         Yes,
     },
+    tx::{
+        PairSigner,
+        Signer as _,
+    },
 };
 
 /// Result of a contract instantiation.
@@ -337,11 +348,15 @@ where
     ) -> Signer<C>
     where
         E::Balance: Clone,
-        C::AccountId: Clone + core::fmt::Display,
+        C::AccountId: Clone + core::fmt::Display + core::fmt::Debug,
+        C::AccountId: From<sp_core::crypto::AccountId32>,
     {
         let (pair, _, _) = <sr25519::Pair as Pair>::generate_with_phrase(None);
-        let account_id =
-            <C::Signature as Verify>::Signer::from(pair.public()).into_account();
+        // let account_id =
+        //     <C::Signature as Verify>::Signer::from(pair.public()).into_account();
+
+        let account_id: C::AccountId =
+            PairSigner::<C, _>::new(pair.clone()).account_id().clone();
 
         for _ in 0..6 {
             let transfer_result = self