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

difftreelog

feat Rewrite tuple to named structures for CollectionLimits.

Trubnikov Sergey2022-12-20parent: #8298cf8.patch.diff
in: master

21 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	execution::{Result, Error},25	weight,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,31	SponsoringRateLimit, SponsorshipState,32};33use alloc::format;3435use crate::{36	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,37	eth::{38		Property as PropertyStruct, EthCrossAccount, CollectionPermissions as EvmPermissions,39		CollectionLimits as EvmCollectionLimits,40	},41	weights::WeightInfo,42};4344/// Events for ethereum collection helper.45#[derive(ToLog)]46pub enum CollectionHelpersEvents {47	/// The collection has been created.48	CollectionCreated {49		/// Collection owner.50		#[indexed]51		owner: address,5253		/// Collection ID.54		#[indexed]55		collection_id: address,56	},57	/// The collection has been destroyed.58	CollectionDestroyed {59		/// Collection ID.60		#[indexed]61		collection_id: address,62	},63	/// The collection has been changed.64	CollectionChanged {65		/// Collection ID.66		#[indexed]67		collection_id: address,68	},6970	/// The token has been changed.71	TokenChanged {72		/// Collection ID.73		#[indexed]74		collection_id: address,75		/// Token ID.76		token_id: uint256,77	},78}7980/// Does not always represent a full collection, for RFT it is either81/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).82pub trait CommonEvmHandler {83	/// Raw compiled binary code of the contract stub84	const CODE: &'static [u8];8586	/// Call precompiled handle.87	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;88}8990/// @title A contract that allows you to work with collections.91#[solidity_interface(name = Collection)]92impl<T: Config> CollectionHandle<T>93where94	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,95{96	/// Set collection property.97	///98	/// @param key Property key.99	/// @param value Propery value.100	#[solidity(hide)]101	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]102	fn set_collection_property(103		&mut self,104		caller: caller,105		key: string,106		value: bytes,107	) -> Result<void> {108		let caller = T::CrossAccountId::from_eth(caller);109		let key = <Vec<u8>>::from(key)110			.try_into()111			.map_err(|_| "key too large")?;112		let value = value.0.try_into().map_err(|_| "value too large")?;113114		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })115			.map_err(dispatch_to_evm::<T>)116	}117118	/// Set collection properties.119	///120	/// @param properties Vector of properties key/value pair.121	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]122	fn set_collection_properties(123		&mut self,124		caller: caller,125		properties: Vec<PropertyStruct>,126	) -> Result<void> {127		let caller = T::CrossAccountId::from_eth(caller);128129		let properties = properties130			.into_iter()131			.map(|PropertyStruct { key, value }| {132				let key = <Vec<u8>>::from(key)133					.try_into()134					.map_err(|_| "key too large")?;135136				let value = value.0.try_into().map_err(|_| "value too large")?;137138				Ok(Property { key, value })139			})140			.collect::<Result<Vec<_>>>()?;141142		<Pallet<T>>::set_collection_properties(self, &caller, properties)143			.map_err(dispatch_to_evm::<T>)144	}145146	/// Delete collection property.147	///148	/// @param key Property key.149	#[solidity(hide)]150	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]151	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {152		let caller = T::CrossAccountId::from_eth(caller);153		let key = <Vec<u8>>::from(key)154			.try_into()155			.map_err(|_| "key too large")?;156157		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)158	}159160	/// Delete collection properties.161	///162	/// @param keys Properties keys.163	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]164	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {165		let caller = T::CrossAccountId::from_eth(caller);166		let keys = keys167			.into_iter()168			.map(|key| {169				<Vec<u8>>::from(key)170					.try_into()171					.map_err(|_| Error::Revert("key too large".into()))172			})173			.collect::<Result<Vec<_>>>()?;174175		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)176	}177178	/// Get collection property.179	///180	/// @dev Throws error if key not found.181	///182	/// @param key Property key.183	/// @return bytes The property corresponding to the key.184	fn collection_property(&self, key: string) -> Result<bytes> {185		let key = <Vec<u8>>::from(key)186			.try_into()187			.map_err(|_| "key too large")?;188189		let props = CollectionProperties::<T>::get(self.id);190		let prop = props.get(&key).ok_or("key not found")?;191192		Ok(bytes(prop.to_vec()))193	}194195	/// Get collection properties.196	///197	/// @param keys Properties keys. Empty keys for all propertyes.198	/// @return Vector of properties key/value pairs.199	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {200		let keys = keys201			.into_iter()202			.map(|key| {203				<Vec<u8>>::from(key)204					.try_into()205					.map_err(|_| Error::Revert("key too large".into()))206			})207			.collect::<Result<Vec<_>>>()?;208209		let properties = Pallet::<T>::filter_collection_properties(210			self.id,211			if keys.is_empty() { None } else { Some(keys) },212		)213		.map_err(dispatch_to_evm::<T>)?;214215		let properties = properties216			.into_iter()217			.map(|p| {218				let key =219					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;220				let value = bytes(p.value.to_vec());221				Ok(PropertyStruct { key, value })222			})223			.collect::<Result<Vec<_>>>()?;224		Ok(properties)225	}226227	/// Set the sponsor of the collection.228	///229	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.230	///231	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.232	#[solidity(hide)]233	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {234		self.consume_store_reads_and_writes(1, 1)?;235236		let caller = T::CrossAccountId::from_eth(caller);237238		let sponsor = T::CrossAccountId::from_eth(sponsor);239		self.set_sponsor(&caller, sponsor.as_sub().clone())240			.map_err(dispatch_to_evm::<T>)241	}242243	/// Set the sponsor of the collection.244	///245	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.246	///247	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.248	fn set_collection_sponsor_cross(249		&mut self,250		caller: caller,251		sponsor: EthCrossAccount,252	) -> Result<void> {253		self.consume_store_reads_and_writes(1, 1)?;254255		let caller = T::CrossAccountId::from_eth(caller);256257		let sponsor = sponsor.into_sub_cross_account::<T>()?;258		self.set_sponsor(&caller, sponsor.as_sub().clone())259			.map_err(dispatch_to_evm::<T>)260	}261262	/// Whether there is a pending sponsor.263	fn has_collection_pending_sponsor(&self) -> Result<bool> {264		Ok(matches!(265			self.collection.sponsorship,266			SponsorshipState::Unconfirmed(_)267		))268	}269270	/// Collection sponsorship confirmation.271	///272	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.273	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {274		self.consume_store_writes(1)?;275276		let caller = T::CrossAccountId::from_eth(caller);277		self.confirm_sponsorship(caller.as_sub())278			.map_err(dispatch_to_evm::<T>)279	}280281	/// Remove collection sponsor.282	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {283		self.consume_store_reads_and_writes(1, 1)?;284		let caller = T::CrossAccountId::from_eth(caller);285		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)286	}287288	/// Get current sponsor.289	///290	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.291	fn collection_sponsor(&self) -> Result<EthCrossAccount> {292		let sponsor = match self.collection.sponsorship.sponsor() {293			Some(sponsor) => sponsor,294			None => return Ok(Default::default()),295		};296297		Ok(EthCrossAccount::from_sub::<T>(&sponsor))298	}299300	/// Get current collection limits.301	///302	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:303	/// 	"accountTokenOwnershipLimit",304	/// 	"sponsoredDataSize",305	/// 	"sponsoredDataRateLimit",306	/// 	"tokenLimit",307	/// 	"sponsorTransferTimeout",308	/// 	"sponsorApproveTimeout"309	///  	"ownerCanTransfer",310	/// 	"ownerCanDestroy",311	/// 	"transfersEnabled"312	/// Return `false` if a limit not set.313	fn collection_limits(&self) -> Result<Vec<(EvmCollectionLimits, bool, uint256)>> {314		let convert_value_limit = |limit: EvmCollectionLimits,315		                           value: Option<u32>|316		 -> (EvmCollectionLimits, bool, uint256) {317			value318				.map(|v| (limit, true, v.into()))319				.unwrap_or((limit, false, Default::default()))320		};321322		let convert_bool_limit = |limit: EvmCollectionLimits,323		                          value: Option<bool>|324		 -> (EvmCollectionLimits, bool, uint256) {325			value326				.map(|v| {327					(328						limit,329						true,330						if v {331							uint256::from(1)332						} else {333							Default::default()334						},335					)336				})337				.unwrap_or((limit, false, Default::default()))338		};339340		let limits = &self.collection.limits;341342		Ok(vec![343			convert_value_limit(344				EvmCollectionLimits::AccountTokenOwnership,345				limits.account_token_ownership_limit,346			),347			convert_value_limit(348				EvmCollectionLimits::SponsoredDataSize,349				limits.sponsored_data_size,350			),351			limits352				.sponsored_data_rate_limit353				.and_then(|limit| {354					if let SponsoringRateLimit::Blocks(blocks) = limit {355						Some((356							EvmCollectionLimits::SponsoredDataRateLimit,357							true,358							blocks.into(),359						))360					} else {361						None362					}363				})364				.unwrap_or((365					EvmCollectionLimits::SponsoredDataRateLimit,366					false,367					Default::default(),368				)),369			convert_value_limit(EvmCollectionLimits::TokenLimit, limits.token_limit),370			convert_value_limit(371				EvmCollectionLimits::SponsorTransferTimeout,372				limits.sponsor_transfer_timeout,373			),374			convert_value_limit(375				EvmCollectionLimits::SponsorApproveTimeout,376				limits.sponsor_approve_timeout,377			),378			convert_bool_limit(379				EvmCollectionLimits::OwnerCanTransfer,380				limits.owner_can_transfer,381			),382			convert_bool_limit(383				EvmCollectionLimits::OwnerCanDestroy,384				limits.owner_can_destroy,385			),386			convert_bool_limit(387				EvmCollectionLimits::TransferEnabled,388				limits.transfers_enabled,389			),390		])391	}392393	/// Set limits for the collection.394	/// @dev Throws error if limit not found.395	/// @param limit Name of the limit. Valid names:396	/// 	"accountTokenOwnershipLimit",397	/// 	"sponsoredDataSize",398	/// 	"sponsoredDataRateLimit",399	/// 	"tokenLimit",400	/// 	"sponsorTransferTimeout",401	/// 	"sponsorApproveTimeout"402	///  	"ownerCanTransfer",403	/// 	"ownerCanDestroy",404	/// 	"transfersEnabled"405	/// @param status enable\disable limit. Works only with `true`.406	/// @param value Value of the limit.407	#[solidity(rename_selector = "setCollectionLimit")]408	fn set_collection_limit(409		&mut self,410		caller: caller,411		limit: EvmCollectionLimits,412		status: bool,413		value: uint256,414	) -> Result<void> {415		self.consume_store_reads_and_writes(1, 1)?;416417		if !status {418			return Err(Error::Revert("user can't disable limits".into()));419		}420421		let value = value422			.try_into()423			.map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;424425		let convert_value_to_bool = || match value {426			0 => Ok(false),427			1 => Ok(true),428			_ => {429				return Err(Error::Revert(format!(430					"can't convert value to boolean \"{}\"",431					value432				)))433			}434		};435436		let mut limits = self.limits.clone();437438		match limit {439			EvmCollectionLimits::AccountTokenOwnership => {440				limits.account_token_ownership_limit = Some(value);441			}442			EvmCollectionLimits::SponsoredDataSize => {443				limits.sponsored_data_size = Some(value);444			}445			EvmCollectionLimits::SponsoredDataRateLimit => {446				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));447			}448			EvmCollectionLimits::TokenLimit => {449				limits.token_limit = Some(value);450			}451			EvmCollectionLimits::SponsorTransferTimeout => {452				limits.sponsor_transfer_timeout = Some(value);453			}454			EvmCollectionLimits::SponsorApproveTimeout => {455				limits.sponsor_approve_timeout = Some(value);456			}457			EvmCollectionLimits::OwnerCanTransfer => {458				limits.owner_can_transfer = Some(convert_value_to_bool()?);459			}460			EvmCollectionLimits::OwnerCanDestroy => {461				limits.owner_can_destroy = Some(convert_value_to_bool()?);462			}463			EvmCollectionLimits::TransferEnabled => {464				limits.transfers_enabled = Some(convert_value_to_bool()?);465			}466			_ => return Err(Error::Revert(format!("unknown limit \"{:?}\"", limit))),467		}468469		let caller = T::CrossAccountId::from_eth(caller);470		<Pallet<T>>::update_limits(&caller, self, limits).map_err(dispatch_to_evm::<T>)471	}472473	/// Get contract address.474	fn contract_address(&self) -> Result<address> {475		Ok(crate::eth::collection_id_to_address(self.id))476	}477478	/// Add collection admin.479	/// @param newAdmin Cross account administrator address.480	fn add_collection_admin_cross(481		&mut self,482		caller: caller,483		new_admin: EthCrossAccount,484	) -> Result<void> {485		self.consume_store_reads_and_writes(2, 2)?;486487		let caller = T::CrossAccountId::from_eth(caller);488		let new_admin = new_admin.into_sub_cross_account::<T>()?;489		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;490		Ok(())491	}492493	/// Remove collection admin.494	/// @param admin Cross account administrator address.495	fn remove_collection_admin_cross(496		&mut self,497		caller: caller,498		admin: EthCrossAccount,499	) -> Result<void> {500		self.consume_store_reads_and_writes(2, 2)?;501502		let caller = T::CrossAccountId::from_eth(caller);503		let admin = admin.into_sub_cross_account::<T>()?;504		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;505		Ok(())506	}507508	/// Add collection admin.509	/// @param newAdmin Address of the added administrator.510	#[solidity(hide)]511	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {512		self.consume_store_reads_and_writes(2, 2)?;513514		let caller = T::CrossAccountId::from_eth(caller);515		let new_admin = T::CrossAccountId::from_eth(new_admin);516		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;517		Ok(())518	}519520	/// Remove collection admin.521	///522	/// @param admin Address of the removed administrator.523	#[solidity(hide)]524	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {525		self.consume_store_reads_and_writes(2, 2)?;526527		let caller = T::CrossAccountId::from_eth(caller);528		let admin = T::CrossAccountId::from_eth(admin);529		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;530		Ok(())531	}532533	/// Toggle accessibility of collection nesting.534	///535	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'536	#[solidity(rename_selector = "setCollectionNesting")]537	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {538		self.consume_store_reads_and_writes(1, 1)?;539540		let caller = T::CrossAccountId::from_eth(caller);541542		let mut permissions = self.collection.permissions.clone();543		let mut nesting = permissions.nesting().clone();544		nesting.token_owner = enable;545		nesting.restricted = None;546		permissions.nesting = Some(nesting);547548		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)549	}550551	/// Toggle accessibility of collection nesting.552	///553	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'554	/// @param collections Addresses of collections that will be available for nesting.555	#[solidity(rename_selector = "setCollectionNesting")]556	fn set_nesting(557		&mut self,558		caller: caller,559		enable: bool,560		collections: Vec<address>,561	) -> Result<void> {562		self.consume_store_reads_and_writes(1, 1)?;563564		if collections.is_empty() {565			return Err("no addresses provided".into());566		}567		let caller = T::CrossAccountId::from_eth(caller);568569		let mut permissions = self.collection.permissions.clone();570		match enable {571			false => {572				let mut nesting = permissions.nesting().clone();573				nesting.token_owner = false;574				nesting.restricted = None;575				permissions.nesting = Some(nesting);576			}577			true => {578				let mut bv = OwnerRestrictedSet::new();579				for i in collections {580					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {581						Error::Revert("Can't convert address into collection id".into())582					})?)583					.map_err(|_| "too many collections")?;584				}585				let mut nesting = permissions.nesting().clone();586				nesting.token_owner = true;587				nesting.restricted = Some(bv);588				permissions.nesting = Some(nesting);589			}590		};591592		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)593	}594595	/// Returns nesting for a collection596	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]597	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {598		let nesting = self.collection.permissions.nesting();599600		Ok((601			nesting.token_owner,602			nesting603				.restricted604				.clone()605				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())606				.unwrap_or_default(),607		))608	}609610	/// Returns permissions for a collection611	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {612		let nesting = self.collection.permissions.nesting();613		Ok(vec![614			(EvmPermissions::CollectionAdmin, nesting.collection_admin),615			(EvmPermissions::TokenOwner, nesting.token_owner),616		])617	}618	/// Set the collection access method.619	/// @param mode Access mode620	/// 	0 for Normal621	/// 	1 for AllowList622	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {623		self.consume_store_reads_and_writes(1, 1)?;624625		let caller = T::CrossAccountId::from_eth(caller);626		let permissions = CollectionPermissions {627			access: Some(match mode {628				0 => AccessMode::Normal,629				1 => AccessMode::AllowList,630				_ => return Err("not supported access mode".into()),631			}),632			..Default::default()633		};634		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)635	}636637	/// Checks that user allowed to operate with collection.638	///639	/// @param user User address to check.640	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {641		let user = user.into_sub_cross_account::<T>()?;642		Ok(Pallet::<T>::allowed(self.id, user))643	}644645	/// Add the user to the allowed list.646	///647	/// @param user Address of a trusted user.648	#[solidity(hide)]649	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {650		self.consume_store_writes(1)?;651652		let caller = T::CrossAccountId::from_eth(caller);653		let user = T::CrossAccountId::from_eth(user);654		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;655		Ok(())656	}657658	/// Add user to allowed list.659	///660	/// @param user User cross account address.661	fn add_to_collection_allow_list_cross(662		&mut self,663		caller: caller,664		user: EthCrossAccount,665	) -> Result<void> {666		self.consume_store_writes(1)?;667668		let caller = T::CrossAccountId::from_eth(caller);669		let user = user.into_sub_cross_account::<T>()?;670		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;671		Ok(())672	}673674	/// Remove the user from the allowed list.675	///676	/// @param user Address of a removed user.677	#[solidity(hide)]678	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {679		self.consume_store_writes(1)?;680681		let caller = T::CrossAccountId::from_eth(caller);682		let user = T::CrossAccountId::from_eth(user);683		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;684		Ok(())685	}686687	/// Remove user from allowed list.688	///689	/// @param user User cross account address.690	fn remove_from_collection_allow_list_cross(691		&mut self,692		caller: caller,693		user: EthCrossAccount,694	) -> Result<void> {695		self.consume_store_writes(1)?;696697		let caller = T::CrossAccountId::from_eth(caller);698		let user = user.into_sub_cross_account::<T>()?;699		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;700		Ok(())701	}702703	/// Switch permission for minting.704	///705	/// @param mode Enable if "true".706	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {707		self.consume_store_reads_and_writes(1, 1)?;708709		let caller = T::CrossAccountId::from_eth(caller);710		let permissions = CollectionPermissions {711			mint_mode: Some(mode),712			..Default::default()713		};714		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)715	}716717	/// Check that account is the owner or admin of the collection718	///719	/// @param user account to verify720	/// @return "true" if account is the owner or admin721	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]722	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {723		let user = T::CrossAccountId::from_eth(user);724		Ok(self.is_owner_or_admin(&user))725	}726727	/// Check that account is the owner or admin of the collection728	///729	/// @param user User cross account to verify730	/// @return "true" if account is the owner or admin731	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {732		let user = user.into_sub_cross_account::<T>()?;733		Ok(self.is_owner_or_admin(&user))734	}735736	/// Returns collection type737	///738	/// @return `Fungible` or `NFT` or `ReFungible`739	fn unique_collection_type(&self) -> Result<string> {740		let mode = match self.collection.mode {741			CollectionMode::Fungible(_) => "Fungible",742			CollectionMode::NFT => "NFT",743			CollectionMode::ReFungible => "ReFungible",744		};745		Ok(mode.into())746	}747748	/// Get collection owner.749	///750	/// @return Tuble with sponsor address and his substrate mirror.751	/// If address is canonical then substrate mirror is zero and vice versa.752	fn collection_owner(&self) -> Result<EthCrossAccount> {753		Ok(EthCrossAccount::from_sub_cross_account::<T>(754			&T::CrossAccountId::from_sub(self.owner.clone()),755		))756	}757758	/// Changes collection owner to another account759	///760	/// @dev Owner can be changed only by current owner761	/// @param newOwner new owner account762	#[solidity(hide, rename_selector = "changeCollectionOwner")]763	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {764		self.consume_store_writes(1)?;765766		let caller = T::CrossAccountId::from_eth(caller);767		let new_owner = T::CrossAccountId::from_eth(new_owner);768		self.change_owner(caller, new_owner)769			.map_err(dispatch_to_evm::<T>)770	}771772	/// Get collection administrators773	///774	/// @return Vector of tuples with admins address and his substrate mirror.775	/// If address is canonical then substrate mirror is zero and vice versa.776	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {777		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))778			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))779			.collect();780		Ok(result)781	}782783	/// Changes collection owner to another account784	///785	/// @dev Owner can be changed only by current owner786	/// @param newOwner new owner cross account787	fn change_collection_owner_cross(788		&mut self,789		caller: caller,790		new_owner: EthCrossAccount,791	) -> Result<void> {792		self.consume_store_writes(1)?;793794		let caller = T::CrossAccountId::from_eth(caller);795		let new_owner = new_owner.into_sub_cross_account::<T>()?;796		self.change_owner(caller, new_owner)797			.map_err(dispatch_to_evm::<T>)798	}799}800801/// ### Note802/// Do not forget to add: `self.consume_store_reads(1)?;`803fn check_is_owner_or_admin<T: Config>(804	caller: caller,805	collection: &CollectionHandle<T>,806) -> Result<T::CrossAccountId> {807	let caller = T::CrossAccountId::from_eth(caller);808	collection809		.check_is_owner_or_admin(&caller)810		.map_err(dispatch_to_evm::<T>)?;811	Ok(caller)812}813814/// ### Note815/// Do not forget to add: `self.consume_store_writes(1)?;`816fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {817	collection818		.check_is_internal()819		.map_err(dispatch_to_evm::<T>)?;820	collection.save().map_err(dispatch_to_evm::<T>)?;821	Ok(())822}823824/// Contains static property keys and values.825pub mod static_property {826	use evm_coder::{827		execution::{Result, Error},828	};829	use alloc::format;830831	const EXPECT_CONVERT_ERROR: &str = "length < limit";832833	/// Keys.834	pub mod key {835		use super::*;836837		/// Key "baseURI".838		pub fn base_uri() -> up_data_structs::PropertyKey {839			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)840		}841842		/// Key "url".843		pub fn url() -> up_data_structs::PropertyKey {844			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)845		}846847		/// Key "suffix".848		pub fn suffix() -> up_data_structs::PropertyKey {849			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)850		}851852		/// Key "parentNft".853		pub fn parent_nft() -> up_data_structs::PropertyKey {854			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)855		}856	}857858	/// Convert `byte` to [`PropertyKey`].859	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {860		bytes.to_vec().try_into().map_err(|_| {861			Error::Revert(format!(862				"Property key is too long. Max length is {}.",863				up_data_structs::PropertyKey::bound()864			))865		})866	}867868	/// Convert `bytes` to [`PropertyValue`].869	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {870		bytes.to_vec().try_into().map_err(|_| {871			Error::Revert(format!(872				"Property key is too long. Max length is {}.",873				up_data_structs::PropertyKey::bound()874			))875		})876	}877}
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	execution::{Result, Error},25	weight,26};27use pallet_evm_coder_substrate::dispatch_to_evm;28use sp_std::{vec, vec::Vec};29use up_data_structs::{30	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,31	SponsoringRateLimit, SponsorshipState,32};33use alloc::format;3435use crate::{36	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,37	eth::{38		Property as PropertyStruct, EthCrossAccount, CollectionPermissions as EvmPermissions,39		CollectionLimitField as EvmCollectionLimits, self,40	},41	weights::WeightInfo,42};4344/// Events for ethereum collection helper.45#[derive(ToLog)]46pub enum CollectionHelpersEvents {47	/// The collection has been created.48	CollectionCreated {49		/// Collection owner.50		#[indexed]51		owner: address,5253		/// Collection ID.54		#[indexed]55		collection_id: address,56	},57	/// The collection has been destroyed.58	CollectionDestroyed {59		/// Collection ID.60		#[indexed]61		collection_id: address,62	},63	/// The collection has been changed.64	CollectionChanged {65		/// Collection ID.66		#[indexed]67		collection_id: address,68	},6970	/// The token has been changed.71	TokenChanged {72		/// Collection ID.73		#[indexed]74		collection_id: address,75		/// Token ID.76		token_id: uint256,77	},78}7980/// Does not always represent a full collection, for RFT it is either81/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).82pub trait CommonEvmHandler {83	/// Raw compiled binary code of the contract stub84	const CODE: &'static [u8];8586	/// Call precompiled handle.87	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;88}8990/// @title A contract that allows you to work with collections.91#[solidity_interface(name = Collection)]92impl<T: Config> CollectionHandle<T>93where94	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,95{96	/// Set collection property.97	///98	/// @param key Property key.99	/// @param value Propery value.100	#[solidity(hide)]101	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]102	fn set_collection_property(103		&mut self,104		caller: caller,105		key: string,106		value: bytes,107	) -> Result<void> {108		let caller = T::CrossAccountId::from_eth(caller);109		let key = <Vec<u8>>::from(key)110			.try_into()111			.map_err(|_| "key too large")?;112		let value = value.0.try_into().map_err(|_| "value too large")?;113114		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })115			.map_err(dispatch_to_evm::<T>)116	}117118	/// Set collection properties.119	///120	/// @param properties Vector of properties key/value pair.121	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]122	fn set_collection_properties(123		&mut self,124		caller: caller,125		properties: Vec<PropertyStruct>,126	) -> Result<void> {127		let caller = T::CrossAccountId::from_eth(caller);128129		let properties = properties130			.into_iter()131			.map(|PropertyStruct { key, value }| {132				let key = <Vec<u8>>::from(key)133					.try_into()134					.map_err(|_| "key too large")?;135136				let value = value.0.try_into().map_err(|_| "value too large")?;137138				Ok(Property { key, value })139			})140			.collect::<Result<Vec<_>>>()?;141142		<Pallet<T>>::set_collection_properties(self, &caller, properties)143			.map_err(dispatch_to_evm::<T>)144	}145146	/// Delete collection property.147	///148	/// @param key Property key.149	#[solidity(hide)]150	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]151	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {152		let caller = T::CrossAccountId::from_eth(caller);153		let key = <Vec<u8>>::from(key)154			.try_into()155			.map_err(|_| "key too large")?;156157		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)158	}159160	/// Delete collection properties.161	///162	/// @param keys Properties keys.163	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]164	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {165		let caller = T::CrossAccountId::from_eth(caller);166		let keys = keys167			.into_iter()168			.map(|key| {169				<Vec<u8>>::from(key)170					.try_into()171					.map_err(|_| Error::Revert("key too large".into()))172			})173			.collect::<Result<Vec<_>>>()?;174175		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)176	}177178	/// Get collection property.179	///180	/// @dev Throws error if key not found.181	///182	/// @param key Property key.183	/// @return bytes The property corresponding to the key.184	fn collection_property(&self, key: string) -> Result<bytes> {185		let key = <Vec<u8>>::from(key)186			.try_into()187			.map_err(|_| "key too large")?;188189		let props = CollectionProperties::<T>::get(self.id);190		let prop = props.get(&key).ok_or("key not found")?;191192		Ok(bytes(prop.to_vec()))193	}194195	/// Get collection properties.196	///197	/// @param keys Properties keys. Empty keys for all propertyes.198	/// @return Vector of properties key/value pairs.199	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {200		let keys = keys201			.into_iter()202			.map(|key| {203				<Vec<u8>>::from(key)204					.try_into()205					.map_err(|_| Error::Revert("key too large".into()))206			})207			.collect::<Result<Vec<_>>>()?;208209		let properties = Pallet::<T>::filter_collection_properties(210			self.id,211			if keys.is_empty() { None } else { Some(keys) },212		)213		.map_err(dispatch_to_evm::<T>)?;214215		let properties = properties216			.into_iter()217			.map(|p| {218				let key =219					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;220				let value = bytes(p.value.to_vec());221				Ok(PropertyStruct { key, value })222			})223			.collect::<Result<Vec<_>>>()?;224		Ok(properties)225	}226227	/// Set the sponsor of the collection.228	///229	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.230	///231	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.232	#[solidity(hide)]233	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {234		self.consume_store_reads_and_writes(1, 1)?;235236		let caller = T::CrossAccountId::from_eth(caller);237238		let sponsor = T::CrossAccountId::from_eth(sponsor);239		self.set_sponsor(&caller, sponsor.as_sub().clone())240			.map_err(dispatch_to_evm::<T>)241	}242243	/// Set the sponsor of the collection.244	///245	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.246	///247	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.248	fn set_collection_sponsor_cross(249		&mut self,250		caller: caller,251		sponsor: EthCrossAccount,252	) -> Result<void> {253		self.consume_store_reads_and_writes(1, 1)?;254255		let caller = T::CrossAccountId::from_eth(caller);256257		let sponsor = sponsor.into_sub_cross_account::<T>()?;258		self.set_sponsor(&caller, sponsor.as_sub().clone())259			.map_err(dispatch_to_evm::<T>)260	}261262	/// Whether there is a pending sponsor.263	fn has_collection_pending_sponsor(&self) -> Result<bool> {264		Ok(matches!(265			self.collection.sponsorship,266			SponsorshipState::Unconfirmed(_)267		))268	}269270	/// Collection sponsorship confirmation.271	///272	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.273	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {274		self.consume_store_writes(1)?;275276		let caller = T::CrossAccountId::from_eth(caller);277		self.confirm_sponsorship(caller.as_sub())278			.map_err(dispatch_to_evm::<T>)279	}280281	/// Remove collection sponsor.282	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {283		self.consume_store_reads_and_writes(1, 1)?;284		let caller = T::CrossAccountId::from_eth(caller);285		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)286	}287288	/// Get current sponsor.289	///290	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.291	fn collection_sponsor(&self) -> Result<EthCrossAccount> {292		let sponsor = match self.collection.sponsorship.sponsor() {293			Some(sponsor) => sponsor,294			None => return Ok(Default::default()),295		};296297		Ok(EthCrossAccount::from_sub::<T>(&sponsor))298	}299300	/// Get current collection limits.301	///302	/// @return Array of collection limits303	fn collection_limits(&self) -> Result<Vec<eth::CollectionLimit>> {304		let limits = &self.collection.limits;305306		Ok(vec![307			eth::CollectionLimit::from_opt_int(308				EvmCollectionLimits::AccountTokenOwnership,309				limits.account_token_ownership_limit,310			),311			eth::CollectionLimit::from_opt_int(312				EvmCollectionLimits::SponsoredDataSize,313				limits.sponsored_data_size,314			),315			limits316				.sponsored_data_rate_limit317				.and_then(|limit| {318					if let SponsoringRateLimit::Blocks(blocks) = limit {319						Some(eth::CollectionLimit::from_int(320							EvmCollectionLimits::SponsoredDataRateLimit,321							blocks,322						))323					} else {324						None325					}326				})327				.unwrap_or(eth::CollectionLimit::from_int(328					EvmCollectionLimits::SponsoredDataRateLimit,329					Default::default(),330				)),331			eth::CollectionLimit::from_opt_int(EvmCollectionLimits::TokenLimit, limits.token_limit),332			eth::CollectionLimit::from_opt_int(333				EvmCollectionLimits::SponsorTransferTimeout,334				limits.sponsor_transfer_timeout,335			),336			eth::CollectionLimit::from_opt_int(337				EvmCollectionLimits::SponsorApproveTimeout,338				limits.sponsor_approve_timeout,339			),340			eth::CollectionLimit::from_opt_bool(341				EvmCollectionLimits::OwnerCanTransfer,342				limits.owner_can_transfer,343			),344			eth::CollectionLimit::from_opt_bool(345				EvmCollectionLimits::OwnerCanDestroy,346				limits.owner_can_destroy,347			),348			eth::CollectionLimit::from_opt_bool(349				EvmCollectionLimits::TransferEnabled,350				limits.transfers_enabled,351			),352		])353	}354355	/// Set limits for the collection.356	/// @dev Throws error if limit not found.357	/// @param limit Some limit.358	#[solidity(rename_selector = "setCollectionLimit")]359	fn set_collection_limit(360		&mut self,361		caller: caller,362		limit: eth::CollectionLimit,363	) -> Result<void> {364		self.consume_store_reads_and_writes(1, 1)?;365366		let caller = T::CrossAccountId::from_eth(caller);367		<Pallet<T>>::update_limits(&caller, self, limit.try_into()?).map_err(dispatch_to_evm::<T>)368	}369370	/// Get contract address.371	fn contract_address(&self) -> Result<address> {372		Ok(crate::eth::collection_id_to_address(self.id))373	}374375	/// Add collection admin.376	/// @param newAdmin Cross account administrator address.377	fn add_collection_admin_cross(378		&mut self,379		caller: caller,380		new_admin: EthCrossAccount,381	) -> Result<void> {382		self.consume_store_reads_and_writes(2, 2)?;383384		let caller = T::CrossAccountId::from_eth(caller);385		let new_admin = new_admin.into_sub_cross_account::<T>()?;386		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;387		Ok(())388	}389390	/// Remove collection admin.391	/// @param admin Cross account administrator address.392	fn remove_collection_admin_cross(393		&mut self,394		caller: caller,395		admin: EthCrossAccount,396	) -> Result<void> {397		self.consume_store_reads_and_writes(2, 2)?;398399		let caller = T::CrossAccountId::from_eth(caller);400		let admin = admin.into_sub_cross_account::<T>()?;401		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;402		Ok(())403	}404405	/// Add collection admin.406	/// @param newAdmin Address of the added administrator.407	#[solidity(hide)]408	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {409		self.consume_store_reads_and_writes(2, 2)?;410411		let caller = T::CrossAccountId::from_eth(caller);412		let new_admin = T::CrossAccountId::from_eth(new_admin);413		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;414		Ok(())415	}416417	/// Remove collection admin.418	///419	/// @param admin Address of the removed administrator.420	#[solidity(hide)]421	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {422		self.consume_store_reads_and_writes(2, 2)?;423424		let caller = T::CrossAccountId::from_eth(caller);425		let admin = T::CrossAccountId::from_eth(admin);426		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;427		Ok(())428	}429430	/// Toggle accessibility of collection nesting.431	///432	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'433	#[solidity(rename_selector = "setCollectionNesting")]434	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {435		self.consume_store_reads_and_writes(1, 1)?;436437		let caller = T::CrossAccountId::from_eth(caller);438439		let mut permissions = self.collection.permissions.clone();440		let mut nesting = permissions.nesting().clone();441		nesting.token_owner = enable;442		nesting.restricted = None;443		permissions.nesting = Some(nesting);444445		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)446	}447448	/// Toggle accessibility of collection nesting.449	///450	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'451	/// @param collections Addresses of collections that will be available for nesting.452	#[solidity(rename_selector = "setCollectionNesting")]453	fn set_nesting(454		&mut self,455		caller: caller,456		enable: bool,457		collections: Vec<address>,458	) -> Result<void> {459		self.consume_store_reads_and_writes(1, 1)?;460461		if collections.is_empty() {462			return Err("no addresses provided".into());463		}464		let caller = T::CrossAccountId::from_eth(caller);465466		let mut permissions = self.collection.permissions.clone();467		match enable {468			false => {469				let mut nesting = permissions.nesting().clone();470				nesting.token_owner = false;471				nesting.restricted = None;472				permissions.nesting = Some(nesting);473			}474			true => {475				let mut bv = OwnerRestrictedSet::new();476				for i in collections {477					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {478						Error::Revert("Can't convert address into collection id".into())479					})?)480					.map_err(|_| "too many collections")?;481				}482				let mut nesting = permissions.nesting().clone();483				nesting.token_owner = true;484				nesting.restricted = Some(bv);485				permissions.nesting = Some(nesting);486			}487		};488489		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)490	}491492	/// Returns nesting for a collection493	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]494	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {495		let nesting = self.collection.permissions.nesting();496497		Ok((498			nesting.token_owner,499			nesting500				.restricted501				.clone()502				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())503				.unwrap_or_default(),504		))505	}506507	/// Returns permissions for a collection508	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {509		let nesting = self.collection.permissions.nesting();510		Ok(vec![511			(EvmPermissions::CollectionAdmin, nesting.collection_admin),512			(EvmPermissions::TokenOwner, nesting.token_owner),513		])514	}515	/// Set the collection access method.516	/// @param mode Access mode517	/// 	0 for Normal518	/// 	1 for AllowList519	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {520		self.consume_store_reads_and_writes(1, 1)?;521522		let caller = T::CrossAccountId::from_eth(caller);523		let permissions = CollectionPermissions {524			access: Some(match mode {525				0 => AccessMode::Normal,526				1 => AccessMode::AllowList,527				_ => return Err("not supported access mode".into()),528			}),529			..Default::default()530		};531		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)532	}533534	/// Checks that user allowed to operate with collection.535	///536	/// @param user User address to check.537	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {538		let user = user.into_sub_cross_account::<T>()?;539		Ok(Pallet::<T>::allowed(self.id, user))540	}541542	/// Add the user to the allowed list.543	///544	/// @param user Address of a trusted user.545	#[solidity(hide)]546	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {547		self.consume_store_writes(1)?;548549		let caller = T::CrossAccountId::from_eth(caller);550		let user = T::CrossAccountId::from_eth(user);551		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;552		Ok(())553	}554555	/// Add user to allowed list.556	///557	/// @param user User cross account address.558	fn add_to_collection_allow_list_cross(559		&mut self,560		caller: caller,561		user: EthCrossAccount,562	) -> Result<void> {563		self.consume_store_writes(1)?;564565		let caller = T::CrossAccountId::from_eth(caller);566		let user = user.into_sub_cross_account::<T>()?;567		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;568		Ok(())569	}570571	/// Remove the user from the allowed list.572	///573	/// @param user Address of a removed user.574	#[solidity(hide)]575	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {576		self.consume_store_writes(1)?;577578		let caller = T::CrossAccountId::from_eth(caller);579		let user = T::CrossAccountId::from_eth(user);580		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;581		Ok(())582	}583584	/// Remove user from allowed list.585	///586	/// @param user User cross account address.587	fn remove_from_collection_allow_list_cross(588		&mut self,589		caller: caller,590		user: EthCrossAccount,591	) -> Result<void> {592		self.consume_store_writes(1)?;593594		let caller = T::CrossAccountId::from_eth(caller);595		let user = user.into_sub_cross_account::<T>()?;596		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;597		Ok(())598	}599600	/// Switch permission for minting.601	///602	/// @param mode Enable if "true".603	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {604		self.consume_store_reads_and_writes(1, 1)?;605606		let caller = T::CrossAccountId::from_eth(caller);607		let permissions = CollectionPermissions {608			mint_mode: Some(mode),609			..Default::default()610		};611		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)612	}613614	/// Check that account is the owner or admin of the collection615	///616	/// @param user account to verify617	/// @return "true" if account is the owner or admin618	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]619	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {620		let user = T::CrossAccountId::from_eth(user);621		Ok(self.is_owner_or_admin(&user))622	}623624	/// Check that account is the owner or admin of the collection625	///626	/// @param user User cross account to verify627	/// @return "true" if account is the owner or admin628	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {629		let user = user.into_sub_cross_account::<T>()?;630		Ok(self.is_owner_or_admin(&user))631	}632633	/// Returns collection type634	///635	/// @return `Fungible` or `NFT` or `ReFungible`636	fn unique_collection_type(&self) -> Result<string> {637		let mode = match self.collection.mode {638			CollectionMode::Fungible(_) => "Fungible",639			CollectionMode::NFT => "NFT",640			CollectionMode::ReFungible => "ReFungible",641		};642		Ok(mode.into())643	}644645	/// Get collection owner.646	///647	/// @return Tuble with sponsor address and his substrate mirror.648	/// If address is canonical then substrate mirror is zero and vice versa.649	fn collection_owner(&self) -> Result<EthCrossAccount> {650		Ok(EthCrossAccount::from_sub_cross_account::<T>(651			&T::CrossAccountId::from_sub(self.owner.clone()),652		))653	}654655	/// Changes collection owner to another account656	///657	/// @dev Owner can be changed only by current owner658	/// @param newOwner new owner account659	#[solidity(hide, rename_selector = "changeCollectionOwner")]660	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {661		self.consume_store_writes(1)?;662663		let caller = T::CrossAccountId::from_eth(caller);664		let new_owner = T::CrossAccountId::from_eth(new_owner);665		self.change_owner(caller, new_owner)666			.map_err(dispatch_to_evm::<T>)667	}668669	/// Get collection administrators670	///671	/// @return Vector of tuples with admins address and his substrate mirror.672	/// If address is canonical then substrate mirror is zero and vice versa.673	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {674		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))675			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))676			.collect();677		Ok(result)678	}679680	/// Changes collection owner to another account681	///682	/// @dev Owner can be changed only by current owner683	/// @param newOwner new owner cross account684	fn change_collection_owner_cross(685		&mut self,686		caller: caller,687		new_owner: EthCrossAccount,688	) -> Result<void> {689		self.consume_store_writes(1)?;690691		let caller = T::CrossAccountId::from_eth(caller);692		let new_owner = new_owner.into_sub_cross_account::<T>()?;693		self.change_owner(caller, new_owner)694			.map_err(dispatch_to_evm::<T>)695	}696}697698/// ### Note699/// Do not forget to add: `self.consume_store_reads(1)?;`700fn check_is_owner_or_admin<T: Config>(701	caller: caller,702	collection: &CollectionHandle<T>,703) -> Result<T::CrossAccountId> {704	let caller = T::CrossAccountId::from_eth(caller);705	collection706		.check_is_owner_or_admin(&caller)707		.map_err(dispatch_to_evm::<T>)?;708	Ok(caller)709}710711/// ### Note712/// Do not forget to add: `self.consume_store_writes(1)?;`713fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {714	collection715		.check_is_internal()716		.map_err(dispatch_to_evm::<T>)?;717	collection.save().map_err(dispatch_to_evm::<T>)?;718	Ok(())719}720721/// Contains static property keys and values.722pub mod static_property {723	use evm_coder::{724		execution::{Result, Error},725	};726	use alloc::format;727728	const EXPECT_CONVERT_ERROR: &str = "length < limit";729730	/// Keys.731	pub mod key {732		use super::*;733734		/// Key "baseURI".735		pub fn base_uri() -> up_data_structs::PropertyKey {736			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)737		}738739		/// Key "url".740		pub fn url() -> up_data_structs::PropertyKey {741			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)742		}743744		/// Key "suffix".745		pub fn suffix() -> up_data_structs::PropertyKey {746			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)747		}748749		/// Key "parentNft".750		pub fn parent_nft() -> up_data_structs::PropertyKey {751			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)752		}753	}754755	/// Convert `byte` to [`PropertyKey`].756	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {757		bytes.to_vec().try_into().map_err(|_| {758			Error::Revert(format!(759				"Property key is too long. Max length is {}.",760				up_data_structs::PropertyKey::bound()761			))762		})763	}764765	/// Convert `bytes` to [`PropertyValue`].766	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {767		bytes.to_vec().try_into().map_err(|_| {768			Error::Revert(format!(769				"Property key is too long. Max length is {}.",770				up_data_structs::PropertyKey::bound()771			))772		})773	}774}
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,6 +16,7 @@
 
 //! The module contains a number of functions for converting and checking ethereum identifiers.
 
