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

difftreelog

fixup impl

Yaroslav Bolyukin2022-01-26parent: #dd2a57f.patch.diff
in: master

1 file changed

modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
before · pallets/evm-contract-helpers/src/eth.rs
1use core::marker::PhantomData;2use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};3use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};4use pallet_evm::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};5use sp_core::H160;6use crate::{7	AllowlistEnabled, Config, Owner, Pallet, SelfSponsoring, SponsoringMode, SponsorBasket,8	SponsoringRateLimit, SponsoringModeT,9};10use frame_support::traits::Get;11use up_sponsorship::SponsorshipHandler;12use sp_std::{convert::TryInto, vec::Vec};1314struct ContractHelpers<T: Config>(SubstrateRecorder<T>);15impl<T: Config> WithRecorder<T> for ContractHelpers<T> {16	fn recorder(&self) -> &SubstrateRecorder<T> {17		&self.018	}1920	fn into_recorder(self) -> SubstrateRecorder<T> {21		self.022	}23}2425#[solidity_interface(name = "ContractHelpers")]26impl<T: Config> ContractHelpers<T> {27	fn contract_owner(&self, contract_address: address) -> Result<address> {28		Ok(<Owner<T>>::get(contract_address))29	}3031	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {32		Ok(<SelfSponsoring<T>>::get(contract_address))33	}3435	/// Deprecated36	fn toggle_sponsoring(37		&mut self,38		caller: caller,39		contract_address: address,40		enabled: bool,41	) -> Result<void> {42		<Pallet<T>>::ensure_owner(contract_address, caller)?;43		<Pallet<T>>::toggle_sponsoring(contract_address, enabled);44		Ok(())45	}4647	fn set_sponsoring_mode(48		&mut self,49		caller: caller,50		contract_address: address,51		mode: uint8,52	) -> Result<void> {53		<Pallet<T>>::ensure_owner(contract_address, caller)?;54		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;55		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);56		Ok(())57	}5859	fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {60		Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())61	}6263	fn set_sponsoring_rate_limit(64		&mut self,65		caller: caller,66		contract_address: address,67		rate_limit: uint32,68	) -> Result<void> {69		<Pallet<T>>::ensure_owner(contract_address, caller)?;70		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());71		Ok(())72	}7374	fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {75		Ok(<SponsoringRateLimit<T>>::get(contract_address)76			.try_into()77			.map_err(|_| "rate limit > u32::MAX")?)78	}7980	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {81		self.0.consume_sload()?;82		Ok(<Pallet<T>>::allowed(contract_address, user)83			|| !<AllowlistEnabled<T>>::get(contract_address))84	}8586	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {87		Ok(<AllowlistEnabled<T>>::get(contract_address))88	}8990	fn toggle_allowlist(91		&mut self,92		caller: caller,93		contract_address: address,94		enabled: bool,95	) -> Result<void> {96		<Pallet<T>>::ensure_owner(contract_address, caller)?;97		<Pallet<T>>::toggle_allowlist(contract_address, enabled);98		Ok(())99	}100101	fn toggle_allowed(102		&mut self,103		caller: caller,104		contract_address: address,105		user: address,106		allowed: bool,107	) -> Result<void> {108		<Pallet<T>>::ensure_owner(contract_address, caller)?;109		<Pallet<T>>::toggle_allowed(contract_address, user, allowed);110		Ok(())111	}112}113114pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);115impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {116	fn is_reserved(contract: &sp_core::H160) -> bool {117		contract == &T::ContractAddress::get()118	}119120	fn is_used(contract: &sp_core::H160) -> bool {121		contract == &T::ContractAddress::get()122	}123124	fn call(125		source: &sp_core::H160,126		target: &sp_core::H160,127		gas_left: u64,128		input: &[u8],129		value: sp_core::U256,130	) -> Option<PrecompileResult> {131		// TODO: Extract to another OnMethodCall handler132		if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {133			return Some(Err(PrecompileFailure::Revert {134				exit_status: ExitRevert::Reverted,135				cost: 0,136				output: {137					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));138					writer.string("Target contract is allowlisted");139					writer.finish()140				},141			}));142		}143144		if target != &T::ContractAddress::get() {145			return None;146		}147148		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));149		pallet_evm_coder_substrate::call(*source, helpers, value, input)150	}151152	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {153		(contract == &T::ContractAddress::get())154			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())155	}156}157158pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);159impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {160	fn on_create(owner: H160, contract: H160) {161		<Owner<T>>::insert(contract, owner);162	}163}164165pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);166impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {167	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {168		let mode = <Pallet<T>>::sponsoring_mode(call.0);169		if mode == SponsoringModeT::Disabled {170			return None;171		}172		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {173			return None;174		}175		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;176177		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {178			let limit = <SponsoringRateLimit<T>>::get(&call.0);179180			let timeout = last_tx_block + limit;181			if block_number < timeout {182				return None;183			}184		}185186		<SponsorBasket<T>>::insert(&call.0, who, block_number);187188		Some(call.0)189	}190}191192generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);193generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
after · pallets/evm-contract-helpers/src/eth.rs
1use core::marker::PhantomData;2use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};3use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};4use pallet_evm::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};5use sp_core::H160;6use crate::{7	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,8};9use frame_support::traits::Get;10use up_sponsorship::SponsorshipHandler;11use sp_std::{convert::TryInto, vec::Vec};1213struct ContractHelpers<T: Config>(SubstrateRecorder<T>);14impl<T: Config> WithRecorder<T> for ContractHelpers<T> {15	fn recorder(&self) -> &SubstrateRecorder<T> {16		&self.017	}1819	fn into_recorder(self) -> SubstrateRecorder<T> {20		self.021	}22}2324#[solidity_interface(name = "ContractHelpers")]25impl<T: Config> ContractHelpers<T> {26	fn contract_owner(&self, contract_address: address) -> Result<address> {27		Ok(<Owner<T>>::get(contract_address))28	}2930	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {31		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)32	}3334	/// Deprecated35	fn toggle_sponsoring(36		&mut self,37		caller: caller,38		contract_address: address,39		enabled: bool,40	) -> Result<void> {41		<Pallet<T>>::ensure_owner(contract_address, caller)?;42		<Pallet<T>>::toggle_sponsoring(contract_address, enabled);43		Ok(())44	}4546	fn set_sponsoring_mode(47		&mut self,48		caller: caller,49		contract_address: address,50		mode: uint8,51	) -> Result<void> {52		<Pallet<T>>::ensure_owner(contract_address, caller)?;53		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;54		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);55		Ok(())56	}5758	fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {59		Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())60	}6162	fn set_sponsoring_rate_limit(63		&mut self,64		caller: caller,65		contract_address: address,66		rate_limit: uint32,67	) -> Result<void> {68		<Pallet<T>>::ensure_owner(contract_address, caller)?;69		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());70		Ok(())71	}7273	fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {74		Ok(<SponsoringRateLimit<T>>::get(contract_address)75			.try_into()76			.map_err(|_| "rate limit > u32::MAX")?)77	}7879	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {80		self.0.consume_sload()?;81		Ok(<Pallet<T>>::allowed(contract_address, user)82			|| !<AllowlistEnabled<T>>::get(contract_address))83	}8485	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {86		Ok(<AllowlistEnabled<T>>::get(contract_address))87	}8889	fn toggle_allowlist(90		&mut self,91		caller: caller,92		contract_address: address,93		enabled: bool,94	) -> Result<void> {95		<Pallet<T>>::ensure_owner(contract_address, caller)?;96		<Pallet<T>>::toggle_allowlist(contract_address, enabled);97		Ok(())98	}99100	fn toggle_allowed(101		&mut self,102		caller: caller,103		contract_address: address,104		user: address,105		allowed: bool,106	) -> Result<void> {107		<Pallet<T>>::ensure_owner(contract_address, caller)?;108		<Pallet<T>>::toggle_allowed(contract_address, user, allowed);109		Ok(())110	}111}112113pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);114impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {115	fn is_reserved(contract: &sp_core::H160) -> bool {116		contract == &T::ContractAddress::get()117	}118119	fn is_used(contract: &sp_core::H160) -> bool {120		contract == &T::ContractAddress::get()121	}122123	fn call(124		source: &sp_core::H160,125		target: &sp_core::H160,126		gas_left: u64,127		input: &[u8],128		value: sp_core::U256,129	) -> Option<PrecompileResult> {130		// TODO: Extract to another OnMethodCall handler131		if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {132			return Some(Err(PrecompileFailure::Revert {133				exit_status: ExitRevert::Reverted,134				cost: 0,135				output: {136					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));137					writer.string("Target contract is allowlisted");138					writer.finish()139				},140			}));141		}142143		if target != &T::ContractAddress::get() {144			return None;145		}146147		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));148		pallet_evm_coder_substrate::call(*source, helpers, value, input)149	}150151	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {152		(contract == &T::ContractAddress::get())153			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())154	}155}156157pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);158impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {159	fn on_create(owner: H160, contract: H160) {160		<Owner<T>>::insert(contract, owner);161	}162}163164pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);165impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {166	fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {167		let mode = <Pallet<T>>::sponsoring_mode(call.0);168		if mode == SponsoringModeT::Disabled {169			return None;170		}171		if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {172			return None;173		}174		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;175176		if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {177			let limit = <SponsoringRateLimit<T>>::get(&call.0);178179			let timeout = last_tx_block + limit;180			if block_number < timeout {181				return None;182			}183		}184185		<SponsorBasket<T>>::insert(&call.0, who, block_number);186187		Some(call.0)188	}189}190191generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);192generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);