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
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -35,8 +35,7 @@
 use crate::{
 	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
 	eth::{
-		Property as PropertyStruct, EthCrossAccount, CollectionPermissions as EvmPermissions,
-		CollectionLimitField as EvmCollectionLimits, self,
+		CollectionPermissions as EvmPermissions, CollectionLimitField as EvmCollectionLimits, self,
 	},
 	weights::WeightInfo,
 };
@@ -122,13 +121,13 @@
 	fn set_collection_properties(
 		&mut self,
 		caller: caller,
-		properties: Vec<PropertyStruct>,
+		properties: Vec<eth::Property>,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 
 		let properties = properties
 			.into_iter()
-			.map(|PropertyStruct { key, value }| {
+			.map(|eth::Property { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -196,7 +195,7 @@
 	///
 	/// @param keys Properties keys. Empty keys for all propertyes.
 	/// @return Vector of properties key/value pairs.
-	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {
+	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<eth::Property>> {
 		let keys = keys
 			.into_iter()
 			.map(|key| {
@@ -218,7 +217,7 @@
 				let key =
 					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
 				let value = bytes(p.value.to_vec());
-				Ok(PropertyStruct { key, value })
+				Ok(eth::Property { key, value })
 			})
 			.collect::<Result<Vec<_>>>()?;
 		Ok(properties)
@@ -248,7 +247,7 @@
 	fn set_collection_sponsor_cross(
 		&mut self,
 		caller: caller,
-		sponsor: EthCrossAccount,
+		sponsor: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_reads_and_writes(1, 1)?;
 
@@ -288,13 +287,13 @@
 	/// Get current sponsor.
 	///
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
-	fn collection_sponsor(&self) -> Result<EthCrossAccount> {
+	fn collection_sponsor(&self) -> Result<eth::CrossAccount> {
 		let sponsor = match self.collection.sponsorship.sponsor() {
 			Some(sponsor) => sponsor,
 			None => return Ok(Default::default()),
 		};
 
-		Ok(EthCrossAccount::from_sub::<T>(&sponsor))
+		Ok(eth::CrossAccount::from_sub::<T>(&sponsor))
 	}
 
 	/// Get current collection limits.
@@ -377,7 +376,7 @@
 	fn add_collection_admin_cross(
 		&mut self,
 		caller: caller,
-		new_admin: EthCrossAccount,
+		new_admin: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_reads_and_writes(2, 2)?;
 
@@ -392,7 +391,7 @@
 	fn remove_collection_admin_cross(
 		&mut self,
 		caller: caller,
-		admin: EthCrossAccount,
+		admin: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_reads_and_writes(2, 2)?;
 
@@ -534,7 +533,7 @@
 	/// Checks that user allowed to operate with collection.
 	///
 	/// @param user User address to check.
-	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {
+	fn allowlisted_cross(&self, user: eth::CrossAccount) -> Result<bool> {
 		let user = user.into_sub_cross_account::<T>()?;
 		Ok(Pallet::<T>::allowed(self.id, user))
 	}
@@ -558,7 +557,7 @@
 	fn add_to_collection_allow_list_cross(
 		&mut self,
 		caller: caller,
-		user: EthCrossAccount,
+		user: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -587,7 +586,7 @@
 	fn remove_from_collection_allow_list_cross(
 		&mut self,
 		caller: caller,
-		user: EthCrossAccount,
+		user: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -625,7 +624,7 @@
 	///
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
-	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {
+	fn is_owner_or_admin_cross(&self, user: eth::CrossAccount) -> Result<bool> {
 		let user = user.into_sub_cross_account::<T>()?;
 		Ok(self.is_owner_or_admin(&user))
 	}
@@ -646,8 +645,8 @@
 	///
 	/// @return Tuble with sponsor address and his substrate mirror.
 	/// If address is canonical then substrate mirror is zero and vice versa.
-	fn collection_owner(&self) -> Result<EthCrossAccount> {
-		Ok(EthCrossAccount::from_sub_cross_account::<T>(
+	fn collection_owner(&self) -> Result<eth::CrossAccount> {
+		Ok(eth::CrossAccount::from_sub_cross_account::<T>(
 			&T::CrossAccountId::from_sub(self.owner.clone()),
 		))
 	}
@@ -670,9 +669,9 @@
 	///
 	/// @return Vector of tuples with admins address and his substrate mirror.
 	/// If address is canonical then substrate mirror is zero and vice versa.
-	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {
+	fn collection_admins(&self) -> Result<Vec<eth::CrossAccount>> {
 		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))
-			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))
+			.map(|(admin, _)| eth::CrossAccount::from_sub_cross_account::<T>(&admin))
 			.collect();
 		Ok(result)
 	}
@@ -684,7 +683,7 @@
 	fn change_collection_owner_cross(
 		&mut self,
 		caller: caller,
-		new_owner: EthCrossAccount,
+		new_owner: eth::CrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -693,29 +692,6 @@
 		self.change_owner(caller, new_owner)
 			.map_err(dispatch_to_evm::<T>)
 	}
-}
-
-/// ### Note
-/// Do not forget to add: `self.consume_store_reads(1)?;`
-fn check_is_owner_or_admin<T: Config>(
-	caller: caller,
-	collection: &CollectionHandle<T>,
-) -> Result<T::CrossAccountId> {
-	let caller = T::CrossAccountId::from_eth(caller);
-	collection
-		.check_is_owner_or_admin(&caller)
-		.map_err(dispatch_to_evm::<T>)?;
-	Ok(caller)
-}
-
-/// ### Note
-/// Do not forget to add: `self.consume_store_writes(1)?;`
-fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {
-	collection
-		.check_is_internal()
-		.map_err(dispatch_to_evm::<T>)?;
-	collection.save().map_err(dispatch_to_evm::<T>)?;
-	Ok(())
 }
 
 /// Contains static property keys and values.
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
before · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8	uint8 dummy;9	string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13	function supportsInterface(bytes4 interfaceID) external view returns (bool) {14		require(false, stub_error);15		interfaceID;16		return true;17	}18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23	// /// @notice Set permissions for token property.24	// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25	// /// @param key Property key.26	// /// @param isMutable Permission to mutate property.27	// /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28	// /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29	// /// @dev EVM selector for this function is: 0x222d97fa,30	// ///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31	// function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32	// 	require(false, stub_error);33	// 	key;34	// 	isMutable;35	// 	collectionAdmin;36	// 	tokenOwner;37	// 	dummy = 0;38	// }3940	/// @notice Set permissions for token property.41	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.42	/// @param permissions Permissions for keys.43	/// @dev EVM selector for this function is: 0xbd92983a,44	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46		require(false, stub_error);47		permissions;48		dummy = 0;49	}5051	/// @notice Get permissions for token properties.52	/// @dev EVM selector for this function is: 0xf23d7790,53	///  or in textual repr: tokenPropertyPermissions()54	function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55		require(false, stub_error);56		dummy;57		return new TokenPropertyPermission[](0);58	}5960	// /// @notice Set token property value.61	// /// @dev Throws error if `msg.sender` has no permission to edit the property.62	// /// @param tokenId ID of the token.63	// /// @param key Property key.64	// /// @param value Property value.65	// /// @dev EVM selector for this function is: 0x1752d67b,66	// ///  or in textual repr: setProperty(uint256,string,bytes)67	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68	// 	require(false, stub_error);69	// 	tokenId;70	// 	key;71	// 	value;72	// 	dummy = 0;73	// }7475	/// @notice Set token properties value.76	/// @dev Throws error if `msg.sender` has no permission to edit the property.77	/// @param tokenId ID of the token.78	/// @param properties settable properties79	/// @dev EVM selector for this function is: 0x14ed3a6e,80	///  or in textual repr: setProperties(uint256,(string,bytes)[])81	function setProperties(uint256 tokenId, Property[] memory properties) public {82		require(false, stub_error);83		tokenId;84		properties;85		dummy = 0;86	}8788	// /// @notice Delete token property value.89	// /// @dev Throws error if `msg.sender` has no permission to edit the property.90	// /// @param tokenId ID of the token.91	// /// @param key Property key.92	// /// @dev EVM selector for this function is: 0x066111d1,93	// ///  or in textual repr: deleteProperty(uint256,string)94	// function deleteProperty(uint256 tokenId, string memory key) public {95	// 	require(false, stub_error);96	// 	tokenId;97	// 	key;98	// 	dummy = 0;99	// }100101	/// @notice Delete token properties value.102	/// @dev Throws error if `msg.sender` has no permission to edit the property.103	/// @param tokenId ID of the token.104	/// @param keys Properties key.105	/// @dev EVM selector for this function is: 0xc472d371,106	///  or in textual repr: deleteProperties(uint256,string[])107	function deleteProperties(uint256 tokenId, string[] memory keys) public {108		require(false, stub_error);109		tokenId;110		keys;111		dummy = 0;112	}113114	/// @notice Get token property value.115	/// @dev Throws error if key not found116	/// @param tokenId ID of the token.117	/// @param key Property key.118	/// @return Property value bytes119	/// @dev EVM selector for this function is: 0x7228c327,120	///  or in textual repr: property(uint256,string)121	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122		require(false, stub_error);123		tokenId;124		key;125		dummy;126		return hex"";127	}128}129130/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132	/// @dev Property key.133	string key;134	/// @dev Property value.135	bytes value;136}137138/// @dev Ethereum representation of Token Property Permissions.139struct TokenPropertyPermission {140	/// @dev Token property key.141	string key;142	/// @dev Token property permissions.143	PropertyPermission[] permissions;144}145146/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.147struct PropertyPermission {148	/// @dev TokenPermission field.149	TokenPermissionField code;150	/// @dev TokenPermission value.151	bool value;152}153154/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.155enum TokenPermissionField {156	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]157	Mutable,158	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]159	TokenOwner,160	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]161	CollectionAdmin162}163164/// @title A contract that allows you to work with collections.165/// @dev the ERC-165 identifier for this interface is 0x23201442166contract Collection is Dummy, ERC165 {167	// /// Set collection property.168	// ///169	// /// @param key Property key.170	// /// @param value Propery value.171	// /// @dev EVM selector for this function is: 0x2f073f66,172	// ///  or in textual repr: setCollectionProperty(string,bytes)173	// function setCollectionProperty(string memory key, bytes memory value) public {174	// 	require(false, stub_error);175	// 	key;176	// 	value;177	// 	dummy = 0;178	// }179180	/// Set collection properties.181	///182	/// @param properties Vector of properties key/value pair.183	/// @dev EVM selector for this function is: 0x50b26b2a,184	///  or in textual repr: setCollectionProperties((string,bytes)[])185	function setCollectionProperties(Property[] memory properties) public {186		require(false, stub_error);187		properties;188		dummy = 0;189	}190191	// /// Delete collection property.192	// ///193	// /// @param key Property key.194	// /// @dev EVM selector for this function is: 0x7b7debce,195	// ///  or in textual repr: deleteCollectionProperty(string)196	// function deleteCollectionProperty(string memory key) public {197	// 	require(false, stub_error);198	// 	key;199	// 	dummy = 0;200	// }201202	/// Delete collection properties.203	///204	/// @param keys Properties keys.205	/// @dev EVM selector for this function is: 0xee206ee3,206	///  or in textual repr: deleteCollectionProperties(string[])207	function deleteCollectionProperties(string[] memory keys) public {208		require(false, stub_error);209		keys;210		dummy = 0;211	}212213	/// Get collection property.214	///215	/// @dev Throws error if key not found.216	///217	/// @param key Property key.218	/// @return bytes The property corresponding to the key.219	/// @dev EVM selector for this function is: 0xcf24fd6d,220	///  or in textual repr: collectionProperty(string)221	function collectionProperty(string memory key) public view returns (bytes memory) {222		require(false, stub_error);223		key;224		dummy;225		return hex"";226	}227228	/// Get collection properties.229	///230	/// @param keys Properties keys. Empty keys for all propertyes.231	/// @return Vector of properties key/value pairs.232	/// @dev EVM selector for this function is: 0x285fb8e6,233	///  or in textual repr: collectionProperties(string[])234	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {235		require(false, stub_error);236		keys;237		dummy;238		return new Property[](0);239	}240241	// /// Set the sponsor of the collection.242	// ///243	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.244	// ///245	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.246	// /// @dev EVM selector for this function is: 0x7623402e,247	// ///  or in textual repr: setCollectionSponsor(address)248	// function setCollectionSponsor(address sponsor) public {249	// 	require(false, stub_error);250	// 	sponsor;251	// 	dummy = 0;252	// }253254	/// Set the sponsor of the collection.255	///256	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.257	///258	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.259	/// @dev EVM selector for this function is: 0x84a1d5a8,260	///  or in textual repr: setCollectionSponsorCross((address,uint256))261	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {262		require(false, stub_error);263		sponsor;264		dummy = 0;265	}266267	/// Whether there is a pending sponsor.268	/// @dev EVM selector for this function is: 0x058ac185,269	///  or in textual repr: hasCollectionPendingSponsor()270	function hasCollectionPendingSponsor() public view returns (bool) {271		require(false, stub_error);272		dummy;273		return false;274	}275276	/// Collection sponsorship confirmation.277	///278	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.279	/// @dev EVM selector for this function is: 0x3c50e97a,280	///  or in textual repr: confirmCollectionSponsorship()281	function confirmCollectionSponsorship() public {282		require(false, stub_error);283		dummy = 0;284	}285286	/// Remove collection sponsor.287	/// @dev EVM selector for this function is: 0x6e0326a3,288	///  or in textual repr: removeCollectionSponsor()289	function removeCollectionSponsor() public {290		require(false, stub_error);291		dummy = 0;292	}293294	/// Get current sponsor.295	///296	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.297	/// @dev EVM selector for this function is: 0x6ec0a9f1,298	///  or in textual repr: collectionSponsor()299	function collectionSponsor() public view returns (EthCrossAccount memory) {300		require(false, stub_error);301		dummy;302		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);303	}304305	/// Get current collection limits.306	///307	/// @return Array of collection limits308	/// @dev EVM selector for this function is: 0xf63bc572,309	///  or in textual repr: collectionLimits()310	function collectionLimits() public view returns (CollectionLimit[] memory) {311		require(false, stub_error);312		dummy;313		return new CollectionLimit[](0);314	}315316	/// Set limits for the collection.317	/// @dev Throws error if limit not found.318	/// @param limit Some limit.319	/// @dev EVM selector for this function is: 0x2a2235e7,320	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))321	function setCollectionLimit(CollectionLimit memory limit) public {322		require(false, stub_error);323		limit;324		dummy = 0;325	}326327	/// Get contract address.328	/// @dev EVM selector for this function is: 0xf6b4dfb4,329	///  or in textual repr: contractAddress()330	function contractAddress() public view returns (address) {331		require(false, stub_error);332		dummy;333		return 0x0000000000000000000000000000000000000000;334	}335336	/// Add collection admin.337	/// @param newAdmin Cross account administrator address.338	/// @dev EVM selector for this function is: 0x859aa7d6,339	///  or in textual repr: addCollectionAdminCross((address,uint256))340	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {341		require(false, stub_error);342		newAdmin;343		dummy = 0;344	}345346	/// Remove collection admin.347	/// @param admin Cross account administrator address.348	/// @dev EVM selector for this function is: 0x6c0cd173,349	///  or in textual repr: removeCollectionAdminCross((address,uint256))350	function removeCollectionAdminCross(EthCrossAccount memory admin) public {351		require(false, stub_error);352		admin;353		dummy = 0;354	}355356	// /// Add collection admin.357	// /// @param newAdmin Address of the added administrator.358	// /// @dev EVM selector for this function is: 0x92e462c7,359	// ///  or in textual repr: addCollectionAdmin(address)360	// function addCollectionAdmin(address newAdmin) public {361	// 	require(false, stub_error);362	// 	newAdmin;363	// 	dummy = 0;364	// }365366	// /// Remove collection admin.367	// ///368	// /// @param admin Address of the removed administrator.369	// /// @dev EVM selector for this function is: 0xfafd7b42,370	// ///  or in textual repr: removeCollectionAdmin(address)371	// function removeCollectionAdmin(address admin) public {372	// 	require(false, stub_error);373	// 	admin;374	// 	dummy = 0;375	// }376377	/// Toggle accessibility of collection nesting.378	///379	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'380	/// @dev EVM selector for this function is: 0x112d4586,381	///  or in textual repr: setCollectionNesting(bool)382	function setCollectionNesting(bool enable) public {383		require(false, stub_error);384		enable;385		dummy = 0;386	}387388	/// Toggle accessibility of collection nesting.389	///390	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'391	/// @param collections Addresses of collections that will be available for nesting.392	/// @dev EVM selector for this function is: 0x64872396,393	///  or in textual repr: setCollectionNesting(bool,address[])394	function setCollectionNesting(bool enable, address[] memory collections) public {395		require(false, stub_error);396		enable;397		collections;398		dummy = 0;399	}400401	/// Returns nesting for a collection402	/// @dev EVM selector for this function is: 0x22d25bfe,403	///  or in textual repr: collectionNestingRestrictedCollectionIds()404	function collectionNestingRestrictedCollectionIds() public view returns (Tuple42 memory) {405		require(false, stub_error);406		dummy;407		return Tuple42(false, new uint256[](0));408	}409410	/// Returns permissions for a collection411	/// @dev EVM selector for this function is: 0x5b2eaf4b,412	///  or in textual repr: collectionNestingPermissions()413	function collectionNestingPermissions() public view returns (Tuple45[] memory) {414		require(false, stub_error);415		dummy;416		return new Tuple45[](0);417	}418419	/// Set the collection access method.420	/// @param mode Access mode421	/// 	0 for Normal422	/// 	1 for AllowList423	/// @dev EVM selector for this function is: 0x41835d4c,424	///  or in textual repr: setCollectionAccess(uint8)425	function setCollectionAccess(uint8 mode) public {426		require(false, stub_error);427		mode;428		dummy = 0;429	}430431	/// Checks that user allowed to operate with collection.432	///433	/// @param user User address to check.434	/// @dev EVM selector for this function is: 0x91b6df49,435	///  or in textual repr: allowlistedCross((address,uint256))436	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {437		require(false, stub_error);438		user;439		dummy;440		return false;441	}442443	// /// Add the user to the allowed list.444	// ///445	// /// @param user Address of a trusted user.446	// /// @dev EVM selector for this function is: 0x67844fe6,447	// ///  or in textual repr: addToCollectionAllowList(address)448	// function addToCollectionAllowList(address user) public {449	// 	require(false, stub_error);450	// 	user;451	// 	dummy = 0;452	// }453454	/// Add user to allowed list.455	///456	/// @param user User cross account address.457	/// @dev EVM selector for this function is: 0xa0184a3a,458	///  or in textual repr: addToCollectionAllowListCross((address,uint256))459	function addToCollectionAllowListCross(EthCrossAccount memory user) public {460		require(false, stub_error);461		user;462		dummy = 0;463	}464465	// /// Remove the user from the allowed list.466	// ///467	// /// @param user Address of a removed user.468	// /// @dev EVM selector for this function is: 0x85c51acb,469	// ///  or in textual repr: removeFromCollectionAllowList(address)470	// function removeFromCollectionAllowList(address user) public {471	// 	require(false, stub_error);472	// 	user;473	// 	dummy = 0;474	// }475476	/// Remove user from allowed list.477	///478	/// @param user User cross account address.479	/// @dev EVM selector for this function is: 0x09ba452a,480	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))481	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {482		require(false, stub_error);483		user;484		dummy = 0;485	}486487	/// Switch permission for minting.488	///489	/// @param mode Enable if "true".490	/// @dev EVM selector for this function is: 0x00018e84,491	///  or in textual repr: setCollectionMintMode(bool)492	function setCollectionMintMode(bool mode) public {493		require(false, stub_error);494		mode;495		dummy = 0;496	}497498	// /// Check that account is the owner or admin of the collection499	// ///500	// /// @param user account to verify501	// /// @return "true" if account is the owner or admin502	// /// @dev EVM selector for this function is: 0x9811b0c7,503	// ///  or in textual repr: isOwnerOrAdmin(address)504	// function isOwnerOrAdmin(address user) public view returns (bool) {505	// 	require(false, stub_error);506	// 	user;507	// 	dummy;508	// 	return false;509	// }510511	/// Check that account is the owner or admin of the collection512	///513	/// @param user User cross account to verify514	/// @return "true" if account is the owner or admin515	/// @dev EVM selector for this function is: 0x3e75a905,516	///  or in textual repr: isOwnerOrAdminCross((address,uint256))517	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {518		require(false, stub_error);519		user;520		dummy;521		return false;522	}523524	/// Returns collection type525	///526	/// @return `Fungible` or `NFT` or `ReFungible`527	/// @dev EVM selector for this function is: 0xd34b55b8,528	///  or in textual repr: uniqueCollectionType()529	function uniqueCollectionType() public view returns (string memory) {530		require(false, stub_error);531		dummy;532		return "";533	}534535	/// Get collection owner.536	///537	/// @return Tuble with sponsor address and his substrate mirror.538	/// If address is canonical then substrate mirror is zero and vice versa.539	/// @dev EVM selector for this function is: 0xdf727d3b,540	///  or in textual repr: collectionOwner()541	function collectionOwner() public view returns (EthCrossAccount memory) {542		require(false, stub_error);543		dummy;544		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);545	}546547	// /// Changes collection owner to another account548	// ///549	// /// @dev Owner can be changed only by current owner550	// /// @param newOwner new owner account551	// /// @dev EVM selector for this function is: 0x4f53e226,552	// ///  or in textual repr: changeCollectionOwner(address)553	// function changeCollectionOwner(address newOwner) public {554	// 	require(false, stub_error);555	// 	newOwner;556	// 	dummy = 0;557	// }558559	/// Get collection administrators560	///561	/// @return Vector of tuples with admins address and his substrate mirror.562	/// If address is canonical then substrate mirror is zero and vice versa.563	/// @dev EVM selector for this function is: 0x5813216b,564	///  or in textual repr: collectionAdmins()565	function collectionAdmins() public view returns (EthCrossAccount[] memory) {566		require(false, stub_error);567		dummy;568		return new EthCrossAccount[](0);569	}570571	/// Changes collection owner to another account572	///573	/// @dev Owner can be changed only by current owner574	/// @param newOwner new owner cross account575	/// @dev EVM selector for this function is: 0x6496c497,576	///  or in textual repr: changeCollectionOwnerCross((address,uint256))577	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {578		require(false, stub_error);579		newOwner;580		dummy = 0;581	}582}583584/// @dev Cross account struct585struct EthCrossAccount {586	address eth;587	uint256 sub;588}589590/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.591enum CollectionPermissions {592	/// @dev Owner of token can nest tokens under it.593	TokenOwner,594	/// @dev Admin of token collection can nest tokens under token.595	CollectionAdmin596}597598/// @dev anonymous struct599struct Tuple45 {600	CollectionPermissions field_0;601	bool field_1;602}603604/// @dev anonymous struct605struct Tuple42 {606	bool field_0;607	uint256[] field_1;608}609610struct CollectionLimit {611	CollectionLimitField field;612	bool status;613	uint256 value;614}615616/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.617enum CollectionLimitField {618	/// @dev How many tokens can a user have on one account.619	AccountTokenOwnership,620	/// @dev How many bytes of data are available for sponsorship.621	SponsoredDataSize,622	/// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]623	SponsoredDataRateLimit,624	/// @dev How many tokens can be mined into this collection.625	TokenLimit,626	/// @dev Timeouts for transfer sponsoring.627	SponsorTransferTimeout,628	/// @dev Timeout for sponsoring an approval in passed blocks.629	SponsorApproveTimeout,630	/// @dev Whether the collection owner of the collection can send tokens (which belong to other users).631	OwnerCanTransfer,632	/// @dev Can the collection owner burn other people's tokens.633	OwnerCanDestroy,634	/// @dev Is it possible to send tokens from this collection between users.635	TransferEnabled636}637638/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension639/// @dev See https://eips.ethereum.org/EIPS/eip-721640/// @dev the ERC-165 identifier for this interface is 0x5b5e139f641contract ERC721Metadata is Dummy, ERC165 {642	// /// @notice A descriptive name for a collection of NFTs in this contract643	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`644	// /// @dev EVM selector for this function is: 0x06fdde03,645	// ///  or in textual repr: name()646	// function name() public view returns (string memory) {647	// 	require(false, stub_error);648	// 	dummy;649	// 	return "";650	// }651652	// /// @notice An abbreviated name for NFTs in this contract653	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`654	// /// @dev EVM selector for this function is: 0x95d89b41,655	// ///  or in textual repr: symbol()656	// function symbol() public view returns (string memory) {657	// 	require(false, stub_error);658	// 	dummy;659	// 	return "";660	// }661662	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.663	///664	/// @dev If the token has a `url` property and it is not empty, it is returned.665	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.666	///  If the collection property `baseURI` is empty or absent, return "" (empty string)667	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix668	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).669	///670	/// @return token's const_metadata671	/// @dev EVM selector for this function is: 0xc87b56dd,672	///  or in textual repr: tokenURI(uint256)673	function tokenURI(uint256 tokenId) public view returns (string memory) {674		require(false, stub_error);675		tokenId;676		dummy;677		return "";678	}679}680681/// @title ERC721 Token that can be irreversibly burned (destroyed).682/// @dev the ERC-165 identifier for this interface is 0x42966c68683contract ERC721Burnable is Dummy, ERC165 {684	/// @notice Burns a specific ERC721 token.685	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized686	///  operator of the current owner.687	/// @param tokenId The NFT to approve688	/// @dev EVM selector for this function is: 0x42966c68,689	///  or in textual repr: burn(uint256)690	function burn(uint256 tokenId) public {691		require(false, stub_error);692		tokenId;693		dummy = 0;694	}695}696697/// @dev inlined interface698contract ERC721UniqueMintableEvents {699	event MintingFinished();700}701702/// @title ERC721 minting logic.703/// @dev the ERC-165 identifier for this interface is 0x476ff149704contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {705	/// @dev EVM selector for this function is: 0x05d2035b,706	///  or in textual repr: mintingFinished()707	function mintingFinished() public view returns (bool) {708		require(false, stub_error);709		dummy;710		return false;711	}712713	/// @notice Function to mint a token.714	/// @param to The new owner715	/// @return uint256 The id of the newly minted token716	/// @dev EVM selector for this function is: 0x6a627842,717	///  or in textual repr: mint(address)718	function mint(address to) public returns (uint256) {719		require(false, stub_error);720		to;721		dummy = 0;722		return 0;723	}724725	// /// @notice Function to mint a token.726	// /// @dev `tokenId` should be obtained with `nextTokenId` method,727	// ///  unlike standard, you can't specify it manually728	// /// @param to The new owner729	// /// @param tokenId ID of the minted NFT730	// /// @dev EVM selector for this function is: 0x40c10f19,731	// ///  or in textual repr: mint(address,uint256)732	// function mint(address to, uint256 tokenId) public returns (bool) {733	// 	require(false, stub_error);734	// 	to;735	// 	tokenId;736	// 	dummy = 0;737	// 	return false;738	// }739740	/// @notice Function to mint token with the given tokenUri.741	/// @param to The new owner742	/// @param tokenUri Token URI that would be stored in the NFT properties743	/// @return uint256 The id of the newly minted token744	/// @dev EVM selector for this function is: 0x45c17782,745	///  or in textual repr: mintWithTokenURI(address,string)746	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {747		require(false, stub_error);748		to;749		tokenUri;750		dummy = 0;751		return 0;752	}753754	// /// @notice Function to mint token with the given tokenUri.755	// /// @dev `tokenId` should be obtained with `nextTokenId` method,756	// ///  unlike standard, you can't specify it manually757	// /// @param to The new owner758	// /// @param tokenId ID of the minted NFT759	// /// @param tokenUri Token URI that would be stored in the NFT properties760	// /// @dev EVM selector for this function is: 0x50bb4e7f,761	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)762	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {763	// 	require(false, stub_error);764	// 	to;765	// 	tokenId;766	// 	tokenUri;767	// 	dummy = 0;768	// 	return false;769	// }770771	/// @dev Not implemented772	/// @dev EVM selector for this function is: 0x7d64bcb4,773	///  or in textual repr: finishMinting()774	function finishMinting() public returns (bool) {775		require(false, stub_error);776		dummy = 0;777		return false;778	}779}780781/// @title Unique extensions for ERC721.782/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4783contract ERC721UniqueExtensions is Dummy, ERC165 {784	/// @notice A descriptive name for a collection of NFTs in this contract785	/// @dev EVM selector for this function is: 0x06fdde03,786	///  or in textual repr: name()787	function name() public view returns (string memory) {788		require(false, stub_error);789		dummy;790		return "";791	}792793	/// @notice An abbreviated name for NFTs in this contract794	/// @dev EVM selector for this function is: 0x95d89b41,795	///  or in textual repr: symbol()796	function symbol() public view returns (string memory) {797		require(false, stub_error);798		dummy;799		return "";800	}801802	/// @notice A description for the collection.803	/// @dev EVM selector for this function is: 0x7284e416,804	///  or in textual repr: description()805	function description() public view returns (string memory) {806		require(false, stub_error);807		dummy;808		return "";809	}810811	/// Returns the owner (in cross format) of the token.812	///813	/// @param tokenId Id for the token.814	/// @dev EVM selector for this function is: 0x2b29dace,815	///  or in textual repr: crossOwnerOf(uint256)816	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {817		require(false, stub_error);818		tokenId;819		dummy;820		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);821	}822823	/// Returns the token properties.824	///825	/// @param tokenId Id for the token.826	/// @param keys Properties keys. Empty keys for all propertyes.827	/// @return Vector of properties key/value pairs.828	/// @dev EVM selector for this function is: 0xe07ede7e,829	///  or in textual repr: properties(uint256,string[])830	function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {831		require(false, stub_error);832		tokenId;833		keys;834		dummy;835		return new Property[](0);836	}837838	/// @notice Set or reaffirm the approved address for an NFT839	/// @dev The zero address indicates there is no approved address.840	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized841	///  operator of the current owner.842	/// @param approved The new substrate address approved NFT controller843	/// @param tokenId The NFT to approve844	/// @dev EVM selector for this function is: 0x0ecd0ab0,845	///  or in textual repr: approveCross((address,uint256),uint256)846	function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {847		require(false, stub_error);848		approved;849		tokenId;850		dummy = 0;851	}852853	/// @notice Transfer ownership of an NFT854	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`855	///  is the zero address. Throws if `tokenId` is not a valid NFT.856	/// @param to The new owner857	/// @param tokenId The NFT to transfer858	/// @dev EVM selector for this function is: 0xa9059cbb,859	///  or in textual repr: transfer(address,uint256)860	function transfer(address to, uint256 tokenId) public {861		require(false, stub_error);862		to;863		tokenId;864		dummy = 0;865	}866867	/// @notice Transfer ownership of an NFT868	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`869	///  is the zero address. Throws if `tokenId` is not a valid NFT.870	/// @param to The new owner871	/// @param tokenId The NFT to transfer872	/// @dev EVM selector for this function is: 0x2ada85ff,873	///  or in textual repr: transferCross((address,uint256),uint256)874	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {875		require(false, stub_error);876		to;877		tokenId;878		dummy = 0;879	}880881	/// @notice Transfer ownership of an NFT from cross account address to cross account address882	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`883	///  is the zero address. Throws if `tokenId` is not a valid NFT.884	/// @param from Cross acccount address of current owner885	/// @param to Cross acccount address of new owner886	/// @param tokenId The NFT to transfer887	/// @dev EVM selector for this function is: 0xd5cf430b,888	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)889	function transferFromCross(890		EthCrossAccount memory from,891		EthCrossAccount memory to,892		uint256 tokenId893	) public {894		require(false, stub_error);895		from;896		to;897		tokenId;898		dummy = 0;899	}900901	// /// @notice Burns a specific ERC721 token.902	// /// @dev Throws unless `msg.sender` is the current owner or an authorized903	// ///  operator for this NFT. Throws if `from` is not the current owner. Throws904	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.905	// /// @param from The current owner of the NFT906	// /// @param tokenId The NFT to transfer907	// /// @dev EVM selector for this function is: 0x79cc6790,908	// ///  or in textual repr: burnFrom(address,uint256)909	// function burnFrom(address from, uint256 tokenId) public {910	// 	require(false, stub_error);911	// 	from;912	// 	tokenId;913	// 	dummy = 0;914	// }915916	/// @notice Burns a specific ERC721 token.917	/// @dev Throws unless `msg.sender` is the current owner or an authorized918	///  operator for this NFT. Throws if `from` is not the current owner. Throws919	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.920	/// @param from The current owner of the NFT921	/// @param tokenId The NFT to transfer922	/// @dev EVM selector for this function is: 0xbb2f5a58,923	///  or in textual repr: burnFromCross((address,uint256),uint256)924	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {925		require(false, stub_error);926		from;927		tokenId;928		dummy = 0;929	}930931	/// @notice Returns next free NFT ID.932	/// @dev EVM selector for this function is: 0x75794a3c,933	///  or in textual repr: nextTokenId()934	function nextTokenId() public view returns (uint256) {935		require(false, stub_error);936		dummy;937		return 0;938	}939940	// /// @notice Function to mint multiple tokens.941	// /// @dev `tokenIds` should be an array of consecutive numbers and first number942	// ///  should be obtained with `nextTokenId` method943	// /// @param to The new owner944	// /// @param tokenIds IDs of the minted NFTs945	// /// @dev EVM selector for this function is: 0x44a9945e,946	// ///  or in textual repr: mintBulk(address,uint256[])947	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {948	// 	require(false, stub_error);949	// 	to;950	// 	tokenIds;951	// 	dummy = 0;952	// 	return false;953	// }954955	// /// @notice Function to mint multiple tokens with the given tokenUris.956	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive957	// ///  numbers and first number should be obtained with `nextTokenId` method958	// /// @param to The new owner959	// /// @param tokens array of pairs of token ID and token URI for minted tokens960	// /// @dev EVM selector for this function is: 0x36543006,961	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])962	// function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {963	// 	require(false, stub_error);964	// 	to;965	// 	tokens;966	// 	dummy = 0;967	// 	return false;968	// }969970	/// @notice Function to mint a token.971	/// @param to The new owner crossAccountId972	/// @param properties Properties of minted token973	/// @return uint256 The id of the newly minted token974	/// @dev EVM selector for this function is: 0xb904db03,975	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])976	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {977		require(false, stub_error);978		to;979		properties;980		dummy = 0;981		return 0;982	}983}984985/// @dev anonymous struct986struct Tuple15 {987	uint256 field_0;988	string field_1;989}990991/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension992/// @dev See https://eips.ethereum.org/EIPS/eip-721993/// @dev the ERC-165 identifier for this interface is 0x780e9d63994contract ERC721Enumerable is Dummy, ERC165 {995	/// @notice Enumerate valid NFTs996	/// @param index A counter less than `totalSupply()`997	/// @return The token identifier for the `index`th NFT,998	///  (sort order not specified)999	/// @dev EVM selector for this function is: 0x4f6ccce7,1000	///  or in textual repr: tokenByIndex(uint256)1001	function tokenByIndex(uint256 index) public view returns (uint256) {1002		require(false, stub_error);1003		index;1004		dummy;1005		return 0;1006	}10071008	/// @dev Not implemented1009	/// @dev EVM selector for this function is: 0x2f745c59,1010	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1011	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1012		require(false, stub_error);1013		owner;1014		index;1015		dummy;1016		return 0;1017	}10181019	/// @notice Count NFTs tracked by this contract1020	/// @return A count of valid NFTs tracked by this contract, where each one of1021	///  them has an assigned and queryable owner not equal to the zero address1022	/// @dev EVM selector for this function is: 0x18160ddd,1023	///  or in textual repr: totalSupply()1024	function totalSupply() public view returns (uint256) {1025		require(false, stub_error);1026		dummy;1027		return 0;1028	}1029}10301031/// @dev inlined interface1032contract ERC721Events {1033	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1034	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1035	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1036}10371038/// @title ERC-721 Non-Fungible Token Standard1039/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1040/// @dev the ERC-165 identifier for this interface is 0x983a942b1041contract ERC721 is Dummy, ERC165, ERC721Events {1042	/// @notice Count all NFTs assigned to an owner1043	/// @dev NFTs assigned to the zero address are considered invalid, and this1044	///  function throws for queries about the zero address.1045	/// @param owner An address for whom to query the balance1046	/// @return The number of NFTs owned by `owner`, possibly zero1047	/// @dev EVM selector for this function is: 0x70a08231,1048	///  or in textual repr: balanceOf(address)1049	function balanceOf(address owner) public view returns (uint256) {1050		require(false, stub_error);1051		owner;1052		dummy;1053		return 0;1054	}10551056	/// @notice Find the owner of an NFT1057	/// @dev NFTs assigned to zero address are considered invalid, and queries1058	///  about them do throw.1059	/// @param tokenId The identifier for an NFT1060	/// @return The address of the owner of the NFT1061	/// @dev EVM selector for this function is: 0x6352211e,1062	///  or in textual repr: ownerOf(uint256)1063	function ownerOf(uint256 tokenId) public view returns (address) {1064		require(false, stub_error);1065		tokenId;1066		dummy;1067		return 0x0000000000000000000000000000000000000000;1068	}10691070	/// @dev Not implemented1071	/// @dev EVM selector for this function is: 0xb88d4fde,1072	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)1073	function safeTransferFrom(1074		address from,1075		address to,1076		uint256 tokenId,1077		bytes memory data1078	) public {1079		require(false, stub_error);1080		from;1081		to;1082		tokenId;1083		data;1084		dummy = 0;1085	}10861087	/// @dev Not implemented1088	/// @dev EVM selector for this function is: 0x42842e0e,1089	///  or in textual repr: safeTransferFrom(address,address,uint256)1090	function safeTransferFrom(1091		address from,1092		address to,1093		uint256 tokenId1094	) public {1095		require(false, stub_error);1096		from;1097		to;1098		tokenId;1099		dummy = 0;1100	}11011102	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1103	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1104	///  THEY MAY BE PERMANENTLY LOST1105	/// @dev Throws unless `msg.sender` is the current owner or an authorized1106	///  operator for this NFT. Throws if `from` is not the current owner. Throws1107	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1108	/// @param from The current owner of the NFT1109	/// @param to The new owner1110	/// @param tokenId The NFT to transfer1111	/// @dev EVM selector for this function is: 0x23b872dd,1112	///  or in textual repr: transferFrom(address,address,uint256)1113	function transferFrom(1114		address from,1115		address to,1116		uint256 tokenId1117	) public {1118		require(false, stub_error);1119		from;1120		to;1121		tokenId;1122		dummy = 0;1123	}11241125	/// @notice Set or reaffirm the approved address for an NFT1126	/// @dev The zero address indicates there is no approved address.1127	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1128	///  operator of the current owner.1129	/// @param approved The new approved NFT controller1130	/// @param tokenId The NFT to approve1131	/// @dev EVM selector for this function is: 0x095ea7b3,1132	///  or in textual repr: approve(address,uint256)1133	function approve(address approved, uint256 tokenId) public {1134		require(false, stub_error);1135		approved;1136		tokenId;1137		dummy = 0;1138	}11391140	/// @notice Sets or unsets the approval of a given operator.1141	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1142	/// @param operator Operator1143	/// @param approved Should operator status be granted or revoked?1144	/// @dev EVM selector for this function is: 0xa22cb465,1145	///  or in textual repr: setApprovalForAll(address,bool)1146	function setApprovalForAll(address operator, bool approved) public {1147		require(false, stub_error);1148		operator;1149		approved;1150		dummy = 0;1151	}11521153	/// @dev Not implemented1154	/// @dev EVM selector for this function is: 0x081812fc,1155	///  or in textual repr: getApproved(uint256)1156	function getApproved(uint256 tokenId) public view returns (address) {1157		require(false, stub_error);1158		tokenId;1159		dummy;1160		return 0x0000000000000000000000000000000000000000;1161	}11621163	/// @notice Tells whether the given `owner` approves the `operator`.1164	/// @dev EVM selector for this function is: 0xe985e9c5,1165	///  or in textual repr: isApprovedForAll(address,address)1166	function isApprovedForAll(address owner, address operator) public view returns (bool) {1167		require(false, stub_error);1168		owner;1169		operator;1170		dummy;1171		return false;1172	}11731174	/// @notice Returns collection helper contract address1175	/// @dev EVM selector for this function is: 0x1896cce6,1176	///  or in textual repr: collectionHelperAddress()1177	function collectionHelperAddress() public view returns (address) {1178		require(false, stub_error);1179		dummy;1180		return 0x0000000000000000000000000000000000000000;1181	}1182}11831184contract UniqueNFT is1185	Dummy,1186	ERC165,1187	ERC721,1188	ERC721Enumerable,1189	ERC721UniqueExtensions,1190	ERC721UniqueMintable,1191	ERC721Burnable,1192	ERC721Metadata,1193	Collection,1194	TokenProperties1195{}
after · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8	uint8 dummy;9	string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13	function supportsInterface(bytes4 interfaceID) external view returns (bool) {14		require(false, stub_error);15		interfaceID;16		return true;17	}18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23	// /// @notice Set permissions for token property.24	// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25	// /// @param key Property key.26	// /// @param isMutable Permission to mutate property.27	// /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28	// /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29	// /// @dev EVM selector for this function is: 0x222d97fa,30	// ///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31	// function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32	// 	require(false, stub_error);33	// 	key;34	// 	isMutable;35	// 	collectionAdmin;36	// 	tokenOwner;37	// 	dummy = 0;38	// }3940	/// @notice Set permissions for token property.41	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.42	/// @param permissions Permissions for keys.43	/// @dev EVM selector for this function is: 0xbd92983a,44	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46		require(false, stub_error);47		permissions;48		dummy = 0;49	}5051	/// @notice Get permissions for token properties.52	/// @dev EVM selector for this function is: 0xf23d7790,53	///  or in textual repr: tokenPropertyPermissions()54	function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55		require(false, stub_error);56		dummy;57		return new TokenPropertyPermission[](0);58	}5960	// /// @notice Set token property value.61	// /// @dev Throws error if `msg.sender` has no permission to edit the property.62	// /// @param tokenId ID of the token.63	// /// @param key Property key.64	// /// @param value Property value.65	// /// @dev EVM selector for this function is: 0x1752d67b,66	// ///  or in textual repr: setProperty(uint256,string,bytes)67	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68	// 	require(false, stub_error);69	// 	tokenId;70	// 	key;71	// 	value;72	// 	dummy = 0;73	// }7475	/// @notice Set token properties value.76	/// @dev Throws error if `msg.sender` has no permission to edit the property.77	/// @param tokenId ID of the token.78	/// @param properties settable properties79	/// @dev EVM selector for this function is: 0x14ed3a6e,80	///  or in textual repr: setProperties(uint256,(string,bytes)[])81	function setProperties(uint256 tokenId, Property[] memory properties) public {82		require(false, stub_error);83		tokenId;84		properties;85		dummy = 0;86	}8788	// /// @notice Delete token property value.89	// /// @dev Throws error if `msg.sender` has no permission to edit the property.90	// /// @param tokenId ID of the token.91	// /// @param key Property key.92	// /// @dev EVM selector for this function is: 0x066111d1,93	// ///  or in textual repr: deleteProperty(uint256,string)94	// function deleteProperty(uint256 tokenId, string memory key) public {95	// 	require(false, stub_error);96	// 	tokenId;97	// 	key;98	// 	dummy = 0;99	// }100101	/// @notice Delete token properties value.102	/// @dev Throws error if `msg.sender` has no permission to edit the property.103	/// @param tokenId ID of the token.104	/// @param keys Properties key.105	/// @dev EVM selector for this function is: 0xc472d371,106	///  or in textual repr: deleteProperties(uint256,string[])107	function deleteProperties(uint256 tokenId, string[] memory keys) public {108		require(false, stub_error);109		tokenId;110		keys;111		dummy = 0;112	}113114	/// @notice Get token property value.115	/// @dev Throws error if key not found116	/// @param tokenId ID of the token.117	/// @param key Property key.118	/// @return Property value bytes119	/// @dev EVM selector for this function is: 0x7228c327,120	///  or in textual repr: property(uint256,string)121	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122		require(false, stub_error);123		tokenId;124		key;125		dummy;126		return hex"";127	}128}129130/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132	/// @dev Property key.133	string key;134	/// @dev Property value.135	bytes value;136}137138/// @dev Ethereum representation of Token Property Permissions.139struct TokenPropertyPermission {140	/// @dev Token property key.141	string key;142	/// @dev Token property permissions.143	PropertyPermission[] permissions;144}145146/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.147struct PropertyPermission {148	/// @dev TokenPermission field.149	TokenPermissionField code;150	/// @dev TokenPermission value.151	bool value;152}153154/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.155enum TokenPermissionField {156	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]157	Mutable,158	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]159	TokenOwner,160	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]161	CollectionAdmin162}163164/// @title A contract that allows you to work with collections.165/// @dev the ERC-165 identifier for this interface is 0x23201442166contract Collection is Dummy, ERC165 {167	// /// Set collection property.168	// ///169	// /// @param key Property key.170	// /// @param value Propery value.171	// /// @dev EVM selector for this function is: 0x2f073f66,172	// ///  or in textual repr: setCollectionProperty(string,bytes)173	// function setCollectionProperty(string memory key, bytes memory value) public {174	// 	require(false, stub_error);175	// 	key;176	// 	value;177	// 	dummy = 0;178	// }179180	/// Set collection properties.181	///182	/// @param properties Vector of properties key/value pair.183	/// @dev EVM selector for this function is: 0x50b26b2a,184	///  or in textual repr: setCollectionProperties((string,bytes)[])185	function setCollectionProperties(Property[] memory properties) public {186		require(false, stub_error);187		properties;188		dummy = 0;189	}190191	// /// Delete collection property.192	// ///193	// /// @param key Property key.194	// /// @dev EVM selector for this function is: 0x7b7debce,195	// ///  or in textual repr: deleteCollectionProperty(string)196	// function deleteCollectionProperty(string memory key) public {197	// 	require(false, stub_error);198	// 	key;199	// 	dummy = 0;200	// }201202	/// Delete collection properties.203	///204	/// @param keys Properties keys.205	/// @dev EVM selector for this function is: 0xee206ee3,206	///  or in textual repr: deleteCollectionProperties(string[])207	function deleteCollectionProperties(string[] memory keys) public {208		require(false, stub_error);209		keys;210		dummy = 0;211	}212213	/// Get collection property.214	///215	/// @dev Throws error if key not found.216	///217	/// @param key Property key.218	/// @return bytes The property corresponding to the key.219	/// @dev EVM selector for this function is: 0xcf24fd6d,220	///  or in textual repr: collectionProperty(string)221	function collectionProperty(string memory key) public view returns (bytes memory) {222		require(false, stub_error);223		key;224		dummy;225		return hex"";226	}227228	/// Get collection properties.229	///230	/// @param keys Properties keys. Empty keys for all propertyes.231	/// @return Vector of properties key/value pairs.232	/// @dev EVM selector for this function is: 0x285fb8e6,233	///  or in textual repr: collectionProperties(string[])234	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {235		require(false, stub_error);236		keys;237		dummy;238		return new Property[](0);239	}240241	// /// Set the sponsor of the collection.242	// ///243	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.244	// ///245	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.246	// /// @dev EVM selector for this function is: 0x7623402e,247	// ///  or in textual repr: setCollectionSponsor(address)248	// function setCollectionSponsor(address sponsor) public {249	// 	require(false, stub_error);250	// 	sponsor;251	// 	dummy = 0;252	// }253254	/// Set the sponsor of the collection.255	///256	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.257	///258	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.259	/// @dev EVM selector for this function is: 0x84a1d5a8,260	///  or in textual repr: setCollectionSponsorCross((address,uint256))261	function setCollectionSponsorCross(CrossAccount memory sponsor) public {262		require(false, stub_error);263		sponsor;264		dummy = 0;265	}266267	/// Whether there is a pending sponsor.268	/// @dev EVM selector for this function is: 0x058ac185,269	///  or in textual repr: hasCollectionPendingSponsor()270	function hasCollectionPendingSponsor() public view returns (bool) {271		require(false, stub_error);272		dummy;273		return false;274	}275276	/// Collection sponsorship confirmation.277	///278	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.279	/// @dev EVM selector for this function is: 0x3c50e97a,280	///  or in textual repr: confirmCollectionSponsorship()281	function confirmCollectionSponsorship() public {282		require(false, stub_error);283		dummy = 0;284	}285286	/// Remove collection sponsor.287	/// @dev EVM selector for this function is: 0x6e0326a3,288	///  or in textual repr: removeCollectionSponsor()289	function removeCollectionSponsor() public {290		require(false, stub_error);291		dummy = 0;292	}293294	/// Get current sponsor.295	///296	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.297	/// @dev EVM selector for this function is: 0x6ec0a9f1,298	///  or in textual repr: collectionSponsor()299	function collectionSponsor() public view returns (CrossAccount memory) {300		require(false, stub_error);301		dummy;302		return CrossAccount(0x0000000000000000000000000000000000000000, 0);303	}304305	/// Get current collection limits.306	///307	/// @return Array of collection limits308	/// @dev EVM selector for this function is: 0xf63bc572,309	///  or in textual repr: collectionLimits()310	function collectionLimits() public view returns (CollectionLimit[] memory) {311		require(false, stub_error);312		dummy;313		return new CollectionLimit[](0);314	}315316	/// Set limits for the collection.317	/// @dev Throws error if limit not found.318	/// @param limit Some limit.319	/// @dev EVM selector for this function is: 0x2a2235e7,320	///  or in textual repr: setCollectionLimit((uint8,bool,uint256))321	function setCollectionLimit(CollectionLimit memory limit) public {322		require(false, stub_error);323		limit;324		dummy = 0;325	}326327	/// Get contract address.328	/// @dev EVM selector for this function is: 0xf6b4dfb4,329	///  or in textual repr: contractAddress()330	function contractAddress() public view returns (address) {331		require(false, stub_error);332		dummy;333		return 0x0000000000000000000000000000000000000000;334	}335336	/// Add collection admin.337	/// @param newAdmin Cross account administrator address.338	/// @dev EVM selector for this function is: 0x859aa7d6,339	///  or in textual repr: addCollectionAdminCross((address,uint256))340	function addCollectionAdminCross(CrossAccount memory newAdmin) public {341		require(false, stub_error);342		newAdmin;343		dummy = 0;344	}345346	/// Remove collection admin.347	/// @param admin Cross account administrator address.348	/// @dev EVM selector for this function is: 0x6c0cd173,349	///  or in textual repr: removeCollectionAdminCross((address,uint256))350	function removeCollectionAdminCross(CrossAccount memory admin) public {351		require(false, stub_error);352		admin;353		dummy = 0;354	}355356	// /// Add collection admin.357	// /// @param newAdmin Address of the added administrator.358	// /// @dev EVM selector for this function is: 0x92e462c7,359	// ///  or in textual repr: addCollectionAdmin(address)360	// function addCollectionAdmin(address newAdmin) public {361	// 	require(false, stub_error);362	// 	newAdmin;363	// 	dummy = 0;364	// }365366	// /// Remove collection admin.367	// ///368	// /// @param admin Address of the removed administrator.369	// /// @dev EVM selector for this function is: 0xfafd7b42,370	// ///  or in textual repr: removeCollectionAdmin(address)371	// function removeCollectionAdmin(address admin) public {372	// 	require(false, stub_error);373	// 	admin;374	// 	dummy = 0;375	// }376377	/// Toggle accessibility of collection nesting.378	///379	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'380	/// @dev EVM selector for this function is: 0x112d4586,381	///  or in textual repr: setCollectionNesting(bool)382	function setCollectionNesting(bool enable) public {383		require(false, stub_error);384		enable;385		dummy = 0;386	}387388	/// Toggle accessibility of collection nesting.389	///390	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'391	/// @param collections Addresses of collections that will be available for nesting.392	/// @dev EVM selector for this function is: 0x64872396,393	///  or in textual repr: setCollectionNesting(bool,address[])394	function setCollectionNesting(bool enable, address[] memory collections) public {395		require(false, stub_error);396		enable;397		collections;398		dummy = 0;399	}400401	/// Returns nesting for a collection402	/// @dev EVM selector for this function is: 0x22d25bfe,403	///  or in textual repr: collectionNestingRestrictedCollectionIds()404	function collectionNestingRestrictedCollectionIds() public view returns (Tuple42 memory) {405		require(false, stub_error);406		dummy;407		return Tuple42(false, new uint256[](0));408	}409410	/// Returns permissions for a collection411	/// @dev EVM selector for this function is: 0x5b2eaf4b,412	///  or in textual repr: collectionNestingPermissions()413	function collectionNestingPermissions() public view returns (Tuple45[] memory) {414		require(false, stub_error);415		dummy;416		return new Tuple45[](0);417	}418419	/// Set the collection access method.420	/// @param mode Access mode421	/// 	0 for Normal422	/// 	1 for AllowList423	/// @dev EVM selector for this function is: 0x41835d4c,424	///  or in textual repr: setCollectionAccess(uint8)425	function setCollectionAccess(uint8 mode) public {426		require(false, stub_error);427		mode;428		dummy = 0;429	}430431	/// Checks that user allowed to operate with collection.432	///433	/// @param user User address to check.434	/// @dev EVM selector for this function is: 0x91b6df49,435	///  or in textual repr: allowlistedCross((address,uint256))436	function allowlistedCross(CrossAccount memory user) public view returns (bool) {437		require(false, stub_error);438		user;439		dummy;440		return false;441	}442443	// /// Add the user to the allowed list.444	// ///445	// /// @param user Address of a trusted user.446	// /// @dev EVM selector for this function is: 0x67844fe6,447	// ///  or in textual repr: addToCollectionAllowList(address)448	// function addToCollectionAllowList(address user) public {449	// 	require(false, stub_error);450	// 	user;451	// 	dummy = 0;452	// }453454	/// Add user to allowed list.455	///456	/// @param user User cross account address.457	/// @dev EVM selector for this function is: 0xa0184a3a,458	///  or in textual repr: addToCollectionAllowListCross((address,uint256))459	function addToCollectionAllowListCross(CrossAccount memory user) public {460		require(false, stub_error);461		user;462		dummy = 0;463	}464465	// /// Remove the user from the allowed list.466	// ///467	// /// @param user Address of a removed user.468	// /// @dev EVM selector for this function is: 0x85c51acb,469	// ///  or in textual repr: removeFromCollectionAllowList(address)470	// function removeFromCollectionAllowList(address user) public {471	// 	require(false, stub_error);472	// 	user;473	// 	dummy = 0;474	// }475476	/// Remove user from allowed list.477	///478	/// @param user User cross account address.479	/// @dev EVM selector for this function is: 0x09ba452a,480	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))481	function removeFromCollectionAllowListCross(CrossAccount memory user) public {482		require(false, stub_error);483		user;484		dummy = 0;485	}486487	/// Switch permission for minting.488	///489	/// @param mode Enable if "true".490	/// @dev EVM selector for this function is: 0x00018e84,491	///  or in textual repr: setCollectionMintMode(bool)492	function setCollectionMintMode(bool mode) public {493		require(false, stub_error);494		mode;495		dummy = 0;496	}497498	// /// Check that account is the owner or admin of the collection499	// ///500	// /// @param user account to verify501	// /// @return "true" if account is the owner or admin502	// /// @dev EVM selector for this function is: 0x9811b0c7,503	// ///  or in textual repr: isOwnerOrAdmin(address)504	// function isOwnerOrAdmin(address user) public view returns (bool) {505	// 	require(false, stub_error);506	// 	user;507	// 	dummy;508	// 	return false;509	// }510511	/// Check that account is the owner or admin of the collection512	///513	/// @param user User cross account to verify514	/// @return "true" if account is the owner or admin515	/// @dev EVM selector for this function is: 0x3e75a905,516	///  or in textual repr: isOwnerOrAdminCross((address,uint256))517	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {518		require(false, stub_error);519		user;520		dummy;521		return false;522	}523524	/// Returns collection type525	///526	/// @return `Fungible` or `NFT` or `ReFungible`527	/// @dev EVM selector for this function is: 0xd34b55b8,528	///  or in textual repr: uniqueCollectionType()529	function uniqueCollectionType() public view returns (string memory) {530		require(false, stub_error);531		dummy;532		return "";533	}534535	/// Get collection owner.536	///537	/// @return Tuble with sponsor address and his substrate mirror.538	/// If address is canonical then substrate mirror is zero and vice versa.539	/// @dev EVM selector for this function is: 0xdf727d3b,540	///  or in textual repr: collectionOwner()541	function collectionOwner() public view returns (CrossAccount memory) {542		require(false, stub_error);543		dummy;544		return CrossAccount(0x0000000000000000000000000000000000000000, 0);545	}546547	// /// Changes collection owner to another account548	// ///549	// /// @dev Owner can be changed only by current owner550	// /// @param newOwner new owner account551	// /// @dev EVM selector for this function is: 0x4f53e226,552	// ///  or in textual repr: changeCollectionOwner(address)553	// function changeCollectionOwner(address newOwner) public {554	// 	require(false, stub_error);555	// 	newOwner;556	// 	dummy = 0;557	// }558559	/// Get collection administrators560	///561	/// @return Vector of tuples with admins address and his substrate mirror.562	/// If address is canonical then substrate mirror is zero and vice versa.563	/// @dev EVM selector for this function is: 0x5813216b,564	///  or in textual repr: collectionAdmins()565	function collectionAdmins() public view returns (CrossAccount[] memory) {566		require(false, stub_error);567		dummy;568		return new CrossAccount[](0);569	}570571	/// Changes collection owner to another account572	///573	/// @dev Owner can be changed only by current owner574	/// @param newOwner new owner cross account575	/// @dev EVM selector for this function is: 0x6496c497,576	///  or in textual repr: changeCollectionOwnerCross((address,uint256))577	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {578		require(false, stub_error);579		newOwner;580		dummy = 0;581	}582}583584/// @dev Cross account struct585struct CrossAccount {586	address eth;587	uint256 sub;588}589590/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.591enum CollectionPermissions {592	/// @dev Owner of token can nest tokens under it.593	TokenOwner,594	/// @dev Admin of token collection can nest tokens under token.595	CollectionAdmin596}597598/// @dev anonymous struct599struct Tuple45 {600	CollectionPermissions field_0;601	bool field_1;602}603604/// @dev anonymous struct605struct Tuple42 {606	bool field_0;607	uint256[] field_1;608}609610/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.611struct CollectionLimit {612	CollectionLimitField field;613	bool status;614	uint256 value;615}616617/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.618enum CollectionLimitField {619	/// @dev How many tokens can a user have on one account.620	AccountTokenOwnership,621	/// @dev How many bytes of data are available for sponsorship.622	SponsoredDataSize,623	/// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]624	SponsoredDataRateLimit,625	/// @dev How many tokens can be mined into this collection.626	TokenLimit,627	/// @dev Timeouts for transfer sponsoring.628	SponsorTransferTimeout,629	/// @dev Timeout for sponsoring an approval in passed blocks.630	SponsorApproveTimeout,631	/// @dev Whether the collection owner of the collection can send tokens (which belong to other users).632	OwnerCanTransfer,633	/// @dev Can the collection owner burn other people's tokens.634	OwnerCanDestroy,635	/// @dev Is it possible to send tokens from this collection between users.636	TransferEnabled637}638639/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension640/// @dev See https://eips.ethereum.org/EIPS/eip-721641/// @dev the ERC-165 identifier for this interface is 0x5b5e139f642contract ERC721Metadata is Dummy, ERC165 {643	// /// @notice A descriptive name for a collection of NFTs in this contract644	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`645	// /// @dev EVM selector for this function is: 0x06fdde03,646	// ///  or in textual repr: name()647	// function name() public view returns (string memory) {648	// 	require(false, stub_error);649	// 	dummy;650	// 	return "";651	// }652653	// /// @notice An abbreviated name for NFTs in this contract654	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`655	// /// @dev EVM selector for this function is: 0x95d89b41,656	// ///  or in textual repr: symbol()657	// function symbol() public view returns (string memory) {658	// 	require(false, stub_error);659	// 	dummy;660	// 	return "";661	// }662663	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.664	///665	/// @dev If the token has a `url` property and it is not empty, it is returned.666	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.667	///  If the collection property `baseURI` is empty or absent, return "" (empty string)668	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix669	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).670	///671	/// @return token's const_metadata672	/// @dev EVM selector for this function is: 0xc87b56dd,673	///  or in textual repr: tokenURI(uint256)674	function tokenURI(uint256 tokenId) public view returns (string memory) {675		require(false, stub_error);676		tokenId;677		dummy;678		return "";679	}680}681682/// @title ERC721 Token that can be irreversibly burned (destroyed).683/// @dev the ERC-165 identifier for this interface is 0x42966c68684contract ERC721Burnable is Dummy, ERC165 {685	/// @notice Burns a specific ERC721 token.686	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized687	///  operator of the current owner.688	/// @param tokenId The NFT to approve689	/// @dev EVM selector for this function is: 0x42966c68,690	///  or in textual repr: burn(uint256)691	function burn(uint256 tokenId) public {692		require(false, stub_error);693		tokenId;694		dummy = 0;695	}696}697698/// @dev inlined interface699contract ERC721UniqueMintableEvents {700	event MintingFinished();701}702703/// @title ERC721 minting logic.704/// @dev the ERC-165 identifier for this interface is 0x476ff149705contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {706	/// @dev EVM selector for this function is: 0x05d2035b,707	///  or in textual repr: mintingFinished()708	function mintingFinished() public view returns (bool) {709		require(false, stub_error);710		dummy;711		return false;712	}713714	/// @notice Function to mint a token.715	/// @param to The new owner716	/// @return uint256 The id of the newly minted token717	/// @dev EVM selector for this function is: 0x6a627842,718	///  or in textual repr: mint(address)719	function mint(address to) public returns (uint256) {720		require(false, stub_error);721		to;722		dummy = 0;723		return 0;724	}725726	// /// @notice Function to mint a token.727	// /// @dev `tokenId` should be obtained with `nextTokenId` method,728	// ///  unlike standard, you can't specify it manually729	// /// @param to The new owner730	// /// @param tokenId ID of the minted NFT731	// /// @dev EVM selector for this function is: 0x40c10f19,732	// ///  or in textual repr: mint(address,uint256)733	// function mint(address to, uint256 tokenId) public returns (bool) {734	// 	require(false, stub_error);735	// 	to;736	// 	tokenId;737	// 	dummy = 0;738	// 	return false;739	// }740741	/// @notice Function to mint token with the given tokenUri.742	/// @param to The new owner743	/// @param tokenUri Token URI that would be stored in the NFT properties744	/// @return uint256 The id of the newly minted token745	/// @dev EVM selector for this function is: 0x45c17782,746	///  or in textual repr: mintWithTokenURI(address,string)747	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {748		require(false, stub_error);749		to;750		tokenUri;751		dummy = 0;752		return 0;753	}754755	// /// @notice Function to mint token with the given tokenUri.756	// /// @dev `tokenId` should be obtained with `nextTokenId` method,757	// ///  unlike standard, you can't specify it manually758	// /// @param to The new owner759	// /// @param tokenId ID of the minted NFT760	// /// @param tokenUri Token URI that would be stored in the NFT properties761	// /// @dev EVM selector for this function is: 0x50bb4e7f,762	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)763	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {764	// 	require(false, stub_error);765	// 	to;766	// 	tokenId;767	// 	tokenUri;768	// 	dummy = 0;769	// 	return false;770	// }771772	/// @dev Not implemented773	/// @dev EVM selector for this function is: 0x7d64bcb4,774	///  or in textual repr: finishMinting()775	function finishMinting() public returns (bool) {776		require(false, stub_error);777		dummy = 0;778		return false;779	}780}781782/// @title Unique extensions for ERC721.783/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4784contract ERC721UniqueExtensions is Dummy, ERC165 {785	/// @notice A descriptive name for a collection of NFTs in this contract786	/// @dev EVM selector for this function is: 0x06fdde03,787	///  or in textual repr: name()788	function name() public view returns (string memory) {789		require(false, stub_error);790		dummy;791		return "";792	}793794	/// @notice An abbreviated name for NFTs in this contract795	/// @dev EVM selector for this function is: 0x95d89b41,796	///  or in textual repr: symbol()797	function symbol() public view returns (string memory) {798		require(false, stub_error);799		dummy;800		return "";801	}802803	/// @notice A description for the collection.804	/// @dev EVM selector for this function is: 0x7284e416,805	///  or in textual repr: description()806	function description() public view returns (string memory) {807		require(false, stub_error);808		dummy;809		return "";810	}811812	/// Returns the owner (in cross format) of the token.813	///814	/// @param tokenId Id for the token.815	/// @dev EVM selector for this function is: 0x2b29dace,816	///  or in textual repr: crossOwnerOf(uint256)817	function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {818		require(false, stub_error);819		tokenId;820		dummy;821		return CrossAccount(0x0000000000000000000000000000000000000000, 0);822	}823824	/// Returns the token properties.825	///826	/// @param tokenId Id for the token.827	/// @param keys Properties keys. Empty keys for all propertyes.828	/// @return Vector of properties key/value pairs.829	/// @dev EVM selector for this function is: 0xe07ede7e,830	///  or in textual repr: properties(uint256,string[])831	function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {832		require(false, stub_error);833		tokenId;834		keys;835		dummy;836		return new Property[](0);837	}838839	/// @notice Set or reaffirm the approved address for an NFT840	/// @dev The zero address indicates there is no approved address.841	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized842	///  operator of the current owner.843	/// @param approved The new substrate address approved NFT controller844	/// @param tokenId The NFT to approve845	/// @dev EVM selector for this function is: 0x0ecd0ab0,846	///  or in textual repr: approveCross((address,uint256),uint256)847	function approveCross(CrossAccount memory approved, uint256 tokenId) public {848		require(false, stub_error);849		approved;850		tokenId;851		dummy = 0;852	}853854	/// @notice Transfer ownership of an NFT855	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`856	///  is the zero address. Throws if `tokenId` is not a valid NFT.857	/// @param to The new owner858	/// @param tokenId The NFT to transfer859	/// @dev EVM selector for this function is: 0xa9059cbb,860	///  or in textual repr: transfer(address,uint256)861	function transfer(address to, uint256 tokenId) public {862		require(false, stub_error);863		to;864		tokenId;865		dummy = 0;866	}867868	/// @notice Transfer ownership of an NFT869	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`870	///  is the zero address. Throws if `tokenId` is not a valid NFT.871	/// @param to The new owner872	/// @param tokenId The NFT to transfer873	/// @dev EVM selector for this function is: 0x2ada85ff,874	///  or in textual repr: transferCross((address,uint256),uint256)875	function transferCross(CrossAccount memory to, uint256 tokenId) public {876		require(false, stub_error);877		to;878		tokenId;879		dummy = 0;880	}881882	/// @notice Transfer ownership of an NFT from cross account address to cross account address883	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`884	///  is the zero address. Throws if `tokenId` is not a valid NFT.885	/// @param from Cross acccount address of current owner886	/// @param to Cross acccount address of new owner887	/// @param tokenId The NFT to transfer888	/// @dev EVM selector for this function is: 0xd5cf430b,889	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)890	function transferFromCross(891		CrossAccount memory from,892		CrossAccount memory to,893		uint256 tokenId894	) public {895		require(false, stub_error);896		from;897		to;898		tokenId;899		dummy = 0;900	}901902	// /// @notice Burns a specific ERC721 token.903	// /// @dev Throws unless `msg.sender` is the current owner or an authorized904	// ///  operator for this NFT. Throws if `from` is not the current owner. Throws905	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.906	// /// @param from The current owner of the NFT907	// /// @param tokenId The NFT to transfer908	// /// @dev EVM selector for this function is: 0x79cc6790,909	// ///  or in textual repr: burnFrom(address,uint256)910	// function burnFrom(address from, uint256 tokenId) public {911	// 	require(false, stub_error);912	// 	from;913	// 	tokenId;914	// 	dummy = 0;915	// }916917	/// @notice Burns a specific ERC721 token.918	/// @dev Throws unless `msg.sender` is the current owner or an authorized919	///  operator for this NFT. Throws if `from` is not the current owner. Throws920	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.921	/// @param from The current owner of the NFT922	/// @param tokenId The NFT to transfer923	/// @dev EVM selector for this function is: 0xbb2f5a58,924	///  or in textual repr: burnFromCross((address,uint256),uint256)925	function burnFromCross(CrossAccount memory from, uint256 tokenId) public {926		require(false, stub_error);927		from;928		tokenId;929		dummy = 0;930	}931932	/// @notice Returns next free NFT ID.933	/// @dev EVM selector for this function is: 0x75794a3c,934	///  or in textual repr: nextTokenId()935	function nextTokenId() public view returns (uint256) {936		require(false, stub_error);937		dummy;938		return 0;939	}940941	// /// @notice Function to mint multiple tokens.942	// /// @dev `tokenIds` should be an array of consecutive numbers and first number943	// ///  should be obtained with `nextTokenId` method944	// /// @param to The new owner945	// /// @param tokenIds IDs of the minted NFTs946	// /// @dev EVM selector for this function is: 0x44a9945e,947	// ///  or in textual repr: mintBulk(address,uint256[])948	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {949	// 	require(false, stub_error);950	// 	to;951	// 	tokenIds;952	// 	dummy = 0;953	// 	return false;954	// }955956	// /// @notice Function to mint multiple tokens with the given tokenUris.957	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive958	// ///  numbers and first number should be obtained with `nextTokenId` method959	// /// @param to The new owner960	// /// @param tokens array of pairs of token ID and token URI for minted tokens961	// /// @dev EVM selector for this function is: 0x36543006,962	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])963	// function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {964	// 	require(false, stub_error);965	// 	to;966	// 	tokens;967	// 	dummy = 0;968	// 	return false;969	// }970971	/// @notice Function to mint a token.972	/// @param to The new owner crossAccountId973	/// @param properties Properties of minted token974	/// @return uint256 The id of the newly minted token975	/// @dev EVM selector for this function is: 0xb904db03,976	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])977	function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {978		require(false, stub_error);979		to;980		properties;981		dummy = 0;982		return 0;983	}984}985986/// @dev anonymous struct987struct Tuple15 {988	uint256 field_0;989	string field_1;990}991992/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension993/// @dev See https://eips.ethereum.org/EIPS/eip-721994/// @dev the ERC-165 identifier for this interface is 0x780e9d63995contract ERC721Enumerable is Dummy, ERC165 {996	/// @notice Enumerate valid NFTs997	/// @param index A counter less than `totalSupply()`998	/// @return The token identifier for the `index`th NFT,999	///  (sort order not specified)1000	/// @dev EVM selector for this function is: 0x4f6ccce7,1001	///  or in textual repr: tokenByIndex(uint256)1002	function tokenByIndex(uint256 index) public view returns (uint256) {1003		require(false, stub_error);1004		index;1005		dummy;1006		return 0;1007	}10081009	/// @dev Not implemented1010	/// @dev EVM selector for this function is: 0x2f745c59,1011	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1012	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1013		require(false, stub_error);1014		owner;1015		index;1016		dummy;1017		return 0;1018	}10191020	/// @notice Count NFTs tracked by this contract1021	/// @return A count of valid NFTs tracked by this contract, where each one of1022	///  them has an assigned and queryable owner not equal to the zero address1023	/// @dev EVM selector for this function is: 0x18160ddd,1024	///  or in textual repr: totalSupply()1025	function totalSupply() public view returns (uint256) {1026		require(false, stub_error);1027		dummy;1028		return 0;1029	}1030}10311032/// @dev inlined interface1033contract ERC721Events {1034	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1035	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1036	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1037}10381039/// @title ERC-721 Non-Fungible Token Standard1040/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1041/// @dev the ERC-165 identifier for this interface is 0x983a942b1042contract ERC721 is Dummy, ERC165, ERC721Events {1043	/// @notice Count all NFTs assigned to an owner1044	/// @dev NFTs assigned to the zero address are considered invalid, and this1045	///  function throws for queries about the zero address.1046	/// @param owner An address for whom to query the balance1047	/// @return The number of NFTs owned by `owner`, possibly zero1048	/// @dev EVM selector for this function is: 0x70a08231,1049	///  or in textual repr: balanceOf(address)1050	function balanceOf(address owner) public view returns (uint256) {1051		require(false, stub_error);1052		owner;1053		dummy;1054		return 0;1055	}10561057	/// @notice Find the owner of an NFT1058	/// @dev NFTs assigned to zero address are considered invalid, and queries1059	///  about them do throw.1060	/// @param tokenId The identifier for an NFT1061	/// @return The address of the owner of the NFT1062	/// @dev EVM selector for this function is: 0x6352211e,1063	///  or in textual repr: ownerOf(uint256)1064	function ownerOf(uint256 tokenId) public view returns (address) {1065		require(false, stub_error);1066		tokenId;1067		dummy;1068		return 0x0000000000000000000000000000000000000000;1069	}10701071	/// @dev Not implemented1072	/// @dev EVM selector for this function is: 0xb88d4fde,1073	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)1074	function safeTransferFrom(1075		address from,1076		address to,1077		uint256 tokenId,1078		bytes memory data1079	) public {1080		require(false, stub_error);1081		from;1082		to;1083		tokenId;1084		data;1085		dummy = 0;1086	}10871088	/// @dev Not implemented1089	/// @dev EVM selector for this function is: 0x42842e0e,1090	///  or in textual repr: safeTransferFrom(address,address,uint256)1091	function safeTransferFrom(1092		address from,1093		address to,1094		uint256 tokenId1095	) public {1096		require(false, stub_error);1097		from;1098		to;1099		tokenId;1100		dummy = 0;1101	}11021103	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1104	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1105	///  THEY MAY BE PERMANENTLY LOST1106	/// @dev Throws unless `msg.sender` is the current owner or an authorized1107	///  operator for this NFT. Throws if `from` is not the current owner. Throws1108	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1109	/// @param from The current owner of the NFT1110	/// @param to The new owner1111	/// @param tokenId The NFT to transfer1112	/// @dev EVM selector for this function is: 0x23b872dd,1113	///  or in textual repr: transferFrom(address,address,uint256)1114	function transferFrom(1115		address from,1116		address to,1117		uint256 tokenId1118	) public {1119		require(false, stub_error);1120		from;1121		to;1122		tokenId;1123		dummy = 0;1124	}11251126	/// @notice Set or reaffirm the approved address for an NFT1127	/// @dev The zero address indicates there is no approved address.1128	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1129	///  operator of the current owner.1130	/// @param approved The new approved NFT controller1131	/// @param tokenId The NFT to approve1132	/// @dev EVM selector for this function is: 0x095ea7b3,1133	///  or in textual repr: approve(address,uint256)1134	function approve(address approved, uint256 tokenId) public {1135		require(false, stub_error);1136		approved;1137		tokenId;1138		dummy = 0;1139	}11401141	/// @notice Sets or unsets the approval of a given operator.1142	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1143	/// @param operator Operator1144	/// @param approved Should operator status be granted or revoked?1145	/// @dev EVM selector for this function is: 0xa22cb465,1146	///  or in textual repr: setApprovalForAll(address,bool)1147	function setApprovalForAll(address operator, bool approved) public {1148		require(false, stub_error);1149		operator;1150		approved;1151		dummy = 0;1152	}11531154	/// @dev Not implemented1155	/// @dev EVM selector for this function is: 0x081812fc,1156	///  or in textual repr: getApproved(uint256)1157	function getApproved(uint256 tokenId) public view returns (address) {1158		require(false, stub_error);1159		tokenId;1160		dummy;1161		return 0x0000000000000000000000000000000000000000;1162	}11631164	/// @notice Tells whether the given `owner` approves the `operator`.1165	/// @dev EVM selector for this function is: 0xe985e9c5,1166	///  or in textual repr: isApprovedForAll(address,address)1167	function isApprovedForAll(address owner, address operator) public view returns (bool) {1168		require(false, stub_error);1169		owner;1170		operator;1171		dummy;1172		return false;1173	}11741175	/// @notice Returns collection helper contract address1176	/// @dev EVM selector for this function is: 0x1896cce6,1177	///  or in textual repr: collectionHelperAddress()1178	function collectionHelperAddress() public view returns (address) {1179		require(false, stub_error);1180		dummy;1181		return 0x0000000000000000000000000000000000000000;1182	}1183}11841185contract UniqueNFT is1186	Dummy,1187	ERC165,1188	ERC721,1189	ERC721Enumerable,1190	ERC721UniqueExtensions,1191	ERC721UniqueMintable,1192	ERC721Burnable,1193	ERC721Metadata,1194	Collection,1195	TokenProperties1196{}
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,
 }