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
before · pallets/nonfungible/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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24	char::{REPLACEMENT_CHARACTER, decode_utf16},25	convert::TryInto,26};27use evm_coder::{28	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,29	weight,30};31use frame_support::BoundedVec;32use up_data_structs::{33	TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,34	CollectionPropertiesVec,35};36use pallet_evm_coder_substrate::dispatch_to_evm;37use sp_std::{vec::Vec, vec};38use pallet_common::{39	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,40	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},41	eth::{Property as PropertyStruct, EthCrossAccount},42};43use pallet_evm::{account::CrossAccountId, PrecompileHandle};44use pallet_evm_coder_substrate::call;45use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};46use sp_core::Get;4748use crate::{49	AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,50	SelfWeightOf, weights::WeightInfo, TokenProperties,51};5253/// @title A contract that allows to set and delete token properties and change token property permissions.54#[solidity_interface(name = TokenProperties)]55impl<T: Config> NonfungibleHandle<T> {56	/// @notice Set permissions for token property.57	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.58	/// @param key Property key.59	/// @param isMutable Permission to mutate property.60	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.61	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.62	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]63	#[solidity(hide)]64	fn set_token_property_permission(65		&mut self,66		caller: caller,67		key: string,68		is_mutable: bool,69		collection_admin: bool,70		token_owner: bool,71	) -> Result<()> {72		let caller = T::CrossAccountId::from_eth(caller);73		<Pallet<T>>::set_token_property_permissions(74			self,75			&caller,76			vec![PropertyKeyPermission {77				key: <Vec<u8>>::from(key)78					.try_into()79					.map_err(|_| "too long key")?,80				permission: PropertyPermission {81					mutable: is_mutable,82					collection_admin,83					token_owner,84				},85			}],86		)87		.map_err(dispatch_to_evm::<T>)88	}8990	/// @notice Set permissions for token property.91	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.92	/// @param permissions Permissions for keys.93	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]94	fn set_token_property_permissions(95		&mut self,96		caller: caller,97		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,98	) -> Result<()> {99		let caller = T::CrossAccountId::from_eth(caller);100		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(101			permissions,102		)?;103104		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)105			.map_err(dispatch_to_evm::<T>)106	}107108	/// @notice Get permissions for token properties.109	fn token_property_permissions(110		&self,111	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {112		let perms = <Pallet<T>>::token_property_permission(self.id);113		Ok(perms114			.into_iter()115			.map(pallet_common::eth::TokenPropertyPermission::from)116			.collect())117	}118119	/// @notice Set token property value.120	/// @dev Throws error if `msg.sender` has no permission to edit the property.121	/// @param tokenId ID of the token.122	/// @param key Property key.123	/// @param value Property value.124	#[solidity(hide)]125	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]126	fn set_property(127		&mut self,128		caller: caller,129		token_id: uint256,130		key: string,131		value: bytes,132	) -> Result<()> {133		let caller = T::CrossAccountId::from_eth(caller);134		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;135		let key = <Vec<u8>>::from(key)136			.try_into()137			.map_err(|_| "key too long")?;138		let value = value.0.try_into().map_err(|_| "value too long")?;139140		let nesting_budget = self141			.recorder142			.weight_calls_budget(<StructureWeight<T>>::find_parent());143144		<Pallet<T>>::set_token_property(145			self,146			&caller,147			TokenId(token_id),148			Property { key, value },149			&nesting_budget,150		)151		.map_err(dispatch_to_evm::<T>)152	}153154	/// @notice Set token properties value.155	/// @dev Throws error if `msg.sender` has no permission to edit the property.156	/// @param tokenId ID of the token.157	/// @param properties settable properties158	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]159	fn set_properties(160		&mut self,161		caller: caller,162		token_id: uint256,163		properties: Vec<PropertyStruct>,164	) -> Result<()> {165		let caller = T::CrossAccountId::from_eth(caller);166		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;167168		let nesting_budget = self169			.recorder170			.weight_calls_budget(<StructureWeight<T>>::find_parent());171172		let properties = properties173			.into_iter()174			.map(|PropertyStruct { key, value }| {175				let key = <Vec<u8>>::from(key)176					.try_into()177					.map_err(|_| "key too large")?;178179				let value = value.0.try_into().map_err(|_| "value too large")?;180181				Ok(Property { key, value })182			})183			.collect::<Result<Vec<_>>>()?;184185		<Pallet<T>>::set_token_properties(186			self,187			&caller,188			TokenId(token_id),189			properties.into_iter(),190			false,191			&nesting_budget,192		)193		.map_err(dispatch_to_evm::<T>)194	}195196	/// @notice Delete token property value.197	/// @dev Throws error if `msg.sender` has no permission to edit the property.198	/// @param tokenId ID of the token.199	/// @param key Property key.200	#[solidity(hide)]201	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]202	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {203		let caller = T::CrossAccountId::from_eth(caller);204		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;205		let key = <Vec<u8>>::from(key)206			.try_into()207			.map_err(|_| "key too long")?;208209		let nesting_budget = self210			.recorder211			.weight_calls_budget(<StructureWeight<T>>::find_parent());212213		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)214			.map_err(dispatch_to_evm::<T>)215	}216217	/// @notice Delete token properties value.218	/// @dev Throws error if `msg.sender` has no permission to edit the property.219	/// @param tokenId ID of the token.220	/// @param keys Properties key.221	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]222	fn delete_properties(223		&mut self,224		token_id: uint256,225		caller: caller,226		keys: Vec<string>,227	) -> Result<()> {228		let caller = T::CrossAccountId::from_eth(caller);229		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;230		let keys = keys231			.into_iter()232			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))233			.collect::<Result<Vec<_>>>()?;234235		let nesting_budget = self236			.recorder237			.weight_calls_budget(<StructureWeight<T>>::find_parent());238239		<Pallet<T>>::delete_token_properties(240			self,241			&caller,242			TokenId(token_id),243			keys.into_iter(),244			&nesting_budget,245		)246		.map_err(dispatch_to_evm::<T>)247	}248249	/// @notice Get token property value.250	/// @dev Throws error if key not found251	/// @param tokenId ID of the token.252	/// @param key Property key.253	/// @return Property value bytes254	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {255		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;256		let key = <Vec<u8>>::from(key)257			.try_into()258			.map_err(|_| "key too long")?;259260		let props = <TokenProperties<T>>::get((self.id, token_id));261		let prop = props.get(&key).ok_or("key not found")?;262263		Ok(prop.to_vec().into())264	}265}266267#[derive(ToLog)]268pub enum ERC721Events {269	/// @dev This emits when ownership of any NFT changes by any mechanism.270	///  This event emits when NFTs are created (`from` == 0) and destroyed271	///  (`to` == 0). Exception: during contract creation, any number of NFTs272	///  may be created and assigned without emitting Transfer. At the time of273	///  any transfer, the approved address for that NFT (if any) is reset to none.274	Transfer {275		#[indexed]276		from: address,277		#[indexed]278		to: address,279		#[indexed]280		token_id: uint256,281	},282	/// @dev This emits when the approved address for an NFT is changed or283	///  reaffirmed. The zero address indicates there is no approved address.284	///  When a Transfer event emits, this also indicates that the approved285	///  address for that NFT (if any) is reset to none.286	Approval {287		#[indexed]288		owner: address,289		#[indexed]290		approved: address,291		#[indexed]292		token_id: uint256,293	},294	/// @dev This emits when an operator is enabled or disabled for an owner.295	///  The operator can manage all NFTs of the owner.296	#[allow(dead_code)]297	ApprovalForAll {298		#[indexed]299		owner: address,300		#[indexed]301		operator: address,302		approved: bool,303	},304}305306#[derive(ToLog)]307pub enum ERC721UniqueMintableEvents {308	#[allow(dead_code)]309	MintingFinished {},310}311312/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension313/// @dev See https://eips.ethereum.org/EIPS/eip-721314#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]315impl<T: Config> NonfungibleHandle<T>316where317	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,318{319	/// @notice A descriptive name for a collection of NFTs in this contract320	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`321	#[solidity(hide, rename_selector = "name")]322	fn name_proxy(&self) -> Result<string> {323		self.name()324	}325326	/// @notice An abbreviated name for NFTs in this contract327	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`328	#[solidity(hide, rename_selector = "symbol")]329	fn symbol_proxy(&self) -> Result<string> {330		self.symbol()331	}332333	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.334	///335	/// @dev If the token has a `url` property and it is not empty, it is returned.336	///  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`.337	///  If the collection property `baseURI` is empty or absent, return "" (empty string)338	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix339	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).340	///341	/// @return token's const_metadata342	#[solidity(rename_selector = "tokenURI")]343	fn token_uri(&self, token_id: uint256) -> Result<string> {344		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;345346		match get_token_property(self, token_id_u32, &key::url()).as_deref() {347			Err(_) | Ok("") => (),348			Ok(url) => {349				return Ok(url.into());350			}351		};352353		let base_uri =354			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())355				.map(BoundedVec::into_inner)356				.map(string::from_utf8)357				.transpose()358				.map_err(|e| {359					Error::Revert(alloc::format!(360						"Can not convert value \"baseURI\" to string with error \"{}\"",361						e362					))363				})?;364365		let base_uri = match base_uri.as_deref() {366			None | Some("") => {367				return Ok("".into());368			}369			Some(base_uri) => base_uri.into(),370		};371372		Ok(373			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {374				Err(_) | Ok("") => base_uri,375				Ok(suffix) => base_uri + suffix,376			},377		)378	}379}380381/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension382/// @dev See https://eips.ethereum.org/EIPS/eip-721383#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]384impl<T: Config> NonfungibleHandle<T> {385	/// @notice Enumerate valid NFTs386	/// @param index A counter less than `totalSupply()`387	/// @return The token identifier for the `index`th NFT,388	///  (sort order not specified)389	fn token_by_index(&self, index: uint256) -> Result<uint256> {390		Ok(index)391	}392393	/// @dev Not implemented394	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {395		// TODO: Not implemetable396		Err("not implemented".into())397	}398399	/// @notice Count NFTs tracked by this contract400	/// @return A count of valid NFTs tracked by this contract, where each one of401	///  them has an assigned and queryable owner not equal to the zero address402	fn total_supply(&self) -> Result<uint256> {403		self.consume_store_reads(1)?;404		Ok(<Pallet<T>>::total_supply(self).into())405	}406}407408/// @title ERC-721 Non-Fungible Token Standard409/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md410#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]411impl<T: Config> NonfungibleHandle<T> {412	/// @notice Count all NFTs assigned to an owner413	/// @dev NFTs assigned to the zero address are considered invalid, and this414	///  function throws for queries about the zero address.415	/// @param owner An address for whom to query the balance416	/// @return The number of NFTs owned by `owner`, possibly zero417	fn balance_of(&self, owner: address) -> Result<uint256> {418		self.consume_store_reads(1)?;419		let owner = T::CrossAccountId::from_eth(owner);420		let balance = <AccountBalance<T>>::get((self.id, owner));421		Ok(balance.into())422	}423	/// @notice Find the owner of an NFT424	/// @dev NFTs assigned to zero address are considered invalid, and queries425	///  about them do throw.426	/// @param tokenId The identifier for an NFT427	/// @return The address of the owner of the NFT428	fn owner_of(&self, token_id: uint256) -> Result<address> {429		self.consume_store_reads(1)?;430		let token: TokenId = token_id.try_into()?;431		Ok(*<TokenData<T>>::get((self.id, token))432			.ok_or("token not found")?433			.owner434			.as_eth())435	}436	/// @dev Not implemented437	#[solidity(rename_selector = "safeTransferFrom")]438	fn safe_transfer_from_with_data(439		&mut self,440		_from: address,441		_to: address,442		_token_id: uint256,443		_data: bytes,444	) -> Result<void> {445		// TODO: Not implemetable446		Err("not implemented".into())447	}448	/// @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 NFT -- 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 NFT. Throws if `from` is not the current owner. Throws464	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.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())]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		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)485			.map_err(dispatch_to_evm::<T>)?;486		Ok(())487	}488489	/// @notice Set or reaffirm the approved address for an NFT490	/// @dev The zero address indicates there is no approved address.491	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized492	///  operator of the current owner.493	/// @param approved The new approved NFT controller494	/// @param tokenId The NFT to approve495	#[weight(<SelfWeightOf<T>>::approve())]496	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {497		let caller = T::CrossAccountId::from_eth(caller);498		let approved = T::CrossAccountId::from_eth(approved);499		let token = token_id.try_into()?;500501		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))502			.map_err(dispatch_to_evm::<T>)?;503		Ok(())504	}505506	/// @notice Sets or unsets the approval of a given operator.507	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.508	/// @param operator Operator509	/// @param approved Should operator status be granted or revoked?510	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]511	fn set_approval_for_all(512		&mut self,513		caller: caller,514		operator: address,515		approved: bool,516	) -> Result<void> {517		let caller = T::CrossAccountId::from_eth(caller);518		let operator = T::CrossAccountId::from_eth(operator);519520		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)521			.map_err(dispatch_to_evm::<T>)?;522		Ok(())523	}524525	/// @dev Not implemented526	fn get_approved(&self, _token_id: uint256) -> Result<address> {527		// TODO: Not implemetable528		Err("not implemented".into())529	}530531	/// @notice Tells whether the given `owner` approves the `operator`.532	#[weight(<SelfWeightOf<T>>::allowance_for_all())]533	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {534		let owner = T::CrossAccountId::from_eth(owner);535		let operator = T::CrossAccountId::from_eth(operator);536537		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))538	}539540	/// @notice Returns collection helper contract address541	fn collection_helper_address(&self) -> Result<address> {542		Ok(T::ContractAddress::get())543	}544}545546/// @title ERC721 Token that can be irreversibly burned (destroyed).547#[solidity_interface(name = ERC721Burnable)]548impl<T: Config> NonfungibleHandle<T> {549	/// @notice Burns a specific ERC721 token.550	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized551	///  operator of the current owner.552	/// @param tokenId The NFT to approve553	#[weight(<SelfWeightOf<T>>::burn_item())]554	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {555		let caller = T::CrossAccountId::from_eth(caller);556		let token = token_id.try_into()?;557558		<Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;559		Ok(())560	}561}562563/// @title ERC721 minting logic.564#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]565impl<T: Config> NonfungibleHandle<T> {566	fn minting_finished(&self) -> Result<bool> {567		Ok(false)568	}569570	/// @notice Function to mint a token.571	/// @param to The new owner572	/// @return uint256 The id of the newly minted token573	#[weight(<SelfWeightOf<T>>::create_item())]574	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {575		let token_id: uint256 = <TokensMinted<T>>::get(self.id)576			.checked_add(1)577			.ok_or("item id overflow")?578			.into();579		self.mint_check_id(caller, to, token_id)?;580		Ok(token_id)581	}582583	/// @notice Function to mint a token.584	/// @dev `tokenId` should be obtained with `nextTokenId` method,585	///  unlike standard, you can't specify it manually586	/// @param to The new owner587	/// @param tokenId ID of the minted NFT588	#[solidity(hide, rename_selector = "mint")]589	#[weight(<SelfWeightOf<T>>::create_item())]590	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {591		let caller = T::CrossAccountId::from_eth(caller);592		let to = T::CrossAccountId::from_eth(to);593		let token_id: u32 = token_id.try_into()?;594		let budget = self595			.recorder596			.weight_calls_budget(<StructureWeight<T>>::find_parent());597598		if <TokensMinted<T>>::get(self.id)599			.checked_add(1)600			.ok_or("item id overflow")?601			!= token_id602		{603			return Err("item id should be next".into());604		}605606		<Pallet<T>>::create_item(607			self,608			&caller,609			CreateItemData::<T> {610				properties: BoundedVec::default(),611				owner: to,612			},613			&budget,614		)615		.map_err(dispatch_to_evm::<T>)?;616617		Ok(true)618	}619620	/// @notice Function to mint token with the given tokenUri.621	/// @param to The new owner622	/// @param tokenUri Token URI that would be stored in the NFT properties623	/// @return uint256 The id of the newly minted token624	#[solidity(rename_selector = "mintWithTokenURI")]625	#[weight(<SelfWeightOf<T>>::create_item())]626	fn mint_with_token_uri(627		&mut self,628		caller: caller,629		to: address,630		token_uri: string,631	) -> Result<uint256> {632		let token_id: uint256 = <TokensMinted<T>>::get(self.id)633			.checked_add(1)634			.ok_or("item id overflow")?635			.into();636		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;637		Ok(token_id)638	}639640	/// @notice Function to mint token with the given tokenUri.641	/// @dev `tokenId` should be obtained with `nextTokenId` method,642	///  unlike standard, you can't specify it manually643	/// @param to The new owner644	/// @param tokenId ID of the minted NFT645	/// @param tokenUri Token URI that would be stored in the NFT properties646	#[solidity(hide, rename_selector = "mintWithTokenURI")]647	#[weight(<SelfWeightOf<T>>::create_item())]648	fn mint_with_token_uri_check_id(649		&mut self,650		caller: caller,651		to: address,652		token_id: uint256,653		token_uri: string,654	) -> Result<bool> {655		let key = key::url();656		let permission = get_token_permission::<T>(self.id, &key)?;657		if !permission.collection_admin {658			return Err("Operation is not allowed".into());659		}660661		let caller = T::CrossAccountId::from_eth(caller);662		let to = T::CrossAccountId::from_eth(to);663		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;664		let budget = self665			.recorder666			.weight_calls_budget(<StructureWeight<T>>::find_parent());667668		if <TokensMinted<T>>::get(self.id)669			.checked_add(1)670			.ok_or("item id overflow")?671			!= token_id672		{673			return Err("item id should be next".into());674		}675676		let mut properties = CollectionPropertiesVec::default();677		properties678			.try_push(Property {679				key,680				value: token_uri681					.into_bytes()682					.try_into()683					.map_err(|_| "token uri is too long")?,684			})685			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;686687		<Pallet<T>>::create_item(688			self,689			&caller,690			CreateItemData::<T> {691				properties,692				owner: to,693			},694			&budget,695		)696		.map_err(dispatch_to_evm::<T>)?;697		Ok(true)698	}699700	/// @dev Not implemented701	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {702		Err("not implementable".into())703	}704}705706fn get_token_property<T: Config>(707	collection: &CollectionHandle<T>,708	token_id: u32,709	key: &up_data_structs::PropertyKey,710) -> Result<string> {711	collection.consume_store_reads(1)?;712	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))713		.map_err(|_| Error::Revert("Token properties not found".into()))?;714	if let Some(property) = properties.get(key) {715		return Ok(string::from_utf8_lossy(property).into());716	}717718	Err("Property tokenURI not found".into())719}720721fn get_token_permission<T: Config>(722	collection_id: CollectionId,723	key: &PropertyKey,724) -> Result<PropertyPermission> {725	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)726		.map_err(|_| Error::Revert("No permissions for collection".into()))?;727	let a = token_property_permissions728		.get(key)729		.map(Clone::clone)730		.ok_or_else(|| {731			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();732			Error::Revert(alloc::format!("No permission for key {}", key))733		})?;734	Ok(a)735}736737/// @title Unique extensions for ERC721.738#[solidity_interface(name = ERC721UniqueExtensions)]739impl<T: Config> NonfungibleHandle<T>740where741	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,742{743	/// @notice A descriptive name for a collection of NFTs in this contract744	fn name(&self) -> Result<string> {745		Ok(decode_utf16(self.name.iter().copied())746			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))747			.collect::<string>())748	}749750	/// @notice An abbreviated name for NFTs in this contract751	fn symbol(&self) -> Result<string> {752		Ok(string::from_utf8_lossy(&self.token_prefix).into())753	}754755	/// @notice A description for the collection.756	fn description(&self) -> Result<string> {757		Ok(decode_utf16(self.description.iter().copied())758			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))759			.collect::<string>())760	}761762	/// Returns the owner (in cross format) of the token.763	///764	/// @param tokenId Id for the token.765	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {766		Self::token_owner(&self, token_id.try_into()?)767			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))768			.ok_or(Error::Revert("key too large".into()))769	}770771	/// Returns the token properties.772	///773	/// @param tokenId Id for the token.774	/// @param keys Properties keys. Empty keys for all propertyes.775	/// @return Vector of properties key/value pairs.776	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {777		let keys = keys778			.into_iter()779			.map(|key| {780				<Vec<u8>>::from(key)781					.try_into()782					.map_err(|_| Error::Revert("key too large".into()))783			})784			.collect::<Result<Vec<_>>>()?;785786		<Self as CommonCollectionOperations<T>>::token_properties(787			&self,788			token_id.try_into()?,789			if keys.is_empty() { None } else { Some(keys) },790		)791		.into_iter()792		.map(|p| {793			let key = string::from_utf8(p.key.to_vec())794				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;795			let value = bytes(p.value.to_vec());796			Ok(PropertyStruct { key, value })797		})798		.collect::<Result<Vec<_>>>()799	}800801	/// @notice Set or reaffirm the approved address for an NFT802	/// @dev The zero address indicates there is no approved address.803	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized804	///  operator of the current owner.805	/// @param approved The new substrate address approved NFT controller806	/// @param tokenId The NFT to approve807	#[weight(<SelfWeightOf<T>>::approve())]808	fn approve_cross(809		&mut self,810		caller: caller,811		approved: EthCrossAccount,812		token_id: uint256,813	) -> Result<void> {814		let caller = T::CrossAccountId::from_eth(caller);815		let approved = approved.into_sub_cross_account::<T>()?;816		let token = token_id.try_into()?;817818		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))819			.map_err(dispatch_to_evm::<T>)?;820		Ok(())821	}822823	/// @notice Transfer ownership of an NFT824	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`825	///  is the zero address. Throws if `tokenId` is not a valid NFT.826	/// @param to The new owner827	/// @param tokenId The NFT to transfer828	#[weight(<SelfWeightOf<T>>::transfer())]829	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {830		let caller = T::CrossAccountId::from_eth(caller);831		let to = T::CrossAccountId::from_eth(to);832		let token = token_id.try_into()?;833		let budget = self834			.recorder835			.weight_calls_budget(<StructureWeight<T>>::find_parent());836837		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;838		Ok(())839	}840841	/// @notice Transfer ownership of an NFT842	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`843	///  is the zero address. Throws if `tokenId` is not a valid NFT.844	/// @param to The new owner845	/// @param tokenId The NFT to transfer846	#[weight(<SelfWeightOf<T>>::transfer())]847	fn transfer_cross(848		&mut self,849		caller: caller,850		to: EthCrossAccount,851		token_id: uint256,852	) -> Result<void> {853		let caller = T::CrossAccountId::from_eth(caller);854		let to = to.into_sub_cross_account::<T>()?;855		let token = token_id.try_into()?;856		let budget = self857			.recorder858			.weight_calls_budget(<StructureWeight<T>>::find_parent());859860		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;861		Ok(())862	}863864	/// @notice Transfer ownership of an NFT from cross account address to cross account address865	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`866	///  is the zero address. Throws if `tokenId` is not a valid NFT.867	/// @param from Cross acccount address of current owner868	/// @param to Cross acccount address of new owner869	/// @param tokenId The NFT to transfer870	#[weight(<SelfWeightOf<T>>::transfer())]871	fn transfer_from_cross(872		&mut self,873		caller: caller,874		from: EthCrossAccount,875		to: EthCrossAccount,876		token_id: uint256,877	) -> Result<void> {878		let caller = T::CrossAccountId::from_eth(caller);879		let from = from.into_sub_cross_account::<T>()?;880		let to = to.into_sub_cross_account::<T>()?;881		let token_id = token_id.try_into()?;882		let budget = self883			.recorder884			.weight_calls_budget(<StructureWeight<T>>::find_parent());885		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)886			.map_err(dispatch_to_evm::<T>)?;887		Ok(())888	}889890	/// @notice Burns a specific ERC721 token.891	/// @dev Throws unless `msg.sender` is the current owner or an authorized892	///  operator for this NFT. Throws if `from` is not the current owner. Throws893	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.894	/// @param from The current owner of the NFT895	/// @param tokenId The NFT to transfer896	#[solidity(hide)]897	#[weight(<SelfWeightOf<T>>::burn_from())]898	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {899		let caller = T::CrossAccountId::from_eth(caller);900		let from = T::CrossAccountId::from_eth(from);901		let token = token_id.try_into()?;902		let budget = self903			.recorder904			.weight_calls_budget(<StructureWeight<T>>::find_parent());905906		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)907			.map_err(dispatch_to_evm::<T>)?;908		Ok(())909	}910911	/// @notice Burns a specific ERC721 token.912	/// @dev Throws unless `msg.sender` is the current owner or an authorized913	///  operator for this NFT. Throws if `from` is not the current owner. Throws914	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.915	/// @param from The current owner of the NFT916	/// @param tokenId The NFT to transfer917	#[weight(<SelfWeightOf<T>>::burn_from())]918	fn burn_from_cross(919		&mut self,920		caller: caller,921		from: EthCrossAccount,922		token_id: uint256,923	) -> Result<void> {924		let caller = T::CrossAccountId::from_eth(caller);925		let from = from.into_sub_cross_account::<T>()?;926		let token = token_id.try_into()?;927		let budget = self928			.recorder929			.weight_calls_budget(<StructureWeight<T>>::find_parent());930931		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)932			.map_err(dispatch_to_evm::<T>)?;933		Ok(())934	}935936	/// @notice Returns next free NFT ID.937	fn next_token_id(&self) -> Result<uint256> {938		self.consume_store_reads(1)?;939		Ok(<TokensMinted<T>>::get(self.id)940			.checked_add(1)941			.ok_or("item id overflow")?942			.into())943	}944945	/// @notice Function to mint multiple tokens.946	/// @dev `tokenIds` should be an array of consecutive numbers and first number947	///  should be obtained with `nextTokenId` method948	/// @param to The new owner949	/// @param tokenIds IDs of the minted NFTs950	#[solidity(hide)]951	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]952	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {953		let caller = T::CrossAccountId::from_eth(caller);954		let to = T::CrossAccountId::from_eth(to);955		let mut expected_index = <TokensMinted<T>>::get(self.id)956			.checked_add(1)957			.ok_or("item id overflow")?;958		let budget = self959			.recorder960			.weight_calls_budget(<StructureWeight<T>>::find_parent());961962		let total_tokens = token_ids.len();963		for id in token_ids.into_iter() {964			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;965			if id != expected_index {966				return Err("item id should be next".into());967			}968			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;969		}970		let data = (0..total_tokens)971			.map(|_| CreateItemData::<T> {972				properties: BoundedVec::default(),973				owner: to.clone(),974			})975			.collect();976977		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)978			.map_err(dispatch_to_evm::<T>)?;979		Ok(true)980	}981982	/// @notice Function to mint multiple tokens with the given tokenUris.983	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive984	///  numbers and first number should be obtained with `nextTokenId` method985	/// @param to The new owner986	/// @param tokens array of pairs of token ID and token URI for minted tokens987	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]988	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]989	fn mint_bulk_with_token_uri(990		&mut self,991		caller: caller,992		to: address,993		tokens: Vec<(uint256, string)>,994	) -> Result<bool> {995		let key = key::url();996		let caller = T::CrossAccountId::from_eth(caller);997		let to = T::CrossAccountId::from_eth(to);998		let mut expected_index = <TokensMinted<T>>::get(self.id)999			.checked_add(1)1000			.ok_or("item id overflow")?;1001		let budget = self1002			.recorder1003			.weight_calls_budget(<StructureWeight<T>>::find_parent());10041005		let mut data = Vec::with_capacity(tokens.len());1006		for (id, token_uri) in tokens {1007			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1008			if id != expected_index {1009				return Err("item id should be next".into());1010			}1011			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10121013			let mut properties = CollectionPropertiesVec::default();1014			properties1015				.try_push(Property {1016					key: key.clone(),1017					value: token_uri1018						.into_bytes()1019						.try_into()1020						.map_err(|_| "token uri is too long")?,1021				})1022				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10231024			data.push(CreateItemData::<T> {1025				properties,1026				owner: to.clone(),1027			});1028		}10291030		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1031			.map_err(dispatch_to_evm::<T>)?;1032		Ok(true)1033	}10341035	/// @notice Function to mint a token.1036	/// @param to The new owner crossAccountId1037	/// @param properties Properties of minted token1038	/// @return uint256 The id of the newly minted token1039	#[weight(<SelfWeightOf<T>>::create_item())]1040	fn mint_cross(1041		&mut self,1042		caller: caller,1043		to: EthCrossAccount,1044		properties: Vec<PropertyStruct>,1045	) -> Result<uint256> {1046		let token_id = <TokensMinted<T>>::get(self.id)1047			.checked_add(1)1048			.ok_or("item id overflow")?;10491050		let to = to.into_sub_cross_account::<T>()?;10511052		let properties = properties1053			.into_iter()1054			.map(|PropertyStruct { key, value }| {1055				let key = <Vec<u8>>::from(key)1056					.try_into()1057					.map_err(|_| "key too large")?;10581059				let value = value.0.try_into().map_err(|_| "value too large")?;10601061				Ok(Property { key, value })1062			})1063			.collect::<Result<Vec<_>>>()?1064			.try_into()1065			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;10661067		let caller = T::CrossAccountId::from_eth(caller);10681069		let budget = self1070			.recorder1071			.weight_calls_budget(<StructureWeight<T>>::find_parent());10721073		<Pallet<T>>::create_item(1074			self,1075			&caller,1076			CreateItemData::<T> {1077				properties,1078				owner: to,1079			},1080			&budget,1081		)1082		.map_err(dispatch_to_evm::<T>)?;10831084		Ok(token_id.into())1085	}1086}10871088#[solidity_interface(1089	name = UniqueNFT,1090	is(1091		ERC721,1092		ERC721Enumerable,1093		ERC721UniqueExtensions,1094		ERC721UniqueMintable,1095		ERC721Burnable,1096		ERC721Metadata(if(this.flags.erc721metadata)),1097		Collection(via(common_mut returns CollectionHandle<T>)),1098		TokenProperties,1099	)1100)]1101impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11021103// Not a tests, but code generators1104generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);1105generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);11061107impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>1108where1109	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1110{1111	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");11121113	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {1114		call::<T, UniqueNFTCall<T>, _, _>(handle, self)1115	}1116}
after · pallets/nonfungible/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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24	char::{REPLACEMENT_CHARACTER, decode_utf16},25	convert::TryInto,26};27use evm_coder::{28	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,29	weight,30};31use frame_support::BoundedVec;32use up_data_structs::{33	TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,34	CollectionPropertiesVec,35};36use pallet_evm_coder_substrate::dispatch_to_evm;37use sp_std::{vec::Vec, vec};38use pallet_common::{39	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,40	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},41};42use pallet_evm::{account::CrossAccountId, PrecompileHandle};43use pallet_evm_coder_substrate::call;44use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};45use sp_core::Get;4647use crate::{48	AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,49	SelfWeightOf, weights::WeightInfo, TokenProperties,50};5152/// @title A contract that allows to set and delete token properties and change token property permissions.53#[solidity_interface(name = TokenProperties)]54impl<T: Config> NonfungibleHandle<T> {55	/// @notice Set permissions for token property.56	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.57	/// @param key Property key.58	/// @param isMutable Permission to mutate property.59	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.60	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.61	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]62	#[solidity(hide)]63	fn set_token_property_permission(64		&mut self,65		caller: caller,66		key: string,67		is_mutable: bool,68		collection_admin: bool,69		token_owner: bool,70	) -> Result<()> {71		let caller = T::CrossAccountId::from_eth(caller);72		<Pallet<T>>::set_token_property_permissions(73			self,74			&caller,75			vec![PropertyKeyPermission {76				key: <Vec<u8>>::from(key)77					.try_into()78					.map_err(|_| "too long key")?,79				permission: PropertyPermission {80					mutable: is_mutable,81					collection_admin,82					token_owner,83				},84			}],85		)86		.map_err(dispatch_to_evm::<T>)87	}8889	/// @notice Set permissions for token property.90	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.91	/// @param permissions Permissions for keys.92	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]93	fn set_token_property_permissions(94		&mut self,95		caller: caller,96		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,97	) -> Result<()> {98		let caller = T::CrossAccountId::from_eth(caller);99		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(100			permissions,101		)?;102103		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)104			.map_err(dispatch_to_evm::<T>)105	}106107	/// @notice Get permissions for token properties.108	fn token_property_permissions(109		&self,110	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {111		let perms = <Pallet<T>>::token_property_permission(self.id);112		Ok(perms113			.into_iter()114			.map(pallet_common::eth::TokenPropertyPermission::from)115			.collect())116	}117118	/// @notice Set token property value.119	/// @dev Throws error if `msg.sender` has no permission to edit the property.120	/// @param tokenId ID of the token.121	/// @param key Property key.122	/// @param value Property value.123	#[solidity(hide)]124	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]125	fn set_property(126		&mut self,127		caller: caller,128		token_id: uint256,129		key: string,130		value: bytes,131	) -> Result<()> {132		let caller = T::CrossAccountId::from_eth(caller);133		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;134		let key = <Vec<u8>>::from(key)135			.try_into()136			.map_err(|_| "key too long")?;137		let value = value.0.try_into().map_err(|_| "value too long")?;138139		let nesting_budget = self140			.recorder141			.weight_calls_budget(<StructureWeight<T>>::find_parent());142143		<Pallet<T>>::set_token_property(144			self,145			&caller,146			TokenId(token_id),147			Property { key, value },148			&nesting_budget,149		)150		.map_err(dispatch_to_evm::<T>)151	}152153	/// @notice Set token properties value.154	/// @dev Throws error if `msg.sender` has no permission to edit the property.155	/// @param tokenId ID of the token.156	/// @param properties settable properties157	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]158	fn set_properties(159		&mut self,160		caller: caller,161		token_id: uint256,162		properties: Vec<pallet_common::eth::Property>,163	) -> Result<()> {164		let caller = T::CrossAccountId::from_eth(caller);165		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;166167		let nesting_budget = self168			.recorder169			.weight_calls_budget(<StructureWeight<T>>::find_parent());170171		let properties = properties172			.into_iter()173			.map(|pallet_common::eth::Property { key, value }| {174				let key = <Vec<u8>>::from(key)175					.try_into()176					.map_err(|_| "key too large")?;177178				let value = value.0.try_into().map_err(|_| "value too large")?;179180				Ok(Property { key, value })181			})182			.collect::<Result<Vec<_>>>()?;183184		<Pallet<T>>::set_token_properties(185			self,186			&caller,187			TokenId(token_id),188			properties.into_iter(),189			false,190			&nesting_budget,191		)192		.map_err(dispatch_to_evm::<T>)193	}194195	/// @notice Delete token property value.196	/// @dev Throws error if `msg.sender` has no permission to edit the property.197	/// @param tokenId ID of the token.198	/// @param key Property key.199	#[solidity(hide)]200	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]201	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {202		let caller = T::CrossAccountId::from_eth(caller);203		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;204		let key = <Vec<u8>>::from(key)205			.try_into()206			.map_err(|_| "key too long")?;207208		let nesting_budget = self209			.recorder210			.weight_calls_budget(<StructureWeight<T>>::find_parent());211212		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)213			.map_err(dispatch_to_evm::<T>)214	}215216	/// @notice Delete token properties value.217	/// @dev Throws error if `msg.sender` has no permission to edit the property.218	/// @param tokenId ID of the token.219	/// @param keys Properties key.220	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]221	fn delete_properties(222		&mut self,223		token_id: uint256,224		caller: caller,225		keys: Vec<string>,226	) -> Result<()> {227		let caller = T::CrossAccountId::from_eth(caller);228		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;229		let keys = keys230			.into_iter()231			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))232			.collect::<Result<Vec<_>>>()?;233234		let nesting_budget = self235			.recorder236			.weight_calls_budget(<StructureWeight<T>>::find_parent());237238		<Pallet<T>>::delete_token_properties(239			self,240			&caller,241			TokenId(token_id),242			keys.into_iter(),243			&nesting_budget,244		)245		.map_err(dispatch_to_evm::<T>)246	}247248	/// @notice Get token property value.249	/// @dev Throws error if key not found250	/// @param tokenId ID of the token.251	/// @param key Property key.252	/// @return Property value bytes253	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {254		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;255		let key = <Vec<u8>>::from(key)256			.try_into()257			.map_err(|_| "key too long")?;258259		let props = <TokenProperties<T>>::get((self.id, token_id));260		let prop = props.get(&key).ok_or("key not found")?;261262		Ok(prop.to_vec().into())263	}264}265266#[derive(ToLog)]267pub enum ERC721Events {268	/// @dev This emits when ownership of any NFT changes by any mechanism.269	///  This event emits when NFTs are created (`from` == 0) and destroyed270	///  (`to` == 0). Exception: during contract creation, any number of NFTs271	///  may be created and assigned without emitting Transfer. At the time of272	///  any transfer, the approved address for that NFT (if any) is reset to none.273	Transfer {274		#[indexed]275		from: address,276		#[indexed]277		to: address,278		#[indexed]279		token_id: uint256,280	},281	/// @dev This emits when the approved address for an NFT is changed or282	///  reaffirmed. The zero address indicates there is no approved address.283	///  When a Transfer event emits, this also indicates that the approved284	///  address for that NFT (if any) is reset to none.285	Approval {286		#[indexed]287		owner: address,288		#[indexed]289		approved: address,290		#[indexed]291		token_id: uint256,292	},293	/// @dev This emits when an operator is enabled or disabled for an owner.294	///  The operator can manage all NFTs of the owner.295	#[allow(dead_code)]296	ApprovalForAll {297		#[indexed]298		owner: address,299		#[indexed]300		operator: address,301		approved: bool,302	},303}304305#[derive(ToLog)]306pub enum ERC721UniqueMintableEvents {307	#[allow(dead_code)]308	MintingFinished {},309}310311/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension312/// @dev See https://eips.ethereum.org/EIPS/eip-721313#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]314impl<T: Config> NonfungibleHandle<T>315where316	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,317{318	/// @notice A descriptive name for a collection of NFTs in this contract319	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`320	#[solidity(hide, rename_selector = "name")]321	fn name_proxy(&self) -> Result<string> {322		self.name()323	}324325	/// @notice An abbreviated name for NFTs in this contract326	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`327	#[solidity(hide, rename_selector = "symbol")]328	fn symbol_proxy(&self) -> Result<string> {329		self.symbol()330	}331332	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.333	///334	/// @dev If the token has a `url` property and it is not empty, it is returned.335	///  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`.336	///  If the collection property `baseURI` is empty or absent, return "" (empty string)337	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix338	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).339	///340	/// @return token's const_metadata341	#[solidity(rename_selector = "tokenURI")]342	fn token_uri(&self, token_id: uint256) -> Result<string> {343		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;344345		match get_token_property(self, token_id_u32, &key::url()).as_deref() {346			Err(_) | Ok("") => (),347			Ok(url) => {348				return Ok(url.into());349			}350		};351352		let base_uri =353			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())354				.map(BoundedVec::into_inner)355				.map(string::from_utf8)356				.transpose()357				.map_err(|e| {358					Error::Revert(alloc::format!(359						"Can not convert value \"baseURI\" to string with error \"{}\"",360						e361					))362				})?;363364		let base_uri = match base_uri.as_deref() {365			None | Some("") => {366				return Ok("".into());367			}368			Some(base_uri) => base_uri.into(),369		};370371		Ok(372			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {373				Err(_) | Ok("") => base_uri,374				Ok(suffix) => base_uri + suffix,375			},376		)377	}378}379380/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension381/// @dev See https://eips.ethereum.org/EIPS/eip-721382#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]383impl<T: Config> NonfungibleHandle<T> {384	/// @notice Enumerate valid NFTs385	/// @param index A counter less than `totalSupply()`386	/// @return The token identifier for the `index`th NFT,387	///  (sort order not specified)388	fn token_by_index(&self, index: uint256) -> Result<uint256> {389		Ok(index)390	}391392	/// @dev Not implemented393	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {394		// TODO: Not implemetable395		Err("not implemented".into())396	}397398	/// @notice Count NFTs tracked by this contract399	/// @return A count of valid NFTs tracked by this contract, where each one of400	///  them has an assigned and queryable owner not equal to the zero address401	fn total_supply(&self) -> Result<uint256> {402		self.consume_store_reads(1)?;403		Ok(<Pallet<T>>::total_supply(self).into())404	}405}406407/// @title ERC-721 Non-Fungible Token Standard408/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md409#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]410impl<T: Config> NonfungibleHandle<T> {411	/// @notice Count all NFTs assigned to an owner412	/// @dev NFTs assigned to the zero address are considered invalid, and this413	///  function throws for queries about the zero address.414	/// @param owner An address for whom to query the balance415	/// @return The number of NFTs owned by `owner`, possibly zero416	fn balance_of(&self, owner: address) -> Result<uint256> {417		self.consume_store_reads(1)?;418		let owner = T::CrossAccountId::from_eth(owner);419		let balance = <AccountBalance<T>>::get((self.id, owner));420		Ok(balance.into())421	}422	/// @notice Find the owner of an NFT423	/// @dev NFTs assigned to zero address are considered invalid, and queries424	///  about them do throw.425	/// @param tokenId The identifier for an NFT426	/// @return The address of the owner of the NFT427	fn owner_of(&self, token_id: uint256) -> Result<address> {428		self.consume_store_reads(1)?;429		let token: TokenId = token_id.try_into()?;430		Ok(*<TokenData<T>>::get((self.id, token))431			.ok_or("token not found")?432			.owner433			.as_eth())434	}435	/// @dev Not implemented436	#[solidity(rename_selector = "safeTransferFrom")]437	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	}447	/// @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 NFT -- 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 NFT. Throws if `from` is not the current owner. Throws463	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.464	/// @param from The current owner of the NFT465	/// @param to The new owner466	/// @param tokenId The NFT to transfer467	#[weight(<SelfWeightOf<T>>::transfer_from())]468	fn transfer_from(469		&mut self,470		caller: caller,471		from: address,472		to: address,473		token_id: uint256,474	) -> Result<void> {475		let caller = T::CrossAccountId::from_eth(caller);476		let from = T::CrossAccountId::from_eth(from);477		let to = T::CrossAccountId::from_eth(to);478		let token = token_id.try_into()?;479		let budget = self480			.recorder481			.weight_calls_budget(<StructureWeight<T>>::find_parent());482483		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)484			.map_err(dispatch_to_evm::<T>)?;485		Ok(())486	}487488	/// @notice Set or reaffirm the approved address for an NFT489	/// @dev The zero address indicates there is no approved address.490	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized491	///  operator of the current owner.492	/// @param approved The new approved NFT controller493	/// @param tokenId The NFT to approve494	#[weight(<SelfWeightOf<T>>::approve())]495	fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {496		let caller = T::CrossAccountId::from_eth(caller);497		let approved = T::CrossAccountId::from_eth(approved);498		let token = token_id.try_into()?;499500		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))501			.map_err(dispatch_to_evm::<T>)?;502		Ok(())503	}504505	/// @notice Sets or unsets the approval of a given operator.506	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.507	/// @param operator Operator508	/// @param approved Should operator status be granted or revoked?509	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]510	fn set_approval_for_all(511		&mut self,512		caller: caller,513		operator: address,514		approved: bool,515	) -> Result<void> {516		let caller = T::CrossAccountId::from_eth(caller);517		let operator = T::CrossAccountId::from_eth(operator);518519		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)520			.map_err(dispatch_to_evm::<T>)?;521		Ok(())522	}523524	/// @dev Not implemented525	fn get_approved(&self, _token_id: uint256) -> Result<address> {526		// TODO: Not implemetable527		Err("not implemented".into())528	}529530	/// @notice Tells whether the given `owner` approves the `operator`.531	#[weight(<SelfWeightOf<T>>::allowance_for_all())]532	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {533		let owner = T::CrossAccountId::from_eth(owner);534		let operator = T::CrossAccountId::from_eth(operator);535536		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))537	}538539	/// @notice Returns collection helper contract address540	fn collection_helper_address(&self) -> Result<address> {541		Ok(T::ContractAddress::get())542	}543}544545/// @title ERC721 Token that can be irreversibly burned (destroyed).546#[solidity_interface(name = ERC721Burnable)]547impl<T: Config> NonfungibleHandle<T> {548	/// @notice Burns a specific ERC721 token.549	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized550	///  operator of the current owner.551	/// @param tokenId The NFT to approve552	#[weight(<SelfWeightOf<T>>::burn_item())]553	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {554		let caller = T::CrossAccountId::from_eth(caller);555		let token = token_id.try_into()?;556557		<Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;558		Ok(())559	}560}561562/// @title ERC721 minting logic.563#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]564impl<T: Config> NonfungibleHandle<T> {565	fn minting_finished(&self) -> Result<bool> {566		Ok(false)567	}568569	/// @notice Function to mint a token.570	/// @param to The new owner571	/// @return uint256 The id of the newly minted token572	#[weight(<SelfWeightOf<T>>::create_item())]573	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {574		let token_id: uint256 = <TokensMinted<T>>::get(self.id)575			.checked_add(1)576			.ok_or("item id overflow")?577			.into();578		self.mint_check_id(caller, to, token_id)?;579		Ok(token_id)580	}581582	/// @notice Function to mint a token.583	/// @dev `tokenId` should be obtained with `nextTokenId` method,584	///  unlike standard, you can't specify it manually585	/// @param to The new owner586	/// @param tokenId ID of the minted NFT587	#[solidity(hide, rename_selector = "mint")]588	#[weight(<SelfWeightOf<T>>::create_item())]589	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {590		let caller = T::CrossAccountId::from_eth(caller);591		let to = T::CrossAccountId::from_eth(to);592		let token_id: u32 = token_id.try_into()?;593		let budget = self594			.recorder595			.weight_calls_budget(<StructureWeight<T>>::find_parent());596597		if <TokensMinted<T>>::get(self.id)598			.checked_add(1)599			.ok_or("item id overflow")?600			!= token_id601		{602			return Err("item id should be next".into());603		}604605		<Pallet<T>>::create_item(606			self,607			&caller,608			CreateItemData::<T> {609				properties: BoundedVec::default(),610				owner: to,611			},612			&budget,613		)614		.map_err(dispatch_to_evm::<T>)?;615616		Ok(true)617	}618619	/// @notice Function to mint token with the given tokenUri.620	/// @param to The new owner621	/// @param tokenUri Token URI that would be stored in the NFT properties622	/// @return uint256 The id of the newly minted token623	#[solidity(rename_selector = "mintWithTokenURI")]624	#[weight(<SelfWeightOf<T>>::create_item())]625	fn mint_with_token_uri(626		&mut self,627		caller: caller,628		to: address,629		token_uri: string,630	) -> Result<uint256> {631		let token_id: uint256 = <TokensMinted<T>>::get(self.id)632			.checked_add(1)633			.ok_or("item id overflow")?634			.into();635		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;636		Ok(token_id)637	}638639	/// @notice Function to mint token with the given tokenUri.640	/// @dev `tokenId` should be obtained with `nextTokenId` method,641	///  unlike standard, you can't specify it manually642	/// @param to The new owner643	/// @param tokenId ID of the minted NFT644	/// @param tokenUri Token URI that would be stored in the NFT properties645	#[solidity(hide, rename_selector = "mintWithTokenURI")]646	#[weight(<SelfWeightOf<T>>::create_item())]647	fn mint_with_token_uri_check_id(648		&mut self,649		caller: caller,650		to: address,651		token_id: uint256,652		token_uri: string,653	) -> Result<bool> {654		let key = key::url();655		let permission = get_token_permission::<T>(self.id, &key)?;656		if !permission.collection_admin {657			return Err("Operation is not allowed".into());658		}659660		let caller = T::CrossAccountId::from_eth(caller);661		let to = T::CrossAccountId::from_eth(to);662		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;663		let budget = self664			.recorder665			.weight_calls_budget(<StructureWeight<T>>::find_parent());666667		if <TokensMinted<T>>::get(self.id)668			.checked_add(1)669			.ok_or("item id overflow")?670			!= token_id671		{672			return Err("item id should be next".into());673		}674675		let mut properties = CollectionPropertiesVec::default();676		properties677			.try_push(Property {678				key,679				value: token_uri680					.into_bytes()681					.try_into()682					.map_err(|_| "token uri is too long")?,683			})684			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;685686		<Pallet<T>>::create_item(687			self,688			&caller,689			CreateItemData::<T> {690				properties,691				owner: to,692			},693			&budget,694		)695		.map_err(dispatch_to_evm::<T>)?;696		Ok(true)697	}698699	/// @dev Not implemented700	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {701		Err("not implementable".into())702	}703}704705fn get_token_property<T: Config>(706	collection: &CollectionHandle<T>,707	token_id: u32,708	key: &up_data_structs::PropertyKey,709) -> Result<string> {710	collection.consume_store_reads(1)?;711	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))712		.map_err(|_| Error::Revert("Token properties not found".into()))?;713	if let Some(property) = properties.get(key) {714		return Ok(string::from_utf8_lossy(property).into());715	}716717	Err("Property tokenURI not found".into())718}719720fn get_token_permission<T: Config>(721	collection_id: CollectionId,722	key: &PropertyKey,723) -> Result<PropertyPermission> {724	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)725		.map_err(|_| Error::Revert("No permissions for collection".into()))?;726	let a = token_property_permissions727		.get(key)728		.map(Clone::clone)729		.ok_or_else(|| {730			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();731			Error::Revert(alloc::format!("No permission for key {}", key))732		})?;733	Ok(a)734}735736/// @title Unique extensions for ERC721.737#[solidity_interface(name = ERC721UniqueExtensions)]738impl<T: Config> NonfungibleHandle<T>739where740	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,741{742	/// @notice A descriptive name for a collection of NFTs in this contract743	fn name(&self) -> Result<string> {744		Ok(decode_utf16(self.name.iter().copied())745			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))746			.collect::<string>())747	}748749	/// @notice An abbreviated name for NFTs in this contract750	fn symbol(&self) -> Result<string> {751		Ok(string::from_utf8_lossy(&self.token_prefix).into())752	}753754	/// @notice A description for the collection.755	fn description(&self) -> Result<string> {756		Ok(decode_utf16(self.description.iter().copied())757			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))758			.collect::<string>())759	}760761	/// Returns the owner (in cross format) of the token.762	///763	/// @param tokenId Id for the token.764	fn cross_owner_of(&self, token_id: uint256) -> Result<pallet_common::eth::CrossAccount> {765		Self::token_owner(&self, token_id.try_into()?)766			.map(|o| pallet_common::eth::CrossAccount::from_sub_cross_account::<T>(&o))767			.ok_or(Error::Revert("key too large".into()))768	}769770	/// Returns the token properties.771	///772	/// @param tokenId Id for the token.773	/// @param keys Properties keys. Empty keys for all propertyes.774	/// @return Vector of properties key/value pairs.775	fn properties(776		&self,777		token_id: uint256,778		keys: Vec<string>,779	) -> Result<Vec<pallet_common::eth::Property>> {780		let keys = keys781			.into_iter()782			.map(|key| {783				<Vec<u8>>::from(key)784					.try_into()785					.map_err(|_| Error::Revert("key too large".into()))786			})787			.collect::<Result<Vec<_>>>()?;788789		<Self as CommonCollectionOperations<T>>::token_properties(790			&self,791			token_id.try_into()?,792			if keys.is_empty() { None } else { Some(keys) },793		)794		.into_iter()795		.map(|p| {796			let key = string::from_utf8(p.key.to_vec())797				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;798			let value = bytes(p.value.to_vec());799			Ok(pallet_common::eth::Property { key, value })800		})801		.collect::<Result<Vec<_>>>()802	}803804	/// @notice Set or reaffirm the approved address for an NFT805	/// @dev The zero address indicates there is no approved address.806	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized807	///  operator of the current owner.808	/// @param approved The new substrate address approved NFT controller809	/// @param tokenId The NFT to approve810	#[weight(<SelfWeightOf<T>>::approve())]811	fn approve_cross(812		&mut self,813		caller: caller,814		approved: pallet_common::eth::CrossAccount,815		token_id: uint256,816	) -> Result<void> {817		let caller = T::CrossAccountId::from_eth(caller);818		let approved = approved.into_sub_cross_account::<T>()?;819		let token = token_id.try_into()?;820821		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))822			.map_err(dispatch_to_evm::<T>)?;823		Ok(())824	}825826	/// @notice Transfer ownership of an NFT827	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`828	///  is the zero address. Throws if `tokenId` is not a valid NFT.829	/// @param to The new owner830	/// @param tokenId The NFT to transfer831	#[weight(<SelfWeightOf<T>>::transfer())]832	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {833		let caller = T::CrossAccountId::from_eth(caller);834		let to = T::CrossAccountId::from_eth(to);835		let token = token_id.try_into()?;836		let budget = self837			.recorder838			.weight_calls_budget(<StructureWeight<T>>::find_parent());839840		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;841		Ok(())842	}843844	/// @notice Transfer ownership of an NFT845	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`846	///  is the zero address. Throws if `tokenId` is not a valid NFT.847	/// @param to The new owner848	/// @param tokenId The NFT to transfer849	#[weight(<SelfWeightOf<T>>::transfer())]850	fn transfer_cross(851		&mut self,852		caller: caller,853		to: pallet_common::eth::CrossAccount,854		token_id: uint256,855	) -> Result<void> {856		let caller = T::CrossAccountId::from_eth(caller);857		let to = to.into_sub_cross_account::<T>()?;858		let token = token_id.try_into()?;859		let budget = self860			.recorder861			.weight_calls_budget(<StructureWeight<T>>::find_parent());862863		<Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;864		Ok(())865	}866867	/// @notice Transfer ownership of an NFT from cross account address to cross account address868	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`869	///  is the zero address. Throws if `tokenId` is not a valid NFT.870	/// @param from Cross acccount address of current owner871	/// @param to Cross acccount address of new owner872	/// @param tokenId The NFT to transfer873	#[weight(<SelfWeightOf<T>>::transfer())]874	fn transfer_from_cross(875		&mut self,876		caller: caller,877		from: pallet_common::eth::CrossAccount,878		to: pallet_common::eth::CrossAccount,879		token_id: uint256,880	) -> Result<void> {881		let caller = T::CrossAccountId::from_eth(caller);882		let from = from.into_sub_cross_account::<T>()?;883		let to = to.into_sub_cross_account::<T>()?;884		let token_id = token_id.try_into()?;885		let budget = self886			.recorder887			.weight_calls_budget(<StructureWeight<T>>::find_parent());888		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)889			.map_err(dispatch_to_evm::<T>)?;890		Ok(())891	}892893	/// @notice Burns a specific ERC721 token.894	/// @dev Throws unless `msg.sender` is the current owner or an authorized895	///  operator for this NFT. Throws if `from` is not the current owner. Throws896	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.897	/// @param from The current owner of the NFT898	/// @param tokenId The NFT to transfer899	#[solidity(hide)]900	#[weight(<SelfWeightOf<T>>::burn_from())]901	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {902		let caller = T::CrossAccountId::from_eth(caller);903		let from = T::CrossAccountId::from_eth(from);904		let token = token_id.try_into()?;905		let budget = self906			.recorder907			.weight_calls_budget(<StructureWeight<T>>::find_parent());908909		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)910			.map_err(dispatch_to_evm::<T>)?;911		Ok(())912	}913914	/// @notice Burns a specific ERC721 token.915	/// @dev Throws unless `msg.sender` is the current owner or an authorized916	///  operator for this NFT. Throws if `from` is not the current owner. Throws917	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.918	/// @param from The current owner of the NFT919	/// @param tokenId The NFT to transfer920	#[weight(<SelfWeightOf<T>>::burn_from())]921	fn burn_from_cross(922		&mut self,923		caller: caller,924		from: pallet_common::eth::CrossAccount,925		token_id: uint256,926	) -> Result<void> {927		let caller = T::CrossAccountId::from_eth(caller);928		let from = from.into_sub_cross_account::<T>()?;929		let token = token_id.try_into()?;930		let budget = self931			.recorder932			.weight_calls_budget(<StructureWeight<T>>::find_parent());933934		<Pallet<T>>::burn_from(self, &caller, &from, token, &budget)935			.map_err(dispatch_to_evm::<T>)?;936		Ok(())937	}938939	/// @notice Returns next free NFT ID.940	fn next_token_id(&self) -> Result<uint256> {941		self.consume_store_reads(1)?;942		Ok(<TokensMinted<T>>::get(self.id)943			.checked_add(1)944			.ok_or("item id overflow")?945			.into())946	}947948	/// @notice Function to mint multiple tokens.949	/// @dev `tokenIds` should be an array of consecutive numbers and first number950	///  should be obtained with `nextTokenId` method951	/// @param to The new owner952	/// @param tokenIds IDs of the minted NFTs953	#[solidity(hide)]954	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]955	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {956		let caller = T::CrossAccountId::from_eth(caller);957		let to = T::CrossAccountId::from_eth(to);958		let mut expected_index = <TokensMinted<T>>::get(self.id)959			.checked_add(1)960			.ok_or("item id overflow")?;961		let budget = self962			.recorder963			.weight_calls_budget(<StructureWeight<T>>::find_parent());964965		let total_tokens = token_ids.len();966		for id in token_ids.into_iter() {967			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;968			if id != expected_index {969				return Err("item id should be next".into());970			}971			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;972		}973		let data = (0..total_tokens)974			.map(|_| CreateItemData::<T> {975				properties: BoundedVec::default(),976				owner: to.clone(),977			})978			.collect();979980		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)981			.map_err(dispatch_to_evm::<T>)?;982		Ok(true)983	}984985	/// @notice Function to mint multiple tokens with the given tokenUris.986	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive987	///  numbers and first number should be obtained with `nextTokenId` method988	/// @param to The new owner989	/// @param tokens array of pairs of token ID and token URI for minted tokens990	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]991	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]992	fn mint_bulk_with_token_uri(993		&mut self,994		caller: caller,995		to: address,996		tokens: Vec<(uint256, string)>,997	) -> Result<bool> {998		let key = key::url();999		let caller = T::CrossAccountId::from_eth(caller);1000		let to = T::CrossAccountId::from_eth(to);1001		let mut expected_index = <TokensMinted<T>>::get(self.id)1002			.checked_add(1)1003			.ok_or("item id overflow")?;1004		let budget = self1005			.recorder1006			.weight_calls_budget(<StructureWeight<T>>::find_parent());10071008		let mut data = Vec::with_capacity(tokens.len());1009		for (id, token_uri) in tokens {1010			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1011			if id != expected_index {1012				return Err("item id should be next".into());1013			}1014			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10151016			let mut properties = CollectionPropertiesVec::default();1017			properties1018				.try_push(Property {1019					key: key.clone(),1020					value: token_uri1021						.into_bytes()1022						.try_into()1023						.map_err(|_| "token uri is too long")?,1024				})1025				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10261027			data.push(CreateItemData::<T> {1028				properties,1029				owner: to.clone(),1030			});1031		}10321033		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1034			.map_err(dispatch_to_evm::<T>)?;1035		Ok(true)1036	}10371038	/// @notice Function to mint a token.1039	/// @param to The new owner crossAccountId1040	/// @param properties Properties of minted token1041	/// @return uint256 The id of the newly minted token1042	#[weight(<SelfWeightOf<T>>::create_item())]1043	fn mint_cross(1044		&mut self,1045		caller: caller,1046		to: pallet_common::eth::CrossAccount,1047		properties: Vec<pallet_common::eth::Property>,1048	) -> Result<uint256> {1049		let token_id = <TokensMinted<T>>::get(self.id)1050			.checked_add(1)1051			.ok_or("item id overflow")?;10521053		let to = to.into_sub_cross_account::<T>()?;10541055		let properties = properties1056			.into_iter()1057			.map(|pallet_common::eth::Property { key, value }| {1058				let key = <Vec<u8>>::from(key)1059					.try_into()1060					.map_err(|_| "key too large")?;10611062				let value = value.0.try_into().map_err(|_| "value too large")?;10631064				Ok(Property { key, value })1065			})1066			.collect::<Result<Vec<_>>>()?1067			.try_into()1068			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;10691070		let caller = T::CrossAccountId::from_eth(caller);10711072		let budget = self1073			.recorder1074			.weight_calls_budget(<StructureWeight<T>>::find_parent());10751076		<Pallet<T>>::create_item(1077			self,1078			&caller,1079			CreateItemData::<T> {1080				properties,1081				owner: to,1082			},1083			&budget,1084		)1085		.map_err(dispatch_to_evm::<T>)?;10861087		Ok(token_id.into())1088	}1089}10901091#[solidity_interface(1092	name = UniqueNFT,1093	is(1094		ERC721,1095		ERC721Enumerable,1096		ERC721UniqueExtensions,1097		ERC721UniqueMintable,1098		ERC721Burnable,1099		ERC721Metadata(if(this.flags.erc721metadata)),1100		Collection(via(common_mut returns CollectionHandle<T>)),1101		TokenProperties,1102	)1103)]1104impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11051106// Not a tests, but code generators1107generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);1108generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);11091110impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>1111where1112	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1113{1114	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");11151116	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {1117		call::<T, UniqueNFTCall<T>, _, _>(handle, self)1118	}1119}
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

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

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -258,7 +258,7 @@
 	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.
 	/// @dev EVM selector for this function is: 0x84a1d5a8,
 	///  or in textual repr: setCollectionSponsorCross((address,uint256))
