git.delta.rocks / unique-network / refs/commits / 8298cf829479

difftreelog

feat Rewrite tuple to named structures for TokenPropertyPermission. fix: AbiCoder derive macro

Trubnikov Sergey2022-12-19parent: #ab6e845.patch.diff
in: master

23 files changed

modifiedcrates/evm-coder/procedural/src/abi_derive/derive_enum.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/derive_enum.rs
@@ -86,6 +86,21 @@
 	)
 }
 
+pub fn impl_enum_solidity_type<'a>(name: &syn::Ident) -> proc_macro2::TokenStream {
+	quote! {
+		#[cfg(feature = "stubgen")]
+		impl ::evm_coder::solidity::SolidityType for #name {
+			fn names(tc: &::evm_coder::solidity::TypeCollector) -> Vec<String> {
+				Vec::new()
+			}
+
+			fn len() -> usize {
+				1
+			}
+		}
+	}
+}
+
 pub fn impl_enum_solidity_type_name(name: &syn::Ident) -> proc_macro2::TokenStream {
 	quote!(
 		#[cfg(feature = "stubgen")]
modifiedcrates/evm-coder/procedural/src/abi_derive/mod.rsdiffbeforeafterboth
--- a/crates/evm-coder/procedural/src/abi_derive/mod.rs
+++ b/crates/evm-coder/procedural/src/abi_derive/mod.rs
@@ -86,6 +86,7 @@
 	let abi_type = impl_enum_abi_type(name, option_count);
 	let abi_read = impl_enum_abi_read(name);
 	let abi_write = impl_enum_abi_write(name);
+	let solidity_type = impl_enum_solidity_type(name);
 	let solidity_type_name = impl_enum_solidity_type_name(name);
 	let solidity_struct_collect = impl_enum_solidity_struct_collect(
 		name,
@@ -102,6 +103,7 @@
 		#abi_type
 		#abi_read
 		#abi_write
+		#solidity_type
 		#solidity_type_name
 		#solidity_struct_collect
 	})
modifiedcrates/evm-coder/src/abi/impls.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -184,6 +184,11 @@
 	}
 }
 
+macro_rules! count {
+    () => (0usize);
+    ( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
+}
+
 macro_rules! impl_tuples {
 	($($ident:ident)+) => {
 		impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)
@@ -198,7 +203,7 @@
                 shift_left(1)
                 fixed(")")
             );
-			const FIELDS_COUNT: usize = 0 $(+ {let _ = <$ident as AbiType>::FIELDS_COUNT; 1})+;
+			const FIELDS_COUNT: usize = count!($($ident)*);
 
 			fn is_dynamic() -> bool {
 				false
modifiedcrates/evm-coder/src/solidity/impls.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity/impls.rs
+++ b/crates/evm-coder/src/solidity/impls.rs
@@ -74,6 +74,16 @@
 	}
 }
 
+impl<T: StructCollect + sealed::CanBePlacedInVec> StructCollect for Vec<T> {
+	fn name() -> String {
+		<T as StructCollect>::name() + "[]"
+	}
+
+	fn declaration() -> String {
+		unimplemented!("Vectors have not declarations.")
+	}
+}
+
 macro_rules! count {
     () => (0usize);
     ( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
@@ -131,60 +141,3 @@
 impl_tuples! {A B C D E F G H}
 impl_tuples! {A B C D E F G H I}
 impl_tuples! {A B C D E F G H I J}
-
-impl StructCollect for Property {
-	fn name() -> String {
-		"Property".into()
-	}
-
-	fn declaration() -> String {
-		use std::fmt::Write;
-
-		let mut str = String::new();
-		writeln!(str, "/// @dev Property struct").unwrap();
-		writeln!(str, "struct {} {{", Self::name()).unwrap();
-		writeln!(str, "\tstring key;").unwrap();
-		writeln!(str, "\tbytes value;").unwrap();
-		writeln!(str, "}}").unwrap();
-		str
-	}
-}
-
-impl SolidityTypeName for Property {
-	fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
-		write!(writer, "{}", tc.collect_struct::<Self>())
-	}
-
-	fn is_simple() -> bool {
-		false
-	}
-
-	fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
-		write!(writer, "{}(", tc.collect_struct::<Self>())?;
-		address::solidity_default(writer, tc)?;
-		write!(writer, ",")?;
-		uint256::solidity_default(writer, tc)?;
-		write!(writer, ")")
-	}
-}
-
-impl SolidityType for Property {
-	fn names(tc: &TypeCollector) -> Vec<string> {
-		let mut collected = Vec::with_capacity(Self::len());
-		{
-			let mut out = string::new();
-			string::solidity_name(&mut out, tc).expect("no fmt error");
-			collected.push(out);
-		}
-		{
-			let mut out = string::new();
-			bytes::solidity_name(&mut out, tc).expect("no fmt error");
-			collected.push(out);
-		}
-		collected
-	}
-
-	fn len() -> usize {
-		2
-	}
-}
modifiedcrates/evm-coder/src/solidity/mod.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity/mod.rs
+++ b/crates/evm-coder/src/solidity/mod.rs
@@ -76,7 +76,8 @@
 		self.anonymous.borrow_mut().insert(names, id);
 		format!("Tuple{}", id)
 	}
-	pub fn collect_struct<T: StructCollect>(&self) -> String {
+	pub fn collect_struct<T: StructCollect + SolidityType>(&self) -> String {
+		let _names = T::names(self);
 		self.collect(<T as StructCollect>::declaration());
 		<T as StructCollect>::name()
 	}
modifiedcrates/evm-coder/tests/abi_derive_generation.rsdiffbeforeafterboth
--- a/crates/evm-coder/tests/abi_derive_generation.rs
+++ b/crates/evm-coder/tests/abi_derive_generation.rs
@@ -100,6 +100,15 @@
 	}
 
 	#[test]
