`ea39b21f5df7`

8 files changed

modifiedpallets/evm-contract-helpers/src/eth.rsdiff before after both

18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
20use pallet_evm::{20use pallet_evm::{
21	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping21	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, account::CrossAccountId
22};22};
23use sp_core::H160;23use sp_core::H160;
24use crate::{24use crate::{
25	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,25	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,
26};26};
27use frame_support::traits::Get;27use frame_support::traits::Get;
28use up_sponsorship::SponsorshipHandler;28use up_sponsorship::SponsorshipHandler;
29use up_evm_mapping::EvmBackwardsAddressMapping;
30use sp_std::vec::Vec;29use sp_std::vec::Vec;
3130
32struct ContractHelpers<T: Config>(SubstrateRecorder<T>);31struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
180}179}
181180
182pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);181pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
183impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {182impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
184	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {183	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
185		let mode = <Pallet<T>>::sponsoring_mode(call.0);184		let mode = <Pallet<T>>::sponsoring_mode(call.0);
186		if mode == SponsoringModeT::Disabled {185		if mode == SponsoringModeT::Disabled {
187			return None;186			return None;
188		}187		}
189188
190		let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
191		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {189		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {
192			return None;190			return None;
193		}191		}
194		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;192		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
195193
196		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {194		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {
197			let limit = <SponsoringRateLimit<T>>::get(&call.0);195			let limit = <SponsoringRateLimit<T>>::get(&call.0);
198196
199			let timeout = last_tx_block + limit;197			let timeout = last_tx_block + limit;
202			}200			}
203		}201		}
204202
205		<SponsorBasket<T>>::insert(&call.0, who, block_number);203		<SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);
206204
207		let sponsor = T::EvmAddressMapping::into_account_id(call.0);205		let sponsor = T::CrossAccountId::from_eth(call.0);
208		Some(sponsor)206		Some(sponsor)
209	}207	}
210}208}

modifiedpallets/evm-contract-helpers/src/lib.rsdiff before after both

30	use sp_core::H160;30	use sp_core::H160;
3131
32	#[pallet::config]32	#[pallet::config]
33	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {33	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config {
34		type ContractAddress: Get<H160>;34		type ContractAddress: Get<H160>;
35		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;35		type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
36		type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;
37		type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping<Self::AccountId>;
38	}36	}
3937
40	#[pallet::error]38	#[pallet::error]

modifiedpallets/evm-transaction-payment/src/lib.rsdiff before after both

