git.delta.rocks / unique-network / refs/commits / 3ab9e10ac5b6

difftreelog

Support sponsoring from frontier

Trubnikov Sergey2022-03-10parent: #fcbdc31.patch.diff
in: master

9 files changed

modified.gitignorediffbeforeafterboth
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *store_key*.json
 
 /.idea/
+/.cargo/
 
 tests/.vscode
 cumulus-parachain/
modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6146,6 +6146,7 @@
  "sp-core",
  "sp-runtime",
  "sp-std",
+ "up-evm-mapping",
  "up-sponsorship",
 ]
modifiedpallets/common/src/account.rsdiffbeforeafterboth
before · pallets/common/src/account.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use crate::Config;18use codec::{Encode, EncodeLike, Decode, MaxEncodedLen};19use sp_core::H160;20use scale_info::{Type, TypeInfo};21use core::cmp::Ordering;22use serde::{Serialize, Deserialize};23use pallet_evm::AddressMapping;24use sp_std::vec::Vec;25use sp_std::clone::Clone;26pub use up_evm_mapping::EvmBackwardsAddressMapping;2728pub trait CrossAccountId<AccountId>:29	Encode + EncodeLike + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Ord + core::fmt::Debug30// +31// Serialize + Deserialize<'static>32{33	fn as_sub(&self) -> &AccountId;34	fn as_eth(&self) -> &H160;3536	fn from_sub(account: AccountId) -> Self;37	fn from_eth(account: H160) -> Self;3839	fn conv_eq(&self, other: &Self) -> bool;40}4142#[derive(Encode, Decode, Serialize, Deserialize, TypeInfo, MaxEncodedLen)]43#[serde(rename_all = "camelCase")]44enum BasicCrossAccountIdRepr<AccountId> {45	Substrate(AccountId),46	Ethereum(H160),47}4849#[derive(PartialEq, Eq)]50pub struct BasicCrossAccountId<T: Config> {51	/// If true - then ethereum is canonical encoding52	from_ethereum: bool,53	substrate: T::AccountId,54	ethereum: H160,55}5657impl<T: Config> MaxEncodedLen for BasicCrossAccountId<T> {58	fn max_encoded_len() -> usize {59		<BasicCrossAccountIdRepr<T::AccountId>>::max_encoded_len()60	}61}6263impl<T: Config> TypeInfo for BasicCrossAccountId<T> {64	type Identity = Self;6566	fn type_info() -> Type {67		<BasicCrossAccountIdRepr<T::AccountId>>::type_info()68	}69}7071impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {72	fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {73		if self.from_ethereum {74			fmt.debug_tuple("CrossAccountId::Ethereum")75				.field(&self.ethereum)76				.finish()77		} else {78			fmt.debug_tuple("CrossAccountId::Substrate")79				.field(&self.substrate)80				.finish()81		}82	}83}8485impl<T: Config> PartialOrd for BasicCrossAccountId<T> {86	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {87		Some(self.substrate.cmp(&other.substrate))88	}89}9091impl<T: Config> Ord for BasicCrossAccountId<T> {92	fn cmp(&self, other: &Self) -> Ordering {93		self.partial_cmp(other)94			.expect("substrate account is total ordered")95	}96}9798impl<T: Config> Clone for BasicCrossAccountId<T> {99	fn clone(&self) -> Self {100		Self {101			from_ethereum: self.from_ethereum,102			substrate: self.substrate.clone(),103			ethereum: self.ethereum,104		}105	}106}107impl<T: Config> Encode for BasicCrossAccountId<T> {108	fn encode(&self) -> Vec<u8> {109		BasicCrossAccountIdRepr::from(self.clone()).encode()110	}111}112impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}113impl<T: Config> Decode for BasicCrossAccountId<T> {114	fn decode<I>(input: &mut I) -> Result<Self, codec::Error>115	where116		I: codec::Input,117	{118		Ok(BasicCrossAccountIdRepr::decode(input)?.into())119	}120}121impl<T> Serialize for BasicCrossAccountId<T>122where123	T: Config,124	T::AccountId: Serialize,125{126	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>127	where128		S: serde::Serializer,129	{130		let repr = BasicCrossAccountIdRepr::from(self.clone());131		(&repr).serialize(serializer)132	}133}134impl<'de, T> Deserialize<'de> for BasicCrossAccountId<T>135where136	T: Config,137	T::AccountId: Deserialize<'de>,138{139	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>140	where141		D: serde::Deserializer<'de>,142	{143		Ok(BasicCrossAccountIdRepr::deserialize(deserializer)?.into())144	}145}146impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {147	fn as_sub(&self) -> &T::AccountId {148		&self.substrate149	}150	fn as_eth(&self) -> &H160 {151		&self.ethereum152	}153	fn from_sub(substrate: T::AccountId) -> Self {154		Self {155			ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),156			substrate,157			from_ethereum: false,158		}159	}160	fn from_eth(ethereum: H160) -> Self {161		Self {162			ethereum,163			substrate: T::EvmAddressMapping::into_account_id(ethereum),164			from_ethereum: true,165		}166	}167	fn conv_eq(&self, other: &Self) -> bool {168		if self.from_ethereum == other.from_ethereum {169			self.substrate == other.substrate && self.ethereum == other.ethereum170		} else if self.from_ethereum {171			// ethereum is canonical encoding, but we need to compare derived address172			self.substrate == other.substrate173		} else {174			self.ethereum == other.ethereum175		}176	}177}178impl<T: Config> From<BasicCrossAccountIdRepr<T::AccountId>> for BasicCrossAccountId<T> {179	fn from(repr: BasicCrossAccountIdRepr<T::AccountId>) -> Self {180		match repr {181			BasicCrossAccountIdRepr::Substrate(s) => Self::from_sub(s),182			BasicCrossAccountIdRepr::Ethereum(e) => Self::from_eth(e),183		}184	}185}186impl<T: Config> From<BasicCrossAccountId<T>> for BasicCrossAccountIdRepr<T::AccountId> {187	fn from(v: BasicCrossAccountId<T>) -> Self {188		if v.from_ethereum {189			BasicCrossAccountIdRepr::Ethereum(*v.as_eth())190		} else {191			BasicCrossAccountIdRepr::Substrate(v.as_sub().clone())192		}193	}194}
after · pallets/common/src/account.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use crate::Config;18use codec::{Encode, EncodeLike, Decode, MaxEncodedLen};19use sp_core::H160;20use scale_info::{Type, TypeInfo};21use core::cmp::Ordering;22use serde::{Serialize, Deserialize};23use pallet_evm::AddressMapping;24use sp_std::vec::Vec;25use sp_std::clone::Clone;2627pub use up_evm_mapping::EvmBackwardsAddressMapping;2829pub trait CrossAccountId<AccountId>:30	Encode + EncodeLike + Decode + TypeInfo + MaxEncodedLen + Clone + PartialEq + Ord + core::fmt::Debug31// +32// Serialize + Deserialize<'static>33{34	fn as_sub(&self) -> &AccountId;35	fn as_eth(&self) -> &H160;3637	fn from_sub(account: AccountId) -> Self;38	fn from_eth(account: H160) -> Self;3940	fn conv_eq(&self, other: &Self) -> bool;41}4243#[derive(Encode, Decode, Serialize, Deserialize, TypeInfo, MaxEncodedLen)]44#[serde(rename_all = "camelCase")]45enum BasicCrossAccountIdRepr<AccountId> {46	Substrate(AccountId),47	Ethereum(H160),48}4950#[derive(PartialEq, Eq)]51pub struct BasicCrossAccountId<T: Config> {52	/// If true - then ethereum is canonical encoding53	from_ethereum: bool,54	substrate: T::AccountId,55	ethereum: H160,56}5758impl<T: Config> MaxEncodedLen for BasicCrossAccountId<T> {59	fn max_encoded_len() -> usize {60		<BasicCrossAccountIdRepr<T::AccountId>>::max_encoded_len()61	}62}6364impl<T: Config> TypeInfo for BasicCrossAccountId<T> {65	type Identity = Self;6667	fn type_info() -> Type {68		<BasicCrossAccountIdRepr<T::AccountId>>::type_info()69	}70}7172impl<T: Config> core::fmt::Debug for BasicCrossAccountId<T> {73	fn fmt(&self, fmt: &mut core::fmt::Formatter) -> core::fmt::Result {74		if self.from_ethereum {75			fmt.debug_tuple("CrossAccountId::Ethereum")76				.field(&self.ethereum)77				.finish()78		} else {79			fmt.debug_tuple("CrossAccountId::Substrate")80				.field(&self.substrate)81				.finish()82		}83	}84}8586impl<T: Config> PartialOrd for BasicCrossAccountId<T> {87	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {88		Some(self.substrate.cmp(&other.substrate))89	}90}9192impl<T: Config> Ord for BasicCrossAccountId<T> {93	fn cmp(&self, other: &Self) -> Ordering {94		self.partial_cmp(other)95			.expect("substrate account is total ordered")96	}97}9899impl<T: Config> Clone for BasicCrossAccountId<T> {100	fn clone(&self) -> Self {101		Self {102			from_ethereum: self.from_ethereum,103			substrate: self.substrate.clone(),104			ethereum: self.ethereum,105		}106	}107}108impl<T: Config> Encode for BasicCrossAccountId<T> {109	fn encode(&self) -> Vec<u8> {110		BasicCrossAccountIdRepr::from(self.clone()).encode()111	}112}113impl<T: Config> EncodeLike for BasicCrossAccountId<T> {}114impl<T: Config> Decode for BasicCrossAccountId<T> {115	fn decode<I>(input: &mut I) -> Result<Self, codec::Error>116	where117		I: codec::Input,118	{119		Ok(BasicCrossAccountIdRepr::decode(input)?.into())120	}121}122impl<T> Serialize for BasicCrossAccountId<T>123where124	T: Config,125	T::AccountId: Serialize,126{127	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>128	where129		S: serde::Serializer,130	{131		let repr = BasicCrossAccountIdRepr::from(self.clone());132		(&repr).serialize(serializer)133	}134}135impl<'de, T> Deserialize<'de> for BasicCrossAccountId<T>136where137	T: Config,138	T::AccountId: Deserialize<'de>,139{140	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>141	where142		D: serde::Deserializer<'de>,143	{144		Ok(BasicCrossAccountIdRepr::deserialize(deserializer)?.into())145	}146}147impl<T: Config> CrossAccountId<T::AccountId> for BasicCrossAccountId<T> {148	fn as_sub(&self) -> &T::AccountId {149		&self.substrate150	}151	fn as_eth(&self) -> &H160 {152		&self.ethereum153	}154	fn from_sub(substrate: T::AccountId) -> Self {155		Self {156			ethereum: T::EvmBackwardsAddressMapping::from_account_id(substrate.clone()),157			substrate,158			from_ethereum: false,159		}160	}161	fn from_eth(ethereum: H160) -> Self {162		Self {163			ethereum,164			substrate: T::EvmAddressMapping::into_account_id(ethereum),165			from_ethereum: true,166		}167	}168	fn conv_eq(&self, other: &Self) -> bool {169		if self.from_ethereum == other.from_ethereum {170			self.substrate == other.substrate && self.ethereum == other.ethereum171		} else if self.from_ethereum {172			// ethereum is canonical encoding, but we need to compare derived address173			self.substrate == other.substrate174		} else {175			self.ethereum == other.ethereum176		}177	}178}179impl<T: Config> From<BasicCrossAccountIdRepr<T::AccountId>> for BasicCrossAccountId<T> {180	fn from(repr: BasicCrossAccountIdRepr<T::AccountId>) -> Self {181		match repr {182			BasicCrossAccountIdRepr::Substrate(s) => Self::from_sub(s),183			BasicCrossAccountIdRepr::Ethereum(e) => Self::from_eth(e),184		}185	}186}187impl<T: Config> From<BasicCrossAccountId<T>> for BasicCrossAccountIdRepr<T::AccountId> {188	fn from(v: BasicCrossAccountId<T>) -> Self {189		if v.from_ethereum {190			BasicCrossAccountIdRepr::Ethereum(*v.as_eth())191		} else {192			BasicCrossAccountIdRepr::Substrate(v.as_sub().clone())193		}194	}195}
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,6 +17,7 @@
 pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
 pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
 up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