+	#[cfg(feature = "stubgen")]
+	fn struct_collect_vec() {
+		assert_eq!(
+			<Vec<u8> as ::evm_coder::solidity::StructCollect>::name(),
+			"uint8[]"
+		);
+	}
+
+	#[test]
 	fn impl_abi_type_signature() {
 		assert_eq!(
 			<TypeStruct1SimpleParam as evm_coder::abi::AbiType>::SIGNATURE
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -16,6 +16,7 @@
 
 //! The module contains a number of functions for converting and checking ethereum identifiers.
 
+use sp_std::{vec, vec::Vec};
 use evm_coder::{
 	AbiCoder,
 	types::{uint256, address},
@@ -183,3 +184,102 @@
 	/// Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]
 	CollectionAdmin,
 }
+
+/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+#[derive(Debug, Default, AbiCoder)]
+pub struct PropertyPermission {
+	/// TokenPermission field.
+	code: EthTokenPermissions,
+	/// TokenPermission value.
+	value: bool,
+}
+
+impl PropertyPermission {
+	pub fn into_vec(pp: up_data_structs::PropertyPermission) -> Vec<Self> {
+		vec![
+			PropertyPermission {
+				code: EthTokenPermissions::Mutable,
+				value: pp.mutable,
+			},
+			PropertyPermission {
+				code: EthTokenPermissions::TokenOwner,
+				value: pp.token_owner,
+			},
+			PropertyPermission {
+				code: EthTokenPermissions::CollectionAdmin,
+				value: pp.collection_admin,
+			},
+		]
+	}
+
+	pub fn from_vec(permission: Vec<Self>) -> up_data_structs::PropertyPermission {
+		let mut token_permission = up_data_structs::PropertyPermission::default();
+
+		for PropertyPermission { code, value } in permission {
+			match code {
+				EthTokenPermissions::Mutable => token_permission.mutable = value,
+				EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
+				EthTokenPermissions::CollectionAdmin => token_permission.collection_admin = value,
+			}
+		}
+		token_permission
+	}
+}
+
+/// Ethereum representation of Token Property Permissions.
+#[derive(Debug, Default, AbiCoder)]
+pub struct TokenPropertyPermission {
+	/// Token property key.
+	key: evm_coder::types::string,
+	/// Token property permissions.
+	permissions: Vec<PropertyPermission>,
+}
+
+impl
+	From<(
+		up_data_structs::PropertyKey,
+		up_data_structs::PropertyPermission,
+	)> for TokenPropertyPermission
+{
+	fn from(
+		value: (
+			up_data_structs::PropertyKey,
+			up_data_structs::PropertyPermission,
+		),
+	) -> Self {
+		let (key, permission) = value;
+		let key = evm_coder::types::string::from_utf8(key.into_inner())
+			.expect("Stored key must be valid");
+		let permissions = PropertyPermission::into_vec(permission);
+		Self { key, permissions }
+	}
+}
+
+impl TokenPropertyPermission {
+	pub fn into_property_key_permissions(
+		permissions: Vec<TokenPropertyPermission>,
+	) -> evm_coder::execution::Result<Vec<up_data_structs::PropertyKeyPermission>> {
+		let mut perms = Vec::new();
+
+		for TokenPropertyPermission { key, permissions } in permissions {
+			if permissions.len() > <EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT {
+				return Err(alloc::format!(
+					"Actual number of fields {} for {}, which exceeds the maximum value of {}",
+					permissions.len(),
+					stringify!(EthTokenPermissions),
+					<EthTokenPermissions as evm_coder::abi::AbiType>::FIELDS_COUNT
+				)
+				.as_str()
+				.into());
+			}
+
+			let token_permission = PropertyPermission::from_vec(permissions);
+
+			perms.push(up_data_structs::PropertyKeyPermission {
+				key: key.into_bytes().try_into().map_err(|_| "too long key")?,
+				permission: token_permission,
+			});
+		}
+		Ok(perms)
+	}
+}
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

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
@@ -470,9 +470,12 @@
 	uint256 sub;
 }
 
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 enum CollectionPermissions {
-	CollectionAdmin,
-	TokenOwner
+	/// @dev Owner of token can nest tokens under it.
+	TokenOwner,
+	/// @dev Admin of token collection can nest tokens under token.
+	CollectionAdmin
 }
 
 /// @dev anonymous struct
@@ -516,9 +519,11 @@
 	uint256 field_2;
 }
 
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
 struct Property {
+	/// @dev Property key.
 	string key;
+	/// @dev Property value.
 	bytes value;
 }
 
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -38,7 +38,7 @@
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
-	eth::{Property as PropertyStruct, EthCrossAccount, EthTokenPermissions},
+	eth::{Property as PropertyStruct, EthCrossAccount},
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
 use pallet_evm_coder_substrate::call;
@@ -94,40 +94,12 @@
 	fn set_token_property_permissions(
 		&mut self,
 		caller: caller,
-		permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,
+		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let mut perms = Vec::new();
-
-		for (key, pp) in permissions {
-			if pp.len() > EthTokenPermissions::FIELDS_COUNT {
-				return Err(alloc::format!(
-					"Actual number of fields {} for {}, which exceeds the maximum value of {}",
-					pp.len(),
-					stringify!(EthTokenPermissions),
-					EthTokenPermissions::FIELDS_COUNT
-				)
-				.as_str()
-				.into());
-			}
-
-			let mut token_permission = PropertyPermission::default();
-
-			for (perm, value) in pp {
-				match perm {
-					EthTokenPermissions::Mutable => token_permission.mutable = value,
-					EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
-					EthTokenPermissions::CollectionAdmin => {
-						token_permission.collection_admin = value
-					}
-				}
-			}
-
-			perms.push(PropertyKeyPermission {
-				key: key.into_bytes().try_into().map_err(|_| "too long key")?,
-				permission: token_permission,
-			});
-		}
+		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
+			permissions,
+		)?;
 
 		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
 			.map_err(dispatch_to_evm::<T>)
