chore(e2e): only call map_account if account is not mapped yet (#2483)

* feat:  if not mapped yet

* chore: fix method name and add CHANGELOG

* fix: clippy warnings

* original_account_entry

* chore: minor fixes

* chore: add new error type

* chore: Remove `skip_clippy_and_linting` from contract_build args

See use-ink/cargo-contract#2015

---------

Co-authored-by: davidsemakula <[email protected]>

Author: chungquantin

CHANGELOG.md

@@ -226,6 +226,7 @@ You can find binary releases of the node [here](https://github.com/use-ink/ink-n
 ## Fixed
 - [E2E] Have port parsing handle comma-separated list ‒ [#2336](https://github.com/use-ink/ink/pull/2336)
 - Always use ink! ABI/ SCALE codec for constructor and instantiation related builders and utilities - [#2474](https://github.com/use-ink/ink/pull/2474)
+- Get rid of "extrinsic for call failed: Pallet error: Revive::AccountAlreadyMapped" - [2483](https://github.com/use-ink/ink/pull/2483)
 
 ## Version 5.1.0
 

crates/e2e/src/contract_build.rs

@@ -184,7 +184,6 @@ fn build_contract(
         keep_debug_symbols: false,
         extra_lints: false,
         output_type: OutputType::HumanReadable,
-        skip_clippy_and_linting: false,
         image: ImageVariant::Default,
         metadata_spec: MetadataSpec::Ink,
     };

crates/e2e/src/error.rs

@@ -39,7 +39,6 @@ pub enum Error<DispatchError: fmt::Debug + fmt::Display> {
     #[error("Call dry-run error: {0}")]
     CallDryRun(DryRunError<DispatchError>),
     /// The `call` extrinsic failed.
-    /// The `call` extrinsic failed.
     #[error("Call extrinsic error: {0}")]
     CallExtrinsic(DispatchError),
     /// The `remove_code` extrinsic failed.
@@ -51,6 +50,9 @@ pub enum Error<DispatchError: fmt::Debug + fmt::Display> {
     /// Decoding failed.
     #[error("Decoding failed: {0}")]
     Decoding(String),
+    /// Other error.
+    #[error("Other error: {0}")]
+    Other(String),
 }
 
 /// Error during a dry run RPC invocation.

crates/e2e/src/subxt_client.rs

@@ -51,6 +51,7 @@ use crate::{
     ContractsBackend,
     E2EBackend,
 };
+use ink::H160;
 use ink_env::{
     call::{
         utils::{
@@ -73,7 +74,10 @@ use ink_primitives::{
 };
 use jsonrpsee::core::async_trait;
 use pallet_revive::evm::CallTrace;
-use scale::Encode;
+use scale::{
+    Decode,
+    Encode,
+};
 use sp_weights::Weight;
 #[cfg(feature = "std")]
 use std::fmt::Debug;
@@ -191,11 +195,7 @@ where
             }
         }
 
-        // copied from `pallet-revive`
-        let account_id =
-            <subxt_signer::sr25519::Keypair as subxt::tx::Signer<C>>::account_id(signer);
-        let account_bytes = account_id.encode();
-        let deployer = AccountIdMapper::to_address(account_bytes.as_ref());
+        let deployer = self.derive_keypair_address(signer);
         let addr = pallet_revive::create2(
             &deployer,
             &code[..],
@@ -320,6 +320,50 @@ where
     pub fn url(&self) -> &str {
         &self.url
     }
+
+    /// Derives the Ethereum address from a keypair.
+    // copied from `pallet-revive`
+    fn derive_keypair_address(&self, signer: &Keypair) -> H160 {
+        let account_id = <Keypair as subxt::tx::Signer<C>>::account_id(signer);
+        let account_bytes = account_id.encode();
+        AccountIdMapper::to_address(account_bytes.as_ref())
+    }
+
+    /// Returns the original mapped `AccountId32` for a `H160`.
+    async fn fetch_original_account(
+        &self,
+        addr: &H160,
+    ) -> Result<Option<C::AccountId>, Error> {
+        let original_account_entry = subxt::dynamic::storage(
+            "Revive",
+            "OriginalAccount",
+            vec![Value::from_bytes(addr)],
+        );
+        let best_block = self.api.best_block().await;
+        let raw_value = self
+            .api
+            .client
+            .storage()
+            .at(best_block)
+            .fetch(&original_account_entry)
+            .await
+            .map_err(|err| {
+                Error::Other(format!("Unable to fetch original account: {err:?}"))
+            })?;
+        Ok(match raw_value {
+            Some(value) => {
+                let raw_account_id = value.as_type::<[u8; 32]>().map_err(|err| {
+                    Error::Decoding(format!("unable to deserialize AccountId: {}", err))
+                })?;
+                let account: C::AccountId = Decode::decode(&mut &raw_account_id[..])
+                    .map_err(|err| {
+                        Error::Decoding(format!("unable to decode AccountId: {}", err))
+                    })?;
+                Some(account)
+            }
+            None => None,
+        })
+    }
 }
 
 #[async_trait]
@@ -697,6 +741,10 @@ where
     }
 
     async fn map_account(&mut self, caller: &Keypair) -> Result<(), Self::Error> {
+        let addr = self.derive_keypair_address(caller);
+        if self.fetch_original_account(&addr).await?.is_some() {
+            return Ok(());
+        }
         let tx_events = self.api.map_account(caller).await;
 
         for evt in tx_events.iter() {