+use alloc::format;
 use sp_std::{vec, vec::Vec};
 use evm_coder::{
 	AbiCoder,
@@ -129,7 +130,7 @@
 /// [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
 #[derive(Debug, Default, Clone, Copy, AbiCoder)]
 #[repr(u8)]
-pub enum CollectionLimits {
+pub enum CollectionLimitField {
 	/// How many tokens can a user have on one account.
 	#[default]
 	AccountTokenOwnership,
@@ -158,6 +159,116 @@
 	/// Is it possible to send tokens from this collection between users.
 	TransferEnabled,
 }
+
+#[derive(Debug, Default, AbiCoder)]
+pub struct CollectionLimit {
+	field: CollectionLimitField,
+	status: bool,
+	value: uint256,
+}
+
+impl CollectionLimit {
+	pub fn from_int(field: CollectionLimitField, value: u32) -> Self {
+		Self {
+			field,
+			status: true,
+			value: value.into(),
+		}
+	}
+
+	pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {
+		value
+			.map(|v| Self {
+				field,
+				status: true,
+				value: v.into(),
+			})
+			.unwrap_or(Self {
+				field,
+				status: false,
+				value: Default::default(),
+			})
+	}
+
+	pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {
+		value
+			.map(|v| Self {
+				field,
+				status: true,
+				value: if v {
+					uint256::from(1)
+				} else {
+					Default::default()
+				},
+			})
+			.unwrap_or(Self {
+				field,
+				status: false,
+				value: Default::default(),
+			})
+	}
+}
+
+impl TryInto<up_data_structs::CollectionLimits> for CollectionLimit {
+	type Error = evm_coder::execution::Error;
+
+	fn try_into(self) -> Result<up_data_structs::CollectionLimits, Self::Error> {
+		if !self.status {
+			return Err(Self::Error::Revert("user can't disable limits".into()));
+		}
+
+		let value = self.value.try_into().map_err(|error| {
+			Self::Error::Revert(format!(
+				"can't convert value to u32 \"{}\" because: \"{error}\"",
+				self.value
+			))
+		})?;
+
+		let convert_value_to_bool = || match value {
+			0 => Ok(false),
+			1 => Ok(true),
+			_ => {
+				return Err(Self::Error::Revert(format!(
+					"can't convert value to boolean \"{value}\""
+				)))
+			}
+		};
+
+		let mut limits = up_data_structs::CollectionLimits::default();
+		match self.field {
+			CollectionLimitField::AccountTokenOwnership => {
+				limits.account_token_ownership_limit = Some(value);
+			}
+			CollectionLimitField::SponsoredDataSize => {
+				limits.sponsored_data_size = Some(value);
+			}
+			CollectionLimitField::SponsoredDataRateLimit => {
+				limits.sponsored_data_rate_limit =
+					Some(up_data_structs::SponsoringRateLimit::Blocks(value));
+			}
+			CollectionLimitField::TokenLimit => {
+				limits.token_limit = Some(value);
+			}
+			CollectionLimitField::SponsorTransferTimeout => {
+				limits.sponsor_transfer_timeout = Some(value);
+			}
+			CollectionLimitField::SponsorApproveTimeout => {
+				limits.sponsor_approve_timeout = Some(value);
+			}
+			CollectionLimitField::OwnerCanTransfer => {
+				limits.owner_can_transfer = Some(convert_value_to_bool()?);
+			}
+			CollectionLimitField::OwnerCanDestroy => {
+				limits.owner_can_destroy = Some(convert_value_to_bool()?);
+			}
+			CollectionLimitField::TransferEnabled => {
+				limits.transfers_enabled = Some(convert_value_to_bool()?);
+			}
+		};
+		Ok(limits)
+	}
+}
+
 /// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 #[derive(Default, Debug, Clone, Copy, AbiCoder)]
 #[repr(u8)]
@@ -173,7 +284,7 @@
 /// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
 #[derive(AbiCoder, Copy, Clone, Default, Debug)]
 #[repr(u8)]
-pub enum EthTokenPermissions {
+pub enum TokenPermissionField {
 	/// Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
 	#[default]
 	Mutable,
@@ -189,7 +300,7 @@
 #[derive(Debug, Default, AbiCoder)]
 pub struct PropertyPermission {
 	/// TokenPermission field.
-	code: EthTokenPermissions,
+	code: TokenPermissionField,
 	/// TokenPermission value.
 	value: bool,
 }
@@ -198,15 +309,15 @@
 	pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {
 		vec![
 			PropertyPermission {
-				code: EthTokenPermissions::Mutable,
+				code: TokenPermissionField::Mutable,
 				value: pp.mutable,
 			},
 			PropertyPermission {
-				code: EthTokenPermissions::TokenOwner,
+				code: TokenPermissionField::TokenOwner,
 				value: pp.token_owner,
 			},
 			PropertyPermission {
-				code: EthTokenPermissions::CollectionAdmin,
+				code: TokenPermissionField::CollectionAdmin,
 				value: pp.collection_admin,
 			},
 		]
@@ -217,9 +328,9 @@
 
 		for PropertyPermission { code, value } in permission {
 			match code {
-				EthTokenPermissions::Mutable => token_permission.mutable = value,
-				EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
-				EthTokenPermissions::CollectionAdmin => token_permission.collection_admin = value,
+				TokenPermissionField::Mutable => token_permission.mutable = value,
+				TokenPermissionField::TokenOwner => token_permission.token_owner = value,
+				TokenPermissionField::CollectionAdmin => token_permission.collection_admin = value,
 			}
 		}
 		token_permission
@@ -262,12 +373,12 @@
 		let mut perms = Vec::new();
 
 		for TokenPropertyPermission { key, permissions } in permissions {
-			if permissions.len() > <EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT {
+			if permissions.len() > <TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT {
 				return Err(alloc::format!(
 					"Actual number of fields {} for {}, which exceeds the maximum value of {}",
 					permissions.len(),
 					stringify!(EthTokenPermissions),
-					<EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT
+					<TokenPermissionField as evm_coder::abi::AbiType>::FIELDS_COUNT
 				)
 				.as_str()
 				.into());
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -18,7 +18,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -160,50 +160,23 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple23[] memory) {
+	function collectionLimits() public view returns (CollectionLimit[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple23[](0);
+		return new CollectionLimit[](0);
 	}
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) public {
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
-		status;
-		value;
 		dummy = 0;
 	}
 
@@ -284,19 +257,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple30 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple29(false, new uint256[](0));
+		return Tuple30(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple32[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple33[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple32[](0);
+		return new Tuple33[](0);
 	}
 
 	/// Set the collection access method.
@@ -479,19 +452,25 @@
 }
 
 /// @dev anonymous struct
-struct Tuple32 {
+struct Tuple33 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple29 {
+struct Tuple30 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -510,13 +489,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple23 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -146,13 +146,13 @@
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
 struct PropertyPermission {
 	/// @dev TokenPermission field.
-	EthTokenPermissions code;
+	TokenPermissionField code;
 	/// @dev TokenPermission value.
 	bool value;
 }
 
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
-enum EthTokenPermissions {
+enum TokenPermissionField {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
 	Mutable,
 	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]
@@ -162,7 +162,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -304,50 +304,23 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple35[] memory) {
+	function collectionLimits() public view returns (CollectionLimit[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple35[](0);
+		return new CollectionLimit[](0);
 	}
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) public {
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
-		status;
-		value;
 		dummy = 0;
 	}
 
@@ -428,19 +401,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple42 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple41(false, new uint256[](0));
+		return Tuple42(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple44[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple45[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple44[](0);
+		return new Tuple45[](0);
 	}
 
 	/// Set the collection access method.
@@ -623,19 +596,25 @@
 }
 
 /// @dev anonymous struct
-struct Tuple44 {
+struct Tuple45 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple41 {
+struct Tuple42 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -654,13 +633,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple35 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -146,13 +146,13 @@
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
 struct PropertyPermission {
 	/// @dev TokenPermission field.
-	EthTokenPermissions code;
+	TokenPermissionField code;
 	/// @dev TokenPermission value.
 	bool value;
 }
 
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
-enum EthTokenPermissions {
+enum TokenPermissionField {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
 	Mutable,
 	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]
@@ -162,7 +162,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -304,50 +304,23 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple34[] memory) {
+	function collectionLimits() public view returns (CollectionLimit[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple34[](0);
+		return new CollectionLimit[](0);
 	}
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) public {
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) public {
 		require(false, stub_error);
 		limit;
-		status;
-		value;
 		dummy = 0;
 	}
 
@@ -428,19 +401,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple40 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple40(false, new uint256[](0));
+		return Tuple41(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple43[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple44[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple43[](0);
+		return new Tuple44[](0);
 	}
 
 	/// Set the collection access method.
@@ -623,19 +596,25 @@
 }
 
 /// @dev anonymous struct
-struct Tuple43 {
+struct Tuple44 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple40 {
+struct Tuple41 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -654,13 +633,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple34 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -213,14 +213,14 @@
       {
         "components": [
           {
-            "internalType": "enum CollectionLimits",
-            "name": "field_0",
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "field_1", "type": "bool" },
-          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
         ],
-        "internalType": "struct Tuple23[]",
+        "internalType": "struct CollectionLimit[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -241,7 +241,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple32[]",
+        "internalType": "struct Tuple33[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -262,7 +262,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple29",
+        "internalType": "struct Tuple30",
         "name": "",
         "type": "tuple"
       }
@@ -494,12 +494,19 @@
   {
     "inputs": [
       {
-        "internalType": "enum CollectionLimits",
+        "components": [
+          {
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
+        ],
+        "internalType": "struct CollectionLimit",
         "name": "limit",
-        "type": "uint8"
-      },
-      { "internalType": "bool", "name": "status", "type": "bool" },
-      { "internalType": "uint256", "name": "value", "type": "uint256" }
+        "type": "tuple"
+      }
     ],
     "name": "setCollectionLimit",
     "outputs": [],
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -243,14 +243,14 @@
       {
         "components": [
           {
-            "internalType": "enum CollectionLimits",
-            "name": "field_0",
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "field_1", "type": "bool" },
-          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
         ],
-        "internalType": "struct Tuple35[]",
+        "internalType": "struct CollectionLimit[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -271,7 +271,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple44[]",
+        "internalType": "struct Tuple45[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -292,7 +292,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple41",
+        "internalType": "struct Tuple42",
         "name": "",
         "type": "tuple"
       }
@@ -656,12 +656,19 @@
   {
     "inputs": [
       {
-        "internalType": "enum CollectionLimits",
+        "components": [
+          {
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
+        ],
+        "internalType": "struct CollectionLimit",
         "name": "limit",
-        "type": "uint8"
-      },
-      { "internalType": "bool", "name": "status", "type": "bool" },
-      { "internalType": "uint256", "name": "value", "type": "uint256" }
+        "type": "tuple"
+      }
     ],
     "name": "setCollectionLimit",
     "outputs": [],
@@ -756,7 +763,7 @@
           {
             "components": [
               {
-                "internalType": "enum EthTokenPermissions",
+                "internalType": "enum TokenPermissionField",
                 "name": "code",
                 "type": "uint8"
               },
@@ -822,7 +829,7 @@
           {
             "components": [
               {
-                "internalType": "enum EthTokenPermissions",
+                "internalType": "enum TokenPermissionField",
                 "name": "code",
                 "type": "uint8"
               },
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -225,14 +225,14 @@
       {
         "components": [
           {
-            "internalType": "enum CollectionLimits",
-            "name": "field_0",
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "field_1", "type": "bool" },
-          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
         ],
-        "internalType": "struct Tuple34[]",
+        "internalType": "struct CollectionLimit[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -253,7 +253,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple43[]",
+        "internalType": "struct Tuple44[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -274,7 +274,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple40",
+        "internalType": "struct Tuple41",
         "name": "",
         "type": "tuple"
       }
@@ -638,12 +638,19 @@
   {
     "inputs": [
       {
-        "internalType": "enum CollectionLimits",
+        "components": [
+          {
+            "internalType": "enum CollectionLimitField",
+            "name": "field",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "status", "type": "bool" },
+          { "internalType": "uint256", "name": "value", "type": "uint256" }
+        ],
+        "internalType": "struct CollectionLimit",
         "name": "limit",
-        "type": "uint8"
-      },
-      { "internalType": "bool", "name": "status", "type": "bool" },
-      { "internalType": "uint256", "name": "value", "type": "uint256" }
+        "type": "tuple"
+      }
     ],
     "name": "setCollectionLimit",
     "outputs": [],
@@ -738,7 +745,7 @@
           {
             "components": [
               {
-                "internalType": "enum EthTokenPermissions",
+                "internalType": "enum TokenPermissionField",
                 "name": "code",
                 "type": "uint8"
               },
@@ -813,7 +820,7 @@
           {
             "components": [
               {
-                "internalType": "enum EthTokenPermissions",
+                "internalType": "enum TokenPermissionField",
                 "name": "code",
                 "type": "uint8"
               },
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,7 +13,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -106,42 +106,17 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple21[] memory);
+	function collectionLimits() external view returns (CollectionLimit[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) external;
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
 	/// @dev EVM selector for this function is: 0xf6b4dfb4,
@@ -330,8 +305,14 @@
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -350,13 +331,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple21 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -99,13 +99,13 @@
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
 struct PropertyPermission {
 	/// @dev TokenPermission field.
-	EthTokenPermissions code;
+	TokenPermissionField code;
 	/// @dev TokenPermission value.
 	bool value;
 }
 
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
-enum EthTokenPermissions {
+enum TokenPermissionField {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
 	Mutable,
 	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]
@@ -115,7 +115,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -208,42 +208,17 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple31[] memory);
+	function collectionLimits() external view returns (CollectionLimit[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) external;
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
 	/// @dev EVM selector for this function is: 0xf6b4dfb4,
@@ -432,8 +407,14 @@
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -452,13 +433,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple31 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -99,13 +99,13 @@
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
 struct PropertyPermission {
 	/// @dev TokenPermission field.
-	EthTokenPermissions code;
+	TokenPermissionField code;
 	/// @dev TokenPermission value.
 	bool value;
 }
 
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
-enum EthTokenPermissions {
+enum TokenPermissionField {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
 	Mutable,
 	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]
@@ -115,7 +115,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0x81172a75
+/// @dev the ERC-165 identifier for this interface is 0x23201442
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -208,42 +208,17 @@
 
 	/// Get current collection limits.
 	///
-	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// Return `false` if a limit not set.
+	/// @return Array of collection limits
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple30[] memory);
+	function collectionLimits() external view returns (CollectionLimit[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
-	/// @param limit Name of the limit. Valid names:
-	/// 	"accountTokenOwnershipLimit",
-	/// 	"sponsoredDataSize",
-	/// 	"sponsoredDataRateLimit",
-	/// 	"tokenLimit",
-	/// 	"sponsorTransferTimeout",
-	/// 	"sponsorApproveTimeout"
-	///  	"ownerCanTransfer",
-	/// 	"ownerCanDestroy",
-	/// 	"transfersEnabled"
-	/// @param status enable\disable limit. Works only with `true`.
-	/// @param value Value of the limit.
-	/// @dev EVM selector for this function is: 0x88150bd0,
-	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
-	function setCollectionLimit(
-		CollectionLimits limit,
-		bool status,
-		uint256 value
-	) external;
+	/// @param limit Some limit.
+	/// @dev EVM selector for this function is: 0x2a2235e7,
+	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))
+	function setCollectionLimit(CollectionLimit memory limit) external;
 
 	/// Get contract address.
 	/// @dev EVM selector for this function is: 0xf6b4dfb4,
@@ -432,8 +407,14 @@
 	uint256[] field_1;
 }
 
+struct CollectionLimit {
+	CollectionLimitField field;
+	bool status;
+	uint256 value;
+}
+
 /// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
-enum CollectionLimits {
+enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
 	/// @dev How many bytes of data are available for sponsorship.
@@ -452,13 +433,6 @@
 	OwnerCanDestroy,
 	/// @dev Is it possible to send tokens from this collection between users.
 	TransferEnabled
-}
-
-/// @dev anonymous struct
-struct Tuple30 {
-	CollectionLimits field_0;
-	bool field_1;
-	uint256 field_2;
 }
 
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
modifiedtests/src/eth/collectionLimits.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionLimits.test.ts
+++ b/tests/src/eth/collectionLimits.test.ts
@@ -1,7 +1,7 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {Pallets} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
-import {CollectionLimits} from './util/playgrounds/types';
+import {CollectionLimitField} from './util/playgrounds/types';
 
 
 describe('Can set collection limits', () => {
@@ -46,15 +46,15 @@
       };
      
       const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, limits.accountTokenOwnershipLimit).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.SponsoredDataSize, true, limits.sponsoredDataSize).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.SponsoredDataRateLimit, true, limits.sponsoredDataRateLimit).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.TokenLimit, true, limits.tokenLimit).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.SponsorTransferTimeout, true, limits.sponsorTransferTimeout).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.SponsorApproveTimeout, true, limits.sponsorApproveTimeout).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.OwnerCanTransfer, true, limits.ownerCanTransfer).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.OwnerCanDestroy, true, limits.ownerCanDestroy).send();
-      await collectionEvm.methods.setCollectionLimit(CollectionLimits.TransferEnabled, true, limits.transfersEnabled).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: limits.accountTokenOwnershipLimit}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: limits.sponsoredDataSize}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsoredDataRateLimit, status: true, value: limits.sponsoredDataRateLimit}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TokenLimit, status: true, value: limits.tokenLimit}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorTransferTimeout, status: true, value: limits.sponsorTransferTimeout}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.SponsorApproveTimeout, status: true, value: limits.sponsorApproveTimeout}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: limits.ownerCanTransfer}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanDestroy, status: true, value: limits.ownerCanDestroy}).send();
+      await collectionEvm.methods.setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: limits.transfersEnabled}).send();
       
       // Check limits from sub:
       const data = (await helper.rft.getData(collectionId))!;
@@ -63,15 +63,15 @@
       // Check limits from eth:
       const limitsEvm = await collectionEvm.methods.collectionLimits().call({from: owner});
       expect(limitsEvm).to.have.length(9);
-      expect(limitsEvm[0]).to.deep.eq([CollectionLimits.AccountTokenOwnership.toString(), true, limits.accountTokenOwnershipLimit.toString()]);
-      expect(limitsEvm[1]).to.deep.eq([CollectionLimits.SponsoredDataSize.toString(), true, limits.sponsoredDataSize.toString()]);
-      expect(limitsEvm[2]).to.deep.eq([CollectionLimits.SponsoredDataRateLimit.toString(), true, limits.sponsoredDataRateLimit.toString()]);
-      expect(limitsEvm[3]).to.deep.eq([CollectionLimits.TokenLimit.toString(), true, limits.tokenLimit.toString()]);
-      expect(limitsEvm[4]).to.deep.eq([CollectionLimits.SponsorTransferTimeout.toString(), true, limits.sponsorTransferTimeout.toString()]);
-      expect(limitsEvm[5]).to.deep.eq([CollectionLimits.SponsorApproveTimeout.toString(), true, limits.sponsorApproveTimeout.toString()]);
-      expect(limitsEvm[6]).to.deep.eq([CollectionLimits.OwnerCanTransfer.toString(), true, limits.ownerCanTransfer.toString()]);
-      expect(limitsEvm[7]).to.deep.eq([CollectionLimits.OwnerCanDestroy.toString(), true, limits.ownerCanDestroy.toString()]);
-      expect(limitsEvm[8]).to.deep.eq([CollectionLimits.TransferEnabled.toString(), true, limits.transfersEnabled.toString()]);
+      expect(limitsEvm[0]).to.deep.eq([CollectionLimitField.AccountTokenOwnership.toString(), true, limits.accountTokenOwnershipLimit.toString()]);
+      expect(limitsEvm[1]).to.deep.eq([CollectionLimitField.SponsoredDataSize.toString(), true, limits.sponsoredDataSize.toString()]);
+      expect(limitsEvm[2]).to.deep.eq([CollectionLimitField.SponsoredDataRateLimit.toString(), true, limits.sponsoredDataRateLimit.toString()]);
+      expect(limitsEvm[3]).to.deep.eq([CollectionLimitField.TokenLimit.toString(), true, limits.tokenLimit.toString()]);
+      expect(limitsEvm[4]).to.deep.eq([CollectionLimitField.SponsorTransferTimeout.toString(), true, limits.sponsorTransferTimeout.toString()]);
+      expect(limitsEvm[5]).to.deep.eq([CollectionLimitField.SponsorApproveTimeout.toString(), true, limits.sponsorApproveTimeout.toString()]);
+      expect(limitsEvm[6]).to.deep.eq([CollectionLimitField.OwnerCanTransfer.toString(), true, limits.ownerCanTransfer.toString()]);
+      expect(limitsEvm[7]).to.deep.eq([CollectionLimitField.OwnerCanDestroy.toString(), true, limits.ownerCanDestroy.toString()]);
+      expect(limitsEvm[8]).to.deep.eq([CollectionLimitField.TransferEnabled.toString(), true, limits.transfersEnabled.toString()]);
     }));
 });
 
@@ -101,24 +101,24 @@
 
       // Cannot set non-existing limit
       await expect(collectionEvm.methods
-        .setCollectionLimit(9, true, 1)
-        .call()).to.be.rejectedWith('Returned error: VM Exception while processing transaction: revert Value not convertible into enum "CollectionLimits"');      
+        .setCollectionLimit({field: 9, status: true, value: 1})
+        .call()).to.be.rejectedWith('Value not convertible into enum "CollectionLimitField"');      
         
       // Cannot disable limits
       await expect(collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, false, 200)
-        .call()).to.be.rejectedWith('Returned error: VM Exception while processing transaction: revert user can\'t disable limits');
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: false, value: 200})
+        .call()).to.be.rejectedWith('user can\'t disable limits');
 
       await expect(collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, invalidLimits.accountTokenOwnershipLimit)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: invalidLimits.accountTokenOwnershipLimit})
         .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);
  
       await expect(collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.TransferEnabled, true, 3)
