git.delta.rocks / unique-network / refs/commits / 81e4f2e24fd5

difftreelog

fix change sponsor to OptioCrossAddress

Trubnikov Sergey2022-12-22parent: #6bfcb42.patch.diff
in: master

9 files changed

modifiedcrates/evm-coder/src/abi/impls.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -181,11 +181,6 @@
 	}
 }
 
-macro_rules! count {
-    () => (0usize);
-    ( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
-}
-
 macro_rules! impl_tuples {
 	($($ident:ident)+) => {
 		impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -122,6 +122,13 @@
 	}
 }
 
+/// Ethereum representation of Optional value with CrossAddress.
+#[derive(Debug, Default, AbiCoder)]
+pub struct OptionCrossAddress {
+	pub status: bool,
+	pub value: CrossAddress,
+}
+
 /// Cross account struct
 #[derive(Debug, Default, AbiCoder)]
 pub struct CrossAddress {
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/>.1617//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22	abi::{AbiWriter, AbiType},23	execution::Result,24	generate_stubgen, solidity_interface,25	types::*,26	ToLog,27};28use pallet_evm::{29	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,30	account::CrossAccountId,31};32use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};33use pallet_evm_transaction_payment::CallContext;34use sp_core::{H160, U256};35use up_data_structs::SponsorshipState;36use crate::{37	AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,38	SponsoringRateLimit, SponsoringModeT, Sponsoring,39};40use frame_support::traits::Get;41use up_sponsorship::SponsorshipHandler;42use sp_std::vec::Vec;4344/// Pallet events.45#[derive(ToLog)]46pub enum ContractHelpersEvents {47	/// Contract sponsor was set.48	ContractSponsorSet {49		/// Contract address of the affected collection.50		#[indexed]51		contract_address: address,52		/// New sponsor address.53		sponsor: address,54	},5556	/// New sponsor was confirm.57	ContractSponsorshipConfirmed {58		/// Contract address of the affected collection.59		#[indexed]60		contract_address: address,61		/// New sponsor address.62		sponsor: address,63	},6465	/// Collection sponsor was removed.66	ContractSponsorRemoved {67		/// Contract address of the affected collection.68		#[indexed]69		contract_address: address,70	},71}7273/// See [`ContractHelpersCall`]74pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);75impl<T: Config> WithRecorder<T> for ContractHelpers<T> {76	fn recorder(&self) -> &SubstrateRecorder<T> {77		&self.078	}7980	fn into_recorder(self) -> SubstrateRecorder<T> {81		self.082	}83}8485/// @title Magic contract, which allows users to reconfigure other contracts86#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]87impl<T: Config> ContractHelpers<T>88where89	T::AccountId: AsRef<[u8; 32]>,90{91	/// Get user, which deployed specified contract92	/// @dev May return zero address in case if contract is deployed93	///  using uniquenetwork evm-migration pallet, or using other terms not94	///  intended by pallet-evm95	/// @dev Returns zero address if contract does not exists96	/// @param contractAddress Contract to get owner of97	/// @return address Owner of contract98	fn contract_owner(&self, contract_address: address) -> Result<address> {99		Ok(<Owner<T>>::get(contract_address))100	}101102	/// Set sponsor.103	/// @param contractAddress Contract for which a sponsor is being established.104	/// @param sponsor User address who set as pending sponsor.105	fn set_sponsor(106		&mut self,107		caller: caller,108		contract_address: address,109		sponsor: address,110	) -> Result<void> {111		self.recorder().consume_sload()?;112		self.recorder().consume_sstore()?;113114		Pallet::<T>::set_sponsor(115			&T::CrossAccountId::from_eth(caller),116			contract_address,117			&T::CrossAccountId::from_eth(sponsor),118		)119		.map_err(dispatch_to_evm::<T>)?;120121		Ok(())122	}123124	/// Set contract as self sponsored.125	///126	/// @param contractAddress Contract for which a self sponsoring is being enabled.127	fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {128		self.recorder().consume_sload()?;129		self.recorder().consume_sstore()?;130131		let caller = T::CrossAccountId::from_eth(caller);132133		Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())134			.map_err(dispatch_to_evm::<T>)?;135136		Pallet::<T>::force_set_sponsor(137			contract_address,138			&T::CrossAccountId::from_eth(contract_address),139		)140		.map_err(dispatch_to_evm::<T>)?;141142		Ok(())143	}144145	/// Remove sponsor.146	///147	/// @param contractAddress Contract for which a sponsorship is being removed.148	fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {149		self.recorder().consume_sload()?;150		self.recorder().consume_sstore()?;151152		Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)153			.map_err(dispatch_to_evm::<T>)?;154155		Ok(())156	}157158	/// Confirm sponsorship.159	///160	/// @dev Caller must be same that set via [`setSponsor`].161	///162	/// @param contractAddress Сontract for which need to confirm sponsorship.163	fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {164		self.recorder().consume_sload()?;165		self.recorder().consume_sstore()?;166167		Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)168			.map_err(dispatch_to_evm::<T>)?;169170		Ok(())171	}172173	/// Get current sponsor.174	///175	/// @param contractAddress The contract for which a sponsor is requested.176	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.177	fn sponsor(&self, contract_address: address) -> Result<pallet_common::eth::CrossAddress> {178		Ok(179			pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(180				&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,181			),182		)183	}184185	/// Check tat contract has confirmed sponsor.186	///187	/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.188	/// @return **true** if contract has confirmed sponsor.189	fn has_sponsor(&self, contract_address: address) -> Result<bool> {190		Ok(Pallet::<T>::get_sponsor(contract_address).is_some())191	}192193	/// Check tat contract has pending sponsor.194	///195	/// @param contractAddress The contract for which the presence of a pending sponsor is checked.196	/// @return **true** if contract has pending sponsor.197	fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {198		Ok(match Sponsoring::<T>::get(contract_address) {199			SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,200			SponsorshipState::Unconfirmed(_) => true,201		})202	}203204	fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {205		Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)206	}207208	fn set_sponsoring_mode(209		&mut self,210		caller: caller,211		contract_address: address,212		// TODO: implement support for enums in evm-coder213		mode: uint8,214	) -> Result<void> {215		self.recorder().consume_sload()?;216		self.recorder().consume_sstore()?;217218		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;219		let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;220		<Pallet<T>>::set_sponsoring_mode(contract_address, mode);221222		Ok(())223	}224225	/// Get current contract sponsoring rate limit226	/// @param contractAddress Contract to get sponsoring rate limit of227	/// @return uint32 Amount of blocks between two sponsored transactions228	fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {229		self.recorder().consume_sload()?;230231		Ok(<SponsoringRateLimit<T>>::get(contract_address)232			.try_into()233			.map_err(|_| "rate limit > u32::MAX")?)234	}235236	/// Set contract sponsoring rate limit237	/// @dev Sponsoring rate limit - is a minimum amount of blocks that should238	///  pass between two sponsored transactions239	/// @param contractAddress Contract to change sponsoring rate limit of240	/// @param rateLimit Target rate limit241	/// @dev Only contract owner can change this setting242	fn set_sponsoring_rate_limit(243		&mut self,244		caller: caller,245		contract_address: address,246		rate_limit: uint32,247	) -> Result<void> {248		self.recorder().consume_sload()?;249		self.recorder().consume_sstore()?;250251		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;252		<Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());253		Ok(())254	}255256	/// Set contract sponsoring fee limit257	/// @dev Sponsoring fee limit - is maximum fee that could be spent by258	///  single transaction259	/// @param contractAddress Contract to change sponsoring fee limit of260	/// @param feeLimit Fee limit261	/// @dev Only contract owner can change this setting262	fn set_sponsoring_fee_limit(263		&mut self,264		caller: caller,265		contract_address: address,266		fee_limit: uint256,267	) -> Result<void> {268		self.recorder().consume_sload()?;269		self.recorder().consume_sstore()?;270271		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;272		<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())273			.map_err(dispatch_to_evm::<T>)?;274		Ok(())275	}276277	/// Get current contract sponsoring fee limit278	/// @param contractAddress Contract to get sponsoring fee limit of279	/// @return uint256 Maximum amount of fee that could be spent by single280	///  transaction281	fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {282		self.recorder().consume_sload()?;283284		Ok(get_sponsoring_fee_limit::<T>(contract_address))285	}286287	/// Is specified user present in contract allow list288	/// @dev Contract owner always implicitly included289	/// @param contractAddress Contract to check allowlist of290	/// @param user User to check291	/// @return bool Is specified users exists in contract allowlist292	fn allowed(&self, contract_address: address, user: address) -> Result<bool> {293		self.0.consume_sload()?;294		Ok(<Pallet<T>>::allowed(contract_address, user))295	}296297	/// Toggle user presence in contract allowlist298	/// @param contractAddress Contract to change allowlist of299	/// @param user Which user presence should be toggled300	/// @param isAllowed `true` if user should be allowed to be sponsored301	///  or call this contract, `false` otherwise302	/// @dev Only contract owner can change this setting303	fn toggle_allowed(304		&mut self,305		caller: caller,306		contract_address: address,307		user: address,308		is_allowed: bool,309	) -> Result<void> {310		self.recorder().consume_sload()?;311		self.recorder().consume_sstore()?;312313		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;314		<Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);315316		Ok(())317	}318319	/// Is this contract has allowlist access enabled320	/// @dev Allowlist always can have users, and it is used for two purposes:321	///  in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist322	///  in case of allowlist access enabled, only users from allowlist may call this contract323	/// @param contractAddress Contract to get allowlist access of324	/// @return bool Is specified contract has allowlist access enabled325	fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {326		Ok(<AllowlistEnabled<T>>::get(contract_address))327	}328329	/// Toggle contract allowlist access330	/// @param contractAddress Contract to change allowlist access of331	/// @param enabled Should allowlist access to be enabled?332	fn toggle_allowlist(333		&mut self,334		caller: caller,335		contract_address: address,336		enabled: bool,337	) -> Result<void> {338		self.recorder().consume_sload()?;339		self.recorder().consume_sstore()?;340341		<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;342		<Pallet<T>>::toggle_allowlist(contract_address, enabled);343		Ok(())344	}345}346347/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]348pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);349impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>350where351	T::AccountId: AsRef<[u8; 32]>,352{353	fn is_reserved(contract: &sp_core::H160) -> bool {354		contract == &T::ContractAddress::get()355	}356357	fn is_used(contract: &sp_core::H160) -> bool {358		contract == &T::ContractAddress::get()359	}360361	fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {362		// TODO: Extract to another OnMethodCall handler363		if <AllowlistEnabled<T>>::get(handle.code_address())364			&& !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)365		{366			return Some(Err(PrecompileFailure::Revert {367				exit_status: ExitRevert::Reverted,368				output: {369					let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));370					writer.string("Target contract is allowlisted");371					writer.finish()372				},373			}));374		}375376		if handle.code_address() != T::ContractAddress::get() {377			return None;378		}379380		let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));381		pallet_evm_coder_substrate::call(handle, helpers)382	}383384	fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {385		(contract == &T::ContractAddress::get())386			.then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())387	}388}389390/// Hooks into contract creation, storing owner of newly deployed contract391pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);392impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {393	fn on_create(owner: H160, contract: H160) {394		<Owner<T>>::insert(contract, owner);395	}396}397398/// Bridge to pallet-sponsoring399pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);400impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>401	for HelpersContractSponsoring<T>402{403	fn get_sponsor(404		who: &T::CrossAccountId,405		call_context: &CallContext,406	) -> Option<T::CrossAccountId> {407		let contract_address = call_context.contract_address;408		let mode = <Pallet<T>>::sponsoring_mode(contract_address);409		if mode == SponsoringModeT::Disabled {410			return None;411		}412413		let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {414			Some(sponsor) => sponsor,415			None => return None,416		};417418		if mode == SponsoringModeT::Allowlisted419			&& !<Pallet<T>>::allowed(contract_address, *who.as_eth())420		{421			return None;422		}423		let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;424425		if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {426			let limit = <SponsoringRateLimit<T>>::get(contract_address);427428			let timeout = last_tx_block + limit;429			if block_number < timeout {430				return None;431			}432		}433434		let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);435436		if call_context.max_fee > sponsored_fee_limit {437			return None;438		}439440		<SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);441442		Some(sponsor)443	}444}445446fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {447	<SponsoringFeeLimit<T>>::get(contract_address)448		.get(&0xffffffff)449		.cloned()450		.unwrap_or(U256::MAX)451}452453generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);454generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) public view returns (CrossAddress memory) {
+	function sponsor(address contractAddress) public view returns (OptionCrossAddress memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return CrossAddress(0x0000000000000000000000000000000000000000, 0);
+		return OptionCrossAddress(false, CrossAddress(0x0000000000000000000000000000000000000000, 0));
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -270,3 +270,9 @@
 	address eth;
 	uint256 sub;
 }
+
+/// @dev Ethereum representation of Optional value with CrossAddress.
+struct OptionCrossAddress {
+	bool status;
+	CrossAddress value;
+}
modifiedpallets/unique/src/lib.rsdiffbeforeafterboth
--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -74,7 +74,7 @@
 extern crate alloc;
 
 use frame_support::{
-	decl_module, decl_storage, decl_error, decl_event,
+	decl_module, decl_storage, decl_error,
 	dispatch::DispatchResult,
 	ensure, fail,
 	weights::{Weight},
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,18 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          {
+            "components": [
+              { "internalType": "address", "name": "eth", "type": "address" },
+              { "internalType": "uint256", "name": "sub", "type": "uint256" }
+            ],
+            "internalType": "struct CrossAddress",
+            "name": "value",
+            "type": "tuple"
+          }
         ],
-        "internalType": "struct CrossAddress",
+        "internalType": "struct OptionCrossAddress",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) external view returns (CrossAddress memory);
+	function sponsor(address contractAddress) external view returns (OptionCrossAddress memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -171,6 +171,12 @@
 	function toggleAllowlist(address contractAddress, bool enabled) external;
 }
 
+/// @dev Ethereum representation of Optional value with CrossAddress.
+struct OptionCrossAddress {
+	bool status;
+	CrossAddress value;
+}
+
 /// @dev Cross account struct
 struct CrossAddress {
 	address eth;
modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -42,7 +42,9 @@
     expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
 
     // 1.1 Can get sponsor using methods.sponsor:
-    const actualSponsor = await helpers.methods.sponsor(flipper.options.address).call();
+    const actualSponsorOpt = await helpers.methods.sponsor(flipper.options.address).call();
+    expect(actualSponsorOpt.status).to.be.true;
+    const actualSponsor = actualSponsorOpt.value;
     expect(actualSponsor.eth).to.eq(flipper.options.address);
     expect(actualSponsor.sub).to.eq('0');
 
@@ -151,7 +153,9 @@
     expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
 
     // 1.1 Can get sponsor using methods.sponsor:
-    const actualSponsor = await helpers.methods.sponsor(flipper.options.address).call();
+    const actualSponsorOpt = await helpers.methods.sponsor(flipper.options.address).call();
+    expect(actualSponsorOpt.status).to.be.true;
+    const actualSponsor = actualSponsorOpt.value;
     expect(actualSponsor.eth).to.eq(sponsor);
     expect(actualSponsor.sub).to.eq('0');