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

11*store_key*.json11*store_key*.json
1212
13/.idea/13/.idea/
14/.cargo/
1415
15tests/.vscode16tests/.vscode
16cumulus-parachain/17cumulus-parachain/

6146 "sp-core",6146 "sp-core",
6147 "sp-runtime",6147 "sp-runtime",
6148 "sp-std",6148 "sp-std",
6149 "up-evm-mapping",
6149 "up-sponsorship",6150 "up-sponsorship",
6150]6151]
61516152

no syntactic changes

17pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }17pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
18pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }18pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
19up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }19up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
20up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
20log = "0.4.14"21log = "0.4.14"
2122
22[dependencies.codec]23[dependencies.codec]

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::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};20use pallet_evm::{
21	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping
22};
21use sp_core::H160;23use sp_core::H160;
22use crate::{24use crate::{
23	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,25	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,
24};26};
25use frame_support::traits::Get;27use frame_support::traits::Get;
26use up_sponsorship::SponsorshipHandler;28use up_sponsorship::SponsorshipHandler;
29use up_evm_mapping::EvmBackwardsAddressMapping;
27use sp_std::{convert::TryInto, vec::Vec};30use sp_std::vec::Vec;
2831
29struct ContractHelpers<T: Config>(SubstrateRecorder<T>);32struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
30impl<T: Config> WithRecorder<T> for ContractHelpers<T> {33impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
177}180}
178181
179pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);182pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
180impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {183impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
181	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {184	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
182		let mode = <Pallet<T>>::sponsoring_mode(call.0);185		let mode = <Pallet<T>>::sponsoring_mode(call.0);
183		if mode == SponsoringModeT::Disabled {186		if mode == SponsoringModeT::Disabled {
184			return None;187			return None;
185		}188		}
189
190		let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
186		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {191		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {
187			return None;192			return None;
188		}193		}
189		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;194		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
199204
200		<SponsorBasket<T>>::insert(&call.0, who, block_number);205		<SponsorBasket<T>>::insert(&call.0, who, block_number);
201206
202		Some(call.0)207		let sponsor = T::EvmAddressMapping::into_account_id(call.0);
208		Some(sponsor)
203	}209	}
204}210}
205211

33	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {33	pub trait Config: frame_system::Config + pallet_evm_coder_substrate::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>;
36	}38	}
3739
38	#[pallet::error]40	#[pallet::error]

3636
37	#[pallet::config]37	#[pallet::config]
38	pub trait Config: frame_system::Config {38	pub trait Config: frame_system::Config {
39		type EvmSponsorshipHandler: SponsorshipHandler<H160, (H160, Vec<u8>)>;39		type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
40		type Currency: Currency<Self::AccountId>;40		type Currency: Currency<Self::AccountId>;
41		type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;41		type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;
42		type EvmAddressMapping: AddressMapping<Self::AccountId>;42		type EvmAddressMapping: AddressMapping<Self::AccountId>;
60}60}
6161
62pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);62pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
63impl<T: Config> fp_evm::TransactionValidityHack for TransactionValidityHack<T> {63impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {
64	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<H160> {64	fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {
65		match reason {65		match reason {
66			WithdrawReason::Call { target, input } => {66			WithdrawReason::Call { target, input } => {
67				// This method is only used for checking, we shouldn't touch storage in it67				// This method is only used for checking, we shouldn't touch storage in it
68				frame_support::storage::with_transaction(|| {68				frame_support::storage::with_transaction(|| {
69					let origin_sub = T::EvmAddressMapping::into_account_id(origin);
69					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(70					TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
70						&origin,71						&origin_sub,
71						&(*target, input.clone()),72						&(*target, input.clone()),
72					))73					))
73				})74				})
85	type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;86	type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
8687
87	fn withdraw_fee(88	fn withdraw_fee(
88		who: &H160,89		who: &T::AccountId,
89		reason: WithdrawReason,90		reason: WithdrawReason,
90		fee: U256,91		fee: U256,
91	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {92	) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
92		let mut who_pays_fee = *who;93		let mut who_pays_fee = who.clone();
93		if let WithdrawReason::Call { target, input } = &reason {94		if let WithdrawReason::Call { target, input } = &reason {
94			who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))95			who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
95				.unwrap_or(who_pays_fee);96				.unwrap_or(who_pays_fee);
100			fee,102			fee,
101		)?;103		)?;
104
105		let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee);
102		Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {106		Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
103			who: who_pays_fee,107			who: who_pays_fee_eth,
104			negative_imbalance: i,108			negative_imbalance: i,
105		}))109		}))
106	}110	}
107111
108	fn correct_and_deposit_fee(112	fn correct_and_deposit_fee(
109		who: &H160,113		who: &T::AccountId,
110		corrected_fee: U256,114		corrected_fee: U256,
111		already_withdrawn: Self::LiquidityInfo,115		already_withdrawn: Self::LiquidityInfo,
112	) {116	) {
113		<EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(117		<EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(
114			&already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),118			&already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()),
115			corrected_fee,119			corrected_fee,
116			already_withdrawn.map(|e| e.negative_imbalance),120			already_withdrawn.map(|e| e.negative_imbalance),
117		)121		)
142					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),146					<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
143				)147				)
144				.ok()?;148				.ok()?;
145				let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
146				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner149				// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner
147				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?150				// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?
148				let sponsor = frame_support::storage::with_transaction(|| {151				let sponsor = frame_support::storage::with_transaction(|| {
151						&(*target, input.clone()),154						&(*target, input.clone()),
152					))155					))
153				})?;156				})?;
154				let sponsor = T::EvmAddressMapping::into_account_id(sponsor);
155				Some(sponsor)157				Some(sponsor)
156			}158			}
157			_ => None,159			_ => None,

32use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};32use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
3333
34pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);34pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
35impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {35impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
36	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {36	fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
37		let collection_id = map_eth_to_id(&call.0)?;37		let collection_id = map_eth_to_id(&call.0)?;
38		let collection = <CollectionHandle<T>>::new(collection_id)?;38		let collection = <CollectionHandle<T>>::new(collection_id)?;
39		let sponsor = collection.sponsorship.sponsor()?.clone();39		let sponsor = collection.sponsorship.sponsor()?.clone();
40		let sponsor =
41			<T as pallet_common::Config>::EvmBackwardsAddressMapping::from_account_id(sponsor);
42		let who = T::CrossAccountId::from_eth(*who);40		let who = T::CrossAccountId::from_sub(who.clone());
43		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;41		let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
44		match &collection.mode {42		match &collection.mode {
45			crate::CollectionMode::NFT => {43			crate::CollectionMode::NFT => {

933impl pallet_evm_contract_helpers::Config for Runtime {933impl pallet_evm_contract_helpers::Config for Runtime {
934	type ContractAddress = HelpersContractAddress;934	type ContractAddress = HelpersContractAddress;
935	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;935	type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
936	type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
937	type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
936}938}
937939
938construct_runtime!(940construct_runtime!(