+        .setCollectionLimit({field: CollectionLimitField.TransferEnabled, status: true, value: 3})
         .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);
 
       expect(() => collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.SponsoredDataSize, true, -1).send()).to.throw('value out-of-bounds');
+        .setCollectionLimit({field: CollectionLimitField.SponsoredDataSize, status: true, value: -1}).send()).to.throw('value out-of-bounds');
     }));
 
   [
@@ -133,12 +133,12 @@
 
       const collectionEvm = helper.ethNativeContract.collection(collectionAddress, testCase.case, owner);
       await expect(collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call({from: nonOwner}))
         .to.be.rejectedWith('NoPermission');
 
       await expect(collectionEvm.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .send({from: nonOwner}))
         .to.be.rejected;
     }));
modifiedtests/src/eth/createFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -18,7 +18,7 @@
 import {evmToAddress} from '@polkadot/util-crypto';
 import {Pallets, requirePalletsOrSkip} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
-import { CollectionLimits } from './util/playgrounds/types';
+import {CollectionLimitField} from './util/playgrounds/types';
 
 const DECIMALS = 18;
 
@@ -197,7 +197,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -222,7 +222,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });    
modifiedtests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -17,7 +17,7 @@
 import {evmToAddress} from '@polkadot/util-crypto';
 import {IKeyringPair} from '@polkadot/types/types';
 import {expect, itEth, usingEthPlaygrounds} from './util';
