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

difftreelog

refactor EthCrossAccount impl, signature some evm methods, tests and stubs

PraetorP2022-12-14parent: #1f3c059.patch.diff
in: master

16 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
before · pallets/common/src/erc.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//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	types::Property as PropertyStruct,25	execution::{Result, Error},26	weight,27};28use pallet_evm_coder_substrate::dispatch_to_evm;29use sp_std::{vec, vec::Vec};30use up_data_structs::{31	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,32	SponsoringRateLimit, SponsorshipState,33};34use alloc::format;3536use crate::{37	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,38	eth::{39		EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,40		CollectionLimits as EvmCollectionLimits,41	},42	weights::WeightInfo,43};4445/// Events for ethereum collection helper.46#[derive(ToLog)]47pub enum CollectionHelpersEvents {48	/// The collection has been created.49	CollectionCreated {50		/// Collection owner.51		#[indexed]52		owner: address,5354		/// Collection ID.55		#[indexed]56		collection_id: address,57	},58	/// The collection has been destroyed.59	CollectionDestroyed {60		/// Collection ID.61		#[indexed]62		collection_id: address,63	},64	/// The collection has been changed.65	CollectionChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69	},7071	/// The token has been changed.72	TokenChanged {73		/// Collection ID.74		#[indexed]75		collection_id: address,76		/// Token ID.77		token_id: uint256,78	},79}8081/// Does not always represent a full collection, for RFT it is either82/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).83pub trait CommonEvmHandler {84	/// Raw compiled binary code of the contract stub85	const CODE: &'static [u8];8687	/// Call precompiled handle.88	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;89}9091/// @title A contract that allows you to work with collections.92#[solidity_interface(name = Collection)]93impl<T: Config> CollectionHandle<T>94where95	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,96{97	/// Set collection property.98	///99	/// @param key Property key.100	/// @param value Propery value.101	#[solidity(hide)]102	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]103	fn set_collection_property(104		&mut self,105		caller: caller,106		key: string,107		value: bytes,108	) -> Result<void> {109		let caller = T::CrossAccountId::from_eth(caller);110		let key = <Vec<u8>>::from(key)111			.try_into()112			.map_err(|_| "key too large")?;113		let value = value.0.try_into().map_err(|_| "value too large")?;114115		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })116			.map_err(dispatch_to_evm::<T>)117	}118119	/// Set collection properties.120	///121	/// @param properties Vector of properties key/value pair.122	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]123	fn set_collection_properties(124		&mut self,125		caller: caller,126		properties: Vec<PropertyStruct>,127	) -> Result<void> {128		let caller = T::CrossAccountId::from_eth(caller);129130		let properties = properties131			.into_iter()132			.map(|PropertyStruct { key, value }| {133				let key = <Vec<u8>>::from(key)134					.try_into()135					.map_err(|_| "key too large")?;136137				let value = value.0.try_into().map_err(|_| "value too large")?;138139				Ok(Property { key, value })140			})141			.collect::<Result<Vec<_>>>()?;142143		<Pallet<T>>::set_collection_properties(self, &caller, properties)144			.map_err(dispatch_to_evm::<T>)145	}146147	/// Delete collection property.148	///149	/// @param key Property key.150	#[solidity(hide)]151	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]152	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {153		let caller = T::CrossAccountId::from_eth(caller);154		let key = <Vec<u8>>::from(key)155			.try_into()156			.map_err(|_| "key too large")?;157158		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)159	}160161	/// Delete collection properties.162	///163	/// @param keys Properties keys.164	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]165	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {166		let caller = T::CrossAccountId::from_eth(caller);167		let keys = keys168			.into_iter()169			.map(|key| {170				<Vec<u8>>::from(key)171					.try_into()172					.map_err(|_| Error::Revert("key too large".into()))173			})174			.collect::<Result<Vec<_>>>()?;175176		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)177	}178179	/// Get collection property.180	///181	/// @dev Throws error if key not found.182	///183	/// @param key Property key.184	/// @return bytes The property corresponding to the key.185	fn collection_property(&self, key: string) -> Result<bytes> {186		let key = <Vec<u8>>::from(key)187			.try_into()188			.map_err(|_| "key too large")?;189190		let props = CollectionProperties::<T>::get(self.id);191		let prop = props.get(&key).ok_or("key not found")?;192193		Ok(bytes(prop.to_vec()))194	}195196	/// Get collection properties.197	///198	/// @param keys Properties keys. Empty keys for all propertyes.199	/// @return Vector of properties key/value pairs.200	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {201		let keys = keys202			.into_iter()203			.map(|key| {204				<Vec<u8>>::from(key)205					.try_into()206					.map_err(|_| Error::Revert("key too large".into()))207			})208			.collect::<Result<Vec<_>>>()?;209210		let properties = Pallet::<T>::filter_collection_properties(211			self.id,212			if keys.is_empty() { None } else { Some(keys) },213		)214		.map_err(dispatch_to_evm::<T>)?;215216		let properties = properties217			.into_iter()218			.map(|p| {219				let key =220					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;221				let value = bytes(p.value.to_vec());222				Ok(PropertyStruct { key, value })223			})224			.collect::<Result<Vec<_>>>()?;225		Ok(properties)226	}227228	/// Set the sponsor of the collection.229	///230	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.231	///232	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.233	#[solidity(hide)]234	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {235		self.consume_store_reads_and_writes(1, 1)?;236237		let caller = T::CrossAccountId::from_eth(caller);238239		let sponsor = T::CrossAccountId::from_eth(sponsor);240		self.set_sponsor(&caller, sponsor.as_sub().clone())241			.map_err(dispatch_to_evm::<T>)242	}243244	/// Set the sponsor of the collection.245	///246	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.247	///248	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.249	fn set_collection_sponsor_cross(250		&mut self,251		caller: caller,252		sponsor: EthCrossAccount,253	) -> Result<void> {254		self.consume_store_reads_and_writes(1, 1)?;255256		let caller = T::CrossAccountId::from_eth(caller);257258		let sponsor = sponsor.into_sub_cross_account::<T>()?;259		self.set_sponsor(&caller, sponsor.as_sub().clone())260			.map_err(dispatch_to_evm::<T>)261	}262263	/// Whether there is a pending sponsor.264	fn has_collection_pending_sponsor(&self) -> Result<bool> {265		Ok(matches!(266			self.collection.sponsorship,267			SponsorshipState::Unconfirmed(_)268		))269	}270271	/// Collection sponsorship confirmation.272	///273	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.274	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {275		self.consume_store_writes(1)?;276277		let caller = T::CrossAccountId::from_eth(caller);278		self.confirm_sponsorship(caller.as_sub())279			.map_err(dispatch_to_evm::<T>)280	}281282	/// Remove collection sponsor.283	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {284		self.consume_store_reads_and_writes(1, 1)?;285		let caller = T::CrossAccountId::from_eth(caller);286		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)287	}288289	/// Get current sponsor.290	///291	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.292	fn collection_sponsor(&self) -> Result<EthCrossAccount> {293		let sponsor = match self.collection.sponsorship.sponsor() {294			Some(sponsor) => sponsor,295			None => return Ok(Default::default()),296		};297298		Ok(EthCrossAccount::from_sub::<T>(&sponsor))299	}300301	/// Get current collection limits.302	///303	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:304	/// 	"accountTokenOwnershipLimit",305	/// 	"sponsoredDataSize",306	/// 	"sponsoredDataRateLimit",307	/// 	"tokenLimit",308	/// 	"sponsorTransferTimeout",309	/// 	"sponsorApproveTimeout"310	///  	"ownerCanTransfer",311	/// 	"ownerCanDestroy",312	/// 	"transfersEnabled"313	/// Return `false` if a limit not set.314	fn collection_limits(&self) -> Result<Vec<(EvmCollectionLimits, bool, uint256)>> {315		let convert_value_limit = |limit: EvmCollectionLimits,316		                           value: Option<u32>|317		 -> (EvmCollectionLimits, bool, uint256) {318			value319				.map(|v| (limit, true, v.into()))320				.unwrap_or((limit, false, Default::default()))321		};322323		let convert_bool_limit = |limit: EvmCollectionLimits,324		                          value: Option<bool>|325		 -> (EvmCollectionLimits, bool, uint256) {326			value327				.map(|v| {328					(329						limit,330						true,331						if v {332							uint256::from(1)333						} else {334							Default::default()335						},336					)337				})338				.unwrap_or((limit, false, Default::default()))339		};340341		let limits = &self.collection.limits;342343		Ok(vec![344			convert_value_limit(345				EvmCollectionLimits::AccountTokenOwnership,346				limits.account_token_ownership_limit,347			),348			convert_value_limit(349				EvmCollectionLimits::SponsoredDataSize,350				limits.sponsored_data_size,351			),352			limits353				.sponsored_data_rate_limit354				.and_then(|limit| {355					if let SponsoringRateLimit::Blocks(blocks) = limit {356						Some((357							EvmCollectionLimits::SponsoredDataRateLimit,358							true,359							blocks.into(),360						))361					} else {362						None363					}364				})365				.unwrap_or((366					EvmCollectionLimits::SponsoredDataRateLimit,367					false,368					Default::default(),369				)),370			convert_value_limit(EvmCollectionLimits::TokenLimit, limits.token_limit),371			convert_value_limit(372				EvmCollectionLimits::SponsorTransferTimeout,373				limits.sponsor_transfer_timeout,374			),375			convert_value_limit(376				EvmCollectionLimits::SponsorApproveTimeout,377				limits.sponsor_approve_timeout,378			),379			convert_bool_limit(380				EvmCollectionLimits::OwnerCanTransfer,381				limits.owner_can_transfer,382			),383			convert_bool_limit(384				EvmCollectionLimits::OwnerCanDestroy,385				limits.owner_can_destroy,386			),387			convert_bool_limit(388				EvmCollectionLimits::TransferEnabled,389				limits.transfers_enabled,390			),391		])392	}393394	/// Set limits for the collection.395	/// @dev Throws error if limit not found.396	/// @param limit Name of the limit. Valid names:397	/// 	"accountTokenOwnershipLimit",398	/// 	"sponsoredDataSize",399	/// 	"sponsoredDataRateLimit",400	/// 	"tokenLimit",401	/// 	"sponsorTransferTimeout",402	/// 	"sponsorApproveTimeout"403	///  	"ownerCanTransfer",404	/// 	"ownerCanDestroy",405	/// 	"transfersEnabled"406	/// @param status enable\disable limit. Works only with `true`.407	/// @param value Value of the limit.408	#[solidity(rename_selector = "setCollectionLimit")]409	fn set_collection_limit(410		&mut self,411		caller: caller,412		limit: EvmCollectionLimits,413		status: bool,414		value: uint256,415	) -> Result<void> {416		self.consume_store_reads_and_writes(1, 1)?;417418		if !status {419			return Err(Error::Revert("user can't disable limits".into()));420		}421422		let value = value423			.try_into()424			.map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;425426		let convert_value_to_bool = || match value {427			0 => Ok(false),428			1 => Ok(true),429			_ => {430				return Err(Error::Revert(format!(431					"can't convert value to boolean \"{}\"",432					value433				)))434			}435		};436437		let mut limits = self.limits.clone();438439		match limit {440			EvmCollectionLimits::AccountTokenOwnership => {441				limits.account_token_ownership_limit = Some(value);442			}443			EvmCollectionLimits::SponsoredDataSize => {444				limits.sponsored_data_size = Some(value);445			}446			EvmCollectionLimits::SponsoredDataRateLimit => {447				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));448			}449			EvmCollectionLimits::TokenLimit => {450				limits.token_limit = Some(value);451			}452			EvmCollectionLimits::SponsorTransferTimeout => {453				limits.sponsor_transfer_timeout = Some(value);454			}455			EvmCollectionLimits::SponsorApproveTimeout => {456				limits.sponsor_approve_timeout = Some(value);457			}458			EvmCollectionLimits::OwnerCanTransfer => {459				limits.owner_can_transfer = Some(convert_value_to_bool()?);460			}461			EvmCollectionLimits::OwnerCanDestroy => {462				limits.owner_can_destroy = Some(convert_value_to_bool()?);463			}464			EvmCollectionLimits::TransferEnabled => {465				limits.transfers_enabled = Some(convert_value_to_bool()?);466			}467			_ => return Err(Error::Revert(format!("unknown limit \"{:?}\"", limit))),468		}469470		let caller = T::CrossAccountId::from_eth(caller);471		<Pallet<T>>::update_limits(&caller, self, limits).map_err(dispatch_to_evm::<T>)472	}473474	/// Get contract address.475	fn contract_address(&self) -> Result<address> {476		Ok(crate::eth::collection_id_to_address(self.id))477	}478479	/// Add collection admin.480	/// @param newAdmin Cross account administrator address.481	fn add_collection_admin_cross(482		&mut self,483		caller: caller,484		new_admin: EthCrossAccount,485	) -> Result<void> {486		self.consume_store_reads_and_writes(2, 2)?;487488		let caller = T::CrossAccountId::from_eth(caller);489		let new_admin = new_admin.into_sub_cross_account::<T>()?;490		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;491		Ok(())492	}493494	/// Remove collection admin.495	/// @param admin Cross account administrator address.496	fn remove_collection_admin_cross(497		&mut self,498		caller: caller,499		admin: EthCrossAccount,500	) -> Result<void> {501		self.consume_store_reads_and_writes(2, 2)?;502503		let caller = T::CrossAccountId::from_eth(caller);504		let admin = admin.into_sub_cross_account::<T>()?;505		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;506		Ok(())507	}508509	/// Add collection admin.510	/// @param newAdmin Address of the added administrator.511	#[solidity(hide)]512	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {513		self.consume_store_reads_and_writes(2, 2)?;514515		let caller = T::CrossAccountId::from_eth(caller);516		let new_admin = T::CrossAccountId::from_eth(new_admin);517		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;518		Ok(())519	}520521	/// Remove collection admin.522	///523	/// @param admin Address of the removed administrator.524	#[solidity(hide)]525	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {526		self.consume_store_reads_and_writes(2, 2)?;527528		let caller = T::CrossAccountId::from_eth(caller);529		let admin = T::CrossAccountId::from_eth(admin);530		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;531		Ok(())532	}533534	/// Toggle accessibility of collection nesting.535	///536	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'537	#[solidity(rename_selector = "setCollectionNesting")]538	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {539		self.consume_store_reads_and_writes(1, 1)?;540541		let caller = T::CrossAccountId::from_eth(caller);542543		let mut permissions = self.collection.permissions.clone();544		let mut nesting = permissions.nesting().clone();545		nesting.token_owner = enable;546		nesting.restricted = None;547		permissions.nesting = Some(nesting);548549		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)550	}551552	/// Toggle accessibility of collection nesting.553	///554	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'555	/// @param collections Addresses of collections that will be available for nesting.556	#[solidity(rename_selector = "setCollectionNesting")]557	fn set_nesting(558		&mut self,559		caller: caller,560		enable: bool,561		collections: Vec<address>,562	) -> Result<void> {563		self.consume_store_reads_and_writes(1, 1)?;564565		if collections.is_empty() {566			return Err("no addresses provided".into());567		}568		let caller = T::CrossAccountId::from_eth(caller);569570		let mut permissions = self.collection.permissions.clone();571		match enable {572			false => {573				let mut nesting = permissions.nesting().clone();574				nesting.token_owner = false;575				nesting.restricted = None;576				permissions.nesting = Some(nesting);577			}578			true => {579				let mut bv = OwnerRestrictedSet::new();580				for i in collections {581					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {582						Error::Revert("Can't convert address into collection id".into())583					})?)584					.map_err(|_| "too many collections")?;585				}586				let mut nesting = permissions.nesting().clone();587				nesting.token_owner = true;588				nesting.restricted = Some(bv);589				permissions.nesting = Some(nesting);590			}591		};592593		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)594	}595596	/// Returns nesting for a collection597	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]598	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {599		let nesting = self.collection.permissions.nesting();600601		Ok((602			nesting.token_owner,603			nesting604				.restricted605				.clone()606				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())607				.unwrap_or_default(),608		))609	}610611	/// Returns permissions for a collection612	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {613		let nesting = self.collection.permissions.nesting();614		Ok(vec![615			(EvmPermissions::CollectionAdmin, nesting.collection_admin),616			(EvmPermissions::TokenOwner, nesting.token_owner),617		])618	}619	/// Set the collection access method.620	/// @param mode Access mode621	/// 	0 for Normal622	/// 	1 for AllowList623	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {624		self.consume_store_reads_and_writes(1, 1)?;625626		let caller = T::CrossAccountId::from_eth(caller);627		let permissions = CollectionPermissions {628			access: Some(match mode {629				0 => AccessMode::Normal,630				1 => AccessMode::AllowList,631				_ => return Err("not supported access mode".into()),632			}),633			..Default::default()634		};635		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)636	}637638	/// Checks that user allowed to operate with collection.639	///640	/// @param user User address to check.641	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {642		let user = user.into_sub_cross_account::<T>()?;643		Ok(Pallet::<T>::allowed(self.id, user))644	}645646	/// Add the user to the allowed list.647	///648	/// @param user Address of a trusted user.649	#[solidity(hide)]650	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {651		self.consume_store_writes(1)?;652653		let caller = T::CrossAccountId::from_eth(caller);654		let user = T::CrossAccountId::from_eth(user);655		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;656		Ok(())657	}658659	/// Add user to allowed list.660	///661	/// @param user User cross account address.662	fn add_to_collection_allow_list_cross(663		&mut self,664		caller: caller,665		user: EthCrossAccount,666	) -> Result<void> {667		self.consume_store_writes(1)?;668669		let caller = T::CrossAccountId::from_eth(caller);670		let user = user.into_sub_cross_account::<T>()?;671		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;672		Ok(())673	}674675	/// Remove the user from the allowed list.676	///677	/// @param user Address of a removed user.678	#[solidity(hide)]679	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {680		self.consume_store_writes(1)?;681682		let caller = T::CrossAccountId::from_eth(caller);683		let user = T::CrossAccountId::from_eth(user);684		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;685		Ok(())686	}687688	/// Remove user from allowed list.689	///690	/// @param user User cross account address.691	fn remove_from_collection_allow_list_cross(692		&mut self,693		caller: caller,694		user: EthCrossAccount,695	) -> Result<void> {696		self.consume_store_writes(1)?;697698		let caller = T::CrossAccountId::from_eth(caller);699		let user = user.into_sub_cross_account::<T>()?;700		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;701		Ok(())702	}703704	/// Switch permission for minting.705	///706	/// @param mode Enable if "true".707	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {708		self.consume_store_reads_and_writes(1, 1)?;709710		let caller = T::CrossAccountId::from_eth(caller);711		let permissions = CollectionPermissions {712			mint_mode: Some(mode),713			..Default::default()714		};715		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)716	}717718	/// Check that account is the owner or admin of the collection719	///720	/// @param user account to verify721	/// @return "true" if account is the owner or admin722	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]723	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {724		let user = T::CrossAccountId::from_eth(user);725		Ok(self.is_owner_or_admin(&user))726	}727728	/// Check that account is the owner or admin of the collection729	///730	/// @param user User cross account to verify731	/// @return "true" if account is the owner or admin732	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {733		let user = user.into_sub_cross_account::<T>()?;734		Ok(self.is_owner_or_admin(&user))735	}736737	/// Returns collection type738	///739	/// @return `Fungible` or `NFT` or `ReFungible`740	fn unique_collection_type(&self) -> Result<string> {741		let mode = match self.collection.mode {742			CollectionMode::Fungible(_) => "Fungible",743			CollectionMode::NFT => "NFT",744			CollectionMode::ReFungible => "ReFungible",745		};746		Ok(mode.into())747	}748749	/// Get collection owner.750	///751	/// @return Tuble with sponsor address and his substrate mirror.752	/// If address is canonical then substrate mirror is zero and vice versa.753	fn collection_owner(&self) -> Result<EthCrossAccount> {754		Ok(EthCrossAccount::from_sub_cross_account::<T>(755			&T::CrossAccountId::from_sub(self.owner.clone()),756		))757	}758759	/// Changes collection owner to another account760	///761	/// @dev Owner can be changed only by current owner762	/// @param newOwner new owner account763	#[solidity(hide, rename_selector = "changeCollectionOwner")]764	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {765		self.consume_store_writes(1)?;766767		let caller = T::CrossAccountId::from_eth(caller);768		let new_owner = T::CrossAccountId::from_eth(new_owner);769		self.change_owner(caller, new_owner)770			.map_err(dispatch_to_evm::<T>)771	}772773	/// Get collection administrators774	///775	/// @return Vector of tuples with admins address and his substrate mirror.776	/// If address is canonical then substrate mirror is zero and vice versa.777	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {778		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))779			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))780			.collect();781		Ok(result)782	}783784	/// Changes collection owner to another account785	///786	/// @dev Owner can be changed only by current owner787	/// @param newOwner new owner cross account788	fn change_collection_owner_cross(789		&mut self,790		caller: caller,791		new_owner: EthCrossAccount,792	) -> Result<void> {793		self.consume_store_writes(1)?;794795		let caller = T::CrossAccountId::from_eth(caller);796		let new_owner = new_owner.into_sub_cross_account::<T>()?;797		self.change_owner(caller, new_owner)798			.map_err(dispatch_to_evm::<T>)799	}800}801802/// ### Note803/// Do not forget to add: `self.consume_store_reads(1)?;`804fn check_is_owner_or_admin<T: Config>(805	caller: caller,806	collection: &CollectionHandle<T>,807) -> Result<T::CrossAccountId> {808	let caller = T::CrossAccountId::from_eth(caller);809	collection810		.check_is_owner_or_admin(&caller)811		.map_err(dispatch_to_evm::<T>)?;812	Ok(caller)813}814815/// ### Note816/// Do not forget to add: `self.consume_store_writes(1)?;`817fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {818	collection819		.check_is_internal()820		.map_err(dispatch_to_evm::<T>)?;821	collection.save().map_err(dispatch_to_evm::<T>)?;822	Ok(())823}824825/// Contains static property keys and values.826pub mod static_property {827	use evm_coder::{828		execution::{Result, Error},829	};830	use alloc::format;831832	const EXPECT_CONVERT_ERROR: &str = "length < limit";833834	/// Keys.835	pub mod key {836		use super::*;837838		/// Key "baseURI".839		pub fn base_uri() -> up_data_structs::PropertyKey {840			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)841		}842843		/// Key "url".844		pub fn url() -> up_data_structs::PropertyKey {845			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)846		}847848		/// Key "suffix".849		pub fn suffix() -> up_data_structs::PropertyKey {850			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)851		}852853		/// Key "parentNft".854		pub fn parent_nft() -> up_data_structs::PropertyKey {855			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)856		}857	}858859	/// Convert `byte` to [`PropertyKey`].860	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {861		bytes.to_vec().try_into().map_err(|_| {862			Error::Revert(format!(863				"Property key is too long. Max length is {}.",864				up_data_structs::PropertyKey::bound()865			))866		})867	}868869	/// Convert `bytes` to [`PropertyValue`].870	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {871		bytes.to_vec().try_into().map_err(|_| {872			Error::Revert(format!(873				"Property key is too long. Max length is {}.",874				up_data_structs::PropertyKey::bound()875			))876		})877	}878}
after · pallets/common/src/erc.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//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	types::Property as PropertyStruct,25	execution::{Result, Error},26	weight,27};28use pallet_evm_coder_substrate::dispatch_to_evm;29use sp_std::{vec, vec::Vec};30use up_data_structs::{31	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,32	SponsoringRateLimit, SponsorshipState,33};34use alloc::format;3536use crate::{37	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,38	eth::{39		EthCrossAccount, CollectionPermissions as EvmPermissions,40		CollectionLimits as EvmCollectionLimits,41	},42	weights::WeightInfo,43};4445/// Events for ethereum collection helper.46#[derive(ToLog)]47pub enum CollectionHelpersEvents {48	/// The collection has been created.49	CollectionCreated {50		/// Collection owner.51		#[indexed]52		owner: address,5354		/// Collection ID.55		#[indexed]56		collection_id: address,57	},58	/// The collection has been destroyed.59	CollectionDestroyed {60		/// Collection ID.61		#[indexed]62		collection_id: address,63	},64	/// The collection has been changed.65	CollectionChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69	},7071	/// The token has been changed.72	TokenChanged {73		/// Collection ID.74		#[indexed]75		collection_id: address,76		/// Token ID.77		token_id: uint256,78	},79}8081/// Does not always represent a full collection, for RFT it is either82/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).83pub trait CommonEvmHandler {84	/// Raw compiled binary code of the contract stub85	const CODE: &'static [u8];8687	/// Call precompiled handle.88	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;89}9091/// @title A contract that allows you to work with collections.92#[solidity_interface(name = Collection)]93impl<T: Config> CollectionHandle<T>94where95	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,96{97	/// Set collection property.98	///99	/// @param key Property key.100	/// @param value Propery value.101	#[solidity(hide)]102	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]103	fn set_collection_property(104		&mut self,105		caller: caller,106		key: string,107		value: bytes,108	) -> Result<void> {109		let caller = T::CrossAccountId::from_eth(caller);110		let key = <Vec<u8>>::from(key)111			.try_into()112			.map_err(|_| "key too large")?;113		let value = value.0.try_into().map_err(|_| "value too large")?;114115		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })116			.map_err(dispatch_to_evm::<T>)117	}118119	/// Set collection properties.120	///121	/// @param properties Vector of properties key/value pair.122	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]123	fn set_collection_properties(124		&mut self,125		caller: caller,126		properties: Vec<PropertyStruct>,127	) -> Result<void> {128		let caller = T::CrossAccountId::from_eth(caller);129130		let properties = properties131			.into_iter()132			.map(|PropertyStruct { key, value }| {133				let key = <Vec<u8>>::from(key)134					.try_into()135					.map_err(|_| "key too large")?;136137				let value = value.0.try_into().map_err(|_| "value too large")?;138139				Ok(Property { key, value })140			})141			.collect::<Result<Vec<_>>>()?;142143		<Pallet<T>>::set_collection_properties(self, &caller, properties)144			.map_err(dispatch_to_evm::<T>)145	}146147	/// Delete collection property.148	///149	/// @param key Property key.150	#[solidity(hide)]151	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]152	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {153		let caller = T::CrossAccountId::from_eth(caller);154		let key = <Vec<u8>>::from(key)155			.try_into()156			.map_err(|_| "key too large")?;157158		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)159	}160161	/// Delete collection properties.162	///163	/// @param keys Properties keys.164	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]165	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {166		let caller = T::CrossAccountId::from_eth(caller);167		let keys = keys168			.into_iter()169			.map(|key| {170				<Vec<u8>>::from(key)171					.try_into()172					.map_err(|_| Error::Revert("key too large".into()))173			})174			.collect::<Result<Vec<_>>>()?;175176		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)177	}178179	/// Get collection property.180	///181	/// @dev Throws error if key not found.182	///183	/// @param key Property key.184	/// @return bytes The property corresponding to the key.185	fn collection_property(&self, key: string) -> Result<bytes> {186		let key = <Vec<u8>>::from(key)187			.try_into()188			.map_err(|_| "key too large")?;189190		let props = CollectionProperties::<T>::get(self.id);191		let prop = props.get(&key).ok_or("key not found")?;192193		Ok(bytes(prop.to_vec()))194	}195196	/// Get collection properties.197	///198	/// @param keys Properties keys. Empty keys for all propertyes.199	/// @return Vector of properties key/value pairs.200	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {201		let keys = keys202			.into_iter()203			.map(|key| {204				<Vec<u8>>::from(key)205					.try_into()206					.map_err(|_| Error::Revert("key too large".into()))207			})208			.collect::<Result<Vec<_>>>()?;209210		let properties = Pallet::<T>::filter_collection_properties(211			self.id,212			if keys.is_empty() { None } else { Some(keys) },213		)214		.map_err(dispatch_to_evm::<T>)?;215216		let properties = properties217			.into_iter()218			.map(|p| {219				let key =220					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;221				let value = bytes(p.value.to_vec());222				Ok(PropertyStruct { key, value })223			})224			.collect::<Result<Vec<_>>>()?;225		Ok(properties)226	}227228	/// Set the sponsor of the collection.229	///230	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.231	///232	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.233	#[solidity(hide)]234	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {235		self.consume_store_reads_and_writes(1, 1)?;236237		let caller = T::CrossAccountId::from_eth(caller);238239		let sponsor = T::CrossAccountId::from_eth(sponsor);240		self.set_sponsor(&caller, sponsor.as_sub().clone())241			.map_err(dispatch_to_evm::<T>)242	}243244	/// Set the sponsor of the collection.245	///246	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.247	///248	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.249	fn set_collection_sponsor_cross(250		&mut self,251		caller: caller,252		sponsor: EthCrossAccount,253	) -> Result<void> {254		self.consume_store_reads_and_writes(1, 1)?;255256		let caller = T::CrossAccountId::from_eth(caller);257258		let sponsor = sponsor.into_sub_cross_account::<T>()?;259		self.set_sponsor(&caller, sponsor.as_sub().clone())260			.map_err(dispatch_to_evm::<T>)261	}262263	/// Whether there is a pending sponsor.264	fn has_collection_pending_sponsor(&self) -> Result<bool> {265		Ok(matches!(266			self.collection.sponsorship,267			SponsorshipState::Unconfirmed(_)268		))269	}270271	/// Collection sponsorship confirmation.272	///273	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.274	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {275		self.consume_store_writes(1)?;276277		let caller = T::CrossAccountId::from_eth(caller);278		self.confirm_sponsorship(caller.as_sub())279			.map_err(dispatch_to_evm::<T>)280	}281282	/// Remove collection sponsor.283	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {284		self.consume_store_reads_and_writes(1, 1)?;285		let caller = T::CrossAccountId::from_eth(caller);286		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)287	}288289	/// Get current sponsor.290	///291	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.292	fn collection_sponsor(&self) -> Result<EthCrossAccount> {293		let sponsor = match self.collection.sponsorship.sponsor() {294			Some(sponsor) => sponsor,295			None => return Ok(Default::default()),296		};297298		Ok(EthCrossAccount::from_sub::<T>(&sponsor))299	}300301	/// Get current collection limits.302	///303	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:304	/// 	"accountTokenOwnershipLimit",305	/// 	"sponsoredDataSize",306	/// 	"sponsoredDataRateLimit",307	/// 	"tokenLimit",308	/// 	"sponsorTransferTimeout",309	/// 	"sponsorApproveTimeout"310	///  	"ownerCanTransfer",311	/// 	"ownerCanDestroy",312	/// 	"transfersEnabled"313	/// Return `false` if a limit not set.314	fn collection_limits(&self) -> Result<Vec<(EvmCollectionLimits, bool, uint256)>> {315		let convert_value_limit = |limit: EvmCollectionLimits,316		                           value: Option<u32>|317		 -> (EvmCollectionLimits, bool, uint256) {318			value319				.map(|v| (limit, true, v.into()))320				.unwrap_or((limit, false, Default::default()))321		};322323		let convert_bool_limit = |limit: EvmCollectionLimits,324		                          value: Option<bool>|325		 -> (EvmCollectionLimits, bool, uint256) {326			value327				.map(|v| {328					(329						limit,330						true,331						if v {332							uint256::from(1)333						} else {334							Default::default()335						},336					)337				})338				.unwrap_or((limit, false, Default::default()))339		};340341		let limits = &self.collection.limits;342343		Ok(vec![344			convert_value_limit(345				EvmCollectionLimits::AccountTokenOwnership,346				limits.account_token_ownership_limit,347			),348			convert_value_limit(349				EvmCollectionLimits::SponsoredDataSize,350				limits.sponsored_data_size,351			),352			limits353				.sponsored_data_rate_limit354				.and_then(|limit| {355					if let SponsoringRateLimit::Blocks(blocks) = limit {356						Some((357							EvmCollectionLimits::SponsoredDataRateLimit,358							true,359							blocks.into(),360						))361					} else {362						None363					}364				})365				.unwrap_or((366					EvmCollectionLimits::SponsoredDataRateLimit,367					false,368					Default::default(),369				)),370			convert_value_limit(EvmCollectionLimits::TokenLimit, limits.token_limit),371			convert_value_limit(372				EvmCollectionLimits::SponsorTransferTimeout,373				limits.sponsor_transfer_timeout,374			),375			convert_value_limit(376				EvmCollectionLimits::SponsorApproveTimeout,377				limits.sponsor_approve_timeout,378			),379			convert_bool_limit(380				EvmCollectionLimits::OwnerCanTransfer,381				limits.owner_can_transfer,382			),383			convert_bool_limit(384				EvmCollectionLimits::OwnerCanDestroy,385				limits.owner_can_destroy,386			),387			convert_bool_limit(388				EvmCollectionLimits::TransferEnabled,389				limits.transfers_enabled,390			),391		])392	}393394	/// Set limits for the collection.395	/// @dev Throws error if limit not found.396	/// @param limit Name of the limit. Valid names:397	/// 	"accountTokenOwnershipLimit",398	/// 	"sponsoredDataSize",399	/// 	"sponsoredDataRateLimit",400	/// 	"tokenLimit",401	/// 	"sponsorTransferTimeout",402	/// 	"sponsorApproveTimeout"403	///  	"ownerCanTransfer",404	/// 	"ownerCanDestroy",405	/// 	"transfersEnabled"406	/// @param status enable\disable limit. Works only with `true`.407	/// @param value Value of the limit.408	#[solidity(rename_selector = "setCollectionLimit")]409	fn set_collection_limit(410		&mut self,411		caller: caller,412		limit: EvmCollectionLimits,413		status: bool,414		value: uint256,415	) -> Result<void> {416		self.consume_store_reads_and_writes(1, 1)?;417418		if !status {419			return Err(Error::Revert("user can't disable limits".into()));420		}421422		let value = value423			.try_into()424			.map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;425426		let convert_value_to_bool = || match value {427			0 => Ok(false),428			1 => Ok(true),429			_ => {430				return Err(Error::Revert(format!(431					"can't convert value to boolean \"{}\"",432					value433				)))434			}435		};436437		let mut limits = self.limits.clone();438439		match limit {440			EvmCollectionLimits::AccountTokenOwnership => {441				limits.account_token_ownership_limit = Some(value);442			}443			EvmCollectionLimits::SponsoredDataSize => {444				limits.sponsored_data_size = Some(value);445			}446			EvmCollectionLimits::SponsoredDataRateLimit => {447				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));448			}449			EvmCollectionLimits::TokenLimit => {450				limits.token_limit = Some(value);451			}452			EvmCollectionLimits::SponsorTransferTimeout => {453				limits.sponsor_transfer_timeout = Some(value);454			}455			EvmCollectionLimits::SponsorApproveTimeout => {456				limits.sponsor_approve_timeout = Some(value);457			}458			EvmCollectionLimits::OwnerCanTransfer => {459				limits.owner_can_transfer = Some(convert_value_to_bool()?);460			}461			EvmCollectionLimits::OwnerCanDestroy => {462				limits.owner_can_destroy = Some(convert_value_to_bool()?);463			}464			EvmCollectionLimits::TransferEnabled => {465				limits.transfers_enabled = Some(convert_value_to_bool()?);466			}467			_ => return Err(Error::Revert(format!("unknown limit \"{:?}\"", limit))),468		}469470		let caller = T::CrossAccountId::from_eth(caller);471		<Pallet<T>>::update_limits(&caller, self, limits).map_err(dispatch_to_evm::<T>)472	}473474	/// Get contract address.475	fn contract_address(&self) -> Result<address> {476		Ok(crate::eth::collection_id_to_address(self.id))477	}478479	/// Add collection admin.480	/// @param newAdmin Cross account administrator address.481	fn add_collection_admin_cross(482		&mut self,483		caller: caller,484		new_admin: EthCrossAccount,485	) -> Result<void> {486		self.consume_store_reads_and_writes(2, 2)?;487488		let caller = T::CrossAccountId::from_eth(caller);489		let new_admin = new_admin.into_sub_cross_account::<T>()?;490		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;491		Ok(())492	}493494	/// Remove collection admin.495	/// @param admin Cross account administrator address.496	fn remove_collection_admin_cross(497		&mut self,498		caller: caller,499		admin: EthCrossAccount,500	) -> Result<void> {501		self.consume_store_reads_and_writes(2, 2)?;502503		let caller = T::CrossAccountId::from_eth(caller);504		let admin = admin.into_sub_cross_account::<T>()?;505		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;506		Ok(())507	}508509	/// Add collection admin.510	/// @param newAdmin Address of the added administrator.511	#[solidity(hide)]512	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {513		self.consume_store_reads_and_writes(2, 2)?;514515		let caller = T::CrossAccountId::from_eth(caller);516		let new_admin = T::CrossAccountId::from_eth(new_admin);517		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;518		Ok(())519	}520521	/// Remove collection admin.522	///523	/// @param admin Address of the removed administrator.524	#[solidity(hide)]525	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {526		self.consume_store_reads_and_writes(2, 2)?;527528		let caller = T::CrossAccountId::from_eth(caller);529		let admin = T::CrossAccountId::from_eth(admin);530		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;531		Ok(())532	}533534	/// Toggle accessibility of collection nesting.535	///536	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'537	#[solidity(rename_selector = "setCollectionNesting")]538	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {539		self.consume_store_reads_and_writes(1, 1)?;540541		let caller = T::CrossAccountId::from_eth(caller);542543		let mut permissions = self.collection.permissions.clone();544		let mut nesting = permissions.nesting().clone();545		nesting.token_owner = enable;546		nesting.restricted = None;547		permissions.nesting = Some(nesting);548549		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)550	}551552	/// Toggle accessibility of collection nesting.553	///554	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'555	/// @param collections Addresses of collections that will be available for nesting.556	#[solidity(rename_selector = "setCollectionNesting")]557	fn set_nesting(558		&mut self,559		caller: caller,560		enable: bool,561		collections: Vec<address>,562	) -> Result<void> {563		self.consume_store_reads_and_writes(1, 1)?;564565		if collections.is_empty() {566			return Err("no addresses provided".into());567		}568		let caller = T::CrossAccountId::from_eth(caller);569570		let mut permissions = self.collection.permissions.clone();571		match enable {572			false => {573				let mut nesting = permissions.nesting().clone();574				nesting.token_owner = false;575				nesting.restricted = None;576				permissions.nesting = Some(nesting);577			}578			true => {579				let mut bv = OwnerRestrictedSet::new();580				for i in collections {581					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {582						Error::Revert("Can't convert address into collection id".into())583					})?)584					.map_err(|_| "too many collections")?;585				}586				let mut nesting = permissions.nesting().clone();587				nesting.token_owner = true;588				nesting.restricted = Some(bv);589				permissions.nesting = Some(nesting);590			}591		};592593		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)594	}595596	/// Returns nesting for a collection597	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]598	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {599		let nesting = self.collection.permissions.nesting();600601		Ok((602			nesting.token_owner,603			nesting604				.restricted605				.clone()606				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())607				.unwrap_or_default(),608		))609	}610611	/// Returns permissions for a collection612	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {613		let nesting = self.collection.permissions.nesting();614		Ok(vec![615			(EvmPermissions::CollectionAdmin, nesting.collection_admin),616			(EvmPermissions::TokenOwner, nesting.token_owner),617		])618	}619	/// Set the collection access method.620	/// @param mode Access mode621	/// 	0 for Normal622	/// 	1 for AllowList623	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {624		self.consume_store_reads_and_writes(1, 1)?;625626		let caller = T::CrossAccountId::from_eth(caller);627		let permissions = CollectionPermissions {628			access: Some(match mode {629				0 => AccessMode::Normal,630				1 => AccessMode::AllowList,631				_ => return Err("not supported access mode".into()),632			}),633			..Default::default()634		};635		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)636	}637638	/// Checks that user allowed to operate with collection.639	///640	/// @param user User address to check.641	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {642		let user = user.into_sub_cross_account::<T>()?;643		Ok(Pallet::<T>::allowed(self.id, user))644	}645646	/// Add the user to the allowed list.647	///648	/// @param user Address of a trusted user.649	#[solidity(hide)]650	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {651		self.consume_store_writes(1)?;652653		let caller = T::CrossAccountId::from_eth(caller);654		let user = T::CrossAccountId::from_eth(user);655		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;656		Ok(())657	}658659	/// Add user to allowed list.660	///661	/// @param user User cross account address.662	fn add_to_collection_allow_list_cross(663		&mut self,664		caller: caller,665		user: EthCrossAccount,666	) -> Result<void> {667		self.consume_store_writes(1)?;668669		let caller = T::CrossAccountId::from_eth(caller);670		let user = user.into_sub_cross_account::<T>()?;671		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;672		Ok(())673	}674675	/// Remove the user from the allowed list.676	///677	/// @param user Address of a removed user.678	#[solidity(hide)]679	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {680		self.consume_store_writes(1)?;681682		let caller = T::CrossAccountId::from_eth(caller);683		let user = T::CrossAccountId::from_eth(user);684		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;685		Ok(())686	}687688	/// Remove user from allowed list.689	///690	/// @param user User cross account address.691	fn remove_from_collection_allow_list_cross(692		&mut self,693		caller: caller,694		user: EthCrossAccount,695	) -> Result<void> {696		self.consume_store_writes(1)?;697698		let caller = T::CrossAccountId::from_eth(caller);699		let user = user.into_sub_cross_account::<T>()?;700		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;701		Ok(())702	}703704	/// Switch permission for minting.705	///706	/// @param mode Enable if "true".707	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {708		self.consume_store_reads_and_writes(1, 1)?;709710		let caller = T::CrossAccountId::from_eth(caller);711		let permissions = CollectionPermissions {712			mint_mode: Some(mode),713			..Default::default()714		};715		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)716	}717718	/// Check that account is the owner or admin of the collection719	///720	/// @param user account to verify721	/// @return "true" if account is the owner or admin722	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]723	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {724		let user = T::CrossAccountId::from_eth(user);725		Ok(self.is_owner_or_admin(&user))726	}727728	/// Check that account is the owner or admin of the collection729	///730	/// @param user User cross account to verify731	/// @return "true" if account is the owner or admin732	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {733		let user = user.into_sub_cross_account::<T>()?;734		Ok(self.is_owner_or_admin(&user))735	}736737	/// Returns collection type738	///739	/// @return `Fungible` or `NFT` or `ReFungible`740	fn unique_collection_type(&self) -> Result<string> {741		let mode = match self.collection.mode {742			CollectionMode::Fungible(_) => "Fungible",743			CollectionMode::NFT => "NFT",744			CollectionMode::ReFungible => "ReFungible",745		};746		Ok(mode.into())747	}748749	/// Get collection owner.750	///751	/// @return Tuble with sponsor address and his substrate mirror.752	/// If address is canonical then substrate mirror is zero and vice versa.753	fn collection_owner(&self) -> Result<EthCrossAccount> {754		Ok(EthCrossAccount::from_sub_cross_account::<T>(755			&T::CrossAccountId::from_sub(self.owner.clone()),756		))757	}758759	/// Changes collection owner to another account760	///761	/// @dev Owner can be changed only by current owner762	/// @param newOwner new owner account763	#[solidity(hide, rename_selector = "changeCollectionOwner")]764	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {765		self.consume_store_writes(1)?;766767		let caller = T::CrossAccountId::from_eth(caller);768		let new_owner = T::CrossAccountId::from_eth(new_owner);769		self.change_owner(caller, new_owner)770			.map_err(dispatch_to_evm::<T>)771	}772773	/// Get collection administrators774	///775	/// @return Vector of tuples with admins address and his substrate mirror.776	/// If address is canonical then substrate mirror is zero and vice versa.777	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {778		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))779			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))780			.collect();781		Ok(result)782	}783784	/// Changes collection owner to another account785	///786	/// @dev Owner can be changed only by current owner787	/// @param newOwner new owner cross account788	fn change_collection_owner_cross(789		&mut self,790		caller: caller,791		new_owner: EthCrossAccount,792	) -> Result<void> {793		self.consume_store_writes(1)?;794795		let caller = T::CrossAccountId::from_eth(caller);796		let new_owner = new_owner.into_sub_cross_account::<T>()?;797		self.change_owner(caller, new_owner)798			.map_err(dispatch_to_evm::<T>)799	}800}801802/// ### Note803/// Do not forget to add: `self.consume_store_reads(1)?;`804fn check_is_owner_or_admin<T: Config>(805	caller: caller,806	collection: &CollectionHandle<T>,807) -> Result<T::CrossAccountId> {808	let caller = T::CrossAccountId::from_eth(caller);809	collection810		.check_is_owner_or_admin(&caller)811		.map_err(dispatch_to_evm::<T>)?;812	Ok(caller)813}814815/// ### Note816/// Do not forget to add: `self.consume_store_writes(1)?;`817fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {818	collection819		.check_is_internal()820		.map_err(dispatch_to_evm::<T>)?;821	collection.save().map_err(dispatch_to_evm::<T>)?;822	Ok(())823}824825/// Contains static property keys and values.826pub mod static_property {827	use evm_coder::{828		execution::{Result, Error},829	};830	use alloc::format;831832	const EXPECT_CONVERT_ERROR: &str = "length < limit";833834	/// Keys.835	pub mod key {836		use super::*;837838		/// Key "baseURI".839		pub fn base_uri() -> up_data_structs::PropertyKey {840			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)841		}842843		/// Key "url".844		pub fn url() -> up_data_structs::PropertyKey {845			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)846		}847848		/// Key "suffix".849		pub fn suffix() -> up_data_structs::PropertyKey {850			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)851		}852853		/// Key "parentNft".854		pub fn parent_nft() -> up_data_structs::PropertyKey {855			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)856		}857	}858859	/// Convert `byte` to [`PropertyKey`].860	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {861		bytes.to_vec().try_into().map_err(|_| {862			Error::Revert(format!(863				"Property key is too long. Max length is {}.",864				up_data_structs::PropertyKey::bound()865			))866		})867	}868869	/// Convert `bytes` to [`PropertyValue`].870	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {871		bytes.to_vec().try_into().map_err(|_| {872			Error::Revert(format!(873				"Property key is too long. Max length is {}.",874				up_data_structs::PropertyKey::bound()875			))876		})877	}878}
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
 	address[0..16] == ETH_COLLECTION_PREFIX
 }
 
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	let slice = from.as_sub().as_ref();
-	uint256::from_big_endian(slice)
-}
-
 /// Convert `uint256` to `CrossAccountId`.
 pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
 where
