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

difftreelog

refactor evm type names

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

30 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		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
@@ -68,13 +68,13 @@
 
 /// Cross account struct
 #[derive(Debug, Default, AbiCoder)]
-pub struct EthCrossAccount {
+pub struct CrossAccount {
 	pub(crate) eth: address,
 	pub(crate) sub: uint256,
 }
 
-impl EthCrossAccount {
-	/// Converts `CrossAccountId` to `EthCrossAccountId`
+impl CrossAccount {
+	/// Converts `CrossAccountId` to [`CrossAccount`]
 	pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
 	where
 		T: pallet_evm::Config,
@@ -89,7 +89,7 @@
 			}
 		}
 	}
-	/// Creates `EthCrossAccount` from substrate account
+	/// Creates [`CrossAccount`] from substrate account
 	pub fn from_sub<T>(account_id: &T::AccountId) -> Self
 	where
 		T: pallet_evm::Config,
@@ -100,7 +100,7 @@
 			sub: uint256::from_big_endian(account_id.as_ref()),
 		}
 	}
-	/// Converts `EthCrossAccount` to `CrossAccountId`
+	/// Converts [`CrossAccount`] to `CrossAccountId`
 	pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
 	where
 		T: pallet_evm::Config,
@@ -127,7 +127,7 @@
 	pub value: evm_coder::types::bytes,
 }
 
-/// [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 #[derive(Debug, Default, Clone, Copy, AbiCoder)]
 #[repr(u8)]
 pub enum CollectionLimitField {
@@ -160,6 +160,7 @@
 	TransferEnabled,
 }
 