-import { CollectionLimits } from './util/playgrounds/types';
+import {CollectionLimitField} from './util/playgrounds/types';
 
 
 describe('Create NFT collection from EVM', () => {
@@ -208,7 +208,7 @@
     }
     {
       await expect(malfeasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -233,7 +233,7 @@
     }
     {
       await expect(malfeasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
modifiedtests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -18,7 +18,7 @@
 import {IKeyringPair} from '@polkadot/types/types';
 import {Pallets, requirePalletsOrSkip} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
-import {CollectionLimits} from './util/playgrounds/types';
+import {CollectionLimitField} from './util/playgrounds/types';
 
 
 describe('Create RFT collection from EVM', () => {
@@ -240,7 +240,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
@@ -265,7 +265,7 @@
     }
     {
       await expect(peasantCollection.methods
-        .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)
+        .setCollectionLimit({field: CollectionLimitField.AccountTokenOwnership, status: true, value: 1000})
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
     }
   });
modifiedtests/src/eth/events.test.tsdiffbeforeafterboth
--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -19,7 +19,7 @@
 import {EthUniqueHelper, itEth, usingEthPlaygrounds} from './util';
 import {IEvent, TCollectionMode} from '../util/playgrounds/types';
 import {Pallets, requirePalletsOrSkip} from '../util';
-import {CollectionLimits, EthTokenPermissions, NormalizedEvent} from './util/playgrounds/types';
+import {CollectionLimitField, TokenPermissionField, NormalizedEvent} from './util/playgrounds/types';
 
 let donor: IKeyringPair;
   
@@ -121,9 +121,9 @@
   const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['PropertyPermissionSet']}]);
   await collection.methods.setTokenPropertyPermissions([
     ['A', [
-      [EthTokenPermissions.Mutable, true], 
-      [EthTokenPermissions.TokenOwner, true], 
-      [EthTokenPermissions.CollectionAdmin, true]],
+      [TokenPermissionField.Mutable, true], 
+      [TokenPermissionField.TokenOwner, true], 
+      [TokenPermissionField.CollectionAdmin, true]],
     ],
   ]).send({from: owner});
   await helper.wait.newBlocks(1);