24use sp_core::{H160, U256};24use sp_core::{H160, U256};
25use sp_runtime::TransactionOutcome;25use sp_runtime::TransactionOutcome;
26use up_sponsorship::SponsorshipHandler;26use up_sponsorship::SponsorshipHandler;
27use up_evm_mapping::EvmBackwardsAddressMapping;
28use pallet_evm::AddressMapping;
2927
30#[frame_support::pallet]28#[frame_support::pallet]
31pub mod pallet {29pub mod pallet {
3634
37	#[pallet::config]35	#[pallet::config]
38	pub trait Config: frame_system::Config + pallet_evm::account::Config {36	pub trait Config: frame_system::Config + pallet_evm::account::Config {
39		type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;37		type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>)>;
40		type Currency: Currency<Self::AccountId>;38		type Currency: Currency<Self::AccountId>;
41	}39	}
4240
58}56}
5957
60pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);58pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
61impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {59impl<T: Config> fp_evm::TransactionValidityHack<T::CrossAccountId> for TransactionValidityHack<T> {
62	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {60	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::CrossAccountId> {
63		match reason {61		match reason {
64			WithdrawReason::Call { target, input } => {62			WithdrawReason::Call { target, input } => {
65				// This method is only used for checking, we shouldn't touch storage in it63				// This method is only used for checking, we shouldn't touch storage in it
66				frame_support::storage::with_transaction(|| {64				frame_support::storage::with_transaction(|| {
67					let origin_sub = T::EvmAddressMapping::into_account_id(origin);65					let origin_sub = T::CrossAccountId::from_eth(origin);
68					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(66					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
69						&origin_sub,67						&origin_sub,
70						&(*target, input.clone()),68						&(*target, input.clone()),
88		reason: WithdrawReason,86		reason: WithdrawReason,
89		fee: U256,87		fee: U256,
90	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {88	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
91		let who_pays_fee;89		let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {
92		if let WithdrawReason::Call { target, input } = &reason {
93			who_pays_fee = <T as pallet_evm::account::Config>::CrossAccountId::from_sub(T::EvmSponsorshipHandler::get_sponsor(&who.as_sub(), &(*target, input.clone()))90			T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())
94				.unwrap_or(who.as_sub().clone()));
95		} else {91		} else {
96			who_pays_fee = who.clone();92			who.clone()
97		}93		};
9894
99		let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(95		let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
100			&who_pays_fee,96			&who_pays_fee,
145					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),141					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
146				)142				)
147				.ok()?;143				.ok()?;
144				let who = T::CrossAccountId::from_sub(who.clone());
148				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner145				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner
149				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?146				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?
150				let sponsor = frame_support::storage::with_transaction(|| {147				let sponsor = frame_support::storage::with_transaction(|| {
153						&(*target, input.clone()),150						&(*target, input.clone()),
154					))151					))
155				})?;152				})?;
156				Some(sponsor)153				Some(sponsor.as_sub().clone())
157			}154			}
158			_ => None,155			_ => None,
159		}156		}

modifiedpallets/unique/src/eth/sponsoring.rsdiff before after both

31use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};31use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
3232
33pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);33pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
34impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {34impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
35	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {35	fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
36		let collection_id = map_eth_to_id(&call.0)?;36		let collection_id = map_eth_to_id(&call.0)?;
37		let collection = <CollectionHandle<T>>::new(collection_id)?;37		let collection = <CollectionHandle<T>>::new(collection_id)?;
38		let sponsor = collection.sponsorship.sponsor()?.clone();38		let sponsor = collection.sponsorship.sponsor()?.clone();
39		let who = T::CrossAccountId::from_sub(who.clone());
40		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;39		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
41		match &collection.mode {40		Some(T::CrossAccountId::from_sub(match &collection.mode {
42			crate::CollectionMode::NFT => {41			crate::CollectionMode::NFT => {
43				let call = <UniqueNFTCall<T>>::parse(method_id, &mut reader).ok()??;42				let call = <UniqueNFTCall<T>>::parse(method_id, &mut reader).ok()??;
44				match call {43				match call {
66				#[allow(clippy::single_match)]65				#[allow(clippy::single_match)]
67				match call {66				match call {
68					UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {67					UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {
69						withdraw_transfer::<T>(&collection, &who, &TokenId::default())68						withdraw_transfer::<T>(&collection, who, &TokenId::default())
70							.map(|()| sponsor)69							.map(|()| sponsor)
71					}70					}
72					UniqueFungibleCall::ERC20(ERC20Call::TransferFrom { from, .. }) => {71					UniqueFungibleCall::ERC20(ERC20Call::TransferFrom { from, .. }) => {
82				}81				}
83			}82			}
84			_ => None,83			_ => None,
85		}84		}?))
86	}85	}
87}86}
8887

modifiedpallets/unique/src/tests.rsdiff before after both

2878		assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));2877		assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));
2879		assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));2878		assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));
28802879		
2881		assert_eq!(<pallet_balances::Pallet<Test>>::free_balance(user2), 0);
2882		let balance_before = <pallet_balances::Pallet<Test>>::free_balance(user1);
2883		
2884		assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));2880		assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));
2885		let balance_after = <pallet_balances::Pallet<Test>>::free_balance(user1);
2886		assert_ne!(balance_before, balance_after);
2887	});2881	});
2888}2882}

modifiedruntime/opal/src/lib.rsdiff before after both

948impl pallet_evm_contract_helpers::Config for Runtime {948impl pallet_evm_contract_helpers::Config for Runtime {
949	type ContractAddress = HelpersContractAddress;949	type ContractAddress = HelpersContractAddress;
950	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;950	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
951	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
952	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
953}951}
954952
955construct_runtime!(953construct_runtime!(

modifiedtests/README.mddiff before after both

20git clone https://github.com/paritytech/polkadot-launch && cd polkadot-launch20git clone https://github.com/paritytech/polkadot-launch && cd polkadot-launch
21```21```
2222
235. Run launch-test-env.sh from the root of this project235. Run launch-testnet.sh from the root of this project
2424
2525
26## How to run tests26## How to run tests

modifiedtests/src/eth/contractSponsoring.test.tsdiff before after both

291    {292    {
292      const nextTokenId = await contract.methods.nextTokenId().call();293      const nextTokenId = await contract.methods.nextTokenId().call();
293      expect(nextTokenId).to.be.equal('1');294      expect(nextTokenId).to.be.equal('1');
294      // const result = await contract.methods.mintWithTokenURI(295      const result = await contract.methods.mintWithTokenURI(
295      //   receiver,296        receiver,
296      //   nextTokenId,297        nextTokenId,
297      //   'Test URI',298        'Test URI',
298      // ).send({from: userEth});299      ).send({from: userEth});
299      // const events = normalizeEvents(result.events);300      // const events = normalizeEvents(result.events);
300301
301      // expect(events).to.be.deep.equal([302      // expect(events).to.be.deep.equal([