@@ -136,19 +108,11 @@
 	/// @notice Get permissions for token properties.
 	fn token_property_permissions(
 		&self,
-	) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
+	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
 		let perms = <Pallet<T>>::token_property_permission(self.id);
 		Ok(perms
 			.into_iter()
-			.map(|(key, pp)| {
-				let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");
-				let pp = vec![
-					(EthTokenPermissions::Mutable, pp.mutable),
-					(EthTokenPermissions::TokenOwner, pp.token_owner),
-					(EthTokenPermissions::CollectionAdmin, pp.collection_admin),
-				];
-				(key, pp)
-			})
+			.map(pallet_common::eth::TokenPropertyPermission::from)
 			.collect())
 	}
 
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
after · pallets/nonfungible/src/stubs/UniqueNFT.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8	uint8 dummy;9	string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13	function supportsInterface(bytes4 interfaceID) external view returns (bool) {14		require(false, stub_error);15		interfaceID;16		return true;17	}18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23	// /// @notice Set permissions for token property.24	// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25	// /// @param key Property key.26	// /// @param isMutable Permission to mutate property.27	// /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28	// /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29	// /// @dev EVM selector for this function is: 0x222d97fa,30	// ///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31	// function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32	// 	require(false, stub_error);33	// 	key;34	// 	isMutable;35	// 	collectionAdmin;36	// 	tokenOwner;37	// 	dummy = 0;38	// }3940	/// @notice Set permissions for token property.41	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.42	/// @param permissions Permissions for keys.43	/// @dev EVM selector for this function is: 0xbd92983a,44	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {46		require(false, stub_error);47		permissions;48		dummy = 0;49	}5051	/// @notice Get permissions for token properties.52	/// @dev EVM selector for this function is: 0xf23d7790,53	///  or in textual repr: tokenPropertyPermissions()54	function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {55		require(false, stub_error);56		dummy;57		return new TokenPropertyPermission[](0);58	}5960	// /// @notice Set token property value.61	// /// @dev Throws error if `msg.sender` has no permission to edit the property.62	// /// @param tokenId ID of the token.63	// /// @param key Property key.64	// /// @param value Property value.65	// /// @dev EVM selector for this function is: 0x1752d67b,66	// ///  or in textual repr: setProperty(uint256,string,bytes)67	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68	// 	require(false, stub_error);69	// 	tokenId;70	// 	key;71	// 	value;72	// 	dummy = 0;73	// }7475	/// @notice Set token properties value.76	/// @dev Throws error if `msg.sender` has no permission to edit the property.77	/// @param tokenId ID of the token.78	/// @param properties settable properties79	/// @dev EVM selector for this function is: 0x14ed3a6e,80	///  or in textual repr: setProperties(uint256,(string,bytes)[])81	function setProperties(uint256 tokenId, Property[] memory properties) public {82		require(false, stub_error);83		tokenId;84		properties;85		dummy = 0;86	}8788	// /// @notice Delete token property value.89	// /// @dev Throws error if `msg.sender` has no permission to edit the property.90	// /// @param tokenId ID of the token.91	// /// @param key Property key.92	// /// @dev EVM selector for this function is: 0x066111d1,93	// ///  or in textual repr: deleteProperty(uint256,string)94	// function deleteProperty(uint256 tokenId, string memory key) public {95	// 	require(false, stub_error);96	// 	tokenId;97	// 	key;98	// 	dummy = 0;99	// }100101	/// @notice Delete token properties value.102	/// @dev Throws error if `msg.sender` has no permission to edit the property.103	/// @param tokenId ID of the token.104	/// @param keys Properties key.105	/// @dev EVM selector for this function is: 0xc472d371,106	///  or in textual repr: deleteProperties(uint256,string[])107	function deleteProperties(uint256 tokenId, string[] memory keys) public {108		require(false, stub_error);109		tokenId;110		keys;111		dummy = 0;112	}113114	/// @notice Get token property value.115	/// @dev Throws error if key not found116	/// @param tokenId ID of the token.117	/// @param key Property key.118	/// @return Property value bytes119	/// @dev EVM selector for this function is: 0x7228c327,120	///  or in textual repr: property(uint256,string)121	function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122		require(false, stub_error);123		tokenId;124		key;125		dummy;126		return hex"";127	}128}129130/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).131struct Property {132	/// @dev Property key.133	string key;134	/// @dev Property value.135	bytes value;136}137138/// @dev Ethereum representation of Token Property Permissions.139struct TokenPropertyPermission {140	/// @dev Token property key.141	string key;142	/// @dev Token property permissions.143	PropertyPermission[] permissions;144}145146/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.147struct PropertyPermission {148	/// @dev TokenPermission field.149	EthTokenPermissions code;150	/// @dev TokenPermission value.151	bool value;152}153154/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.155enum EthTokenPermissions {156	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]157	Mutable,158	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]159	TokenOwner,160	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]161	CollectionAdmin162}163164/// @title A contract that allows you to work with collections.165/// @dev the ERC-165 identifier for this interface is 0x81172a75166contract Collection is Dummy, ERC165 {167	// /// Set collection property.168	// ///169	// /// @param key Property key.170	// /// @param value Propery value.171	// /// @dev EVM selector for this function is: 0x2f073f66,172	// ///  or in textual repr: setCollectionProperty(string,bytes)173	// function setCollectionProperty(string memory key, bytes memory value) public {174	// 	require(false, stub_error);175	// 	key;176	// 	value;177	// 	dummy = 0;178	// }179180	/// Set collection properties.181	///182	/// @param properties Vector of properties key/value pair.183	/// @dev EVM selector for this function is: 0x50b26b2a,184	///  or in textual repr: setCollectionProperties((string,bytes)[])185	function setCollectionProperties(Property[] memory properties) public {186		require(false, stub_error);187		properties;188		dummy = 0;189	}190191	// /// Delete collection property.192	// ///193	// /// @param key Property key.194	// /// @dev EVM selector for this function is: 0x7b7debce,195	// ///  or in textual repr: deleteCollectionProperty(string)196	// function deleteCollectionProperty(string memory key) public {197	// 	require(false, stub_error);198	// 	key;199	// 	dummy = 0;200	// }201202	/// Delete collection properties.203	///204	/// @param keys Properties keys.205	/// @dev EVM selector for this function is: 0xee206ee3,206	///  or in textual repr: deleteCollectionProperties(string[])207	function deleteCollectionProperties(string[] memory keys) public {208		require(false, stub_error);209		keys;210		dummy = 0;211	}212213	/// Get collection property.214	///215	/// @dev Throws error if key not found.216	///217	/// @param key Property key.218	/// @return bytes The property corresponding to the key.219	/// @dev EVM selector for this function is: 0xcf24fd6d,220	///  or in textual repr: collectionProperty(string)221	function collectionProperty(string memory key) public view returns (bytes memory) {222		require(false, stub_error);223		key;224		dummy;225		return hex"";226	}227228	/// Get collection properties.229	///230	/// @param keys Properties keys. Empty keys for all propertyes.231	/// @return Vector of properties key/value pairs.232	/// @dev EVM selector for this function is: 0x285fb8e6,233	///  or in textual repr: collectionProperties(string[])234	function collectionProperties(string[] memory keys) public view returns (Property[] memory) {235		require(false, stub_error);236		keys;237		dummy;238		return new Property[](0);239	}240241	// /// Set the sponsor of the collection.242	// ///243	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.244	// ///245	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.246	// /// @dev EVM selector for this function is: 0x7623402e,247	// ///  or in textual repr: setCollectionSponsor(address)248	// function setCollectionSponsor(address sponsor) public {249	// 	require(false, stub_error);250	// 	sponsor;251	// 	dummy = 0;252	// }253254	/// Set the sponsor of the collection.255	///256	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.257	///258	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.259	/// @dev EVM selector for this function is: 0x84a1d5a8,260	///  or in textual repr: setCollectionSponsorCross((address,uint256))261	function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {262		require(false, stub_error);263		sponsor;264		dummy = 0;265	}266267	/// Whether there is a pending sponsor.268	/// @dev EVM selector for this function is: 0x058ac185,269	///  or in textual repr: hasCollectionPendingSponsor()270	function hasCollectionPendingSponsor() public view returns (bool) {271		require(false, stub_error);272		dummy;273		return false;274	}275276	/// Collection sponsorship confirmation.277	///278	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.279	/// @dev EVM selector for this function is: 0x3c50e97a,280	///  or in textual repr: confirmCollectionSponsorship()281	function confirmCollectionSponsorship() public {282		require(false, stub_error);283		dummy = 0;284	}285286	/// Remove collection sponsor.287	/// @dev EVM selector for this function is: 0x6e0326a3,288	///  or in textual repr: removeCollectionSponsor()289	function removeCollectionSponsor() public {290		require(false, stub_error);291		dummy = 0;292	}293294	/// Get current sponsor.295	///296	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.297	/// @dev EVM selector for this function is: 0x6ec0a9f1,298	///  or in textual repr: collectionSponsor()299	function collectionSponsor() public view returns (EthCrossAccount memory) {300		require(false, stub_error);301		dummy;302		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);303	}304305	/// Get current collection limits.306	///307	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:308	/// 	"accountTokenOwnershipLimit",309	/// 	"sponsoredDataSize",310	/// 	"sponsoredDataRateLimit",311	/// 	"tokenLimit",312	/// 	"sponsorTransferTimeout",313	/// 	"sponsorApproveTimeout"314	///  	"ownerCanTransfer",315	/// 	"ownerCanDestroy",316	/// 	"transfersEnabled"317	/// Return `false` if a limit not set.318	/// @dev EVM selector for this function is: 0xf63bc572,319	///  or in textual repr: collectionLimits()320	function collectionLimits() public view returns (Tuple35[] memory) {321		require(false, stub_error);322		dummy;323		return new Tuple35[](0);324	}325326	/// Set limits for the collection.327	/// @dev Throws error if limit not found.328	/// @param limit Name of the limit. Valid names:329	/// 	"accountTokenOwnershipLimit",330	/// 	"sponsoredDataSize",331	/// 	"sponsoredDataRateLimit",332	/// 	"tokenLimit",333	/// 	"sponsorTransferTimeout",334	/// 	"sponsorApproveTimeout"335	///  	"ownerCanTransfer",336	/// 	"ownerCanDestroy",337	/// 	"transfersEnabled"338	/// @param status enable\disable limit. Works only with `true`.339	/// @param value Value of the limit.340	/// @dev EVM selector for this function is: 0x88150bd0,341	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)342	function setCollectionLimit(343		CollectionLimits limit,344		bool status,345		uint256 value346	) public {347		require(false, stub_error);348		limit;349		status;350		value;351		dummy = 0;352	}353354	/// Get contract address.355	/// @dev EVM selector for this function is: 0xf6b4dfb4,356	///  or in textual repr: contractAddress()357	function contractAddress() public view returns (address) {358		require(false, stub_error);359		dummy;360		return 0x0000000000000000000000000000000000000000;361	}362363	/// Add collection admin.364	/// @param newAdmin Cross account administrator address.365	/// @dev EVM selector for this function is: 0x859aa7d6,366	///  or in textual repr: addCollectionAdminCross((address,uint256))367	function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {368		require(false, stub_error);369		newAdmin;370		dummy = 0;371	}372373	/// Remove collection admin.374	/// @param admin Cross account administrator address.375	/// @dev EVM selector for this function is: 0x6c0cd173,376	///  or in textual repr: removeCollectionAdminCross((address,uint256))377	function removeCollectionAdminCross(EthCrossAccount memory admin) public {378		require(false, stub_error);379		admin;380		dummy = 0;381	}382383	// /// Add collection admin.384	// /// @param newAdmin Address of the added administrator.385	// /// @dev EVM selector for this function is: 0x92e462c7,386	// ///  or in textual repr: addCollectionAdmin(address)387	// function addCollectionAdmin(address newAdmin) public {388	// 	require(false, stub_error);389	// 	newAdmin;390	// 	dummy = 0;391	// }392393	// /// Remove collection admin.394	// ///395	// /// @param admin Address of the removed administrator.396	// /// @dev EVM selector for this function is: 0xfafd7b42,397	// ///  or in textual repr: removeCollectionAdmin(address)398	// function removeCollectionAdmin(address admin) public {399	// 	require(false, stub_error);400	// 	admin;401	// 	dummy = 0;402	// }403404	/// Toggle accessibility of collection nesting.405	///406	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'407	/// @dev EVM selector for this function is: 0x112d4586,408	///  or in textual repr: setCollectionNesting(bool)409	function setCollectionNesting(bool enable) public {410		require(false, stub_error);411		enable;412		dummy = 0;413	}414415	/// Toggle accessibility of collection nesting.416	///417	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'418	/// @param collections Addresses of collections that will be available for nesting.419	/// @dev EVM selector for this function is: 0x64872396,420	///  or in textual repr: setCollectionNesting(bool,address[])421	function setCollectionNesting(bool enable, address[] memory collections) public {422		require(false, stub_error);423		enable;424		collections;425		dummy = 0;426	}427428	/// Returns nesting for a collection429	/// @dev EVM selector for this function is: 0x22d25bfe,430	///  or in textual repr: collectionNestingRestrictedCollectionIds()431	function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {432		require(false, stub_error);433		dummy;434		return Tuple41(false, new uint256[](0));435	}436437	/// Returns permissions for a collection438	/// @dev EVM selector for this function is: 0x5b2eaf4b,439	///  or in textual repr: collectionNestingPermissions()440	function collectionNestingPermissions() public view returns (Tuple44[] memory) {441		require(false, stub_error);442		dummy;443		return new Tuple44[](0);444	}445446	/// Set the collection access method.447	/// @param mode Access mode448	/// 	0 for Normal449	/// 	1 for AllowList450	/// @dev EVM selector for this function is: 0x41835d4c,451	///  or in textual repr: setCollectionAccess(uint8)452	function setCollectionAccess(uint8 mode) public {453		require(false, stub_error);454		mode;455		dummy = 0;456	}457458	/// Checks that user allowed to operate with collection.459	///460	/// @param user User address to check.461	/// @dev EVM selector for this function is: 0x91b6df49,462	///  or in textual repr: allowlistedCross((address,uint256))463	function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {464		require(false, stub_error);465		user;466		dummy;467		return false;468	}469470	// /// Add the user to the allowed list.471	// ///472	// /// @param user Address of a trusted user.473	// /// @dev EVM selector for this function is: 0x67844fe6,474	// ///  or in textual repr: addToCollectionAllowList(address)475	// function addToCollectionAllowList(address user) public {476	// 	require(false, stub_error);477	// 	user;478	// 	dummy = 0;479	// }480481	/// Add user to allowed list.482	///483	/// @param user User cross account address.484	/// @dev EVM selector for this function is: 0xa0184a3a,485	///  or in textual repr: addToCollectionAllowListCross((address,uint256))486	function addToCollectionAllowListCross(EthCrossAccount memory user) public {487		require(false, stub_error);488		user;489		dummy = 0;490	}491492	// /// Remove the user from the allowed list.493	// ///494	// /// @param user Address of a removed user.495	// /// @dev EVM selector for this function is: 0x85c51acb,496	// ///  or in textual repr: removeFromCollectionAllowList(address)497	// function removeFromCollectionAllowList(address user) public {498	// 	require(false, stub_error);499	// 	user;500	// 	dummy = 0;501	// }502503	/// Remove user from allowed list.504	///505	/// @param user User cross account address.506	/// @dev EVM selector for this function is: 0x09ba452a,507	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))508	function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {509		require(false, stub_error);510		user;511		dummy = 0;512	}513514	/// Switch permission for minting.515	///516	/// @param mode Enable if "true".517	/// @dev EVM selector for this function is: 0x00018e84,518	///  or in textual repr: setCollectionMintMode(bool)519	function setCollectionMintMode(bool mode) public {520		require(false, stub_error);521		mode;522		dummy = 0;523	}524525	// /// Check that account is the owner or admin of the collection526	// ///527	// /// @param user account to verify528	// /// @return "true" if account is the owner or admin529	// /// @dev EVM selector for this function is: 0x9811b0c7,530	// ///  or in textual repr: isOwnerOrAdmin(address)531	// function isOwnerOrAdmin(address user) public view returns (bool) {532	// 	require(false, stub_error);533	// 	user;534	// 	dummy;535	// 	return false;536	// }537538	/// Check that account is the owner or admin of the collection539	///540	/// @param user User cross account to verify541	/// @return "true" if account is the owner or admin542	/// @dev EVM selector for this function is: 0x3e75a905,543	///  or in textual repr: isOwnerOrAdminCross((address,uint256))544	function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {545		require(false, stub_error);546		user;547		dummy;548		return false;549	}550551	/// Returns collection type552	///553	/// @return `Fungible` or `NFT` or `ReFungible`554	/// @dev EVM selector for this function is: 0xd34b55b8,555	///  or in textual repr: uniqueCollectionType()556	function uniqueCollectionType() public view returns (string memory) {557		require(false, stub_error);558		dummy;559		return "";560	}561562	/// Get collection owner.563	///564	/// @return Tuble with sponsor address and his substrate mirror.565	/// If address is canonical then substrate mirror is zero and vice versa.566	/// @dev EVM selector for this function is: 0xdf727d3b,567	///  or in textual repr: collectionOwner()568	function collectionOwner() public view returns (EthCrossAccount memory) {569		require(false, stub_error);570		dummy;571		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);572	}573574	// /// Changes collection owner to another account575	// ///576	// /// @dev Owner can be changed only by current owner577	// /// @param newOwner new owner account578	// /// @dev EVM selector for this function is: 0x4f53e226,579	// ///  or in textual repr: changeCollectionOwner(address)580	// function changeCollectionOwner(address newOwner) public {581	// 	require(false, stub_error);582	// 	newOwner;583	// 	dummy = 0;584	// }585586	/// Get collection administrators587	///588	/// @return Vector of tuples with admins address and his substrate mirror.589	/// If address is canonical then substrate mirror is zero and vice versa.590	/// @dev EVM selector for this function is: 0x5813216b,591	///  or in textual repr: collectionAdmins()592	function collectionAdmins() public view returns (EthCrossAccount[] memory) {593		require(false, stub_error);594		dummy;595		return new EthCrossAccount[](0);596	}597598	/// Changes collection owner to another account599	///600	/// @dev Owner can be changed only by current owner601	/// @param newOwner new owner cross account602	/// @dev EVM selector for this function is: 0x6496c497,603	///  or in textual repr: changeCollectionOwnerCross((address,uint256))604	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {605		require(false, stub_error);606		newOwner;607		dummy = 0;608	}609}610611/// @dev Cross account struct612struct EthCrossAccount {613	address eth;614	uint256 sub;615}616617/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.618enum CollectionPermissions {619	/// @dev Owner of token can nest tokens under it.620	TokenOwner,621	/// @dev Admin of token collection can nest tokens under token.622	CollectionAdmin623}624625/// @dev anonymous struct626struct Tuple44 {627	CollectionPermissions field_0;628	bool field_1;629}630631/// @dev anonymous struct632struct Tuple41 {633	bool field_0;634	uint256[] field_1;635}636637/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.638enum CollectionLimits {639	/// @dev How many tokens can a user have on one account.640	AccountTokenOwnership,641	/// @dev How many bytes of data are available for sponsorship.642	SponsoredDataSize,643	/// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]644	SponsoredDataRateLimit,645	/// @dev How many tokens can be mined into this collection.646	TokenLimit,647	/// @dev Timeouts for transfer sponsoring.648	SponsorTransferTimeout,649	/// @dev Timeout for sponsoring an approval in passed blocks.650	SponsorApproveTimeout,651	/// @dev Whether the collection owner of the collection can send tokens (which belong to other users).652	OwnerCanTransfer,653	/// @dev Can the collection owner burn other people's tokens.654	OwnerCanDestroy,655	/// @dev Is it possible to send tokens from this collection between users.656	TransferEnabled657}658659/// @dev anonymous struct660struct Tuple35 {661	CollectionLimits field_0;662	bool field_1;663	uint256 field_2;664}665666/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension667/// @dev See https://eips.ethereum.org/EIPS/eip-721668/// @dev the ERC-165 identifier for this interface is 0x5b5e139f669contract ERC721Metadata is Dummy, ERC165 {670	// /// @notice A descriptive name for a collection of NFTs in this contract671	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`672	// /// @dev EVM selector for this function is: 0x06fdde03,673	// ///  or in textual repr: name()674	// function name() public view returns (string memory) {675	// 	require(false, stub_error);676	// 	dummy;677	// 	return "";678	// }679680	// /// @notice An abbreviated name for NFTs in this contract681	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`682	// /// @dev EVM selector for this function is: 0x95d89b41,683	// ///  or in textual repr: symbol()684	// function symbol() public view returns (string memory) {685	// 	require(false, stub_error);686	// 	dummy;687	// 	return "";688	// }689690	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.691	///692	/// @dev If the token has a `url` property and it is not empty, it is returned.693	///  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`.694	///  If the collection property `baseURI` is empty or absent, return "" (empty string)695	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix696	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).697	///698	/// @return token's const_metadata699	/// @dev EVM selector for this function is: 0xc87b56dd,700	///  or in textual repr: tokenURI(uint256)701	function tokenURI(uint256 tokenId) public view returns (string memory) {702		require(false, stub_error);703		tokenId;704		dummy;705		return "";706	}707}708709/// @title ERC721 Token that can be irreversibly burned (destroyed).710/// @dev the ERC-165 identifier for this interface is 0x42966c68711contract ERC721Burnable is Dummy, ERC165 {712	/// @notice Burns a specific ERC721 token.713	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized714	///  operator of the current owner.715	/// @param tokenId The NFT to approve716	/// @dev EVM selector for this function is: 0x42966c68,717	///  or in textual repr: burn(uint256)718	function burn(uint256 tokenId) public {719		require(false, stub_error);720		tokenId;721		dummy = 0;722	}723}724725/// @dev inlined interface726contract ERC721UniqueMintableEvents {727	event MintingFinished();728}729730/// @title ERC721 minting logic.731/// @dev the ERC-165 identifier for this interface is 0x476ff149732contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {733	/// @dev EVM selector for this function is: 0x05d2035b,734	///  or in textual repr: mintingFinished()735	function mintingFinished() public view returns (bool) {736		require(false, stub_error);737		dummy;738		return false;739	}740741	/// @notice Function to mint a token.742	/// @param to The new owner743	/// @return uint256 The id of the newly minted token744	/// @dev EVM selector for this function is: 0x6a627842,745	///  or in textual repr: mint(address)746	function mint(address to) public returns (uint256) {747		require(false, stub_error);748		to;749		dummy = 0;750		return 0;751	}752753	// /// @notice Function to mint a token.754	// /// @dev `tokenId` should be obtained with `nextTokenId` method,755	// ///  unlike standard, you can't specify it manually756	// /// @param to The new owner757	// /// @param tokenId ID of the minted NFT758	// /// @dev EVM selector for this function is: 0x40c10f19,759	// ///  or in textual repr: mint(address,uint256)760	// function mint(address to, uint256 tokenId) public returns (bool) {761	// 	require(false, stub_error);762	// 	to;763	// 	tokenId;764	// 	dummy = 0;765	// 	return false;766	// }767768	/// @notice Function to mint token with the given tokenUri.769	/// @param to The new owner770	/// @param tokenUri Token URI that would be stored in the NFT properties771	/// @return uint256 The id of the newly minted token772	/// @dev EVM selector for this function is: 0x45c17782,773	///  or in textual repr: mintWithTokenURI(address,string)774	function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {775		require(false, stub_error);776		to;777		tokenUri;778		dummy = 0;779		return 0;780	}781782	// /// @notice Function to mint token with the given tokenUri.783	// /// @dev `tokenId` should be obtained with `nextTokenId` method,784	// ///  unlike standard, you can't specify it manually785	// /// @param to The new owner786	// /// @param tokenId ID of the minted NFT787	// /// @param tokenUri Token URI that would be stored in the NFT properties788	// /// @dev EVM selector for this function is: 0x50bb4e7f,789	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)790	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {791	// 	require(false, stub_error);792	// 	to;793	// 	tokenId;794	// 	tokenUri;795	// 	dummy = 0;796	// 	return false;797	// }798799	/// @dev Not implemented800	/// @dev EVM selector for this function is: 0x7d64bcb4,801	///  or in textual repr: finishMinting()802	function finishMinting() public returns (bool) {803		require(false, stub_error);804		dummy = 0;805		return false;806	}807}808809/// @title Unique extensions for ERC721.810/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4811contract ERC721UniqueExtensions is Dummy, ERC165 {812	/// @notice A descriptive name for a collection of NFTs in this contract813	/// @dev EVM selector for this function is: 0x06fdde03,814	///  or in textual repr: name()815	function name() public view returns (string memory) {816		require(false, stub_error);817		dummy;818		return "";819	}820821	/// @notice An abbreviated name for NFTs in this contract822	/// @dev EVM selector for this function is: 0x95d89b41,823	///  or in textual repr: symbol()824	function symbol() public view returns (string memory) {825		require(false, stub_error);826		dummy;827		return "";828	}829830	/// @notice A description for the collection.831	/// @dev EVM selector for this function is: 0x7284e416,832	///  or in textual repr: description()833	function description() public view returns (string memory) {834		require(false, stub_error);835		dummy;836		return "";837	}838839	/// Returns the owner (in cross format) of the token.840	///841	/// @param tokenId Id for the token.842	/// @dev EVM selector for this function is: 0x2b29dace,843	///  or in textual repr: crossOwnerOf(uint256)844	function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {845		require(false, stub_error);846		tokenId;847		dummy;848		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);849	}850851	/// Returns the token properties.852	///853	/// @param tokenId Id for the token.854	/// @param keys Properties keys. Empty keys for all propertyes.855	/// @return Vector of properties key/value pairs.856	/// @dev EVM selector for this function is: 0xe07ede7e,857	///  or in textual repr: properties(uint256,string[])858	function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {859		require(false, stub_error);860		tokenId;861		keys;862		dummy;863		return new Property[](0);864	}865866	/// @notice Set or reaffirm the approved address for an NFT867	/// @dev The zero address indicates there is no approved address.868	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized869	///  operator of the current owner.870	/// @param approved The new substrate address approved NFT controller871	/// @param tokenId The NFT to approve872	/// @dev EVM selector for this function is: 0x0ecd0ab0,873	///  or in textual repr: approveCross((address,uint256),uint256)874	function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {875		require(false, stub_error);876		approved;877		tokenId;878		dummy = 0;879	}880881	/// @notice Transfer ownership of an NFT882	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`883	///  is the zero address. Throws if `tokenId` is not a valid NFT.884	/// @param to The new owner885	/// @param tokenId The NFT to transfer886	/// @dev EVM selector for this function is: 0xa9059cbb,887	///  or in textual repr: transfer(address,uint256)888	function transfer(address to, uint256 tokenId) public {889		require(false, stub_error);890		to;891		tokenId;892		dummy = 0;893	}894895	/// @notice Transfer ownership of an NFT896	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`897	///  is the zero address. Throws if `tokenId` is not a valid NFT.898	/// @param to The new owner899	/// @param tokenId The NFT to transfer900	/// @dev EVM selector for this function is: 0x2ada85ff,901	///  or in textual repr: transferCross((address,uint256),uint256)902	function transferCross(EthCrossAccount memory to, uint256 tokenId) public {903		require(false, stub_error);904		to;905		tokenId;906		dummy = 0;907	}908909	/// @notice Transfer ownership of an NFT from cross account address to cross account address910	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`911	///  is the zero address. Throws if `tokenId` is not a valid NFT.912	/// @param from Cross acccount address of current owner913	/// @param to Cross acccount address of new owner914	/// @param tokenId The NFT to transfer915	/// @dev EVM selector for this function is: 0xd5cf430b,916	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)917	function transferFromCross(918		EthCrossAccount memory from,919		EthCrossAccount memory to,920		uint256 tokenId921	) public {922		require(false, stub_error);923		from;924		to;925		tokenId;926		dummy = 0;927	}928929	// /// @notice Burns a specific ERC721 token.930	// /// @dev Throws unless `msg.sender` is the current owner or an authorized931	// ///  operator for this NFT. Throws if `from` is not the current owner. Throws932	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.933	// /// @param from The current owner of the NFT934	// /// @param tokenId The NFT to transfer935	// /// @dev EVM selector for this function is: 0x79cc6790,936	// ///  or in textual repr: burnFrom(address,uint256)937	// function burnFrom(address from, uint256 tokenId) public {938	// 	require(false, stub_error);939	// 	from;940	// 	tokenId;941	// 	dummy = 0;942	// }943944	/// @notice Burns a specific ERC721 token.945	/// @dev Throws unless `msg.sender` is the current owner or an authorized946	///  operator for this NFT. Throws if `from` is not the current owner. Throws947	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.948	/// @param from The current owner of the NFT949	/// @param tokenId The NFT to transfer950	/// @dev EVM selector for this function is: 0xbb2f5a58,951	///  or in textual repr: burnFromCross((address,uint256),uint256)952	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {953		require(false, stub_error);954		from;955		tokenId;956		dummy = 0;957	}958959	/// @notice Returns next free NFT ID.960	/// @dev EVM selector for this function is: 0x75794a3c,961	///  or in textual repr: nextTokenId()962	function nextTokenId() public view returns (uint256) {963		require(false, stub_error);964		dummy;965		return 0;966	}967968	// /// @notice Function to mint multiple tokens.969	// /// @dev `tokenIds` should be an array of consecutive numbers and first number970	// ///  should be obtained with `nextTokenId` method971	// /// @param to The new owner972	// /// @param tokenIds IDs of the minted NFTs973	// /// @dev EVM selector for this function is: 0x44a9945e,974	// ///  or in textual repr: mintBulk(address,uint256[])975	// function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {976	// 	require(false, stub_error);977	// 	to;978	// 	tokenIds;979	// 	dummy = 0;980	// 	return false;981	// }982983	// /// @notice Function to mint multiple tokens with the given tokenUris.984	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive985	// ///  numbers and first number should be obtained with `nextTokenId` method986	// /// @param to The new owner987	// /// @param tokens array of pairs of token ID and token URI for minted tokens988	// /// @dev EVM selector for this function is: 0x36543006,989	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])990	// function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {991	// 	require(false, stub_error);992	// 	to;993	// 	tokens;994	// 	dummy = 0;995	// 	return false;996	// }997998	/// @notice Function to mint a token.999	/// @param to The new owner crossAccountId1000	/// @param properties Properties of minted token1001	/// @return uint256 The id of the newly minted token1002	/// @dev EVM selector for this function is: 0xb904db03,1003	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])1004	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {1005		require(false, stub_error);1006		to;1007		properties;1008		dummy = 0;1009		return 0;1010	}1011}10121013/// @dev anonymous struct1014struct Tuple15 {1015	uint256 field_0;1016	string field_1;1017}10181019/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1020/// @dev See https://eips.ethereum.org/EIPS/eip-7211021/// @dev the ERC-165 identifier for this interface is 0x780e9d631022contract ERC721Enumerable is Dummy, ERC165 {1023	/// @notice Enumerate valid NFTs1024	/// @param index A counter less than `totalSupply()`1025	/// @return The token identifier for the `index`th NFT,1026	///  (sort order not specified)1027	/// @dev EVM selector for this function is: 0x4f6ccce7,1028	///  or in textual repr: tokenByIndex(uint256)1029	function tokenByIndex(uint256 index) public view returns (uint256) {1030		require(false, stub_error);1031		index;1032		dummy;1033		return 0;1034	}10351036	/// @dev Not implemented1037	/// @dev EVM selector for this function is: 0x2f745c59,1038	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)1039	function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1040		require(false, stub_error);1041		owner;1042		index;1043		dummy;1044		return 0;1045	}10461047	/// @notice Count NFTs tracked by this contract1048	/// @return A count of valid NFTs tracked by this contract, where each one of1049	///  them has an assigned and queryable owner not equal to the zero address1050	/// @dev EVM selector for this function is: 0x18160ddd,1051	///  or in textual repr: totalSupply()1052	function totalSupply() public view returns (uint256) {1053		require(false, stub_error);1054		dummy;1055		return 0;1056	}1057}10581059/// @dev inlined interface1060contract ERC721Events {1061	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1062	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1063	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1064}10651066/// @title ERC-721 Non-Fungible Token Standard1067/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1068/// @dev the ERC-165 identifier for this interface is 0x983a942b1069contract ERC721 is Dummy, ERC165, ERC721Events {1070	/// @notice Count all NFTs assigned to an owner1071	/// @dev NFTs assigned to the zero address are considered invalid, and this1072	///  function throws for queries about the zero address.1073	/// @param owner An address for whom to query the balance1074	/// @return The number of NFTs owned by `owner`, possibly zero1075	/// @dev EVM selector for this function is: 0x70a08231,1076	///  or in textual repr: balanceOf(address)1077	function balanceOf(address owner) public view returns (uint256) {1078		require(false, stub_error);1079		owner;1080		dummy;1081		return 0;1082	}10831084	/// @notice Find the owner of an NFT1085	/// @dev NFTs assigned to zero address are considered invalid, and queries1086	///  about them do throw.1087	/// @param tokenId The identifier for an NFT1088	/// @return The address of the owner of the NFT1089	/// @dev EVM selector for this function is: 0x6352211e,1090	///  or in textual repr: ownerOf(uint256)1091	function ownerOf(uint256 tokenId) public view returns (address) {1092		require(false, stub_error);1093		tokenId;1094		dummy;1095		return 0x0000000000000000000000000000000000000000;1096	}10971098	/// @dev Not implemented1099	/// @dev EVM selector for this function is: 0xb88d4fde,1100	///  or in textual repr: safeTransferFrom(address,address,uint256,bytes)1101	function safeTransferFrom(1102		address from,1103		address to,1104		uint256 tokenId,1105		bytes memory data1106	) public {1107		require(false, stub_error);1108		from;1109		to;1110		tokenId;1111		data;1112		dummy = 0;1113	}11141115	/// @dev Not implemented1116	/// @dev EVM selector for this function is: 0x42842e0e,1117	///  or in textual repr: safeTransferFrom(address,address,uint256)1118	function safeTransferFrom(1119		address from,1120		address to,1121		uint256 tokenId1122	) public {1123		require(false, stub_error);1124		from;1125		to;1126		tokenId;1127		dummy = 0;1128	}11291130	/// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1131	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1132	///  THEY MAY BE PERMANENTLY LOST1133	/// @dev Throws unless `msg.sender` is the current owner or an authorized1134	///  operator for this NFT. Throws if `from` is not the current owner. Throws1135	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1136	/// @param from The current owner of the NFT1137	/// @param to The new owner1138	/// @param tokenId The NFT to transfer1139	/// @dev EVM selector for this function is: 0x23b872dd,1140	///  or in textual repr: transferFrom(address,address,uint256)1141	function transferFrom(1142		address from,1143		address to,1144		uint256 tokenId1145	) public {1146		require(false, stub_error);1147		from;1148		to;1149		tokenId;1150		dummy = 0;1151	}11521153	/// @notice Set or reaffirm the approved address for an NFT1154	/// @dev The zero address indicates there is no approved address.1155	/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1156	///  operator of the current owner.1157	/// @param approved The new approved NFT controller1158	/// @param tokenId The NFT to approve1159	/// @dev EVM selector for this function is: 0x095ea7b3,1160	///  or in textual repr: approve(address,uint256)1161	function approve(address approved, uint256 tokenId) public {1162		require(false, stub_error);1163		approved;1164		tokenId;1165		dummy = 0;1166	}11671168	/// @notice Sets or unsets the approval of a given operator.1169	/// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1170	/// @param operator Operator1171	/// @param approved Should operator status be granted or revoked?1172	/// @dev EVM selector for this function is: 0xa22cb465,1173	///  or in textual repr: setApprovalForAll(address,bool)1174	function setApprovalForAll(address operator, bool approved) public {1175		require(false, stub_error);1176		operator;1177		approved;1178		dummy = 0;1179	}11801181	/// @dev Not implemented1182	/// @dev EVM selector for this function is: 0x081812fc,1183	///  or in textual repr: getApproved(uint256)1184	function getApproved(uint256 tokenId) public view returns (address) {1185		require(false, stub_error);1186		tokenId;1187		dummy;1188		return 0x0000000000000000000000000000000000000000;1189	}11901191	/// @notice Tells whether the given `owner` approves the `operator`.1192	/// @dev EVM selector for this function is: 0xe985e9c5,1193	///  or in textual repr: isApprovedForAll(address,address)1194	function isApprovedForAll(address owner, address operator) public view returns (bool) {1195		require(false, stub_error);1196		owner;1197		operator;1198		dummy;1199		return false;1200	}12011202	/// @notice Returns collection helper contract address1203	/// @dev EVM selector for this function is: 0x1896cce6,1204	///  or in textual repr: collectionHelperAddress()1205	function collectionHelperAddress() public view returns (address) {1206		require(false, stub_error);1207		dummy;1208		return 0x0000000000000000000000000000000000000000;1209	}1210}12111212contract UniqueNFT is1213	Dummy,1214	ERC165,1215	ERC721,1216	ERC721Enumerable,1217	ERC721UniqueExtensions,1218	ERC721UniqueMintable,1219	ERC721Burnable,1220	ERC721Metadata,1221	Collection,1222	TokenProperties1223{}
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,7 +33,7 @@
 use pallet_common::{
 	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
 	erc::{CommonEvmHandler, CollectionCall, static_property::key},
-	eth::{Property as PropertyStruct, EthCrossAccount, EthTokenPermissions},
+	eth::{Property as PropertyStruct, EthCrossAccount},
 	Error as CommonError,
 };
 use pallet_evm::{account::CrossAccountId, PrecompileHandle};