@@ -233,7 +233,7 @@
   });
   const {unsubscribe, collectedEvents: subEvents} = await helper.subscribeEvents([{section: 'common', names: ['CollectionLimitSet']}]);
   {
-    await collection.methods.setCollectionLimit(CollectionLimits.OwnerCanTransfer, true, 0).send({from: owner});
+    await collection.methods.setCollectionLimit({field: CollectionLimitField.OwnerCanTransfer, status: true, value: 0}).send({from: owner});
     await helper.wait.newBlocks(1);
     expect(ethEvents).to.containSubset([
       {
@@ -379,9 +379,9 @@
   const tokenId = result.events.Transfer.returnValues.tokenId;
   await collection.methods.setTokenPropertyPermissions([
     ['A', [
-      [EthTokenPermissions.Mutable, true], 
-      [EthTokenPermissions.TokenOwner, true], 
-      [EthTokenPermissions.CollectionAdmin, true]],
+      [TokenPermissionField.Mutable, true], 
+      [TokenPermissionField.TokenOwner, true], 
+      [TokenPermissionField.CollectionAdmin, true]],
     ],
   ]).send({from: owner});
 
modifiedtests/src/eth/tokenProperties.test.tsdiffbeforeafterboth
--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -20,7 +20,7 @@
 import {ITokenPropertyPermission} from '../util/playgrounds/types';
 import {Pallets} from '../util';
 import {UniqueNFTCollection, UniqueNFToken, UniqueRFTCollection} from '../util/playgrounds/unique';
-import {EthTokenPermissions} from './util/playgrounds/types';
+import {TokenPermissionField} from './util/playgrounds/types';
 
 describe('EVM token properties', () => {
   let donor: IKeyringPair;
@@ -47,9 +47,9 @@
 
         await collection.methods.setTokenPropertyPermissions([
           ['testKey', [
-            [EthTokenPermissions.Mutable, mutable], 
-            [EthTokenPermissions.TokenOwner, tokenOwner], 
-            [EthTokenPermissions.CollectionAdmin, collectionAdmin]],
+            [TokenPermissionField.Mutable, mutable], 
+            [TokenPermissionField.TokenOwner, tokenOwner], 
+            [TokenPermissionField.CollectionAdmin, collectionAdmin]],
           ],
         ]).send({from: caller.eth});
       
@@ -60,9 +60,9 @@
 
         expect(await collection.methods.tokenPropertyPermissions().call({from: caller.eth})).to.be.like([
           ['testKey', [
-            [EthTokenPermissions.Mutable.toString(), mutable], 
-            [EthTokenPermissions.TokenOwner.toString(), tokenOwner], 
-            [EthTokenPermissions.CollectionAdmin.toString(), collectionAdmin]],
+            [TokenPermissionField.Mutable.toString(), mutable], 
+            [TokenPermissionField.TokenOwner.toString(), tokenOwner], 
+            [TokenPermissionField.CollectionAdmin.toString(), collectionAdmin]],
           ],
         ]);
       }
@@ -80,19 +80,19 @@
 
       await collection.methods.setTokenPropertyPermissions([
         ['testKey_0', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
         ['testKey_1', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, false], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, false], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
         ['testKey_2', [
-          [EthTokenPermissions.Mutable, false], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, false]],
+          [TokenPermissionField.Mutable, false], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, false]],
         ],
       ]).send({from: owner});
       