+/// [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 #[derive(Debug, Default, AbiCoder)]
 pub struct CollectionLimit {
 	field: CollectionLimitField,
@@ -168,6 +169,7 @@
 }
 
 impl CollectionLimit {
+	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and int value.
 	pub fn from_int(field: CollectionLimitField, value: u32) -> Self {
 		Self {
 			field,
@@ -176,6 +178,7 @@
 		}
 	}
 
+	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and optional int value.
 	pub fn from_opt_int(field: CollectionLimitField, value: Option<u32>) -> Self {
 		value
 			.map(|v| Self {
@@ -190,6 +193,7 @@
 			})
 	}
 
+	/// Make [`CollectionLimit`] from [`CollectionLimitField`] and bool value.
 	pub fn from_opt_bool(field: CollectionLimitField, value: Option<bool>) -> Self {
 		value
 			.map(|v| Self {
@@ -306,6 +310,7 @@
 }
 
 impl PropertyPermission {
+	/// Make vector of [`PropertyPermission`] from [`up_data_structs::PropertyPermission`].
 	pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {
 		vec![
 			PropertyPermission {
@@ -323,6 +328,7 @@
 		]
 	}
 
+	/// Make [`up_data_structs::PropertyPermission`] from vector of [`PropertyPermission`].
 	pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {
 		let mut token_permission = up_data_structs::PropertyPermission::default();
 
@@ -367,6 +373,7 @@
 }
 
 impl TokenPropertyPermission {
+	/// Convert vector of [`TokenPropertyPermission`] into vector of [`up_data_structs::PropertyKeyPermission`].
 	pub fn into_property_key_permissions(
 		permissions: Vec<TokenPropertyPermission>,
 	) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -25,7 +25,6 @@
 	types::*,
 	ToLog,
 };
-use pallet_common::eth::EthCrossAccount;
 use pallet_evm::{
 	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
 	account::CrossAccountId,
@@ -175,10 +174,12 @@
 	///
 	/// @param contractAddress The contract for which a sponsor is requested.
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
-	fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
-		Ok(EthCrossAccount::from_sub_cross_account::<T>(
-			&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
-		))
+	fn sponsor(&self, contract_address: address) -> Result<pallet_common::eth::CrossAccount> {
+		Ok(
+			pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(
+				&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
+			),
+		)
 	}
 
 	/// Check tat contract has confirmed sponsor.
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
+	function sponsor(address contractAddress) public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -266,7 +266,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -27,7 +27,6 @@
 use pallet_common::{
 	CollectionHandle,
 	erc::{CommonEvmHandler, PrecompileResult, CollectionCall},
-	eth::EthCrossAccount,
 };
 use sp_std::vec::Vec;
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -175,7 +174,12 @@
 	}
 
 	#[weight(<SelfWeightOf<T>>::create_item())]
-	fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+	fn mint_cross(
+		&mut self,
+		caller: caller,
+		to: pallet_common::eth::CrossAccount,
+		amount: uint256,
+	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let to = to.into_sub_cross_account::<T>()?;
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
@@ -191,7 +195,7 @@
 	fn approve_cross(
 		&mut self,
 		caller: caller,
-		spender: EthCrossAccount,
+		spender: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -232,7 +236,7 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -274,7 +278,7 @@
 	fn transfer_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -292,8 +296,8 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
-		to: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
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
@@ -114,7 +114,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+	function setCollectionSponsorCross(CrossAccount memory sponsor) public {
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -152,10 +152,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (EthCrossAccount memory) {
+	function collectionSponsor() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -193,7 +193,7 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+	function addCollectionAdminCross(CrossAccount memory newAdmin) public {
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -203,7 +203,7 @@
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+	function removeCollectionAdminCross(CrossAccount memory admin) public {
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -289,7 +289,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+	function allowlistedCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -312,7 +312,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+	function addToCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -334,7 +334,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+	function removeFromCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -370,7 +370,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -394,10 +394,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (EthCrossAccount memory) {
+	function collectionOwner() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	// /// Changes collection owner to another account
@@ -418,10 +418,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+	function collectionAdmins() public view returns (CrossAccount[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new EthCrossAccount[](0);
+		return new CrossAccount[](0);
 	}
 
 	/// Changes collection owner to another account
@@ -430,7 +430,7 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -438,7 +438,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -463,13 +463,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -512,7 +513,7 @@
 
 	/// @dev EVM selector for this function is: 0x269e6158,
 	///  or in textual repr: mintCross((address,uint256),uint256)
-	function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+	function mintCross(CrossAccount memory to, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		to;
 		amount;
@@ -522,7 +523,7 @@
 
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
+	function approveCross(CrossAccount memory spender, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		spender;
 		amount;
@@ -552,7 +553,7 @@
 	/// @param amount The amount that will be burnt.
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {
+	function burnFromCross(CrossAccount memory from, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		from;
 		amount;
@@ -573,7 +574,7 @@
 
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+	function transferCross(CrossAccount memory to, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		to;
 		amount;
@@ -584,8 +585,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 amount
 	) public returns (bool) {
 		require(false, stub_error);
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,6 @@
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
-	eth::{Property as PropertyStruct, EthCrossAccount},
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::call;
@@ -160,7 +159,7 @@
 		&mut self,
 		caller: caller,
 		token_id: uint256,
-		properties: Vec<PropertyStruct>,
+		properties: Vec<pallet_common::eth::Property>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -171,7 +170,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|PropertyStruct { key, value }| {
+			.map(|pallet_common::eth::Property { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -762,9 +761,9 @@
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+	fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {
 		Self::token_owner(&self, token_id.try_into()?)
-			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+			.map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))
 			.ok_or(Error::Revert("key too large".into()))
 	}
 
@@ -773,7 +772,11 @@
 	/// @param tokenId Id for the token.
 	/// @param keys Properties keys. Empty keys for all propertyes.
 	/// @return Vector of properties key/value pairs.
-	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {
+	fn properties(
+		&self,
+		token_id: uint256,
+		keys: Vec<string>,
+	) -> Result<Vec<pallet_common::eth::Property>> {
 		let keys = keys
 			.into_iter()
 			.map(|key| {
@@ -793,7 +796,7 @@
 			let key = string::from_utf8(p.key.to_vec())
 				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
 			let value = bytes(p.value.to_vec());
-			Ok(PropertyStruct { key, value })
+			Ok(pallet_common::eth::Property { key, value })
 		})
 		.collect::<Result<Vec<_>>>()
 	}
@@ -808,7 +811,7 @@
 	fn approve_cross(
 		&mut self,
 		caller: caller,
-		approved: EthCrossAccount,
+		approved: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -847,7 +850,7 @@
 	fn transfer_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -871,8 +874,8 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
-		to: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -918,7 +921,7 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -1040,8 +1043,8 @@
 	fn mint_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
-		properties: Vec<PropertyStruct>,
+		to: pallet_common::eth::CrossAccount,
+		properties: Vec<pallet_common::eth::Property>,
 	) -> Result<uint256> {
 		let token_id = <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
@@ -1051,7 +1054,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|PropertyStruct { key, value }| {
+			.map(|pallet_common::eth::Property { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
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
@@ -258,7 +258,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+	function setCollectionSponsorCross(CrossAccount memory sponsor) public {
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -296,10 +296,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (EthCrossAccount memory) {
+	function collectionSponsor() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -337,7 +337,7 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+	function addCollectionAdminCross(CrossAccount memory newAdmin) public {
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -347,7 +347,7 @@
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+	function removeCollectionAdminCross(CrossAccount memory admin) public {
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -433,7 +433,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+	function allowlistedCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -456,7 +456,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+	function addToCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -478,7 +478,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+	function removeFromCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -514,7 +514,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -538,10 +538,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (EthCrossAccount memory) {
+	function collectionOwner() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+	function collectionAdmins() public view returns (CrossAccount[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new EthCrossAccount[](0);
+		return new CrossAccount[](0);
 	}
 
 	/// Changes collection owner to another account
@@ -574,7 +574,7 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -582,7 +582,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -607,13 +607,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -813,11 +814,11 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+	function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Returns the token properties.
@@ -843,7 +844,7 @@
 	/// @param tokenId The NFT to approve
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {
+	function approveCross(CrossAccount memory approved, uint256 tokenId) public {
 		require(false, stub_error);
 		approved;
 		tokenId;
@@ -871,7 +872,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+	function transferCross(CrossAccount memory to, uint256 tokenId) public {
 		require(false, stub_error);
 		to;
 		tokenId;
@@ -887,8 +888,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -921,7 +922,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
 		require(false, stub_error);
 		from;
 		tokenId;
@@ -973,7 +974,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+	function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
 		require(false, stub_error);
 		to;
 		properties;
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,7 +33,6 @@
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	erc::{CommonEvmHandler, CollectionCall, static_property::key},
-	eth::{Property as PropertyStruct, EthCrossAccount},
 	Error as CommonError,
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -163,7 +162,7 @@
 		&mut self,
 		caller: caller,
 		token_id: uint256,
-		properties: Vec<PropertyStruct>,
+		properties: Vec<pallet_common::eth::Property>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -174,7 +173,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|PropertyStruct { key, value }| {
+			.map(|pallet_common::eth::Property { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -797,9 +796,9 @@
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+	fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {
 		Self::token_owner(&self, token_id.try_into()?)
-			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+			.map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))
 			.ok_or(Error::Revert("key too large".into()))
 	}
 
@@ -808,7 +807,11 @@
 	/// @param tokenId Id for the token.
 	/// @param keys Properties keys. Empty keys for all propertyes.
 	/// @return Vector of properties key/value pairs.
-	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {
+	fn properties(
+		&self,
+		token_id: uint256,
+		keys: Vec<string>,
+	) -> Result<Vec<pallet_common::eth::Property>> {
 		let keys = keys
 			.into_iter()
 			.map(|key| {
@@ -828,7 +831,7 @@
 			let key = string::from_utf8(p.key.to_vec())
 				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
 			let value = bytes(p.value.to_vec());
-			Ok(PropertyStruct { key, value })
+			Ok(pallet_common::eth::Property { key, value })
 		})
 		.collect::<Result<Vec<_>>>()
 	}
@@ -865,7 +868,7 @@
 	fn transfer_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -893,8 +896,8 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
-		to: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -949,7 +952,7 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -1086,8 +1089,8 @@
 	fn mint_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
-		properties: Vec<PropertyStruct>,
+		to: pallet_common::eth::CrossAccount,
+		properties: Vec<pallet_common::eth::Property>,
 	) -> Result<uint256> {
 		let token_id = <TokensMinted<T>>::get(self.id)
 			.checked_add(1)
@@ -1097,7 +1100,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|PropertyStruct { key, value }| {
+			.map(|pallet_common::eth::Property { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
modifiedpallets/refungible/src/erc_token.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -30,7 +30,7 @@
 use pallet_common::{
 	CommonWeightInfo,
 	erc::{CommonEvmHandler, PrecompileResult},
-	eth::{collection_id_to_address, EthCrossAccount},
+	eth::collection_id_to_address,
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
@@ -224,7 +224,7 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -250,7 +250,7 @@
 	fn approve_cross(
 		&mut self,
 		caller: caller,
-		spender: EthCrossAccount,
+		spender: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -280,7 +280,7 @@
 	fn transfer_cross(
 		&mut self,
 		caller: caller,
-		to: EthCrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -303,8 +303,8 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: EthCrossAccount,
-		to: EthCrossAccount,
+		from: pallet_common::eth::CrossAccount,
+		to: pallet_common::eth::CrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -92,12 +92,8 @@
 
 use codec::{Encode, Decode, MaxEncodedLen};
 use core::ops::Deref;
-use derivative::Derivative;
 use evm_coder::ToLog;
-use frame_support::{
-	BoundedBTreeMap, BoundedVec, ensure, fail, storage::with_transaction, transactional,
-	pallet_prelude::ConstU32,
-};
+use frame_support::{BoundedVec, ensure, fail, storage::with_transaction, transactional};
 use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
 use pallet_evm_coder_substrate::WithRecorder;
 use pallet_common::{
@@ -110,11 +106,10 @@
 use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};
 use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
 use up_data_structs::{
-	AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,
-	CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
-	MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
-	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
-	CreateRefungibleExMultipleOwners,
+	AccessMode, budget::Budget, CollectionId, CollectionFlags, CreateCollectionData,
+	CustomDataLimit, mapping::TokenAddressMapping, MAX_REFUNGIBLE_PIECES, Property, PropertyKey,
+	PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue, TokenId,
+	TrySetProperty, PropertiesPermissionMap, CreateRefungibleExMultipleOwners,
 };
 
 pub use pallet::*;
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
@@ -258,7 +258,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+	function setCollectionSponsorCross(CrossAccount memory sponsor) public {
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -296,10 +296,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (EthCrossAccount memory) {
+	function collectionSponsor() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -337,7 +337,7 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+	function addCollectionAdminCross(CrossAccount memory newAdmin) public {
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -347,7 +347,7 @@
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+	function removeCollectionAdminCross(CrossAccount memory admin) public {
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -433,7 +433,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+	function allowlistedCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -456,7 +456,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+	function addToCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -478,7 +478,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+	function removeFromCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -514,7 +514,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -538,10 +538,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (EthCrossAccount memory) {
+	function collectionOwner() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+	function collectionAdmins() public view returns (CrossAccount[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new EthCrossAccount[](0);
+		return new CrossAccount[](0);
 	}
 
 	/// Changes collection owner to another account
@@ -574,7 +574,7 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -582,7 +582,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -607,13 +607,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -811,11 +812,11 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+	function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Returns the token properties.
@@ -856,7 +857,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+	function transferCross(CrossAccount memory to, uint256 tokenId) public {
 		require(false, stub_error);
 		to;
 		tokenId;
@@ -872,8 +873,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -908,7 +909,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
 		require(false, stub_error);
 		from;
 		tokenId;
@@ -960,7 +961,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+	function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
 		require(false, stub_error);
 		to;
 		properties;
modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -58,7 +58,7 @@
 	/// @param amount The amount that will be burnt.
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 amount) public returns (bool) {
+	function burnFromCross(CrossAccount memory from, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		from;
 		amount;
@@ -75,7 +75,7 @@
 	/// @param amount The amount of tokens to be spent.
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
+	function approveCross(CrossAccount memory spender, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		spender;
 		amount;
@@ -100,7 +100,7 @@
 	/// @param amount The amount to be transferred.
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+	function transferCross(CrossAccount memory to, uint256 amount) public returns (bool) {
 		require(false, stub_error);
 		to;
 		amount;
@@ -115,8 +115,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 amount
 	) public returns (bool) {
 		require(false, stub_error);
@@ -129,7 +129,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -226,7 +226,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -56,7 +56,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -73,7 +73,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -100,7 +100,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -127,7 +127,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "spender",
         "type": "tuple"
       },
@@ -154,7 +154,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -172,7 +172,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newOwner",
         "type": "tuple"
       }
@@ -191,7 +191,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount[]",
+        "internalType": "struct CrossAccount[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -279,7 +279,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -322,7 +322,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -381,7 +381,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -425,7 +425,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -450,7 +450,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "admin",
         "type": "tuple"
       }
@@ -474,7 +474,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -565,7 +565,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "sponsor",
         "type": "tuple"
       }
@@ -615,7 +615,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -644,7 +644,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -653,7 +653,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -87,7 +87,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -104,7 +104,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -121,7 +121,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -148,7 +148,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "approved",
         "type": "tuple"
       },
@@ -184,7 +184,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -202,7 +202,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newOwner",
         "type": "tuple"
       }
@@ -221,7 +221,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount[]",
+        "internalType": "struct CrossAccount[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -309,7 +309,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -352,7 +352,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -385,7 +385,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -459,7 +459,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -483,7 +483,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -579,7 +579,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "admin",
         "type": "tuple"
       }
@@ -603,7 +603,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -727,7 +727,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "sponsor",
         "type": "tuple"
       }
@@ -881,7 +881,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -910,7 +910,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -919,7 +919,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -87,7 +87,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newAdmin",
         "type": "tuple"
       }
@@ -104,7 +104,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -121,7 +121,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -166,7 +166,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -184,7 +184,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "newOwner",
         "type": "tuple"
       }
@@ -203,7 +203,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount[]",
+        "internalType": "struct CrossAccount[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -291,7 +291,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -334,7 +334,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -367,7 +367,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -441,7 +441,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -465,7 +465,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -561,7 +561,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "admin",
         "type": "tuple"
       }
@@ -585,7 +585,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "user",
         "type": "tuple"
       }
@@ -709,7 +709,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "sponsor",
         "type": "tuple"
       }
@@ -872,7 +872,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -901,7 +901,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -910,7 +910,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
modifiedtests/src/eth/abi/reFungibleToken.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungibleToken.json
+++ b/tests/src/eth/abi/reFungibleToken.json
@@ -76,7 +76,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "spender",
         "type": "tuple"
       },
@@ -113,7 +113,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -201,7 +201,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
@@ -230,7 +230,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "from",
         "type": "tuple"
       },
@@ -239,7 +239,7 @@
           { "internalType": "address", "name": "eth", "type": "address" },
           { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct EthCrossAccount",
+        "internalType": "struct CrossAccount",
         "name": "to",
         "type": "tuple"
       },
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
+	function sponsor(address contractAddress) external view returns (CrossAccount memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -172,7 +172,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -78,7 +78,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+	function setCollectionSponsorCross(CrossAccount memory sponsor) external;
 
 	/// Whether there is a pending sponsor.
 	/// @dev EVM selector for this function is: 0x058ac185,
@@ -102,7 +102,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (EthCrossAccount memory);
+	function collectionSponsor() external view returns (CrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -127,13 +127,13 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+	function addCollectionAdminCross(CrossAccount memory newAdmin) external;
 
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+	function removeCollectionAdminCross(CrossAccount memory admin) external;
 
 	// /// Add collection admin.
 	// /// @param newAdmin Address of the added administrator.
@@ -186,7 +186,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);
+	function allowlistedCross(CrossAccount memory user) external view returns (bool);
 
 	// /// Add the user to the allowed list.
 	// ///
@@ -200,7 +200,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+	function addToCollectionAllowListCross(CrossAccount memory user) external;
 
 	// /// Remove the user from the allowed list.
 	// ///
@@ -214,7 +214,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+	function removeFromCollectionAllowListCross(CrossAccount memory user) external;
 
 	/// Switch permission for minting.
 	///
@@ -237,7 +237,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+	function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);
 
 	/// Returns collection type
 	///
@@ -252,7 +252,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (EthCrossAccount memory);
+	function collectionOwner() external view returns (CrossAccount memory);
 
 	// /// Changes collection owner to another account
 	// ///
@@ -268,7 +268,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() external view returns (EthCrossAccount[] memory);
+	function collectionAdmins() external view returns (CrossAccount[] memory);
 
 	/// Changes collection owner to another account
 	///
@@ -276,11 +276,11 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -305,13 +305,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -350,11 +351,11 @@
 
 	/// @dev EVM selector for this function is: 0x269e6158,
 	///  or in textual repr: mintCross((address,uint256),uint256)
-	function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+	function mintCross(CrossAccount memory to, uint256 amount) external returns (bool);
 
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
+	function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);
 
 	// /// Burn tokens from account
 	// /// @dev Function that burns an `amount` of the tokens of a given account,
@@ -372,7 +373,7 @@
 	/// @param amount The amount that will be burnt.
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);
+	function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);
 
 	/// Mint tokens for multiple accounts.
 	/// @param amounts array of pairs of account address and amount
@@ -382,13 +383,13 @@
 
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+	function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);
 
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 amount
 	) external returns (bool);
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -180,7 +180,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+	function setCollectionSponsorCross(CrossAccount memory sponsor) external;
 
 	/// Whether there is a pending sponsor.
 	/// @dev EVM selector for this function is: 0x058ac185,
@@ -204,7 +204,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (EthCrossAccount memory);
+	function collectionSponsor() external view returns (CrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -229,13 +229,13 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+	function addCollectionAdminCross(CrossAccount memory newAdmin) external;
 
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+	function removeCollectionAdminCross(CrossAccount memory admin) external;
 
 	// /// Add collection admin.
 	// /// @param newAdmin Address of the added administrator.
@@ -288,7 +288,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);
+	function allowlistedCross(CrossAccount memory user) external view returns (bool);
 
 	// /// Add the user to the allowed list.
 	// ///
@@ -302,7 +302,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+	function addToCollectionAllowListCross(CrossAccount memory user) external;
 
 	// /// Remove the user from the allowed list.
 	// ///
@@ -316,7 +316,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+	function removeFromCollectionAllowListCross(CrossAccount memory user) external;
 
 	/// Switch permission for minting.
 	///
@@ -339,7 +339,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+	function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);
 
 	/// Returns collection type
 	///
@@ -354,7 +354,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (EthCrossAccount memory);
+	function collectionOwner() external view returns (CrossAccount memory);
 
 	// /// Changes collection owner to another account
 	// ///
@@ -370,7 +370,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() external view returns (EthCrossAccount[] memory);
+	function collectionAdmins() external view returns (CrossAccount[] memory);
 
 	/// Changes collection owner to another account
 	///
@@ -378,11 +378,11 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -407,13 +407,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -552,7 +553,7 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);
+	function crossOwnerOf(uint256 tokenId) external view returns (CrossAccount memory);
 
 	/// Returns the token properties.
 	///
@@ -571,7 +572,7 @@
 	/// @param tokenId The NFT to approve
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory approved, uint256 tokenId) external;
+	function approveCross(CrossAccount memory approved, uint256 tokenId) external;
 
 	/// @notice Transfer ownership of an NFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -589,7 +590,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) external;
+	function transferCross(CrossAccount memory to, uint256 tokenId) external;
 
 	/// @notice Transfer ownership of an NFT from cross account address to cross account address
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -600,8 +601,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) external;
 
@@ -623,7 +624,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) external;
 
 	/// @notice Returns next free NFT ID.
 	/// @dev EVM selector for this function is: 0x75794a3c,
@@ -654,7 +655,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+	function mintCross(CrossAccount memory to, Property[] memory properties) external returns (uint256);
 }
 
 /// @dev anonymous struct
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -180,7 +180,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;
+	function setCollectionSponsorCross(CrossAccount memory sponsor) external;
 
 	/// Whether there is a pending sponsor.
 	/// @dev EVM selector for this function is: 0x058ac185,
@@ -204,7 +204,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (EthCrossAccount memory);
+	function collectionSponsor() external view returns (CrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -229,13 +229,13 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;
+	function addCollectionAdminCross(CrossAccount memory newAdmin) external;
 
 	/// Remove collection admin.
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
+	function removeCollectionAdminCross(CrossAccount memory admin) external;
 
 	// /// Add collection admin.
 	// /// @param newAdmin Address of the added administrator.
@@ -288,7 +288,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);
+	function allowlistedCross(CrossAccount memory user) external view returns (bool);
 
 	// /// Add the user to the allowed list.
 	// ///
@@ -302,7 +302,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
+	function addToCollectionAllowListCross(CrossAccount memory user) external;
 
 	// /// Remove the user from the allowed list.
 	// ///
@@ -316,7 +316,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;
+	function removeFromCollectionAllowListCross(CrossAccount memory user) external;
 
 	/// Switch permission for minting.
 	///
@@ -339,7 +339,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);
+	function isOwnerOrAdminCross(CrossAccount memory user) external view returns (bool);
 
 	/// Returns collection type
 	///
@@ -354,7 +354,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() external view returns (EthCrossAccount memory);
+	function collectionOwner() external view returns (CrossAccount memory);
 
 	// /// Changes collection owner to another account
 	// ///
@@ -370,7 +370,7 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() external view returns (EthCrossAccount[] memory);
+	function collectionAdmins() external view returns (CrossAccount[] memory);
 
 	/// Changes collection owner to another account
 	///
@@ -378,11 +378,11 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -407,13 +407,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -550,7 +551,7 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);
+	function crossOwnerOf(uint256 tokenId) external view returns (CrossAccount memory);
 
 	/// Returns the token properties.
 	///
@@ -579,7 +580,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) external;
+	function transferCross(CrossAccount memory to, uint256 tokenId) external;
 
 	/// @notice Transfer ownership of an RFT
 	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -590,8 +591,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) external;
 
@@ -615,7 +616,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) external;
 
 	/// @notice Returns next free RFT ID.
 	/// @dev EVM selector for this function is: 0x75794a3c,
@@ -646,7 +647,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+	function mintCross(CrossAccount memory to, Property[] memory properties) external returns (uint256);
 
 	/// Returns EVM address for refungible token
 	///
modifiedtests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -39,7 +39,7 @@
 	/// @param amount The amount that will be burnt.
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);
+	function burnFromCross(CrossAccount memory from, uint256 amount) external returns (bool);
 
 	/// @dev Approve the passed address to spend the specified amount of tokens on behalf of `msg.sender`.
 	/// Beware that changing an allowance with this method brings the risk that someone may use both the old
@@ -50,7 +50,7 @@
 	/// @param amount The amount of tokens to be spent.
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
+	function approveCross(CrossAccount memory spender, uint256 amount) external returns (bool);
 
 	/// @dev Function that changes total amount of the tokens.
 	///  Throws if `msg.sender` doesn't owns all of the tokens.
@@ -64,7 +64,7 @@
 	/// @param amount The amount to be transferred.
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+	function transferCross(CrossAccount memory to, uint256 amount) external returns (bool);
 
 	/// @dev Transfer tokens from one address to another
 	/// @param from The address which you want to send tokens from
@@ -73,14 +73,14 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 amount
 	) external returns (bool);
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
modifiedtests/src/eth/fractionalizer/Fractionalizer.soldiffbeforeafterboth
--- a/tests/src/eth/fractionalizer/Fractionalizer.sol
+++ b/tests/src/eth/fractionalizer/Fractionalizer.sol
@@ -3,7 +3,7 @@
 import {CollectionHelpers} from "../api/CollectionHelpers.sol";
 import {ContractHelpers} from "../api/ContractHelpers.sol";
 import {UniqueRefungibleToken} from "../api/UniqueRefungibleToken.sol";
-import {UniqueRefungible, EthCrossAccount} from "../api/UniqueRefungible.sol";
+import {UniqueRefungible, CrossAccount} from "../api/UniqueRefungible.sol";
 import {UniqueNFT} from "../api/UniqueNFT.sol";
 
 /// @dev Fractionalization contract. It stores mappings between NFT and RFT tokens,
@@ -63,7 +63,7 @@
 			"Wrong collection type. Collection is not refungible."
 		);
 		require(
-			refungibleContract.isOwnerOrAdminCross(EthCrossAccount({eth: address(this), sub: uint256(0)})),
+			refungibleContract.isOwnerOrAdminCross(CrossAccount({eth: address(this), sub: uint256(0)})),
 			"Fractionalizer contract should be an admin of the collection"
 		);
 		rftCollection = _collection;
@@ -128,7 +128,7 @@
 		address rftTokenAddress;
 		UniqueRefungibleToken rftTokenContract;
 		if (nft2rftMapping[_collection][_token] == 0) {
-            rftTokenId = rftCollectionContract.mint(address(this));
+			rftTokenId = rftCollectionContract.mint(address(this));
 			rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);
 			nft2rftMapping[_collection][_token] = rftTokenId;
 			rft2nftMapping[rftTokenAddress] = Token(_collection, _token);
modifiedtests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -25,6 +25,7 @@
   TokenOwner,
   CollectionAdmin
 }
+
 export enum CollectionLimitField {
   AccountTokenOwnership,
 	SponsoredDataSize,
@@ -37,8 +38,8 @@
 	TransferEnabled
 }
 
-export interface EthCollectionLimit {
+export interface CollectionLimit {
   field: CollectionLimitField,
   status: boolean,
-  value: bigint,
+  value: bigint | number,
 }