@@ -97,47 +97,13 @@
 	fn set_token_property_permissions(
 		&mut self,
 		caller: caller,
-		permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,
+		permissions: Vec<pallet_common::eth::TokenPropertyPermission>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		const PERMISSIONS_FIELDS_COUNT: usize = 3;
-
-		let mut perms = Vec::new();
-
-		for (key, pp) in permissions {
-			if pp.len() > PERMISSIONS_FIELDS_COUNT {
-				return Err(alloc::format!(
-					"Actual number of fields {} for {}, which exceeds the maximum value of {}",
-					pp.len(),
-					stringify!(EthTokenPermissions),
-					PERMISSIONS_FIELDS_COUNT
-				)
-				.as_str()
-				.into());
-			}
-
-			let mut token_permission = PropertyPermission {
-				mutable: false,
-				collection_admin: false,
-				token_owner: false,
-			};
+		let perms = pallet_common::eth::TokenPropertyPermission::into_property_key_permissions(
+			permissions,
+		)?;
 
-			for (perm, value) in pp {
-				match perm {
-					EthTokenPermissions::Mutable => token_permission.mutable = value,
-					EthTokenPermissions::TokenOwner => token_permission.token_owner = value,
-					EthTokenPermissions::CollectionAdmin => {
-						token_permission.collection_admin = value
-					}
-				}
-			}
-
-			perms.push(PropertyKeyPermission {
-				key: key.into_bytes().try_into().map_err(|_| "too long key")?,
-				permission: token_permission,
-			});
-		}
-
 		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)
 			.map_err(dispatch_to_evm::<T>)
 	}