@@ -113,19 +113,19 @@
 
       expect(await collection.methods.tokenPropertyPermissions().call({from: owner})).to.be.like([
         ['testKey_0', [
-          [EthTokenPermissions.Mutable.toString(), true], 
-          [EthTokenPermissions.TokenOwner.toString(), true], 
-          [EthTokenPermissions.CollectionAdmin.toString(), true]],
+          [TokenPermissionField.Mutable.toString(), true], 
+          [TokenPermissionField.TokenOwner.toString(), true], 
+          [TokenPermissionField.CollectionAdmin.toString(), true]],
         ],
         ['testKey_1', [
-          [EthTokenPermissions.Mutable.toString(), true], 
-          [EthTokenPermissions.TokenOwner.toString(), false], 
-          [EthTokenPermissions.CollectionAdmin.toString(), true]],
+          [TokenPermissionField.Mutable.toString(), true], 
+          [TokenPermissionField.TokenOwner.toString(), false], 
+          [TokenPermissionField.CollectionAdmin.toString(), true]],
         ],
         ['testKey_2', [
-          [EthTokenPermissions.Mutable.toString(), false], 
-          [EthTokenPermissions.TokenOwner.toString(), true], 
-          [EthTokenPermissions.CollectionAdmin.toString(), false]],
+          [TokenPermissionField.Mutable.toString(), false], 
+          [TokenPermissionField.TokenOwner.toString(), true], 
+          [TokenPermissionField.CollectionAdmin.toString(), false]],
         ],
       ]);
     }));
