git.delta.rocks / unique-network / refs/commits / ea39b21f5df7

difftreelog

Fix SponsorshipHandler

Trubnikov Sergey2022-03-18parent: #74c60c7.patch.diff
in: master

8 files changed

modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
before · pallets/evm-contract-helpers/src/eth.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 core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm::{21	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping22};23use sp_core::H160;24use crate::{25	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,26};27use frame_support::traits::Get;28use up_sponsorship::SponsorshipHandler;29use up_evm_mapping::EvmBackwardsAddressMapping;30use sp_std::vec::Vec;3132struct ContractHelpers<T: Config>(SubstrateRecorder<T>);33impl<T: Config> WithRecorder<T> for ContractHelpers<T> {34	fn recorder(&self) -> &SubstrateRecorder<T> {35		&self.036	}3738	fn into_recorder(self) -> SubstrateRecorder<T> {39		self.040	}41}4243#[solidity_interface(name = "ContractHelpers")]44impl<T: Config> ContractHelpers<T> {45	fn contract_owner(&self, contract_address: address) -> Result<address> {46		Ok(<Owner<T>>::get(contract_address))47	}4849	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {50		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)51	}5253	/// Deprecated54	fn toggle_sponsoring(55		&mut self,56		caller: caller,57		contract_address: address,58		enabled: bool,59	) -> Result<void> {60		<Pallet<T>>::ensure_owner(contract_address, caller)?;61		<Pallet<T>>::toggle_sponsoring(contract_address, enabled);62		Ok(())63	}6465	fn set_sponsoring_mode(66		&mut self,67		caller: caller,68		contract_address: address,69		mode: uint8,70	) -> Result<void> {71		<Pallet<T>>::ensure_owner(contract_address, caller)?;72		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;73		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);74		Ok(())75	}7677	fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {78		Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())79	}8081	fn set_sponsoring_rate_limit(82		&mut self,83		caller: caller,84		contract_address: address,85		rate_limit: uint32,86	) -> Result<void> {87		<Pallet<T>>::ensure_owner(contract_address, caller)?;88		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());89		Ok(())90	}9192	fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {93		Ok(<SponsoringRateLimit<T>>::get(contract_address)94			.try_into()95			.map_err(|_| "rate limit > u32::MAX")?)96	}9798	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {99		self.0.consume_sload()?;100		Ok(<Pallet<T>>::allowed(contract_address, user))101	}102103	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {104		Ok(<AllowlistEnabled<T>>::get(contract_address))105	}106107	fn toggle_allowlist(108		&mut self,109		caller: caller,110		contract_address: address,111		enabled: bool,112	) -> Result<void> {113		<Pallet<T>>::ensure_owner(contract_address, caller)?;114		<Pallet<T>>::toggle_allowlist(contract_address, enabled);115		Ok(())116	}117118	fn toggle_allowed(119		&mut self,120		caller: caller,121		contract_address: address,122		user: address,123		allowed: bool,124	) -> Result<void> {125		<Pallet<T>>::ensure_owner(contract_address, caller)?;126		<Pallet<T>>::toggle_allowed(contract_address, user, allowed);127		Ok(())128	}129}130131pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);132impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {133	fn is_reserved(contract: &sp_core::H160) -> bool {134		contract == &T::ContractAddress::get()135	}136137	fn is_used(contract: &sp_core::H160) -> bool {138		contract == &T::ContractAddress::get()139	}140141	fn call(142		source: &sp_core::H160,143		target: &sp_core::H160,144		gas_left: u64,145		input: &[u8],146		value: sp_core::U256,147	) -> Option<PrecompileResult> {148		// TODO: Extract to another OnMethodCall handler149		if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {150			return Some(Err(PrecompileFailure::Revert {151				exit_status: ExitRevert::Reverted,152				cost: 0,153				output: {154					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));155					writer.string("Target contract is allowlisted");156					writer.finish()157				},158			}));159		}160161		if target != &T::ContractAddress::get() {162			return None;163		}164165		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));166		pallet_evm_coder_substrate::call(*source, helpers, value, input)167	}168169	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {170		(contract == &T::ContractAddress::get())171			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())172	}173}174175pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);176impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {177	fn on_create(owner: H160, contract: H160) {178		<Owner<T>>::insert(contract, owner);179	}180}181182pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);183impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {184	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {185		let mode = <Pallet<T>>::sponsoring_mode(call.0);186		if mode == SponsoringModeT::Disabled {187			return None;188		}189190		let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());191		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {192			return None;193		}194		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;195196		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {197			let limit = <SponsoringRateLimit<T>>::get(&call.0);198199			let timeout = last_tx_block + limit;200			if block_number < timeout {201				return None;202			}203		}204205		<SponsorBasket<T>>::insert(&call.0, who, block_number);206207		let sponsor = T::EvmAddressMapping::into_account_id(call.0);208		Some(sponsor)209	}210}211212generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);213generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
after · pallets/evm-contract-helpers/src/eth.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 core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm::{21	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, account::CrossAccountId22};23use sp_core::H160;24use crate::{25	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,26};27use frame_support::traits::Get;28use up_sponsorship::SponsorshipHandler;29use sp_std::vec::Vec;3031struct ContractHelpers<T: Config>(SubstrateRecorder<T>);32impl<T: Config> WithRecorder<T> for ContractHelpers<T> {33	fn recorder(&self) -> &SubstrateRecorder<T> {34		&self.035	}3637	fn into_recorder(self) -> SubstrateRecorder<T> {38		self.039	}40}4142#[solidity_interface(name = "ContractHelpers")]43impl<T: Config> ContractHelpers<T> {44	fn contract_owner(&self, contract_address: address) -> Result<address> {45		Ok(<Owner<T>>::get(contract_address))46	}4748	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {49		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)50	}5152	/// Deprecated53	fn toggle_sponsoring(54		&mut self,55		caller: caller,56		contract_address: address,57		enabled: bool,58	) -> Result<void> {59		<Pallet<T>>::ensure_owner(contract_address, caller)?;60		<Pallet<T>>::toggle_sponsoring(contract_address, enabled);61		Ok(())62	}6364	fn set_sponsoring_mode(65		&mut self,66		caller: caller,67		contract_address: address,68		mode: uint8,69	) -> Result<void> {70		<Pallet<T>>::ensure_owner(contract_address, caller)?;71		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;72		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);73		Ok(())74	}7576	fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {77		Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())78	}7980	fn set_sponsoring_rate_limit(81		&mut self,82		caller: caller,83		contract_address: address,84		rate_limit: uint32,85	) -> Result<void> {86		<Pallet<T>>::ensure_owner(contract_address, caller)?;87		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());88		Ok(())89	}9091	fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {92		Ok(<SponsoringRateLimit<T>>::get(contract_address)93			.try_into()94			.map_err(|_| "rate limit > u32::MAX")?)95	}9697	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {98		self.0.consume_sload()?;99		Ok(<Pallet<T>>::allowed(contract_address, user))100	}101102	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {103		Ok(<AllowlistEnabled<T>>::get(contract_address))104	}105106	fn toggle_allowlist(107		&mut self,108		caller: caller,109		contract_address: address,110		enabled: bool,111	) -> Result<void> {112		<Pallet<T>>::ensure_owner(contract_address, caller)?;113		<Pallet<T>>::toggle_allowlist(contract_address, enabled);114		Ok(())115	}116117	fn toggle_allowed(118		&mut self,119		caller: caller,120		contract_address: address,121		user: address,122		allowed: bool,123	) -> Result<void> {124		<Pallet<T>>::ensure_owner(contract_address, caller)?;125		<Pallet<T>>::toggle_allowed(contract_address, user, allowed);126		Ok(())127	}128}129130pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);131impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {132	fn is_reserved(contract: &sp_core::H160) -> bool {133		contract == &T::ContractAddress::get()134	}135136	fn is_used(contract: &sp_core::H160) -> bool {137		contract == &T::ContractAddress::get()138	}139140	fn call(141		source: &sp_core::H160,142		target: &sp_core::H160,143		gas_left: u64,144		input: &[u8],145		value: sp_core::U256,146	) -> Option<PrecompileResult> {147		// TODO: Extract to another OnMethodCall handler148		if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {149			return Some(Err(PrecompileFailure::Revert {150				exit_status: ExitRevert::Reverted,151				cost: 0,152				output: {153					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));154					writer.string("Target contract is allowlisted");155					writer.finish()156				},157			}));158		}159160		if target != &T::ContractAddress::get() {161			return None;162		}163164		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));165		pallet_evm_coder_substrate::call(*source, helpers, value, input)166	}167168	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {169		(contract == &T::ContractAddress::get())170			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())171	}172}173174pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);175impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {176	fn on_create(owner: H160, contract: H160) {177		<Owner<T>>::insert(contract, owner);178	}179}180181pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);182impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {183	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {184		let mode = <Pallet<T>>::sponsoring_mode(call.0);185		if mode == SponsoringModeT::Disabled {186			return None;187		}188189		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {190			return None;191		}192		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;193194		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {195			let limit = <SponsoringRateLimit<T>>::get(&call.0);196197			let timeout = last_tx_block + limit;198			if block_number < timeout {199				return None;200			}201		}202203		<SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);204205		let sponsor = T::CrossAccountId::from_eth(call.0);206		Some(sponsor)207	}208}209210generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);211generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
modifiedpallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -30,11 +30,9 @@
 	use sp_core::H160;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {
+	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::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
@@ -24,8 +24,6 @@
 use sp_core::{H160, U256};
 use sp_runtime::TransactionOutcome;
 use up_sponsorship::SponsorshipHandler;
-use up_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_evm::AddressMapping;
 
 #[frame_support::pallet]
 pub mod pallet {
@@ -36,7 +34,7 @@
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + pallet_evm::account::Config {
-		type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
+		type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>)>;
 		type Currency: Currency<Self::AccountId>;
 	}
 
@@ -58,13 +56,13 @@
 }
 
 pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
-impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {
-	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {
+impl<T: Config> fp_evm::TransactionValidityHack<T::CrossAccountId> for TransactionValidityHack<T> {
+	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::CrossAccountId> {
 		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);
+					let origin_sub = T::CrossAccountId::from_eth(origin);
 					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
 						&origin_sub,
 						&(*target, input.clone()),
@@ -88,13 +86,11 @@
 		reason: WithdrawReason,
 		fee: U256,
 	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
-		let who_pays_fee;
-		if let WithdrawReason::Call { target, input } = &reason {
-			who_pays_fee = <T as pallet_evm::account::Config>::CrossAccountId::from_sub(T::EvmSponsorshipHandler::get_sponsor(&who.as_sub(), &(*target, input.clone()))
-				.unwrap_or(who.as_sub().clone()));
+		let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {
+			T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())
 		} else {
-			who_pays_fee = who.clone();
-		}
+			who.clone()
+		};
 
 		let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
 			&who_pays_fee,
@@ -145,6 +141,7 @@
 					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
 				)
 				.ok()?;
+				let who = T::CrossAccountId::from_sub(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(|| {
@@ -153,7 +150,7 @@
 						&(*target, input.clone()),
 					))
 				})?;
-				Some(sponsor)
+				Some(sponsor.as_sub().clone())
 			}
 			_ => None,
 		}
modifiedpallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -31,14 +31,13 @@
 use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
 
 pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-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> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
+	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
 		let collection_id = map_eth_to_id(&call.0)?;
 		let collection = <CollectionHandle<T>>::new(collection_id)?;
 		let sponsor = collection.sponsorship.sponsor()?.clone();
-		let who = T::CrossAccountId::from_sub(who.clone());
 		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
-		match &collection.mode {
+		Some(T::CrossAccountId::from_sub(match &collection.mode {
 			crate::CollectionMode::NFT => {
 				let call = <UniqueNFTCall<T>>::parse(method_id, &mut reader).ok()??;
 				match call {
@@ -66,7 +65,7 @@
 				#[allow(clippy::single_match)]
 				match call {
 					UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {
-						withdraw_transfer::<T>(&collection, &who, &TokenId::default())
+						withdraw_transfer::<T>(&collection, who, &TokenId::default())
 							.map(|()| sponsor)
 					}
 					UniqueFungibleCall::ERC20(ERC20Call::TransferFrom { from, .. }) => {
@@ -82,6 +81,6 @@
 				}
 			}
 			_ => None,
-		}
+		}?))
 	}
 }
modifiedpallets/unique/src/tests.rsdiffbeforeafterboth
--- a/pallets/unique/src/tests.rs
+++ b/pallets/unique/src/tests.rs
@@ -2866,8 +2866,7 @@
 		let origin2 = Origin::signed(user2);
 		let account2 = account(user2);
 		
-		let collection_id =
-		create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
+		let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
 		assert_ok!(TemplateModule::set_collection_sponsor(origin1.clone(), collection_id, user1));
 		assert_ok!(TemplateModule::confirm_sponsorship(origin1.clone(), collection_id));
 
@@ -2877,12 +2876,7 @@
 		assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), collection_id, AccessMode::AllowList));
 		assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));
 		assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));
-
-		assert_eq!(<pallet_balances::Pallet<Test>>::free_balance(user2), 0);
-		let balance_before = <pallet_balances::Pallet<Test>>::free_balance(user1);
 		
 		assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));
-		let balance_after = <pallet_balances::Pallet<Test>>::free_balance(user1);
-		assert_ne!(balance_before, balance_after);
 	});
 }
\ No newline at end of file
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -948,8 +948,6 @@
 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!(
modifiedtests/README.mddiffbeforeafterboth
--- a/tests/README.md
+++ b/tests/README.md
@@ -20,7 +20,7 @@
 git clone https://github.com/paritytech/polkadot-launch && cd polkadot-launch
 ```
 
-5. Run launch-test-env.sh from the root of this project
+5. Run launch-testnet.sh from the root of this project
 
 
 ## How to run tests
modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -288,14 +288,15 @@
       const result = getCreateCollectionResult(events);
       expect(result.success).to.be.true;
     }
+
     {
       const nextTokenId = await contract.methods.nextTokenId().call();
       expect(nextTokenId).to.be.equal('1');
-      // const result = await contract.methods.mintWithTokenURI(
-      //   receiver,
-      //   nextTokenId,
-      //   'Test URI',
-      // ).send({from: userEth});
+      const result = await contract.methods.mintWithTokenURI(
+        receiver,
+        nextTokenId,
+        'Test URI',
+      ).send({from: userEth});
       // const events = normalizeEvents(result.events);
 
       // expect(events).to.be.deep.equal([