@@ -71,22 +62,6 @@
 	from.to_big_endian(&mut new_admin_arr);
 	let account_id = T::AccountId::from(new_admin_arr);
 	T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
-	cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	if cross_account_id.is_canonical_substrate() {
-		let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
-		(Default::default(), sub)
-	} else {
-		let eth = *cross_account_id.as_eth();
-		(eth, Default::default())
-	}
 }
 
 /// Convert tuple `(address, uint256)` to `CrossAccountId`.
@@ -128,10 +103,7 @@
 		T::AccountId: AsRef<[u8; 32]>,
 	{
 		if cross_account_id.is_canonical_substrate() {
-			Self {
-				eth: Default::default(),
-				sub: convert_cross_account_to_uint256::<T>(cross_account_id),
-			}
+			Self::from_sub::<T>(cross_account_id.as_sub())
 		} else {
 			Self {
 				eth: *cross_account_id.as_eth(),
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
     "pallet-evm-coder-substrate/std",
     "pallet-evm/std",
     "up-sponsorship/std",
+    "pallet-common/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -175,18 +175,11 @@
 	///
 	/// @param contractAddress The contract for which a sponsor is requested.
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
-	fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
-		let sponsor =
-			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
-		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
-			&sponsor,
+	fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
+		Ok(EthCrossAccount::from_sub_cross_account::<T>(
+			&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
 		))
 	}
-	// fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
-	// 	Ok(EthCrossAccount::from_sub_cross_account::<T>(
-	// 		&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
-	// 	))
-	// }
 
 	/// Check tat contract has confirmed sponsor.
 	///
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 (Tuple0 memory) {
+	function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return Tuple0(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -618,7 +618,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -1070,7 +1070,7 @@
 		Ok(true)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -738,7 +738,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -750,7 +750,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -995,7 +995,7 @@
 	// 	return false;
 	// }
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -1120,7 +1120,7 @@
 		Ok(true)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -733,7 +733,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +745,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -979,7 +979,7 @@
 	// 	return false;
 	// }
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple0",
+        "internalType": "struct EthCrossAccount",
         "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 (Tuple0 memory);
+	function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -171,8 +171,8 @@
 	function toggleAllowlist(address contractAddress, bool enabled) external;
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -515,14 +515,14 @@
 	///  or in textual repr: mintingFinished()
 	function mintingFinished() external view returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
 	///  or in textual repr: mint(address)
 	function mint(address to) external returns (uint256);
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -674,7 +674,7 @@
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -513,14 +513,14 @@
 	///  or in textual repr: mintingFinished()
 	function mintingFinished() external view returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
 	///  or in textual repr: mint(address)
 	function mint(address to) external returns (uint256);
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -666,7 +666,7 @@
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,7 +17,6 @@
 import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
 import {Contract} from 'web3-eth-contract';
-import exp from 'constants';
 import {ITokenPropertyPermission} from '../util/playgrounds/types';
 
 
@@ -180,9 +179,16 @@
     const caller = await helper.eth.createAccountWithBalance(donor);
     const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
     const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
-    const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
-      collectionAdmin: true,
-      mutable: true}}; });
+    const permissions: ITokenPropertyPermission[] = properties
+      .map(p => {
+        return {
+          key: p.key, permission: {
+            tokenOwner: true,
+            collectionAdmin: true,
+            mutable: true,
+          },
+        };
+      });
     
     
     const collection = await helper.nft.mintCollection(minter, {
@@ -198,7 +204,7 @@
     let tokenId = result.events.Transfer.returnValues.tokenId;
     expect(tokenId).to.be.equal(expectedTokenId);
 
-    const event = result.events.Transfer;
+    let event = result.events.Transfer;
     expect(event.address).to.be.equal(collectionAddress);
     expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
     expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -206,10 +212,16 @@
     
     expectedTokenId = await contract.methods.nextTokenId().call();
     result = await contract.methods.mintCross(receiverCross, properties).send();
+    event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
     tokenId = result.events.Transfer.returnValues.tokenId;
-
+    
     expect(tokenId).to.be.equal(expectedTokenId);
-    
+
     expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
       .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
   });
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,7 +17,7 @@
 import {Pallets, requirePalletsOrSkip} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
-import { ITokenPropertyPermission } from '../util/playgrounds/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
 
 describe('Refungible: Information getting', () => {
   let donor: IKeyringPair;
@@ -159,7 +159,7 @@
     let tokenId = result.events.Transfer.returnValues.tokenId;
     expect(tokenId).to.be.equal(expectedTokenId);
 
-    const event = result.events.Transfer;
+    let event = result.events.Transfer;
     expect(event.address).to.be.equal(collectionAddress);
     expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
     expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -167,6 +167,12 @@
     
     expectedTokenId = await contract.methods.nextTokenId().call();
     result = await contract.methods.mintCross(receiverCross, properties).send();
+    event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
     tokenId = result.events.Transfer.returnValues.tokenId;
 
     expect(tokenId).to.be.equal(expectedTokenId);