@@ -144,19 +144,19 @@
 
       await collection.methods.setTokenPropertyPermissions([
         ['testKey_0', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
         ['testKey_1', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, false], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, false], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
         ['testKey_2', [
-          [EthTokenPermissions.Mutable, false], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, false]],
+          [TokenPermissionField.Mutable, false], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, false]],
         ],
       ]).send({from: caller.eth});
       
@@ -177,19 +177,19 @@
 
       expect(await collection.methods.tokenPropertyPermissions().call({from: caller.eth})).to.be.like([
         ['testKey_0', [
-          [EthTokenPermissions.Mutable.toString(), true], 
-          [EthTokenPermissions.TokenOwner.toString(), true], 
-          [EthTokenPermissions.CollectionAdmin.toString(), true]],
+          [TokenPermissionField.Mutable.toString(), true], 
+          [TokenPermissionField.TokenOwner.toString(), true], 
+          [TokenPermissionField.CollectionAdmin.toString(), true]],
         ],
         ['testKey_1', [
-          [EthTokenPermissions.Mutable.toString(), true], 
-          [EthTokenPermissions.TokenOwner.toString(), false], 
-          [EthTokenPermissions.CollectionAdmin.toString(), true]],
+          [TokenPermissionField.Mutable.toString(), true], 
+          [TokenPermissionField.TokenOwner.toString(), false], 
+          [TokenPermissionField.CollectionAdmin.toString(), true]],
         ],
         ['testKey_2', [
-          [EthTokenPermissions.Mutable.toString(), false], 
-          [EthTokenPermissions.TokenOwner.toString(), true], 
-          [EthTokenPermissions.CollectionAdmin.toString(), false]],
+          [TokenPermissionField.Mutable.toString(), false], 
+          [TokenPermissionField.TokenOwner.toString(), true], 
+          [TokenPermissionField.CollectionAdmin.toString(), false]],
         ],
       ]);
       