@@ -145,19 +111,11 @@
 	/// @notice Get permissions for token properties.
 	fn token_property_permissions(
 		&self,
-	) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {
+	) -> Result<Vec<pallet_common::eth::TokenPropertyPermission>> {
 		let perms = <Pallet<T>>::token_property_permission(self.id);
 		Ok(perms
 			.into_iter()
-			.map(|(key, pp)| {
-				let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");
-				let pp = vec![
-					(EthTokenPermissions::Mutable, pp.mutable),
-					(EthTokenPermissions::TokenOwner, pp.token_owner),
-					(EthTokenPermissions::CollectionAdmin, pp.collection_admin),
-				];
-				(key, pp)
-			})
+			.map(pallet_common::eth::TokenPropertyPermission::from)
 			.collect())
 	}
 
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
@@ -42,7 +42,7 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
+	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) public {
 		require(false, stub_error);
 		permissions;
 		dummy = 0;
@@ -51,10 +51,10 @@
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
+	function tokenPropertyPermissions() public view returns (TokenPropertyPermission[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple60[](0);
+		return new TokenPropertyPermission[](0);
 	}
 
 	// /// @notice Set token property value.
@@ -127,12 +127,30 @@
 	}
 }
 
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
 struct Property {
+	/// @dev Property key.
 	string key;
+	/// @dev Property value.
 	bytes value;
 }
 
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+	/// @dev Token property key.
+	string key;
+	/// @dev Token property permissions.
+	PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+	/// @dev TokenPermission field.
+	EthTokenPermissions code;
+	/// @dev TokenPermission value.
+	bool value;
+}
+
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
 enum EthTokenPermissions {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -141,18 +159,6 @@
 	TokenOwner,
 	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]
 	CollectionAdmin