-	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {
+	function setCollectionSponsorCross(CrossAccount memory sponsor) public {
 		require(false, stub_error);
 		sponsor;
 		dummy = 0;
@@ -296,10 +296,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (EthCrossAccount memory) {
+	function collectionSponsor() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -337,7 +337,7 @@
 	/// @param newAdmin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x859aa7d6,
 	///  or in textual repr: addCollectionAdminCross((address,uint256))
-	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {
+	function addCollectionAdminCross(CrossAccount memory newAdmin) public {
 		require(false, stub_error);
 		newAdmin;
 		dummy = 0;
@@ -347,7 +347,7 @@
 	/// @param admin Cross account administrator address.
 	/// @dev EVM selector for this function is: 0x6c0cd173,
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
-	function removeCollectionAdminCross(EthCrossAccount memory admin) public {
+	function removeCollectionAdminCross(CrossAccount memory admin) public {
 		require(false, stub_error);
 		admin;
 		dummy = 0;
@@ -433,7 +433,7 @@
 	/// @param user User address to check.
 	/// @dev EVM selector for this function is: 0x91b6df49,
 	///  or in textual repr: allowlistedCross((address,uint256))
-	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {
+	function allowlistedCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -456,7 +456,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0xa0184a3a,
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
-	function addToCollectionAllowListCross(EthCrossAccount memory user) public {
+	function addToCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -478,7 +478,7 @@
 	/// @param user User cross account address.
 	/// @dev EVM selector for this function is: 0x09ba452a,
 	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))
-	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {
+	function removeFromCollectionAllowListCross(CrossAccount memory user) public {
 		require(false, stub_error);
 		user;
 		dummy = 0;
@@ -514,7 +514,7 @@
 	/// @return "true" if account is the owner or admin
 	/// @dev EVM selector for this function is: 0x3e75a905,
 	///  or in textual repr: isOwnerOrAdminCross((address,uint256))
-	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {
+	function isOwnerOrAdminCross(CrossAccount memory user) public view returns (bool) {
 		require(false, stub_error);
 		user;
 		dummy;
@@ -538,10 +538,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0xdf727d3b,
 	///  or in textual repr: collectionOwner()
-	function collectionOwner() public view returns (EthCrossAccount memory) {
+	function collectionOwner() public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	// /// Changes collection owner to another account
@@ -562,10 +562,10 @@
 	/// If address is canonical then substrate mirror is zero and vice versa.
 	/// @dev EVM selector for this function is: 0x5813216b,
 	///  or in textual repr: collectionAdmins()
-	function collectionAdmins() public view returns (EthCrossAccount[] memory) {
+	function collectionAdmins() public view returns (CrossAccount[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new EthCrossAccount[](0);
+		return new CrossAccount[](0);
 	}
 
 	/// Changes collection owner to another account
@@ -574,7 +574,7 @@
 	/// @param newOwner new owner cross account
 	/// @dev EVM selector for this function is: 0x6496c497,
 	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
-	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
+	function changeCollectionOwnerCross(CrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -582,7 +582,7 @@
 }
 
 /// @dev Cross account struct
-struct EthCrossAccount {
+struct CrossAccount {
 	address eth;
 	uint256 sub;
 }
@@ -607,13 +607,14 @@
 	uint256[] field_1;
 }
 
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
 struct CollectionLimit {
 	CollectionLimitField field;
 	bool status;
 	uint256 value;
 }
 
-/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
+/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) fields representation for EVM.
 enum CollectionLimitField {
 	/// @dev How many tokens can a user have on one account.
 	AccountTokenOwnership,
@@ -811,11 +812,11 @@
 	/// @param tokenId Id for the token.
 	/// @dev EVM selector for this function is: 0x2b29dace,
 	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+	function crossOwnerOf(uint256 tokenId) public view returns (CrossAccount memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
-		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+		return CrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Returns the token properties.
@@ -856,7 +857,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
-	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {
+	function transferCross(CrossAccount memory to, uint256 tokenId) public {
 		require(false, stub_error);
 		to;
 		tokenId;
@@ -872,8 +873,8 @@
 	/// @dev EVM selector for this function is: 0xd5cf430b,
 	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)
 	function transferFromCross(
-		EthCrossAccount memory from,
-		EthCrossAccount memory to,
+		CrossAccount memory from,
+		CrossAccount memory to,
 		uint256 tokenId
 	) public {
 		require(false, stub_error);
@@ -908,7 +909,7 @@
 	/// @param tokenId The RFT to transfer
 	/// @dev EVM selector for this function is: 0xbb2f5a58,
 	///  or in textual repr: burnFromCross((address,uint256),uint256)
-	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {
+	function burnFromCross(CrossAccount memory from, uint256 tokenId) public {
 		require(false, stub_error);
 		from;
 		tokenId;
@@ -960,7 +961,7 @@
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0xb904db03,
 	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
-	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+	function mintCross(CrossAccount memory to, Property[] memory properties) public returns (uint256) {
 		require(false, stub_error);
 		to;
 		properties;
modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterboth

binary blob — no preview

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