@@ -460,9 +460,9 @@
   
       await expect(collection.methods.setTokenPropertyPermissions([
         ['testKey_0', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
       ]).call({from: caller})).to.be.rejectedWith('NoPermission');  
     }));
@@ -480,9 +480,9 @@
       await expect(collection.methods.setTokenPropertyPermissions([
         // "Space" is invalid character
         ['testKey 0', [
-          [EthTokenPermissions.Mutable, true], 
-          [EthTokenPermissions.TokenOwner, true], 
-          [EthTokenPermissions.CollectionAdmin, true]],
+          [TokenPermissionField.Mutable, true], 
+          [TokenPermissionField.TokenOwner, true], 
+          [TokenPermissionField.CollectionAdmin, true]],
         ],
       ]).call({from: owner})).to.be.rejectedWith('InvalidCharacterInPropertyKey');  
     }));
modifiedtests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -20,12 +20,12 @@
 
 export type EthProperty = string[];
 
-export enum EthTokenPermissions {
+export enum TokenPermissionField {
   Mutable,
   TokenOwner,
   CollectionAdmin
 }
-export enum CollectionLimits {
+export enum CollectionLimitField {
   AccountTokenOwnership,
 	SponsoredDataSize,
 	SponsoredDataRateLimit,
@@ -36,3 +36,9 @@
 	OwnerCanDestroy,
 	TransferEnabled
 }
+
+export interface EthCollectionLimit {
+  field: CollectionLimitField,
+  status: boolean,
+  value: bigint,
+}