-}
-
-/// @dev anonymous struct
-struct Tuple60 {
-	string field_0;
-	Tuple58[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple58 {
-	EthTokenPermissions field_0;
-	bool field_1;
 }
 
 /// @title A contract that allows you to work with collections.
@@ -608,9 +614,12 @@
 	uint256 sub;
 }
 
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 enum CollectionPermissions {
-	CollectionAdmin,
-	TokenOwner
+	/// @dev Owner of token can nest tokens under it.
+	TokenOwner,
+	/// @dev Admin of token collection can nest tokens under token.
+	CollectionAdmin
 }
 
 /// @dev anonymous struct
modifiedpallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -752,22 +752,22 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "string", "name": "field_0", "type": "string" },
+          { "internalType": "string", "name": "key", "type": "string" },
           {
             "components": [
               {
                 "internalType": "enum EthTokenPermissions",
-                "name": "field_0",
+                "name": "code",
                 "type": "uint8"
               },
-              { "internalType": "bool", "name": "field_1", "type": "bool" }
+              { "internalType": "bool", "name": "value", "type": "bool" }
             ],
-            "internalType": "struct Tuple59[]",
-            "name": "field_1",
+            "internalType": "struct PropertyPermission[]",
+            "name": "permissions",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple61[]",
+        "internalType": "struct TokenPropertyPermission[]",
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -818,22 +818,22 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "string", "name": "field_0", "type": "string" },
+          { "internalType": "string", "name": "key", "type": "string" },
           {
             "components": [
               {
                 "internalType": "enum EthTokenPermissions",
-                "name": "field_0",
+                "name": "code",
                 "type": "uint8"
               },
-              { "internalType": "bool", "name": "field_1", "type": "bool" }
+              { "internalType": "bool", "name": "value", "type": "bool" }
             ],
-            "internalType": "struct Tuple59[]",
-            "name": "field_1",
+            "internalType": "struct PropertyPermission[]",
+            "name": "permissions",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple61[]",
+        "internalType": "struct TokenPropertyPermission[]",
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -734,22 +734,22 @@
     "inputs": [
       {
         "components": [
-          { "internalType": "string", "name": "field_0", "type": "string" },
+          { "internalType": "string", "name": "key", "type": "string" },
           {
             "components": [
               {
                 "internalType": "enum EthTokenPermissions",
-                "name": "field_0",
+                "name": "code",
                 "type": "uint8"
               },
-              { "internalType": "bool", "name": "field_1", "type": "bool" }
+              { "internalType": "bool", "name": "value", "type": "bool" }
             ],
-            "internalType": "struct Tuple58[]",
-            "name": "field_1",
+            "internalType": "struct PropertyPermission[]",
+            "name": "permissions",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple60[]",
+        "internalType": "struct TokenPropertyPermission[]",
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -809,22 +809,22 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "string", "name": "field_0", "type": "string" },
+          { "internalType": "string", "name": "key", "type": "string" },
           {
             "components": [
               {
                 "internalType": "enum EthTokenPermissions",
-                "name": "field_0",
+                "name": "code",
                 "type": "uint8"
               },
-              { "internalType": "bool", "name": "field_1", "type": "bool" }
+              { "internalType": "bool", "name": "value", "type": "bool" }
             ],
-            "internalType": "struct Tuple58[]",
-            "name": "field_1",
+            "internalType": "struct PropertyPermission[]",
+            "name": "permissions",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple60[]",
+        "internalType": "struct TokenPropertyPermission[]",
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -316,9 +316,12 @@
 	bool field_1;
 }
 
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 enum CollectionPermissions {
-	CollectionAdmin,
-	TokenOwner
+	/// @dev Owner of token can nest tokens under it.
+	TokenOwner,
+	/// @dev Admin of token collection can nest tokens under token.
+	CollectionAdmin
 }
 
 /// @dev anonymous struct
@@ -356,9 +359,11 @@
 	uint256 field_2;
 }
 
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
 struct Property {
+	/// @dev Property key.
 	string key;
+	/// @dev Property value.
 	bytes value;
 }
 
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,12 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
+	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() external view returns (Tuple53[] memory);
+	function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -80,12 +80,30 @@
 	function property(uint256 tokenId, string memory key) external view returns (bytes memory);
 }
 
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
 struct Property {
+	/// @dev Property key.
 	string key;
+	/// @dev Property value.
 	bytes value;
 }
 
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+	/// @dev Token property key.
+	string key;
+	/// @dev Token property permissions.
+	PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+	/// @dev TokenPermission field.
+	EthTokenPermissions code;
+	/// @dev TokenPermission value.
+	bool value;
+}
+
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
 enum EthTokenPermissions {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -96,18 +114,6 @@
 	CollectionAdmin
 }
 
-/// @dev anonymous struct
-struct Tuple53 {
-	string field_0;
-	Tuple51[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple51 {
-	EthTokenPermissions field_0;
-	bool field_1;
-}
-
 /// @title A contract that allows you to work with collections.
 /// @dev the ERC-165 identifier for this interface is 0x81172a75
 interface Collection is Dummy, ERC165 {
@@ -412,9 +418,12 @@
 	bool field_1;
 }
 
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 enum CollectionPermissions {
-	CollectionAdmin,
-	TokenOwner
+	/// @dev Owner of token can nest tokens under it.
+	TokenOwner,
+	/// @dev Admin of token collection can nest tokens under token.
+	CollectionAdmin
 }
 
 /// @dev anonymous struct
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,12 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+	function setTokenPropertyPermissions(TokenPropertyPermission[] memory permissions) external;
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+	function tokenPropertyPermissions() external view returns (TokenPropertyPermission[] memory);
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -80,12 +80,30 @@
 	function property(uint256 tokenId, string memory key) external view returns (bytes memory);
 }
 
-/// @dev Property struct
+/// @dev Ethereum representation of collection [`PropertyKey`](up_data_structs::PropertyKey) and [`PropertyValue`](up_data_structs::PropertyValue).
 struct Property {
+	/// @dev Property key.
 	string key;
+	/// @dev Property value.
 	bytes value;
 }
 
+/// @dev Ethereum representation of Token Property Permissions.
+struct TokenPropertyPermission {
+	/// @dev Token property key.
+	string key;
+	/// @dev Token property permissions.
+	PropertyPermission[] permissions;
+}
+
+/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) as an key and value.
+struct PropertyPermission {
+	/// @dev TokenPermission field.
+	EthTokenPermissions code;
+	/// @dev TokenPermission value.
+	bool value;
+}
+
 /// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
 enum EthTokenPermissions {
 	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]
@@ -96,18 +114,6 @@
 	CollectionAdmin
 }
 
-/// @dev anonymous struct
-struct Tuple52 {
-	string field_0;
-	Tuple50[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple50 {
-	EthTokenPermissions field_0;
-	bool field_1;
-}
-
 /// @title A contract that allows you to work with collections.
 /// @dev the ERC-165 identifier for this interface is 0x81172a75
 interface Collection is Dummy, ERC165 {
@@ -412,9 +418,12 @@
 	bool field_1;
 }
 
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 enum CollectionPermissions {
-	CollectionAdmin,
-	TokenOwner
+	/// @dev Owner of token can nest tokens under it.
+	TokenOwner,
+	/// @dev Admin of token collection can nest tokens under token.
+	CollectionAdmin
 }
 
 /// @dev anonymous struct