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
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -258,7 +258,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+	function setCollectionSponsorCross(CrossAccount memory sponsor) public {
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -296,10 +296,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (EthCrossAccount memory) {
+	function collectionSponsor() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -337,7 +337,7 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+	function addCollectionAdminCross(CrossAccount memory newAdmin) public {
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -347,7 +347,7 @@
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+	function removeCollectionAdminCross(CrossAccount memory admin) public {
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -433,7 +433,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+	function allowlistedCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -456,7 +456,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+	function addToCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -478,7 +478,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+	function removeFromCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -514,7 +514,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -538,10 +538,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (EthCrossAccount memory) {
+	function collectionOwner() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+	function collectionAdmins() public view returns (CrossAccount[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new EthCrossAccount[](0);
+		return new CrossAccount[](0);
 	}
 
 	/// Changes collection owner to another account
@@ -574,7 +574,7 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -582,7 +582,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -607,13 +607,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -813,11 +814,11 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+	function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Returns the token properties.
@@ -843,7 +844,7 @@
 	/// @param tokenId The NFT to approve
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
-	function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {
+	function approveCross(CrossAccount memory approved, uint256 tokenId) public {
 		require(false, stub_error);
 		approved;
 		tokenId;
@@ -871,7 +872,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+	function transferCross(CrossAccount memory to, uint256 tokenId) public {
 		require(false, stub_error);
 		to;
 		tokenId;
@@ -887,8 +888,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -921,7 +922,7 @@
 	/// @param tokenId The NFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
 		require(false, stub_error);
 		from;
 		tokenId;
@@ -973,7 +974,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+	function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
 		require(false, stub_error);
 		to;
 		properties;
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
before · pallets/refungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{29	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30	weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,35	erc::{CommonEvmHandler, CollectionCall, static_property::key},36	eth::{Property as PropertyStruct, EthCrossAccount},37	Error as CommonError,38};39use pallet_evm::{account::CrossAccountId, PrecompileHandle};40use pallet_evm_coder_substrate::{call, dispatch_to_evm};41use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};42use sp_core::{H160, Get};43use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};44use up_data_structs::{45	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,46	PropertyKeyPermission, PropertyPermission, TokenId,47};4849use crate::{50	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,51	TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,52};5354pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5556/// @title A contract that allows to set and delete token properties and change token property permissions.57#[solidity_interface(name = TokenProperties)]58impl<T: Config> RefungibleHandle<T> {59	/// @notice Set permissions for token property.60	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.61	/// @param key Property key.62	/// @param isMutable Permission to mutate property.63	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.64	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.65	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]66	#[solidity(hide)]67	fn set_token_property_permission(68		&mut self,69		caller: caller,70		key: string,71		is_mutable: bool,72		collection_admin: bool,73		token_owner: bool,74	) -> Result<()> {75		let caller = T::CrossAccountId::from_eth(caller);76		<Pallet<T>>::set_token_property_permissions(77			self,78			&caller,79			vec![PropertyKeyPermission {80				key: <Vec<u8>>::from(key)81					.try_into()82					.map_err(|_| "too long key")?,83				permission: PropertyPermission {84					mutable: is_mutable,85					collection_admin,86					token_owner,87				},88			}],89		)90		.map_err(dispatch_to_evm::<T>)91	}9293	/// @notice Set permissions for token property.94	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.95	/// @param permissions Permissions for keys.96	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]97	fn set_token_property_permissions(98		&mut self,99		caller: caller,100		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,101	) -> Result<()> {102		let caller = T::CrossAccountId::from_eth(caller);103		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(104			permissions,105		)?;106107		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)108			.map_err(dispatch_to_evm::<T>)109	}110111	/// @notice Get permissions for token properties.112	fn token_property_permissions(113		&self,114	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {115		let perms = <Pallet<T>>::token_property_permission(self.id);116		Ok(perms117			.into_iter()118			.map(pallet_common::eth::TokenPropertyPermission::from)119			.collect())120	}121122	/// @notice Set token property value.123	/// @dev Throws error if `msg.sender` has no permission to edit the property.124	/// @param tokenId ID of the token.125	/// @param key Property key.126	/// @param value Property value.127	#[solidity(hide)]128	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]129	fn set_property(130		&mut self,131		caller: caller,132		token_id: uint256,133		key: string,134		value: bytes,135	) -> Result<()> {136		let caller = T::CrossAccountId::from_eth(caller);137		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;138		let key = <Vec<u8>>::from(key)139			.try_into()140			.map_err(|_| "key too long")?;141		let value = value.0.try_into().map_err(|_| "value too long")?;142143		let nesting_budget = self144			.recorder145			.weight_calls_budget(<StructureWeight<T>>::find_parent());146147		<Pallet<T>>::set_token_property(148			self,149			&caller,150			TokenId(token_id),151			Property { key, value },152			&nesting_budget,153		)154		.map_err(dispatch_to_evm::<T>)155	}156157	/// @notice Set token properties value.158	/// @dev Throws error if `msg.sender` has no permission to edit the property.159	/// @param tokenId ID of the token.160	/// @param properties settable properties161	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]162	fn set_properties(163		&mut self,164		caller: caller,165		token_id: uint256,166		properties: Vec<PropertyStruct>,167	) -> Result<()> {168		let caller = T::CrossAccountId::from_eth(caller);169		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;170171		let nesting_budget = self172			.recorder173			.weight_calls_budget(<StructureWeight<T>>::find_parent());174175		let properties = properties176			.into_iter()177			.map(|PropertyStruct { key, value }| {178				let key = <Vec<u8>>::from(key)179					.try_into()180					.map_err(|_| "key too large")?;181182				let value = value.0.try_into().map_err(|_| "value too large")?;183184				Ok(Property { key, value })185			})186			.collect::<Result<Vec<_>>>()?;187188		<Pallet<T>>::set_token_properties(189			self,190			&caller,191			TokenId(token_id),192			properties.into_iter(),193			false,194			&nesting_budget,195		)196		.map_err(dispatch_to_evm::<T>)197	}198199	/// @notice Delete token property value.200	/// @dev Throws error if `msg.sender` has no permission to edit the property.201	/// @param tokenId ID of the token.202	/// @param key Property key.203	#[solidity(hide)]204	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]205	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {206		let caller = T::CrossAccountId::from_eth(caller);207		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;208		let key = <Vec<u8>>::from(key)209			.try_into()210			.map_err(|_| "key too long")?;211212		let nesting_budget = self213			.recorder214			.weight_calls_budget(<StructureWeight<T>>::find_parent());215216		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)217			.map_err(dispatch_to_evm::<T>)218	}219220	/// @notice Delete token properties value.221	/// @dev Throws error if `msg.sender` has no permission to edit the property.222	/// @param tokenId ID of the token.223	/// @param keys Properties key.224	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]225	fn delete_properties(226		&mut self,227		token_id: uint256,228		caller: caller,229		keys: Vec<string>,230	) -> Result<()> {231		let caller = T::CrossAccountId::from_eth(caller);232		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;233		let keys = keys234			.into_iter()235			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))236			.collect::<Result<Vec<_>>>()?;237238		let nesting_budget = self239			.recorder240			.weight_calls_budget(<StructureWeight<T>>::find_parent());241242		<Pallet<T>>::delete_token_properties(243			self,244			&caller,245			TokenId(token_id),246			keys.into_iter(),247			&nesting_budget,248		)249		.map_err(dispatch_to_evm::<T>)250	}251252	/// @notice Get token property value.253	/// @dev Throws error if key not found254	/// @param tokenId ID of the token.255	/// @param key Property key.256	/// @return Property value bytes257	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {258		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;259		let key = <Vec<u8>>::from(key)260			.try_into()261			.map_err(|_| "key too long")?;262263		let props = <TokenProperties<T>>::get((self.id, token_id));264		let prop = props.get(&key).ok_or("key not found")?;265266		Ok(prop.to_vec().into())267	}268}269270#[derive(ToLog)]271pub enum ERC721Events {272	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed273	///  (`to` == 0). Exception: during contract creation, any number of RFTs274	///  may be created and assigned without emitting Transfer.275	Transfer {276		#[indexed]277		from: address,278		#[indexed]279		to: address,280		#[indexed]281		token_id: uint256,282	},283	/// @dev Not supported284	Approval {285		#[indexed]286		owner: address,287		#[indexed]288		approved: address,289		#[indexed]290		token_id: uint256,291	},292	/// @dev Not supported293	#[allow(dead_code)]294	ApprovalForAll {295		#[indexed]296		owner: address,297		#[indexed]298		operator: address,299		approved: bool,300	},301}302303#[derive(ToLog)]304pub enum ERC721UniqueMintableEvents {305	/// @dev Not supported306	#[allow(dead_code)]307	MintingFinished {},308}309310#[solidity_interface(name = ERC721Metadata)]311impl<T: Config> RefungibleHandle<T>312where313	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,314{315	/// @notice A descriptive name for a collection of NFTs in this contract316	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`317	#[solidity(hide, rename_selector = "name")]318	fn name_proxy(&self) -> Result<string> {319		self.name()320	}321322	/// @notice An abbreviated name for NFTs in this contract323	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`324	#[solidity(hide, rename_selector = "symbol")]325	fn symbol_proxy(&self) -> Result<string> {326		self.symbol()327	}328329	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.330	///331	/// @dev If the token has a `url` property and it is not empty, it is returned.332	///  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`.333	///  If the collection property `baseURI` is empty or absent, return "" (empty string)334	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix335	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).336	///337	/// @return token's const_metadata338	#[solidity(rename_selector = "tokenURI")]339	fn token_uri(&self, token_id: uint256) -> Result<string> {340		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;341342		match get_token_property(self, token_id_u32, &key::url()).as_deref() {343			Err(_) | Ok("") => (),344			Ok(url) => {345				return Ok(url.into());346			}347		};348349		let base_uri =350			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())351				.map(BoundedVec::into_inner)352				.map(string::from_utf8)353				.transpose()354				.map_err(|e| {355					Error::Revert(alloc::format!(356						"Can not convert value \"baseURI\" to string with error \"{}\"",357						e358					))359				})?;360361		let base_uri = match base_uri.as_deref() {362			None | Some("") => {363				return Ok("".into());364			}365			Some(base_uri) => base_uri.into(),366		};367368		Ok(369			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {370				Err(_) | Ok("") => base_uri,371				Ok(suffix) => base_uri + suffix,372			},373		)374	}375}376377/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension378/// @dev See https://eips.ethereum.org/EIPS/eip-721379#[solidity_interface(name = ERC721Enumerable)]380impl<T: Config> RefungibleHandle<T> {381	/// @notice Enumerate valid RFTs382	/// @param index A counter less than `totalSupply()`383	/// @return The token identifier for the `index`th NFT,384	///  (sort order not specified)385	fn token_by_index(&self, index: uint256) -> Result<uint256> {386		Ok(index)387	}388389	/// Not implemented390	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {391		// TODO: Not implemetable392		Err("not implemented".into())393	}394395	/// @notice Count RFTs tracked by this contract396	/// @return A count of valid RFTs tracked by this contract, where each one of397	///  them has an assigned and queryable owner not equal to the zero address398	fn total_supply(&self) -> Result<uint256> {399		self.consume_store_reads(1)?;400		Ok(<Pallet<T>>::total_supply(self).into())401	}402}403404/// @title ERC-721 Non-Fungible Token Standard405/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md406#[solidity_interface(name = ERC721, events(ERC721Events))]407impl<T: Config> RefungibleHandle<T> {408	/// @notice Count all RFTs assigned to an owner409	/// @dev RFTs assigned to the zero address are considered invalid, and this410	///  function throws for queries about the zero address.411	/// @param owner An address for whom to query the balance412	/// @return The number of RFTs owned by `owner`, possibly zero413	fn balance_of(&self, owner: address) -> Result<uint256> {414		self.consume_store_reads(1)?;415		let owner = T::CrossAccountId::from_eth(owner);416		let balance = <AccountBalance<T>>::get((self.id, owner));417		Ok(balance.into())418	}419420	/// @notice Find the owner of an RFT421	/// @dev RFTs assigned to zero address are considered invalid, and queries422	///  about them do throw.423	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for424	///  the tokens that are partially owned.425	/// @param tokenId The identifier for an RFT426	/// @return The address of the owner of the RFT427	fn owner_of(&self, token_id: uint256) -> Result<address> {428		self.consume_store_reads(2)?;429		let token = token_id.try_into()?;430		let owner = <Pallet<T>>::token_owner(self.id, token);431		Ok(owner432			.map(|address| *address.as_eth())433			.unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))434	}435436	/// @dev Not implemented437	fn safe_transfer_from_with_data(438		&mut self,439		_from: address,440		_to: address,441		_token_id: uint256,442		_data: bytes,443	) -> Result<void> {444		// TODO: Not implemetable445		Err("not implemented".into())446	}447448	/// @dev Not implemented449	fn safe_transfer_from(450		&mut self,451		_from: address,452		_to: address,453		_token_id: uint256,454	) -> Result<void> {455		// TODO: Not implemetable456		Err("not implemented".into())457	}458459	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE460	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE461	///  THEY MAY BE PERMANENTLY LOST462	/// @dev Throws unless `msg.sender` is the current owner or an authorized463	///  operator for this RFT. Throws if `from` is not the current owner. Throws464	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.465	///  Throws if RFT pieces have multiple owners.466	/// @param from The current owner of the NFT467	/// @param to The new owner468	/// @param tokenId The NFT to transfer469	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]470	fn transfer_from(471		&mut self,472		caller: caller,473		from: address,474		to: address,475		token_id: uint256,476	) -> Result<void> {477		let caller = T::CrossAccountId::from_eth(caller);478		let from = T::CrossAccountId::from_eth(from);479		let to = T::CrossAccountId::from_eth(to);480		let token = token_id.try_into()?;481		let budget = self482			.recorder483			.weight_calls_budget(<StructureWeight<T>>::find_parent());484485		let balance = balance(&self, token, &from)?;486		ensure_single_owner(&self, token, balance)?;487488		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)489			.map_err(dispatch_to_evm::<T>)?;490491		Ok(())492	}493494	/// @dev Not implemented495	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {496		Err("not implemented".into())497	}498499	/// @notice Sets or unsets the approval of a given operator.500	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.501	/// @param operator Operator502	/// @param approved Should operator status be granted or revoked?503	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]504	fn set_approval_for_all(505		&mut self,506		caller: caller,507		operator: address,508		approved: bool,509	) -> Result<void> {510		let caller = T::CrossAccountId::from_eth(caller);511		let operator = T::CrossAccountId::from_eth(operator);512513		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)514			.map_err(dispatch_to_evm::<T>)?;515		Ok(())516	}517518	/// @dev Not implemented519	fn get_approved(&self, _token_id: uint256) -> Result<address> {520		// TODO: Not implemetable521		Err("not implemented".into())522	}523524	/// @notice Tells whether the given `owner` approves the `operator`.525	#[weight(<SelfWeightOf<T>>::allowance_for_all())]526	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {527		let owner = T::CrossAccountId::from_eth(owner);528		let operator = T::CrossAccountId::from_eth(operator);529530		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))531	}532533	/// @notice Returns collection helper contract address534	fn collection_helper_address(&self) -> Result<address> {535		Ok(T::ContractAddress::get())536	}537}538539/// Returns amount of pieces of `token` that `owner` have540pub fn balance<T: Config>(541	collection: &RefungibleHandle<T>,542	token: TokenId,543	owner: &T::CrossAccountId,544) -> Result<u128> {545	collection.consume_store_reads(1)?;546	let balance = <Balance<T>>::get((collection.id, token, &owner));547	Ok(balance)548}549550/// Throws if `owner_balance` is lower than total amount of `token` pieces551pub fn ensure_single_owner<T: Config>(552	collection: &RefungibleHandle<T>,553	token: TokenId,554	owner_balance: u128,555) -> Result<()> {556	collection.consume_store_reads(1)?;557	let total_supply = <TotalSupply<T>>::get((collection.id, token));558559	if owner_balance == 0 {560		return Err(dispatch_to_evm::<T>(561			<CommonError<T>>::MustBeTokenOwner.into(),562		));563	}564565	if total_supply != owner_balance {566		return Err("token has multiple owners".into());567	}568	Ok(())569}570571/// @title ERC721 Token that can be irreversibly burned (destroyed).572#[solidity_interface(name = ERC721Burnable)]573impl<T: Config> RefungibleHandle<T> {574	/// @notice Burns a specific ERC721 token.575	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized576	///  operator of the current owner.577	/// @param tokenId The RFT to approve578	#[weight(<SelfWeightOf<T>>::burn_item_fully())]579	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {580		let caller = T::CrossAccountId::from_eth(caller);581		let token = token_id.try_into()?;582583		let balance = balance(&self, token, &caller)?;584		ensure_single_owner(&self, token, balance)?;585586		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;587		Ok(())588	}589}590591/// @title ERC721 minting logic.592#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]593impl<T: Config> RefungibleHandle<T> {594	fn minting_finished(&self) -> Result<bool> {595		Ok(false)596	}597598	/// @notice Function to mint a token.599	/// @param to The new owner600	/// @return uint256 The id of the newly minted token601	#[weight(<SelfWeightOf<T>>::create_item())]602	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {603		let token_id: uint256 = <TokensMinted<T>>::get(self.id)604			.checked_add(1)605			.ok_or("item id overflow")?606			.into();607		self.mint_check_id(caller, to, token_id)?;608		Ok(token_id)609	}610611	/// @notice Function to mint a token.612	/// @dev `tokenId` should be obtained with `nextTokenId` method,613	///  unlike standard, you can't specify it manually614	/// @param to The new owner615	/// @param tokenId ID of the minted RFT616	#[solidity(hide, rename_selector = "mint")]617	#[weight(<SelfWeightOf<T>>::create_item())]618	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {619		let caller = T::CrossAccountId::from_eth(caller);620		let to = T::CrossAccountId::from_eth(to);621		let token_id: u32 = token_id.try_into()?;622		let budget = self623			.recorder624			.weight_calls_budget(<StructureWeight<T>>::find_parent());625626		if <TokensMinted<T>>::get(self.id)627			.checked_add(1)628			.ok_or("item id overflow")?629			!= token_id630		{631			return Err("item id should be next".into());632		}633634		let users = [(to.clone(), 1)]635			.into_iter()636			.collect::<BTreeMap<_, _>>()637			.try_into()638			.unwrap();639		<Pallet<T>>::create_item(640			self,641			&caller,642			CreateItemData::<T> {643				users,644				properties: CollectionPropertiesVec::default(),645			},646			&budget,647		)648		.map_err(dispatch_to_evm::<T>)?;649650		Ok(true)651	}652653	/// @notice Function to mint token with the given tokenUri.654	/// @param to The new owner655	/// @param tokenUri Token URI that would be stored in the NFT properties656	/// @return uint256 The id of the newly minted token657	#[solidity(rename_selector = "mintWithTokenURI")]658	#[weight(<SelfWeightOf<T>>::create_item())]659	fn mint_with_token_uri(660		&mut self,661		caller: caller,662		to: address,663		token_uri: string,664	) -> Result<uint256> {665		let token_id: uint256 = <TokensMinted<T>>::get(self.id)666			.checked_add(1)667			.ok_or("item id overflow")?668			.into();669		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;670		Ok(token_id)671	}672673	/// @notice Function to mint token with the given tokenUri.674	/// @dev `tokenId` should be obtained with `nextTokenId` method,675	///  unlike standard, you can't specify it manually676	/// @param to The new owner677	/// @param tokenId ID of the minted RFT678	/// @param tokenUri Token URI that would be stored in the RFT properties679	#[solidity(hide, rename_selector = "mintWithTokenURI")]680	#[weight(<SelfWeightOf<T>>::create_item())]681	fn mint_with_token_uri_check_id(682		&mut self,683		caller: caller,684		to: address,685		token_id: uint256,686		token_uri: string,687	) -> Result<bool> {688		let key = key::url();689		let permission = get_token_permission::<T>(self.id, &key)?;690		if !permission.collection_admin {691			return Err("Operation is not allowed".into());692		}693694		let caller = T::CrossAccountId::from_eth(caller);695		let to = T::CrossAccountId::from_eth(to);696		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;697		let budget = self698			.recorder699			.weight_calls_budget(<StructureWeight<T>>::find_parent());700701		if <TokensMinted<T>>::get(self.id)702			.checked_add(1)703			.ok_or("item id overflow")?704			!= token_id705		{706			return Err("item id should be next".into());707		}708709		let mut properties = CollectionPropertiesVec::default();710		properties711			.try_push(Property {712				key,713				value: token_uri714					.into_bytes()715					.try_into()716					.map_err(|_| "token uri is too long")?,717			})718			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;719720		let users = [(to.clone(), 1)]721			.into_iter()722			.collect::<BTreeMap<_, _>>()723			.try_into()724			.unwrap();725		<Pallet<T>>::create_item(726			self,727			&caller,728			CreateItemData::<T> { users, properties },729			&budget,730		)731		.map_err(dispatch_to_evm::<T>)?;732		Ok(true)733	}734735	/// @dev Not implemented736	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {737		Err("not implementable".into())738	}739}740741fn get_token_property<T: Config>(742	collection: &CollectionHandle<T>,743	token_id: u32,744	key: &up_data_structs::PropertyKey,745) -> Result<string> {746	collection.consume_store_reads(1)?;747	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))748		.map_err(|_| Error::Revert("Token properties not found".into()))?;749	if let Some(property) = properties.get(key) {750		return Ok(string::from_utf8_lossy(property).into());751	}752753	Err("Property tokenURI not found".into())754}755756fn get_token_permission<T: Config>(757	collection_id: CollectionId,758	key: &PropertyKey,759) -> Result<PropertyPermission> {760	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)761		.map_err(|_| Error::Revert("No permissions for collection".into()))?;762	let a = token_property_permissions763		.get(key)764		.map(Clone::clone)765		.ok_or_else(|| {766			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();767			Error::Revert(alloc::format!("No permission for key {}", key))768		})?;769	Ok(a)770}771772/// @title Unique extensions for ERC721.773#[solidity_interface(name = ERC721UniqueExtensions)]774impl<T: Config> RefungibleHandle<T>775where776	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,777{778	/// @notice A descriptive name for a collection of NFTs in this contract779	fn name(&self) -> Result<string> {780		Ok(decode_utf16(self.name.iter().copied())781			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))782			.collect::<string>())783	}784785	/// @notice An abbreviated name for NFTs in this contract786	fn symbol(&self) -> Result<string> {787		Ok(string::from_utf8_lossy(&self.token_prefix).into())788	}789790	/// @notice A description for the collection.791	fn description(&self) -> Result<string> {792		Ok(decode_utf16(self.description.iter().copied())793			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))794			.collect::<string>())795	}796797	/// Returns the owner (in cross format) of the token.798	///799	/// @param tokenId Id for the token.800	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {801		Self::token_owner(&self, token_id.try_into()?)802			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))803			.ok_or(Error::Revert("key too large".into()))804	}805806	/// Returns the token properties.807	///808	/// @param tokenId Id for the token.809	/// @param keys Properties keys. Empty keys for all propertyes.810	/// @return Vector of properties key/value pairs.811	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {812		let keys = keys813			.into_iter()814			.map(|key| {815				<Vec<u8>>::from(key)816					.try_into()817					.map_err(|_| Error::Revert("key too large".into()))818			})819			.collect::<Result<Vec<_>>>()?;820821		<Self as CommonCollectionOperations<T>>::token_properties(822			&self,823			token_id.try_into()?,824			if keys.is_empty() { None } else { Some(keys) },825		)826		.into_iter()827		.map(|p| {828			let key = string::from_utf8(p.key.to_vec())829				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;830			let value = bytes(p.value.to_vec());831			Ok(PropertyStruct { key, value })832		})833		.collect::<Result<Vec<_>>>()834	}835	/// @notice Transfer ownership of an RFT836	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`837	///  is the zero address. Throws if `tokenId` is not a valid RFT.838	///  Throws if RFT pieces have multiple owners.839	/// @param to The new owner840	/// @param tokenId The RFT to transfer841	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]842	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {843		let caller = T::CrossAccountId::from_eth(caller);844		let to = T::CrossAccountId::from_eth(to);845		let token = token_id.try_into()?;846		let budget = self847			.recorder848			.weight_calls_budget(<StructureWeight<T>>::find_parent());849850		let balance = balance(self, token, &caller)?;851		ensure_single_owner(self, token, balance)?;852853		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)854			.map_err(dispatch_to_evm::<T>)?;855		Ok(())856	}857858	/// @notice Transfer ownership of an RFT859	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`860	///  is the zero address. Throws if `tokenId` is not a valid RFT.861	///  Throws if RFT pieces have multiple owners.862	/// @param to The new owner863	/// @param tokenId The RFT to transfer864	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]865	fn transfer_cross(866		&mut self,867		caller: caller,868		to: EthCrossAccount,869		token_id: uint256,870	) -> Result<void> {871		let caller = T::CrossAccountId::from_eth(caller);872		let to = to.into_sub_cross_account::<T>()?;873		let token = token_id.try_into()?;874		let budget = self875			.recorder876			.weight_calls_budget(<StructureWeight<T>>::find_parent());877878		let balance = balance(self, token, &caller)?;879		ensure_single_owner(self, token, balance)?;880881		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)882			.map_err(dispatch_to_evm::<T>)?;883		Ok(())884	}885886	/// @notice Transfer ownership of an RFT887	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`888	///  is the zero address. Throws if `tokenId` is not a valid RFT.889	///  Throws if RFT pieces have multiple owners.890	/// @param to The new owner891	/// @param tokenId The RFT to transfer892	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]893	fn transfer_from_cross(894		&mut self,895		caller: caller,896		from: EthCrossAccount,897		to: EthCrossAccount,898		token_id: uint256,899	) -> Result<void> {900		let caller = T::CrossAccountId::from_eth(caller);901		let from = from.into_sub_cross_account::<T>()?;902		let to = to.into_sub_cross_account::<T>()?;903		let token_id = token_id.try_into()?;904		let budget = self905			.recorder906			.weight_calls_budget(<StructureWeight<T>>::find_parent());907908		let balance = balance(self, token_id, &from)?;909		ensure_single_owner(self, token_id, balance)?;910911		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)912			.map_err(dispatch_to_evm::<T>)?;913		Ok(())914	}915916	/// @notice Burns a specific ERC721 token.917	/// @dev Throws unless `msg.sender` is the current owner or an authorized918	///  operator for this RFT. Throws if `from` is not the current owner. Throws919	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.920	///  Throws if RFT pieces have multiple owners.921	/// @param from The current owner of the RFT922	/// @param tokenId The RFT to transfer923	#[solidity(hide)]924	#[weight(<SelfWeightOf<T>>::burn_from())]925	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {926		let caller = T::CrossAccountId::from_eth(caller);927		let from = T::CrossAccountId::from_eth(from);928		let token = token_id.try_into()?;929		let budget = self930			.recorder931			.weight_calls_budget(<StructureWeight<T>>::find_parent());932933		let balance = balance(self, token, &from)?;934		ensure_single_owner(self, token, balance)?;935936		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)937			.map_err(dispatch_to_evm::<T>)?;938		Ok(())939	}940941	/// @notice Burns a specific ERC721 token.942	/// @dev Throws unless `msg.sender` is the current owner or an authorized943	///  operator for this RFT. Throws if `from` is not the current owner. Throws944	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.945	///  Throws if RFT pieces have multiple owners.946	/// @param from The current owner of the RFT947	/// @param tokenId The RFT to transfer948	#[weight(<SelfWeightOf<T>>::burn_from())]949	fn burn_from_cross(950		&mut self,951		caller: caller,952		from: EthCrossAccount,953		token_id: uint256,954	) -> Result<void> {955		let caller = T::CrossAccountId::from_eth(caller);956		let from = from.into_sub_cross_account::<T>()?;957		let token = token_id.try_into()?;958		let budget = self959			.recorder960			.weight_calls_budget(<StructureWeight<T>>::find_parent());961962		let balance = balance(self, token, &from)?;963		ensure_single_owner(self, token, balance)?;964965		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)966			.map_err(dispatch_to_evm::<T>)?;967		Ok(())968	}969970	/// @notice Returns next free RFT ID.971	fn next_token_id(&self) -> Result<uint256> {972		self.consume_store_reads(1)?;973		Ok(<TokensMinted<T>>::get(self.id)974			.checked_add(1)975			.ok_or("item id overflow")?976			.into())977	}978979	/// @notice Function to mint multiple tokens.980	/// @dev `tokenIds` should be an array of consecutive numbers and first number981	///  should be obtained with `nextTokenId` method982	/// @param to The new owner983	/// @param tokenIds IDs of the minted RFTs984	#[solidity(hide)]985	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]986	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {987		let caller = T::CrossAccountId::from_eth(caller);988		let to = T::CrossAccountId::from_eth(to);989		let mut expected_index = <TokensMinted<T>>::get(self.id)990			.checked_add(1)991			.ok_or("item id overflow")?;992		let budget = self993			.recorder994			.weight_calls_budget(<StructureWeight<T>>::find_parent());995996		let total_tokens = token_ids.len();997		for id in token_ids.into_iter() {998			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;999			if id != expected_index {1000				return Err("item id should be next".into());1001			}1002			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1003		}1004		let users = [(to.clone(), 1)]1005			.into_iter()1006			.collect::<BTreeMap<_, _>>()1007			.try_into()1008			.unwrap();1009		let create_item_data = CreateItemData::<T> {1010			users,1011			properties: CollectionPropertiesVec::default(),1012		};1013		let data = (0..total_tokens)1014			.map(|_| create_item_data.clone())1015			.collect();10161017		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1018			.map_err(dispatch_to_evm::<T>)?;1019		Ok(true)1020	}10211022	/// @notice Function to mint multiple tokens with the given tokenUris.1023	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1024	///  numbers and first number should be obtained with `nextTokenId` method1025	/// @param to The new owner1026	/// @param tokens array of pairs of token ID and token URI for minted tokens1027	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1028	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1029	fn mint_bulk_with_token_uri(1030		&mut self,1031		caller: caller,1032		to: address,1033		tokens: Vec<(uint256, string)>,1034	) -> Result<bool> {1035		let key = key::url();1036		let caller = T::CrossAccountId::from_eth(caller);1037		let to = T::CrossAccountId::from_eth(to);1038		let mut expected_index = <TokensMinted<T>>::get(self.id)1039			.checked_add(1)1040			.ok_or("item id overflow")?;1041		let budget = self1042			.recorder1043			.weight_calls_budget(<StructureWeight<T>>::find_parent());10441045		let mut data = Vec::with_capacity(tokens.len());1046		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1047			.into_iter()1048			.collect::<BTreeMap<_, _>>()1049			.try_into()1050			.unwrap();1051		for (id, token_uri) in tokens {1052			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1053			if id != expected_index {1054				return Err("item id should be next".into());1055			}1056			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10571058			let mut properties = CollectionPropertiesVec::default();1059			properties1060				.try_push(Property {1061					key: key.clone(),1062					value: token_uri1063						.into_bytes()1064						.try_into()1065						.map_err(|_| "token uri is too long")?,1066				})1067				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10681069			let create_item_data = CreateItemData::<T> {1070				users: users.clone(),1071				properties,1072			};1073			data.push(create_item_data);1074		}10751076		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1077			.map_err(dispatch_to_evm::<T>)?;1078		Ok(true)1079	}10801081	/// @notice Function to mint a token.1082	/// @param to The new owner crossAccountId1083	/// @param properties Properties of minted token1084	/// @return uint256 The id of the newly minted token1085	#[weight(<SelfWeightOf<T>>::create_item())]1086	fn mint_cross(1087		&mut self,1088		caller: caller,1089		to: EthCrossAccount,1090		properties: Vec<PropertyStruct>,1091	) -> Result<uint256> {1092		let token_id = <TokensMinted<T>>::get(self.id)1093			.checked_add(1)1094			.ok_or("item id overflow")?;10951096		let to = to.into_sub_cross_account::<T>()?;10971098		let properties = properties1099			.into_iter()1100			.map(|PropertyStruct { key, value }| {1101				let key = <Vec<u8>>::from(key)1102					.try_into()1103					.map_err(|_| "key too large")?;11041105				let value = value.0.try_into().map_err(|_| "value too large")?;11061107				Ok(Property { key, value })1108			})1109			.collect::<Result<Vec<_>>>()?1110			.try_into()1111			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11121113		let caller = T::CrossAccountId::from_eth(caller);11141115		let budget = self1116			.recorder1117			.weight_calls_budget(<StructureWeight<T>>::find_parent());11181119		let users = [(to, 1)]1120			.into_iter()1121			.collect::<BTreeMap<_, _>>()1122			.try_into()1123			.unwrap();1124		<Pallet<T>>::create_item(1125			self,1126			&caller,1127			CreateItemData::<T> { users, properties },1128			&budget,1129		)1130		.map_err(dispatch_to_evm::<T>)?;11311132		Ok(token_id.into())1133	}11341135	/// Returns EVM address for refungible token1136	///1137	/// @param token ID of the token1138	fn token_contract_address(&self, token: uint256) -> Result<address> {1139		Ok(T::EvmTokenAddressMapping::token_to_address(1140			self.id,1141			token.try_into().map_err(|_| "token id overflow")?,1142		))1143	}1144}11451146#[solidity_interface(1147	name = UniqueRefungible,1148	is(1149		ERC721,1150		ERC721Enumerable,1151		ERC721UniqueExtensions,1152		ERC721UniqueMintable,1153		ERC721Burnable,1154		ERC721Metadata(if(this.flags.erc721metadata)),1155		Collection(via(common_mut returns CollectionHandle<T>)),1156		TokenProperties,1157	)1158)]1159impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11601161// Not a tests, but code generators1162generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1163generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11641165impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1166where1167	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1168{1169	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1170	fn call(1171		self,1172		handle: &mut impl PrecompileHandle,1173	) -> Option<pallet_common::erc::PrecompileResult> {1174		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1175	}1176}
after · pallets/refungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{29	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30	weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,35	erc::{CommonEvmHandler, CollectionCall, static_property::key},36	Error as CommonError,37};38use pallet_evm::{account::CrossAccountId, PrecompileHandle};39use pallet_evm_coder_substrate::{call, dispatch_to_evm};40use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};41use sp_core::{H160, Get};42use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};43use up_data_structs::{44	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,45	PropertyKeyPermission, PropertyPermission, TokenId,46};4748use crate::{49	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,50	TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,51};5253pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5455/// @title A contract that allows to set and delete token properties and change token property permissions.56#[solidity_interface(name = TokenProperties)]57impl<T: Config> RefungibleHandle<T> {58	/// @notice Set permissions for token property.59	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.60	/// @param key Property key.61	/// @param isMutable Permission to mutate property.62	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.63	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.64	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]65	#[solidity(hide)]66	fn set_token_property_permission(67		&mut self,68		caller: caller,69		key: string,70		is_mutable: bool,71		collection_admin: bool,72		token_owner: bool,73	) -> Result<()> {74		let caller = T::CrossAccountId::from_eth(caller);75		<Pallet<T>>::set_token_property_permissions(76			self,77			&caller,78			vec![PropertyKeyPermission {79				key: <Vec<u8>>::from(key)80					.try_into()81					.map_err(|_| "too long key")?,82				permission: PropertyPermission {83					mutable: is_mutable,84					collection_admin,85					token_owner,86				},87			}],88		)89		.map_err(dispatch_to_evm::<T>)90	}9192	/// @notice Set permissions for token property.93	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.94	/// @param permissions Permissions for keys.95	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]96	fn set_token_property_permissions(97		&mut self,98		caller: caller,99		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,100	) -> Result<()> {101		let caller = T::CrossAccountId::from_eth(caller);102		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(103			permissions,104		)?;105106		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)107			.map_err(dispatch_to_evm::<T>)108	}109110	/// @notice Get permissions for token properties.111	fn token_property_permissions(112		&self,113	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {114		let perms = <Pallet<T>>::token_property_permission(self.id);115		Ok(perms116			.into_iter()117			.map(pallet_common::eth::TokenPropertyPermission::from)118			.collect())119	}120121	/// @notice Set token property value.122	/// @dev Throws error if `msg.sender` has no permission to edit the property.123	/// @param tokenId ID of the token.124	/// @param key Property key.125	/// @param value Property value.126	#[solidity(hide)]127	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]128	fn set_property(129		&mut self,130		caller: caller,131		token_id: uint256,132		key: string,133		value: bytes,134	) -> Result<()> {135		let caller = T::CrossAccountId::from_eth(caller);136		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;137		let key = <Vec<u8>>::from(key)138			.try_into()139			.map_err(|_| "key too long")?;140		let value = value.0.try_into().map_err(|_| "value too long")?;141142		let nesting_budget = self143			.recorder144			.weight_calls_budget(<StructureWeight<T>>::find_parent());145146		<Pallet<T>>::set_token_property(147			self,148			&caller,149			TokenId(token_id),150			Property { key, value },151			&nesting_budget,152		)153		.map_err(dispatch_to_evm::<T>)154	}155156	/// @notice Set token properties value.157	/// @dev Throws error if `msg.sender` has no permission to edit the property.158	/// @param tokenId ID of the token.159	/// @param properties settable properties160	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]161	fn set_properties(162		&mut self,163		caller: caller,164		token_id: uint256,165		properties: Vec<pallet_common::eth::Property>,166	) -> Result<()> {167		let caller = T::CrossAccountId::from_eth(caller);168		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;169170		let nesting_budget = self171			.recorder172			.weight_calls_budget(<StructureWeight<T>>::find_parent());173174		let properties = properties175			.into_iter()176			.map(|pallet_common::eth::Property { key, value }| {177				let key = <Vec<u8>>::from(key)178					.try_into()179					.map_err(|_| "key too large")?;180181				let value = value.0.try_into().map_err(|_| "value too large")?;182183				Ok(Property { key, value })184			})185			.collect::<Result<Vec<_>>>()?;186187		<Pallet<T>>::set_token_properties(188			self,189			&caller,190			TokenId(token_id),191			properties.into_iter(),192			false,193			&nesting_budget,194		)195		.map_err(dispatch_to_evm::<T>)196	}197198	/// @notice Delete token property value.199	/// @dev Throws error if `msg.sender` has no permission to edit the property.200	/// @param tokenId ID of the token.201	/// @param key Property key.202	#[solidity(hide)]203	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]204	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {205		let caller = T::CrossAccountId::from_eth(caller);206		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;207		let key = <Vec<u8>>::from(key)208			.try_into()209			.map_err(|_| "key too long")?;210211		let nesting_budget = self212			.recorder213			.weight_calls_budget(<StructureWeight<T>>::find_parent());214215		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)216			.map_err(dispatch_to_evm::<T>)217	}218219	/// @notice Delete token properties value.220	/// @dev Throws error if `msg.sender` has no permission to edit the property.221	/// @param tokenId ID of the token.222	/// @param keys Properties key.223	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]224	fn delete_properties(225		&mut self,226		token_id: uint256,227		caller: caller,228		keys: Vec<string>,229	) -> Result<()> {230		let caller = T::CrossAccountId::from_eth(caller);231		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;232		let keys = keys233			.into_iter()234			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))235			.collect::<Result<Vec<_>>>()?;236237		let nesting_budget = self238			.recorder239			.weight_calls_budget(<StructureWeight<T>>::find_parent());240241		<Pallet<T>>::delete_token_properties(242			self,243			&caller,244			TokenId(token_id),245			keys.into_iter(),246			&nesting_budget,247		)248		.map_err(dispatch_to_evm::<T>)249	}250251	/// @notice Get token property value.252	/// @dev Throws error if key not found253	/// @param tokenId ID of the token.254	/// @param key Property key.255	/// @return Property value bytes256	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {257		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;258		let key = <Vec<u8>>::from(key)259			.try_into()260			.map_err(|_| "key too long")?;261262		let props = <TokenProperties<T>>::get((self.id, token_id));263		let prop = props.get(&key).ok_or("key not found")?;264265		Ok(prop.to_vec().into())266	}267}268269#[derive(ToLog)]270pub enum ERC721Events {271	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed272	///  (`to` == 0). Exception: during contract creation, any number of RFTs273	///  may be created and assigned without emitting Transfer.274	Transfer {275		#[indexed]276		from: address,277		#[indexed]278		to: address,279		#[indexed]280		token_id: uint256,281	},282	/// @dev Not supported283	Approval {284		#[indexed]285		owner: address,286		#[indexed]287		approved: address,288		#[indexed]289		token_id: uint256,290	},291	/// @dev Not supported292	#[allow(dead_code)]293	ApprovalForAll {294		#[indexed]295		owner: address,296		#[indexed]297		operator: address,298		approved: bool,299	},300}301302#[derive(ToLog)]303pub enum ERC721UniqueMintableEvents {304	/// @dev Not supported305	#[allow(dead_code)]306	MintingFinished {},307}308309#[solidity_interface(name = ERC721Metadata)]310impl<T: Config> RefungibleHandle<T>311where312	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,313{314	/// @notice A descriptive name for a collection of NFTs in this contract315	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`316	#[solidity(hide, rename_selector = "name")]317	fn name_proxy(&self) -> Result<string> {318		self.name()319	}320321	/// @notice An abbreviated name for NFTs in this contract322	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`323	#[solidity(hide, rename_selector = "symbol")]324	fn symbol_proxy(&self) -> Result<string> {325		self.symbol()326	}327328	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.329	///330	/// @dev If the token has a `url` property and it is not empty, it is returned.331	///  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`.332	///  If the collection property `baseURI` is empty or absent, return "" (empty string)333	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix334	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).335	///336	/// @return token's const_metadata337	#[solidity(rename_selector = "tokenURI")]338	fn token_uri(&self, token_id: uint256) -> Result<string> {339		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;340341		match get_token_property(self, token_id_u32, &key::url()).as_deref() {342			Err(_) | Ok("") => (),343			Ok(url) => {344				return Ok(url.into());345			}346		};347348		let base_uri =349			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())350				.map(BoundedVec::into_inner)351				.map(string::from_utf8)352				.transpose()353				.map_err(|e| {354					Error::Revert(alloc::format!(355						"Can not convert value \"baseURI\" to string with error \"{}\"",356						e357					))358				})?;359360		let base_uri = match base_uri.as_deref() {361			None | Some("") => {362				return Ok("".into());363			}364			Some(base_uri) => base_uri.into(),365		};366367		Ok(368			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {369				Err(_) | Ok("") => base_uri,370				Ok(suffix) => base_uri + suffix,371			},372		)373	}374}375376/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension377/// @dev See https://eips.ethereum.org/EIPS/eip-721378#[solidity_interface(name = ERC721Enumerable)]379impl<T: Config> RefungibleHandle<T> {380	/// @notice Enumerate valid RFTs381	/// @param index A counter less than `totalSupply()`382	/// @return The token identifier for the `index`th NFT,383	///  (sort order not specified)384	fn token_by_index(&self, index: uint256) -> Result<uint256> {385		Ok(index)386	}387388	/// Not implemented389	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {390		// TODO: Not implemetable391		Err("not implemented".into())392	}393394	/// @notice Count RFTs tracked by this contract395	/// @return A count of valid RFTs tracked by this contract, where each one of396	///  them has an assigned and queryable owner not equal to the zero address397	fn total_supply(&self) -> Result<uint256> {398		self.consume_store_reads(1)?;399		Ok(<Pallet<T>>::total_supply(self).into())400	}401}402403/// @title ERC-721 Non-Fungible Token Standard404/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md405#[solidity_interface(name = ERC721, events(ERC721Events))]406impl<T: Config> RefungibleHandle<T> {407	/// @notice Count all RFTs assigned to an owner408	/// @dev RFTs assigned to the zero address are considered invalid, and this409	///  function throws for queries about the zero address.410	/// @param owner An address for whom to query the balance411	/// @return The number of RFTs owned by `owner`, possibly zero412	fn balance_of(&self, owner: address) -> Result<uint256> {413		self.consume_store_reads(1)?;414		let owner = T::CrossAccountId::from_eth(owner);415		let balance = <AccountBalance<T>>::get((self.id, owner));416		Ok(balance.into())417	}418419	/// @notice Find the owner of an RFT420	/// @dev RFTs assigned to zero address are considered invalid, and queries421	///  about them do throw.422	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for423	///  the tokens that are partially owned.424	/// @param tokenId The identifier for an RFT425	/// @return The address of the owner of the RFT426	fn owner_of(&self, token_id: uint256) -> Result<address> {427		self.consume_store_reads(2)?;428		let token = token_id.try_into()?;429		let owner = <Pallet<T>>::token_owner(self.id, token);430		Ok(owner431			.map(|address| *address.as_eth())432			.unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))433	}434435	/// @dev Not implemented436	fn safe_transfer_from_with_data(437		&mut self,438		_from: address,439		_to: address,440		_token_id: uint256,441		_data: bytes,442	) -> Result<void> {443		// TODO: Not implemetable444		Err("not implemented".into())445	}446447	/// @dev Not implemented448	fn safe_transfer_from(449		&mut self,450		_from: address,451		_to: address,452		_token_id: uint256,453	) -> Result<void> {454		// TODO: Not implemetable455		Err("not implemented".into())456	}457458	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE459	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE460	///  THEY MAY BE PERMANENTLY LOST461	/// @dev Throws unless `msg.sender` is the current owner or an authorized462	///  operator for this RFT. Throws if `from` is not the current owner. Throws463	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.464	///  Throws if RFT pieces have multiple owners.465	/// @param from The current owner of the NFT466	/// @param to The new owner467	/// @param tokenId The NFT to transfer468	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]469	fn transfer_from(470		&mut self,471		caller: caller,472		from: address,473		to: address,474		token_id: uint256,475	) -> Result<void> {476		let caller = T::CrossAccountId::from_eth(caller);477		let from = T::CrossAccountId::from_eth(from);478		let to = T::CrossAccountId::from_eth(to);479		let token = token_id.try_into()?;480		let budget = self481			.recorder482			.weight_calls_budget(<StructureWeight<T>>::find_parent());483484		let balance = balance(&self, token, &from)?;485		ensure_single_owner(&self, token, balance)?;486487		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)488			.map_err(dispatch_to_evm::<T>)?;489490		Ok(())491	}492493	/// @dev Not implemented494	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {495		Err("not implemented".into())496	}497498	/// @notice Sets or unsets the approval of a given operator.499	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.500	/// @param operator Operator501	/// @param approved Should operator status be granted or revoked?502	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]503	fn set_approval_for_all(504		&mut self,505		caller: caller,506		operator: address,507		approved: bool,508	) -> Result<void> {509		let caller = T::CrossAccountId::from_eth(caller);510		let operator = T::CrossAccountId::from_eth(operator);511512		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)513			.map_err(dispatch_to_evm::<T>)?;514		Ok(())515	}516517	/// @dev Not implemented518	fn get_approved(&self, _token_id: uint256) -> Result<address> {519		// TODO: Not implemetable520		Err("not implemented".into())521	}522523	/// @notice Tells whether the given `owner` approves the `operator`.524	#[weight(<SelfWeightOf<T>>::allowance_for_all())]525	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {526		let owner = T::CrossAccountId::from_eth(owner);527		let operator = T::CrossAccountId::from_eth(operator);528529		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))530	}531532	/// @notice Returns collection helper contract address533	fn collection_helper_address(&self) -> Result<address> {534		Ok(T::ContractAddress::get())535	}536}537538/// Returns amount of pieces of `token` that `owner` have539pub fn balance<T: Config>(540	collection: &RefungibleHandle<T>,541	token: TokenId,542	owner: &T::CrossAccountId,543) -> Result<u128> {544	collection.consume_store_reads(1)?;545	let balance = <Balance<T>>::get((collection.id, token, &owner));546	Ok(balance)547}548549/// Throws if `owner_balance` is lower than total amount of `token` pieces550pub fn ensure_single_owner<T: Config>(551	collection: &RefungibleHandle<T>,552	token: TokenId,553	owner_balance: u128,554) -> Result<()> {555	collection.consume_store_reads(1)?;556	let total_supply = <TotalSupply<T>>::get((collection.id, token));557558	if owner_balance == 0 {559		return Err(dispatch_to_evm::<T>(560			<CommonError<T>>::MustBeTokenOwner.into(),561		));562	}563564	if total_supply != owner_balance {565		return Err("token has multiple owners".into());566	}567	Ok(())568}569570/// @title ERC721 Token that can be irreversibly burned (destroyed).571#[solidity_interface(name = ERC721Burnable)]572impl<T: Config> RefungibleHandle<T> {573	/// @notice Burns a specific ERC721 token.574	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized575	///  operator of the current owner.576	/// @param tokenId The RFT to approve577	#[weight(<SelfWeightOf<T>>::burn_item_fully())]578	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {579		let caller = T::CrossAccountId::from_eth(caller);580		let token = token_id.try_into()?;581582		let balance = balance(&self, token, &caller)?;583		ensure_single_owner(&self, token, balance)?;584585		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;586		Ok(())587	}588}589590/// @title ERC721 minting logic.591#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]592impl<T: Config> RefungibleHandle<T> {593	fn minting_finished(&self) -> Result<bool> {594		Ok(false)595	}596597	/// @notice Function to mint a token.598	/// @param to The new owner599	/// @return uint256 The id of the newly minted token600	#[weight(<SelfWeightOf<T>>::create_item())]601	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {602		let token_id: uint256 = <TokensMinted<T>>::get(self.id)603			.checked_add(1)604			.ok_or("item id overflow")?605			.into();606		self.mint_check_id(caller, to, token_id)?;607		Ok(token_id)608	}609610	/// @notice Function to mint a token.611	/// @dev `tokenId` should be obtained with `nextTokenId` method,612	///  unlike standard, you can't specify it manually613	/// @param to The new owner614	/// @param tokenId ID of the minted RFT615	#[solidity(hide, rename_selector = "mint")]616	#[weight(<SelfWeightOf<T>>::create_item())]617	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {618		let caller = T::CrossAccountId::from_eth(caller);619		let to = T::CrossAccountId::from_eth(to);620		let token_id: u32 = token_id.try_into()?;621		let budget = self622			.recorder623			.weight_calls_budget(<StructureWeight<T>>::find_parent());624625		if <TokensMinted<T>>::get(self.id)626			.checked_add(1)627			.ok_or("item id overflow")?628			!= token_id629		{630			return Err("item id should be next".into());631		}632633		let users = [(to.clone(), 1)]634			.into_iter()635			.collect::<BTreeMap<_, _>>()636			.try_into()637			.unwrap();638		<Pallet<T>>::create_item(639			self,640			&caller,641			CreateItemData::<T> {642				users,643				properties: CollectionPropertiesVec::default(),644			},645			&budget,646		)647		.map_err(dispatch_to_evm::<T>)?;648649		Ok(true)650	}651652	/// @notice Function to mint token with the given tokenUri.653	/// @param to The new owner654	/// @param tokenUri Token URI that would be stored in the NFT properties655	/// @return uint256 The id of the newly minted token656	#[solidity(rename_selector = "mintWithTokenURI")]657	#[weight(<SelfWeightOf<T>>::create_item())]658	fn mint_with_token_uri(659		&mut self,660		caller: caller,661		to: address,662		token_uri: string,663	) -> Result<uint256> {664		let token_id: uint256 = <TokensMinted<T>>::get(self.id)665			.checked_add(1)666			.ok_or("item id overflow")?667			.into();668		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;669		Ok(token_id)670	}671672	/// @notice Function to mint token with the given tokenUri.673	/// @dev `tokenId` should be obtained with `nextTokenId` method,674	///  unlike standard, you can't specify it manually675	/// @param to The new owner676	/// @param tokenId ID of the minted RFT677	/// @param tokenUri Token URI that would be stored in the RFT properties678	#[solidity(hide, rename_selector = "mintWithTokenURI")]679	#[weight(<SelfWeightOf<T>>::create_item())]680	fn mint_with_token_uri_check_id(681		&mut self,682		caller: caller,683		to: address,684		token_id: uint256,685		token_uri: string,686	) -> Result<bool> {687		let key = key::url();688		let permission = get_token_permission::<T>(self.id, &key)?;689		if !permission.collection_admin {690			return Err("Operation is not allowed".into());691		}692693		let caller = T::CrossAccountId::from_eth(caller);694		let to = T::CrossAccountId::from_eth(to);695		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;696		let budget = self697			.recorder698			.weight_calls_budget(<StructureWeight<T>>::find_parent());699700		if <TokensMinted<T>>::get(self.id)701			.checked_add(1)702			.ok_or("item id overflow")?703			!= token_id704		{705			return Err("item id should be next".into());706		}707708		let mut properties = CollectionPropertiesVec::default();709		properties710			.try_push(Property {711				key,712				value: token_uri713					.into_bytes()714					.try_into()715					.map_err(|_| "token uri is too long")?,716			})717			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;718719		let users = [(to.clone(), 1)]720			.into_iter()721			.collect::<BTreeMap<_, _>>()722			.try_into()723			.unwrap();724		<Pallet<T>>::create_item(725			self,726			&caller,727			CreateItemData::<T> { users, properties },728			&budget,729		)730		.map_err(dispatch_to_evm::<T>)?;731		Ok(true)732	}733734	/// @dev Not implemented735	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {736		Err("not implementable".into())737	}738}739740fn get_token_property<T: Config>(741	collection: &CollectionHandle<T>,742	token_id: u32,743	key: &up_data_structs::PropertyKey,744) -> Result<string> {745	collection.consume_store_reads(1)?;746	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))747		.map_err(|_| Error::Revert("Token properties not found".into()))?;748	if let Some(property) = properties.get(key) {749		return Ok(string::from_utf8_lossy(property).into());750	}751752	Err("Property tokenURI not found".into())753}754755fn get_token_permission<T: Config>(756	collection_id: CollectionId,757	key: &PropertyKey,758) -> Result<PropertyPermission> {759	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)760		.map_err(|_| Error::Revert("No permissions for collection".into()))?;761	let a = token_property_permissions762		.get(key)763		.map(Clone::clone)764		.ok_or_else(|| {765			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();766			Error::Revert(alloc::format!("No permission for key {}", key))767		})?;768	Ok(a)769}770771/// @title Unique extensions for ERC721.772#[solidity_interface(name = ERC721UniqueExtensions)]773impl<T: Config> RefungibleHandle<T>774where775	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,776{777	/// @notice A descriptive name for a collection of NFTs in this contract778	fn name(&self) -> Result<string> {779		Ok(decode_utf16(self.name.iter().copied())780			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))781			.collect::<string>())782	}783784	/// @notice An abbreviated name for NFTs in this contract785	fn symbol(&self) -> Result<string> {786		Ok(string::from_utf8_lossy(&self.token_prefix).into())787	}788789	/// @notice A description for the collection.790	fn description(&self) -> Result<string> {791		Ok(decode_utf16(self.description.iter().copied())792			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))793			.collect::<string>())794	}795796	/// Returns the owner (in cross format) of the token.797	///798	/// @param tokenId Id for the token.799	fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {800		Self::token_owner(&self, token_id.try_into()?)801			.map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))802			.ok_or(Error::Revert("key too large".into()))803	}804805	/// Returns the token properties.806	///807	/// @param tokenId Id for the token.808	/// @param keys Properties keys. Empty keys for all propertyes.809	/// @return Vector of properties key/value pairs.810	fn properties(811		&self,812		token_id: uint256,813		keys: Vec<string>,814	) -> Result<Vec<pallet_common::eth::Property>> {815		let keys = keys816			.into_iter()817			.map(|key| {818				<Vec<u8>>::from(key)819					.try_into()820					.map_err(|_| Error::Revert("key too large".into()))821			})822			.collect::<Result<Vec<_>>>()?;823824		<Self as CommonCollectionOperations<T>>::token_properties(825			&self,826			token_id.try_into()?,827			if keys.is_empty() { None } else { Some(keys) },828		)829		.into_iter()830		.map(|p| {831			let key = string::from_utf8(p.key.to_vec())832				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;833			let value = bytes(p.value.to_vec());834			Ok(pallet_common::eth::Property { key, value })835		})836		.collect::<Result<Vec<_>>>()837	}838	/// @notice Transfer ownership of an RFT839	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`840	///  is the zero address. Throws if `tokenId` is not a valid RFT.841	///  Throws if RFT pieces have multiple owners.842	/// @param to The new owner843	/// @param tokenId The RFT to transfer844	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]845	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {846		let caller = T::CrossAccountId::from_eth(caller);847		let to = T::CrossAccountId::from_eth(to);848		let token = token_id.try_into()?;849		let budget = self850			.recorder851			.weight_calls_budget(<StructureWeight<T>>::find_parent());852853		let balance = balance(self, token, &caller)?;854		ensure_single_owner(self, token, balance)?;855856		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)857			.map_err(dispatch_to_evm::<T>)?;858		Ok(())859	}860861	/// @notice Transfer ownership of an RFT862	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`863	///  is the zero address. Throws if `tokenId` is not a valid RFT.864	///  Throws if RFT pieces have multiple owners.865	/// @param to The new owner866	/// @param tokenId The RFT to transfer867	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]868	fn transfer_cross(869		&mut self,870		caller: caller,871		to: pallet_common::eth::CrossAccount,872		token_id: uint256,873	) -> Result<void> {874		let caller = T::CrossAccountId::from_eth(caller);875		let to = to.into_sub_cross_account::<T>()?;876		let token = token_id.try_into()?;877		let budget = self878			.recorder879			.weight_calls_budget(<StructureWeight<T>>::find_parent());880881		let balance = balance(self, token, &caller)?;882		ensure_single_owner(self, token, balance)?;883884		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)885			.map_err(dispatch_to_evm::<T>)?;886		Ok(())887	}888889	/// @notice Transfer ownership of an RFT890	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`891	///  is the zero address. Throws if `tokenId` is not a valid RFT.892	///  Throws if RFT pieces have multiple owners.893	/// @param to The new owner894	/// @param tokenId The RFT to transfer895	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]896	fn transfer_from_cross(897		&mut self,898		caller: caller,899		from: pallet_common::eth::CrossAccount,900		to: pallet_common::eth::CrossAccount,901		token_id: uint256,902	) -> Result<void> {903		let caller = T::CrossAccountId::from_eth(caller);904		let from = from.into_sub_cross_account::<T>()?;905		let to = to.into_sub_cross_account::<T>()?;906		let token_id = token_id.try_into()?;907		let budget = self908			.recorder909			.weight_calls_budget(<StructureWeight<T>>::find_parent());910911		let balance = balance(self, token_id, &from)?;912		ensure_single_owner(self, token_id, balance)?;913914		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)915			.map_err(dispatch_to_evm::<T>)?;916		Ok(())917	}918919	/// @notice Burns a specific ERC721 token.920	/// @dev Throws unless `msg.sender` is the current owner or an authorized921	///  operator for this RFT. Throws if `from` is not the current owner. Throws922	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.923	///  Throws if RFT pieces have multiple owners.924	/// @param from The current owner of the RFT925	/// @param tokenId The RFT to transfer926	#[solidity(hide)]927	#[weight(<SelfWeightOf<T>>::burn_from())]928	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {929		let caller = T::CrossAccountId::from_eth(caller);930		let from = T::CrossAccountId::from_eth(from);931		let token = token_id.try_into()?;932		let budget = self933			.recorder934			.weight_calls_budget(<StructureWeight<T>>::find_parent());935936		let balance = balance(self, token, &from)?;937		ensure_single_owner(self, token, balance)?;938939		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)940			.map_err(dispatch_to_evm::<T>)?;941		Ok(())942	}943944	/// @notice Burns a specific ERC721 token.945	/// @dev Throws unless `msg.sender` is the current owner or an authorized946	///  operator for this RFT. Throws if `from` is not the current owner. Throws947	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.948	///  Throws if RFT pieces have multiple owners.949	/// @param from The current owner of the RFT950	/// @param tokenId The RFT to transfer951	#[weight(<SelfWeightOf<T>>::burn_from())]952	fn burn_from_cross(953		&mut self,954		caller: caller,955		from: pallet_common::eth::CrossAccount,956		token_id: uint256,957	) -> Result<void> {958		let caller = T::CrossAccountId::from_eth(caller);959		let from = from.into_sub_cross_account::<T>()?;960		let token = token_id.try_into()?;961		let budget = self962			.recorder963			.weight_calls_budget(<StructureWeight<T>>::find_parent());964965		let balance = balance(self, token, &from)?;966		ensure_single_owner(self, token, balance)?;967968		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)969			.map_err(dispatch_to_evm::<T>)?;970		Ok(())971	}972973	/// @notice Returns next free RFT ID.974	fn next_token_id(&self) -> Result<uint256> {975		self.consume_store_reads(1)?;976		Ok(<TokensMinted<T>>::get(self.id)977			.checked_add(1)978			.ok_or("item id overflow")?979			.into())980	}981982	/// @notice Function to mint multiple tokens.983	/// @dev `tokenIds` should be an array of consecutive numbers and first number984	///  should be obtained with `nextTokenId` method985	/// @param to The new owner986	/// @param tokenIds IDs of the minted RFTs987	#[solidity(hide)]988	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]989	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {990		let caller = T::CrossAccountId::from_eth(caller);991		let to = T::CrossAccountId::from_eth(to);992		let mut expected_index = <TokensMinted<T>>::get(self.id)993			.checked_add(1)994			.ok_or("item id overflow")?;995		let budget = self996			.recorder997			.weight_calls_budget(<StructureWeight<T>>::find_parent());998999		let total_tokens = token_ids.len();1000		for id in token_ids.into_iter() {1001			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1002			if id != expected_index {1003				return Err("item id should be next".into());1004			}1005			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1006		}1007		let users = [(to.clone(), 1)]1008			.into_iter()1009			.collect::<BTreeMap<_, _>>()1010			.try_into()1011			.unwrap();1012		let create_item_data = CreateItemData::<T> {1013			users,1014			properties: CollectionPropertiesVec::default(),1015		};1016		let data = (0..total_tokens)1017			.map(|_| create_item_data.clone())1018			.collect();10191020		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1021			.map_err(dispatch_to_evm::<T>)?;1022		Ok(true)1023	}10241025	/// @notice Function to mint multiple tokens with the given tokenUris.1026	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1027	///  numbers and first number should be obtained with `nextTokenId` method1028	/// @param to The new owner1029	/// @param tokens array of pairs of token ID and token URI for minted tokens1030	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1031	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1032	fn mint_bulk_with_token_uri(1033		&mut self,1034		caller: caller,1035		to: address,1036		tokens: Vec<(uint256, string)>,1037	) -> Result<bool> {1038		let key = key::url();1039		let caller = T::CrossAccountId::from_eth(caller);1040		let to = T::CrossAccountId::from_eth(to);1041		let mut expected_index = <TokensMinted<T>>::get(self.id)1042			.checked_add(1)1043			.ok_or("item id overflow")?;1044		let budget = self1045			.recorder1046			.weight_calls_budget(<StructureWeight<T>>::find_parent());10471048		let mut data = Vec::with_capacity(tokens.len());1049		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1050			.into_iter()1051			.collect::<BTreeMap<_, _>>()1052			.try_into()1053			.unwrap();1054		for (id, token_uri) in tokens {1055			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1056			if id != expected_index {1057				return Err("item id should be next".into());1058			}1059			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10601061			let mut properties = CollectionPropertiesVec::default();1062			properties1063				.try_push(Property {1064					key: key.clone(),1065					value: token_uri1066						.into_bytes()1067						.try_into()1068						.map_err(|_| "token uri is too long")?,1069				})1070				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10711072			let create_item_data = CreateItemData::<T> {1073				users: users.clone(),1074				properties,1075			};1076			data.push(create_item_data);1077		}10781079		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1080			.map_err(dispatch_to_evm::<T>)?;1081		Ok(true)1082	}10831084	/// @notice Function to mint a token.1085	/// @param to The new owner crossAccountId1086	/// @param properties Properties of minted token1087	/// @return uint256 The id of the newly minted token1088	#[weight(<SelfWeightOf<T>>::create_item())]1089	fn mint_cross(1090		&mut self,1091		caller: caller,1092		to: pallet_common::eth::CrossAccount,1093		properties: Vec<pallet_common::eth::Property>,1094	) -> Result<uint256> {1095		let token_id = <TokensMinted<T>>::get(self.id)1096			.checked_add(1)1097			.ok_or("item id overflow")?;10981099		let to = to.into_sub_cross_account::<T>()?;11001101		let properties = properties1102			.into_iter()1103			.map(|pallet_common::eth::Property { key, value }| {1104				let key = <Vec<u8>>::from(key)1105					.try_into()1106					.map_err(|_| "key too large")?;11071108				let value = value.0.try_into().map_err(|_| "value too large")?;11091110				Ok(Property { key, value })1111			})1112			.collect::<Result<Vec<_>>>()?1113			.try_into()1114			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11151116		let caller = T::CrossAccountId::from_eth(caller);11171118		let budget = self1119			.recorder1120			.weight_calls_budget(<StructureWeight<T>>::find_parent());11211122		let users = [(to, 1)]1123			.into_iter()1124			.collect::<BTreeMap<_, _>>()1125			.try_into()1126			.unwrap();1127		<Pallet<T>>::create_item(1128			self,1129			&caller,1130			CreateItemData::<T> { users, properties },1131			&budget,1132		)1133		.map_err(dispatch_to_evm::<T>)?;11341135		Ok(token_id.into())1136	}11371138	/// Returns EVM address for refungible token1139	///1140	/// @param token ID of the token1141	fn token_contract_address(&self, token: uint256) -> Result<address> {1142		Ok(T::EvmTokenAddressMapping::token_to_address(1143			self.id,1144			token.try_into().map_err(|_| "token id overflow")?,1145		))1146	}1147}11481149#[solidity_interface(1150	name = UniqueRefungible,1151	is(1152		ERC721,1153		ERC721Enumerable,1154		ERC721UniqueExtensions,1155		ERC721UniqueMintable,1156		ERC721Burnable,1157		ERC721Metadata(if(this.flags.erc721metadata)),1158		Collection(via(common_mut returns CollectionHandle<T>)),1159		TokenProperties,1160	)1161)]1162impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11631164// Not a tests, but code generators1165generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1166generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11671168impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1169where1170	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1171{1172	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1173	fn call(1174		self,1175		handle: &mut impl PrecompileHandle,1176	) -> Option<pallet_common::erc::PrecompileResult> {1177		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1178	}1179}
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,
 }