+up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
 log = "0.4.14"
 
 [dependencies.codec]
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -17,14 +17,17 @@
 use core::marker::PhantomData;
 use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
 use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use pallet_evm::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};
+use pallet_evm::{
+	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping
+};
 use sp_core::H160;
 use crate::{
 	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,
 };
 use frame_support::traits::Get;
 use up_sponsorship::SponsorshipHandler;
-use sp_std::{convert::TryInto, vec::Vec};
+use up_evm_mapping::EvmBackwardsAddressMapping;
+use sp_std::vec::Vec;
 
 struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
 impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
@@ -177,13 +180,15 @@
 }
 
 pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
-	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {
+impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
+	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
 		let mode = <Pallet<T>>::sponsoring_mode(call.0);
 		if mode == SponsoringModeT::Disabled {
 			return None;
 		}
-		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {
+
+		let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
+		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {
 			return None;
 		}
 		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
@@ -199,7 +204,8 @@
 
 		<SponsorBasket<T>>::insert(&call.0, who, block_number);
 
-		Some(call.0)
+		let sponsor = T::EvmAddressMapping::into_account_id(call.0);
+		Some(sponsor)
 	}
 }
modifiedpallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -33,6 +33,8 @@
 	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {
 		type ContractAddress: Get<H160>;
 		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
+		type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;
+		type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping<Self::AccountId>;
 	}
 
 	#[pallet::error]
modifiedpallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -36,7 +36,7 @@
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type EvmSponsorshipHandler: SponsorshipHandler<H160, (H160, Vec<u8>)>;
+		type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
 		type Currency: Currency<Self::AccountId>;
 		type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;
 		type EvmAddressMapping: AddressMapping<Self::AccountId>;
@@ -60,14 +60,15 @@
 }
 
 pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
-impl<T: Config> fp_evm::TransactionValidityHack for TransactionValidityHack<T> {
-	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<H160> {
+impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {
+	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {
 		match reason {
 			WithdrawReason::Call { target, input } => {
 				// This method is only used for checking, we shouldn't touch storage in it
 				frame_support::storage::with_transaction(|| {
+					let origin_sub = T::EvmAddressMapping::into_account_id(origin);
 					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
-						&origin,
+						&origin_sub,
 						&(*target, input.clone()),
 					))
 				})
@@ -85,33 +86,36 @@
 	type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
 
 	fn withdraw_fee(
-		who: &H160,
+		who: &T::AccountId,
 		reason: WithdrawReason,
 		fee: U256,
 	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
-		let mut who_pays_fee = *who;
+		let mut who_pays_fee = who.clone();
 		if let WithdrawReason::Call { target, input } = &reason {
 			who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
 				.unwrap_or(who_pays_fee);
 		}
+
 		let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
 			&who_pays_fee,
 			reason,
 			fee,
 		)?;
+
+		let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee);
 		Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
-			who: who_pays_fee,
+			who: who_pays_fee_eth,
 			negative_imbalance: i,
 		}))
 	}
 
 	fn correct_and_deposit_fee(
-		who: &H160,
+		who: &T::AccountId,
 		corrected_fee: U256,
 		already_withdrawn: Self::LiquidityInfo,
 	) {
 		<EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(
-			&already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),
+			&already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()),
 			corrected_fee,
 			already_withdrawn.map(|e| e.negative_imbalance),
 		)
@@ -142,7 +146,6 @@
 					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
 				)
 				.ok()?;
-				let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
 				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner
 				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?
 				let sponsor = frame_support::storage::with_transaction(|| {
@@ -151,7 +154,6 @@
 						&(*target, input.clone()),
 					))
 				})?;
-				let sponsor = T::EvmAddressMapping::into_account_id(sponsor);
 				Some(sponsor)
 			}
 			_ => None,
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -32,14 +32,12 @@
 use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
 
 pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
-	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {
+impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
+	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
 		let collection_id = map_eth_to_id(&call.0)?;
 		let collection = <CollectionHandle<T>>::new(collection_id)?;
 		let sponsor = collection.sponsorship.sponsor()?.clone();
-		let sponsor =
-			<T as pallet_common::Config>::EvmBackwardsAddressMapping::from_account_id(sponsor);
-		let who = T::CrossAccountId::from_eth(*who);
+		let who = T::CrossAccountId::from_sub(who.clone());
 		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
 		match &collection.mode {
 			crate::CollectionMode::NFT => {
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -933,6 +933,8 @@
 impl pallet_evm_contract_helpers::Config for Runtime {
 	type ContractAddress = HelpersContractAddress;
 	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
+	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
+	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
 }
 
 construct_runtime!(