git.delta.rocks / unique-network / refs/commits / 3f089fc34b06

difftreelog

refactor EthCrossAccount impl, signature some evm methods, tests and stubs

PraetorP2022-12-14parent: #1f3c059.patch.diff
in: master

16 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -36,7 +36,7 @@
 use crate::{
 	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
 	eth::{
-		EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,
+		EthCrossAccount, CollectionPermissions as EvmPermissions,
 		CollectionLimits as EvmCollectionLimits,
 	},
 	weights::WeightInfo,
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
 	address[0..16] == ETH_COLLECTION_PREFIX
 }
 
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	let slice = from.as_sub().as_ref();
-	uint256::from_big_endian(slice)
-}
-
 /// Convert `uint256` to `CrossAccountId`.
 pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
 where
@@ -71,22 +62,6 @@
 	from.to_big_endian(&mut new_admin_arr);
 	let account_id = T::AccountId::from(new_admin_arr);
 	T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
-	cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	if cross_account_id.is_canonical_substrate() {
-		let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
-		(Default::default(), sub)
-	} else {
-		let eth = *cross_account_id.as_eth();
-		(eth, Default::default())
-	}
 }
 
 /// Convert tuple `(address, uint256)` to `CrossAccountId`.
@@ -128,10 +103,7 @@
 		T::AccountId: AsRef<[u8; 32]>,
 	{
 		if cross_account_id.is_canonical_substrate() {
-			Self {
-				eth: Default::default(),
-				sub: convert_cross_account_to_uint256::<T>(cross_account_id),
-			}
+			Self::from_sub::<T>(cross_account_id.as_sub())
 		} else {
 			Self {
 				eth: *cross_account_id.as_eth(),
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
     "pallet-evm-coder-substrate/std",
     "pallet-evm/std",
     "up-sponsorship/std",
+    "pallet-common/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -175,18 +175,11 @@
 	///
 	/// @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<(address, uint256)> {
-		let sponsor =
-			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
-		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
-			&sponsor,
+	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<EthCrossAccount> {
-	// 	Ok(EthCrossAccount::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 (Tuple0 memory) {
+	function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return Tuple0(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -618,7 +618,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -1070,7 +1070,7 @@
 		Ok(true)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -738,7 +738,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -750,7 +750,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -995,7 +995,7 @@
 	// 	return false;
 	// }
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -1120,7 +1120,7 @@
 		Ok(true)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -733,7 +733,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +745,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -979,7 +979,7 @@
 	// 	return false;
 	// }
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple0",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "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 (Tuple0 memory);
+	function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -171,8 +171,8 @@
 	function toggleAllowlist(address contractAddress, bool enabled) external;
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -515,14 +515,14 @@
 	///  or in textual repr: mintingFinished()
 	function mintingFinished() external view returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
 	///  or in textual repr: mint(address)
 	function mint(address to) external returns (uint256);
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to a mint token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -674,7 +674,7 @@
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to a mint token.
 	/// @param to The new owner crossAccountId
 	/// @param properties Properties of minted token
 	/// @return uint256 The id of the newly minted token
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
before · tests/src/eth/api/UniqueRefungible.sol
1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12	function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0xde0695c217interface TokenProperties is Dummy, ERC165 {18	// /// @notice Set permissions for token property.19	// /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20	// /// @param key Property key.21	// /// @param isMutable Permission to mutate property.22	// /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23	// /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24	// /// @dev EVM selector for this function is: 0x222d97fa,25	// ///  or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26	// function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) external;2728	/// @notice Set permissions for token property.29	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.30	/// @param permissions Permissions for keys.31	/// @dev EVM selector for this function is: 0xbd92983a,32	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])33	function setTokenPropertyPermissions(Tuple51[] memory permissions) external;3435	/// @notice Get permissions for token properties.36	/// @dev EVM selector for this function is: 0xf23d7790,37	///  or in textual repr: tokenPropertyPermissions()38	function tokenPropertyPermissions() external view returns (Tuple51[] memory);3940	// /// @notice Set token property value.41	// /// @dev Throws error if `msg.sender` has no permission to edit the property.42	// /// @param tokenId ID of the token.43	// /// @param key Property key.44	// /// @param value Property value.45	// /// @dev EVM selector for this function is: 0x1752d67b,46	// ///  or in textual repr: setProperty(uint256,string,bytes)47	// function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4849	/// @notice Set token properties value.50	/// @dev Throws error if `msg.sender` has no permission to edit the property.51	/// @param tokenId ID of the token.52	/// @param properties settable properties53	/// @dev EVM selector for this function is: 0x14ed3a6e,54	///  or in textual repr: setProperties(uint256,(string,bytes)[])55	function setProperties(uint256 tokenId, Property[] memory properties) external;5657	// /// @notice Delete token property value.58	// /// @dev Throws error if `msg.sender` has no permission to edit the property.59	// /// @param tokenId ID of the token.60	// /// @param key Property key.61	// /// @dev EVM selector for this function is: 0x066111d1,62	// ///  or in textual repr: deleteProperty(uint256,string)63	// function deleteProperty(uint256 tokenId, string memory key) external;6465	/// @notice Delete token properties value.66	/// @dev Throws error if `msg.sender` has no permission to edit the property.67	/// @param tokenId ID of the token.68	/// @param keys Properties key.69	/// @dev EVM selector for this function is: 0xc472d371,70	///  or in textual repr: deleteProperties(uint256,string[])71	function deleteProperties(uint256 tokenId, string[] memory keys) external;7273	/// @notice Get token property value.74	/// @dev Throws error if key not found75	/// @param tokenId ID of the token.76	/// @param key Property key.77	/// @return Property value bytes78	/// @dev EVM selector for this function is: 0x7228c327,79	///  or in textual repr: property(uint256,string)80	function property(uint256 tokenId, string memory key) external view returns (bytes memory);81}8283/// @dev Property struct84struct Property {85	string key;86	bytes value;87}8889/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.90enum EthTokenPermissions {91	/// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]92	Mutable,93	/// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]94	TokenOwner,95	/// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]96	CollectionAdmin97}9899/// @dev anonymous struct100struct Tuple51 {101	string field_0;102	Tuple49[] field_1;103}104105/// @dev anonymous struct106struct Tuple49 {107	EthTokenPermissions field_0;108	bool field_1;109}110111/// @title A contract that allows you to work with collections.112/// @dev the ERC-165 identifier for this interface is 0x81172a75113interface Collection is Dummy, ERC165 {114	// /// Set collection property.115	// ///116	// /// @param key Property key.117	// /// @param value Propery value.118	// /// @dev EVM selector for this function is: 0x2f073f66,119	// ///  or in textual repr: setCollectionProperty(string,bytes)120	// function setCollectionProperty(string memory key, bytes memory value) external;121122	/// Set collection properties.123	///124	/// @param properties Vector of properties key/value pair.125	/// @dev EVM selector for this function is: 0x50b26b2a,126	///  or in textual repr: setCollectionProperties((string,bytes)[])127	function setCollectionProperties(Property[] memory properties) external;128129	// /// Delete collection property.130	// ///131	// /// @param key Property key.132	// /// @dev EVM selector for this function is: 0x7b7debce,133	// ///  or in textual repr: deleteCollectionProperty(string)134	// function deleteCollectionProperty(string memory key) external;135136	/// Delete collection properties.137	///138	/// @param keys Properties keys.139	/// @dev EVM selector for this function is: 0xee206ee3,140	///  or in textual repr: deleteCollectionProperties(string[])141	function deleteCollectionProperties(string[] memory keys) external;142143	/// Get collection property.144	///145	/// @dev Throws error if key not found.146	///147	/// @param key Property key.148	/// @return bytes The property corresponding to the key.149	/// @dev EVM selector for this function is: 0xcf24fd6d,150	///  or in textual repr: collectionProperty(string)151	function collectionProperty(string memory key) external view returns (bytes memory);152153	/// Get collection properties.154	///155	/// @param keys Properties keys. Empty keys for all propertyes.156	/// @return Vector of properties key/value pairs.157	/// @dev EVM selector for this function is: 0x285fb8e6,158	///  or in textual repr: collectionProperties(string[])159	function collectionProperties(string[] memory keys) external view returns (Property[] memory);160161	// /// Set the sponsor of the collection.162	// ///163	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.164	// ///165	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.166	// /// @dev EVM selector for this function is: 0x7623402e,167	// ///  or in textual repr: setCollectionSponsor(address)168	// function setCollectionSponsor(address sponsor) external;169170	/// Set the sponsor of the collection.171	///172	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.173	///174	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.175	/// @dev EVM selector for this function is: 0x84a1d5a8,176	///  or in textual repr: setCollectionSponsorCross((address,uint256))177	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;178179	/// Whether there is a pending sponsor.180	/// @dev EVM selector for this function is: 0x058ac185,181	///  or in textual repr: hasCollectionPendingSponsor()182	function hasCollectionPendingSponsor() external view returns (bool);183184	/// Collection sponsorship confirmation.185	///186	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.187	/// @dev EVM selector for this function is: 0x3c50e97a,188	///  or in textual repr: confirmCollectionSponsorship()189	function confirmCollectionSponsorship() external;190191	/// Remove collection sponsor.192	/// @dev EVM selector for this function is: 0x6e0326a3,193	///  or in textual repr: removeCollectionSponsor()194	function removeCollectionSponsor() external;195196	/// Get current sponsor.197	///198	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.199	/// @dev EVM selector for this function is: 0x6ec0a9f1,200	///  or in textual repr: collectionSponsor()201	function collectionSponsor() external view returns (EthCrossAccount memory);202203	/// Get current collection limits.204	///205	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:206	/// 	"accountTokenOwnershipLimit",207	/// 	"sponsoredDataSize",208	/// 	"sponsoredDataRateLimit",209	/// 	"tokenLimit",210	/// 	"sponsorTransferTimeout",211	/// 	"sponsorApproveTimeout"212	///  	"ownerCanTransfer",213	/// 	"ownerCanDestroy",214	/// 	"transfersEnabled"215	/// Return `false` if a limit not set.216	/// @dev EVM selector for this function is: 0xf63bc572,217	///  or in textual repr: collectionLimits()218	function collectionLimits() external view returns (Tuple29[] memory);219220	/// Set limits for the collection.221	/// @dev Throws error if limit not found.222	/// @param limit Name of the limit. Valid names:223	/// 	"accountTokenOwnershipLimit",224	/// 	"sponsoredDataSize",225	/// 	"sponsoredDataRateLimit",226	/// 	"tokenLimit",227	/// 	"sponsorTransferTimeout",228	/// 	"sponsorApproveTimeout"229	///  	"ownerCanTransfer",230	/// 	"ownerCanDestroy",231	/// 	"transfersEnabled"232	/// @param status enable\disable limit. Works only with `true`.233	/// @param value Value of the limit.234	/// @dev EVM selector for this function is: 0x88150bd0,235	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)236	function setCollectionLimit(237		CollectionLimits limit,238		bool status,239		uint256 value240	) external;241242	/// Get contract address.243	/// @dev EVM selector for this function is: 0xf6b4dfb4,244	///  or in textual repr: contractAddress()245	function contractAddress() external view returns (address);246247	/// Add collection admin.248	/// @param newAdmin Cross account administrator address.249	/// @dev EVM selector for this function is: 0x859aa7d6,250	///  or in textual repr: addCollectionAdminCross((address,uint256))251	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;252253	/// Remove collection admin.254	/// @param admin Cross account administrator address.255	/// @dev EVM selector for this function is: 0x6c0cd173,256	///  or in textual repr: removeCollectionAdminCross((address,uint256))257	function removeCollectionAdminCross(EthCrossAccount memory admin) external;258259	// /// Add collection admin.260	// /// @param newAdmin Address of the added administrator.261	// /// @dev EVM selector for this function is: 0x92e462c7,262	// ///  or in textual repr: addCollectionAdmin(address)263	// function addCollectionAdmin(address newAdmin) external;264265	// /// Remove collection admin.266	// ///267	// /// @param admin Address of the removed administrator.268	// /// @dev EVM selector for this function is: 0xfafd7b42,269	// ///  or in textual repr: removeCollectionAdmin(address)270	// function removeCollectionAdmin(address admin) external;271272	/// Toggle accessibility of collection nesting.273	///274	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'275	/// @dev EVM selector for this function is: 0x112d4586,276	///  or in textual repr: setCollectionNesting(bool)277	function setCollectionNesting(bool enable) external;278279	/// Toggle accessibility of collection nesting.280	///281	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'282	/// @param collections Addresses of collections that will be available for nesting.283	/// @dev EVM selector for this function is: 0x64872396,284	///  or in textual repr: setCollectionNesting(bool,address[])285	function setCollectionNesting(bool enable, address[] memory collections) external;286287	/// Returns nesting for a collection288	/// @dev EVM selector for this function is: 0x22d25bfe,289	///  or in textual repr: collectionNestingRestrictedCollectionIds()290	function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory);291292	/// Returns permissions for a collection293	/// @dev EVM selector for this function is: 0x5b2eaf4b,294	///  or in textual repr: collectionNestingPermissions()295	function collectionNestingPermissions() external view returns (Tuple37[] memory);296297	/// Set the collection access method.298	/// @param mode Access mode299	/// 	0 for Normal300	/// 	1 for AllowList301	/// @dev EVM selector for this function is: 0x41835d4c,302	///  or in textual repr: setCollectionAccess(uint8)303	function setCollectionAccess(uint8 mode) external;304305	/// Checks that user allowed to operate with collection.306	///307	/// @param user User address to check.308	/// @dev EVM selector for this function is: 0x91b6df49,309	///  or in textual repr: allowlistedCross((address,uint256))310	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);311312	// /// Add the user to the allowed list.313	// ///314	// /// @param user Address of a trusted user.315	// /// @dev EVM selector for this function is: 0x67844fe6,316	// ///  or in textual repr: addToCollectionAllowList(address)317	// function addToCollectionAllowList(address user) external;318319	/// Add user to allowed list.320	///321	/// @param user User cross account address.322	/// @dev EVM selector for this function is: 0xa0184a3a,323	///  or in textual repr: addToCollectionAllowListCross((address,uint256))324	function addToCollectionAllowListCross(EthCrossAccount memory user) external;325326	// /// Remove the user from the allowed list.327	// ///328	// /// @param user Address of a removed user.329	// /// @dev EVM selector for this function is: 0x85c51acb,330	// ///  or in textual repr: removeFromCollectionAllowList(address)331	// function removeFromCollectionAllowList(address user) external;332333	/// Remove user from allowed list.334	///335	/// @param user User cross account address.336	/// @dev EVM selector for this function is: 0x09ba452a,337	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))338	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;339340	/// Switch permission for minting.341	///342	/// @param mode Enable if "true".343	/// @dev EVM selector for this function is: 0x00018e84,344	///  or in textual repr: setCollectionMintMode(bool)345	function setCollectionMintMode(bool mode) external;346347	// /// Check that account is the owner or admin of the collection348	// ///349	// /// @param user account to verify350	// /// @return "true" if account is the owner or admin351	// /// @dev EVM selector for this function is: 0x9811b0c7,352	// ///  or in textual repr: isOwnerOrAdmin(address)353	// function isOwnerOrAdmin(address user) external view returns (bool);354355	/// Check that account is the owner or admin of the collection356	///357	/// @param user User cross account to verify358	/// @return "true" if account is the owner or admin359	/// @dev EVM selector for this function is: 0x3e75a905,360	///  or in textual repr: isOwnerOrAdminCross((address,uint256))361	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);362363	/// Returns collection type364	///365	/// @return `Fungible` or `NFT` or `ReFungible`366	/// @dev EVM selector for this function is: 0xd34b55b8,367	///  or in textual repr: uniqueCollectionType()368	function uniqueCollectionType() external view returns (string memory);369370	/// Get collection owner.371	///372	/// @return Tuble with sponsor address and his substrate mirror.373	/// If address is canonical then substrate mirror is zero and vice versa.374	/// @dev EVM selector for this function is: 0xdf727d3b,375	///  or in textual repr: collectionOwner()376	function collectionOwner() external view returns (EthCrossAccount memory);377378	// /// Changes collection owner to another account379	// ///380	// /// @dev Owner can be changed only by current owner381	// /// @param newOwner new owner account382	// /// @dev EVM selector for this function is: 0x4f53e226,383	// ///  or in textual repr: changeCollectionOwner(address)384	// function changeCollectionOwner(address newOwner) external;385386	/// Get collection administrators387	///388	/// @return Vector of tuples with admins address and his substrate mirror.389	/// If address is canonical then substrate mirror is zero and vice versa.390	/// @dev EVM selector for this function is: 0x5813216b,391	///  or in textual repr: collectionAdmins()392	function collectionAdmins() external view returns (EthCrossAccount[] memory);393394	/// Changes collection owner to another account395	///396	/// @dev Owner can be changed only by current owner397	/// @param newOwner new owner cross account398	/// @dev EVM selector for this function is: 0x6496c497,399	///  or in textual repr: changeCollectionOwnerCross((address,uint256))400	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;401}402403/// @dev Cross account struct404struct EthCrossAccount {405	address eth;406	uint256 sub;407}408409<<<<<<< HEAD410/// @dev anonymous struct411struct Tuple37 {412	CollectionPermissions field_0;413	bool field_1;414}415416enum CollectionPermissions {417	CollectionAdmin,418	TokenOwner419}420421/// @dev anonymous struct422struct Tuple34 {423	bool field_0;424	uint256[] field_1;425}426427/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.428enum CollectionLimits {429	/// @dev How many tokens can a user have on one account.430	AccountTokenOwnership,431	/// @dev How many bytes of data are available for sponsorship.432	SponsoredDataSize,433	/// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]434	SponsoredDataRateLimit,435	/// @dev How many tokens can be mined into this collection.436	TokenLimit,437	/// @dev Timeouts for transfer sponsoring.438	SponsorTransferTimeout,439	/// @dev Timeout for sponsoring an approval in passed blocks.440	SponsorApproveTimeout,441	/// @dev Whether the collection owner of the collection can send tokens (which belong to other users).442	OwnerCanTransfer,443	/// @dev Can the collection owner burn other people's tokens.444	OwnerCanDestroy,445	/// @dev Is it possible to send tokens from this collection between users.446	TransferEnabled447}448449/// @dev anonymous struct450struct Tuple29 {451	CollectionLimits field_0;452	bool field_1;453	uint256 field_2;454}455456/// @dev anonymous struct457struct Tuple26 {458	address field_0;459	uint256 field_1;460}461462=======463>>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet464/// @dev the ERC-165 identifier for this interface is 0x5b5e139f465interface ERC721Metadata is Dummy, ERC165 {466	// /// @notice A descriptive name for a collection of NFTs in this contract467	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`468	// /// @dev EVM selector for this function is: 0x06fdde03,469	// ///  or in textual repr: name()470	// function name() external view returns (string memory);471472	// /// @notice An abbreviated name for NFTs in this contract473	// /// @dev real implementation of this function lies in `ERC721UniqueExtensions`474	// /// @dev EVM selector for this function is: 0x95d89b41,475	// ///  or in textual repr: symbol()476	// function symbol() external view returns (string memory);477478	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.479	///480	/// @dev If the token has a `url` property and it is not empty, it is returned.481	///  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`.482	///  If the collection property `baseURI` is empty or absent, return "" (empty string)483	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix484	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).485	///486	/// @return token's const_metadata487	/// @dev EVM selector for this function is: 0xc87b56dd,488	///  or in textual repr: tokenURI(uint256)489	function tokenURI(uint256 tokenId) external view returns (string memory);490}491492/// @title ERC721 Token that can be irreversibly burned (destroyed).493/// @dev the ERC-165 identifier for this interface is 0x42966c68494interface ERC721Burnable is Dummy, ERC165 {495	/// @notice Burns a specific ERC721 token.496	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized497	///  operator of the current owner.498	/// @param tokenId The RFT to approve499	/// @dev EVM selector for this function is: 0x42966c68,500	///  or in textual repr: burn(uint256)501	function burn(uint256 tokenId) external;502}503504/// @dev inlined interface505interface ERC721UniqueMintableEvents {506	event MintingFinished();507}508509/// @title ERC721 minting logic.510/// @dev the ERC-165 identifier for this interface is 0x476ff149511interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {512	/// @dev EVM selector for this function is: 0x05d2035b,513	///  or in textual repr: mintingFinished()514	function mintingFinished() external view returns (bool);515516	/// @notice Function to mint token.517	/// @param to The new owner518	/// @return uint256 The id of the newly minted token519	/// @dev EVM selector for this function is: 0x6a627842,520	///  or in textual repr: mint(address)521	function mint(address to) external returns (uint256);522523	// /// @notice Function to mint token.524	// /// @dev `tokenId` should be obtained with `nextTokenId` method,525	// ///  unlike standard, you can't specify it manually526	// /// @param to The new owner527	// /// @param tokenId ID of the minted RFT528	// /// @dev EVM selector for this function is: 0x40c10f19,529	// ///  or in textual repr: mint(address,uint256)530	// function mint(address to, uint256 tokenId) external returns (bool);531532	/// @notice Function to mint token with the given tokenUri.533	/// @param to The new owner534	/// @param tokenUri Token URI that would be stored in the NFT properties535	/// @return uint256 The id of the newly minted token536	/// @dev EVM selector for this function is: 0x45c17782,537	///  or in textual repr: mintWithTokenURI(address,string)538	function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);539540	// /// @notice Function to mint token with the given tokenUri.541	// /// @dev `tokenId` should be obtained with `nextTokenId` method,542	// ///  unlike standard, you can't specify it manually543	// /// @param to The new owner544	// /// @param tokenId ID of the minted RFT545	// /// @param tokenUri Token URI that would be stored in the RFT properties546	// /// @dev EVM selector for this function is: 0x50bb4e7f,547	// ///  or in textual repr: mintWithTokenURI(address,uint256,string)548	// function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);549550	/// @dev Not implemented551	/// @dev EVM selector for this function is: 0x7d64bcb4,552	///  or in textual repr: finishMinting()553	function finishMinting() external returns (bool);554}555556/// @title Unique extensions for ERC721.557/// @dev the ERC-165 identifier for this interface is 0xabf30dc2558interface ERC721UniqueExtensions is Dummy, ERC165 {559	/// @notice A descriptive name for a collection of NFTs in this contract560	/// @dev EVM selector for this function is: 0x06fdde03,561	///  or in textual repr: name()562	function name() external view returns (string memory);563564	/// @notice An abbreviated name for NFTs in this contract565	/// @dev EVM selector for this function is: 0x95d89b41,566	///  or in textual repr: symbol()567	function symbol() external view returns (string memory);568569	/// @notice A description for the collection.570	/// @dev EVM selector for this function is: 0x7284e416,571	///  or in textual repr: description()572	function description() external view returns (string memory);573574	/// Returns the owner (in cross format) of the token.575	///576	/// @param tokenId Id for the token.577	/// @dev EVM selector for this function is: 0x2b29dace,578	///  or in textual repr: crossOwnerOf(uint256)579	function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);580581	/// Returns the token properties.582	///583	/// @param tokenId Id for the token.584	/// @param keys Properties keys. Empty keys for all propertyes.585	/// @return Vector of properties key/value pairs.586	/// @dev EVM selector for this function is: 0xe07ede7e,587	///  or in textual repr: properties(uint256,string[])588	function properties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);589590	/// @notice Transfer ownership of an RFT591	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`592	///  is the zero address. Throws if `tokenId` is not a valid RFT.593	///  Throws if RFT pieces have multiple owners.594	/// @param to The new owner595	/// @param tokenId The RFT to transfer596	/// @dev EVM selector for this function is: 0xa9059cbb,597	///  or in textual repr: transfer(address,uint256)598	function transfer(address to, uint256 tokenId) external;599600	/// @notice Transfer ownership of an RFT601	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`602	///  is the zero address. Throws if `tokenId` is not a valid RFT.603	///  Throws if RFT pieces have multiple owners.604	/// @param to The new owner605	/// @param tokenId The RFT to transfer606	/// @dev EVM selector for this function is: 0x2ada85ff,607	///  or in textual repr: transferCross((address,uint256),uint256)608	function transferCross(EthCrossAccount memory to, uint256 tokenId) external;609610	/// @notice Transfer ownership of an RFT611	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`612	///  is the zero address. Throws if `tokenId` is not a valid RFT.613	///  Throws if RFT pieces have multiple owners.614	/// @param to The new owner615	/// @param tokenId The RFT to transfer616	/// @dev EVM selector for this function is: 0xd5cf430b,617	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)618	function transferFromCross(619		EthCrossAccount memory from,620		EthCrossAccount memory to,621		uint256 tokenId622	) external;623624	// /// @notice Burns a specific ERC721 token.625	// /// @dev Throws unless `msg.sender` is the current owner or an authorized626	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws627	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.628	// ///  Throws if RFT pieces have multiple owners.629	// /// @param from The current owner of the RFT630	// /// @param tokenId The RFT to transfer631	// /// @dev EVM selector for this function is: 0x79cc6790,632	// ///  or in textual repr: burnFrom(address,uint256)633	// function burnFrom(address from, uint256 tokenId) external;634635	/// @notice Burns a specific ERC721 token.636	/// @dev Throws unless `msg.sender` is the current owner or an authorized637	///  operator for this RFT. Throws if `from` is not the current owner. Throws638	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.639	///  Throws if RFT pieces have multiple owners.640	/// @param from The current owner of the RFT641	/// @param tokenId The RFT to transfer642	/// @dev EVM selector for this function is: 0xbb2f5a58,643	///  or in textual repr: burnFromCross((address,uint256),uint256)644	function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;645646	/// @notice Returns next free RFT ID.647	/// @dev EVM selector for this function is: 0x75794a3c,648	///  or in textual repr: nextTokenId()649	function nextTokenId() external view returns (uint256);650651	// /// @notice Function to mint multiple tokens.652	// /// @dev `tokenIds` should be an array of consecutive numbers and first number653	// ///  should be obtained with `nextTokenId` method654	// /// @param to The new owner655	// /// @param tokenIds IDs of the minted RFTs656	// /// @dev EVM selector for this function is: 0x44a9945e,657	// ///  or in textual repr: mintBulk(address,uint256[])658	// function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);659660	// /// @notice Function to mint multiple tokens with the given tokenUris.661	// /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive662	// ///  numbers and first number should be obtained with `nextTokenId` method663	// /// @param to The new owner664	// /// @param tokens array of pairs of token ID and token URI for minted tokens665	// /// @dev EVM selector for this function is: 0x36543006,666	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])667	// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);668669	/// @notice Function to mint token.670	/// @param to The new owner crossAccountId671	/// @param properties Properties of minted token672	/// @return uint256 The id of the newly minted token673	/// @dev EVM selector for this function is: 0xb904db03,674	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])675	function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);676677	/// Returns EVM address for refungible token678	///679	/// @param token ID of the token680	/// @dev EVM selector for this function is: 0xab76fac6,681	///  or in textual repr: tokenContractAddress(uint256)682	function tokenContractAddress(uint256 token) external view returns (address);683}684685/// @dev anonymous struct686struct Tuple12 {687	uint256 field_0;688	string field_1;689}690691/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension692/// @dev See https://eips.ethereum.org/EIPS/eip-721693/// @dev the ERC-165 identifier for this interface is 0x780e9d63694interface ERC721Enumerable is Dummy, ERC165 {695	/// @notice Enumerate valid RFTs696	/// @param index A counter less than `totalSupply()`697	/// @return The token identifier for the `index`th NFT,698	///  (sort order not specified)699	/// @dev EVM selector for this function is: 0x4f6ccce7,700	///  or in textual repr: tokenByIndex(uint256)701	function tokenByIndex(uint256 index) external view returns (uint256);702703	/// Not implemented704	/// @dev EVM selector for this function is: 0x2f745c59,705	///  or in textual repr: tokenOfOwnerByIndex(address,uint256)706	function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);707708	/// @notice Count RFTs tracked by this contract709	/// @return A count of valid RFTs tracked by this contract, where each one of710	///  them has an assigned and queryable owner not equal to the zero address711	/// @dev EVM selector for this function is: 0x18160ddd,712	///  or in textual repr: totalSupply()713	function totalSupply() external view returns (uint256);714}715716/// @dev inlined interface717interface ERC721Events {718	event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);719	event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);720	event ApprovalForAll(address indexed owner, address indexed operator, bool approved);721}722723/// @title ERC-721 Non-Fungible Token Standard724/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md725/// @dev the ERC-165 identifier for this interface is 0x4016cd87726interface ERC721 is Dummy, ERC165, ERC721Events {727	/// @notice Count all RFTs assigned to an owner728	/// @dev RFTs assigned to the zero address are considered invalid, and this729	///  function throws for queries about the zero address.730	/// @param owner An address for whom to query the balance731	/// @return The number of RFTs owned by `owner`, possibly zero732	/// @dev EVM selector for this function is: 0x70a08231,733	///  or in textual repr: balanceOf(address)734	function balanceOf(address owner) external view returns (uint256);735736	/// @notice Find the owner of an RFT737	/// @dev RFTs assigned to zero address are considered invalid, and queries738	///  about them do throw.739	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for740	///  the tokens that are partially owned.741	/// @param tokenId The identifier for an RFT742	/// @return The address of the owner of the RFT743	/// @dev EVM selector for this function is: 0x6352211e,744	///  or in textual repr: ownerOf(uint256)745	function ownerOf(uint256 tokenId) external view returns (address);746747	/// @dev Not implemented748	/// @dev EVM selector for this function is: 0x60a11672,749	///  or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)750	function safeTransferFromWithData(751		address from,752		address to,753		uint256 tokenId,754		bytes memory data755	) external;756757	/// @dev Not implemented758	/// @dev EVM selector for this function is: 0x42842e0e,759	///  or in textual repr: safeTransferFrom(address,address,uint256)760	function safeTransferFrom(761		address from,762		address to,763		uint256 tokenId764	) external;765766	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE767	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE768	///  THEY MAY BE PERMANENTLY LOST769	/// @dev Throws unless `msg.sender` is the current owner or an authorized770	///  operator for this RFT. Throws if `from` is not the current owner. Throws771	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.772	///  Throws if RFT pieces have multiple owners.773	/// @param from The current owner of the NFT774	/// @param to The new owner775	/// @param tokenId The NFT to transfer776	/// @dev EVM selector for this function is: 0x23b872dd,777	///  or in textual repr: transferFrom(address,address,uint256)778	function transferFrom(779		address from,780		address to,781		uint256 tokenId782	) external;783784	/// @dev Not implemented785	/// @dev EVM selector for this function is: 0x095ea7b3,786	///  or in textual repr: approve(address,uint256)787	function approve(address approved, uint256 tokenId) external;788789	/// @notice Sets or unsets the approval of a given operator.790	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.791	/// @param operator Operator792	/// @param approved Should operator status be granted or revoked?793	/// @dev EVM selector for this function is: 0xa22cb465,794	///  or in textual repr: setApprovalForAll(address,bool)795	function setApprovalForAll(address operator, bool approved) external;796797	/// @dev Not implemented798	/// @dev EVM selector for this function is: 0x081812fc,799	///  or in textual repr: getApproved(uint256)800	function getApproved(uint256 tokenId) external view returns (address);801802	/// @notice Tells whether the given `owner` approves the `operator`.803	/// @dev EVM selector for this function is: 0xe985e9c5,804	///  or in textual repr: isApprovedForAll(address,address)805	function isApprovedForAll(address owner, address operator) external view returns (bool);806807	/// @notice Returns collection helper contract address808	/// @dev EVM selector for this function is: 0x1896cce6,809	///  or in textual repr: collectionHelperAddress()810	function collectionHelperAddress() external view returns (address);811}812813interface UniqueRefungible is814	Dummy,815	ERC165,816	ERC721,817	ERC721Enumerable,818	ERC721UniqueExtensions,819	ERC721UniqueMintable,820	ERC721Burnable,821	ERC721Metadata,822	Collection,823	TokenProperties824{}
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,7 +17,6 @@
 import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
 import {Contract} from 'web3-eth-contract';
-import exp from 'constants';
 import {ITokenPropertyPermission} from '../util/playgrounds/types';
 
 
@@ -180,9 +179,16 @@
     const caller = await helper.eth.createAccountWithBalance(donor);
     const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
     const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
-    const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
-      collectionAdmin: true,
-      mutable: true}}; });
+    const permissions: ITokenPropertyPermission[] = properties
+      .map(p => {
+        return {
+          key: p.key, permission: {
+            tokenOwner: true,
+            collectionAdmin: true,
+            mutable: true,
+          },
+        };
+      });
     
     
     const collection = await helper.nft.mintCollection(minter, {
@@ -198,7 +204,7 @@
     let tokenId = result.events.Transfer.returnValues.tokenId;
     expect(tokenId).to.be.equal(expectedTokenId);
 
-    const event = result.events.Transfer;
+    let event = result.events.Transfer;
     expect(event.address).to.be.equal(collectionAddress);
     expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
     expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -206,10 +212,16 @@
     
     expectedTokenId = await contract.methods.nextTokenId().call();
     result = await contract.methods.mintCross(receiverCross, properties).send();
+    event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
     tokenId = result.events.Transfer.returnValues.tokenId;
-
+    
     expect(tokenId).to.be.equal(expectedTokenId);
-    
+
     expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
       .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
   });
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,7 +17,7 @@
 import {Pallets, requirePalletsOrSkip} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
-import { ITokenPropertyPermission } from '../util/playgrounds/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
 
 describe('Refungible: Information getting', () => {
   let donor: IKeyringPair;
@@ -159,7 +159,7 @@
     let tokenId = result.events.Transfer.returnValues.tokenId;
     expect(tokenId).to.be.equal(expectedTokenId);
 
-    const event = result.events.Transfer;
+    let event = result.events.Transfer;
     expect(event.address).to.be.equal(collectionAddress);
     expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
     expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
@@ -167,6 +167,12 @@
     
     expectedTokenId = await contract.methods.nextTokenId().call();
     result = await contract.methods.mintCross(receiverCross, properties).send();
+    event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
     tokenId = result.events.Transfer.returnValues.tokenId;
 
     expect(tokenId).to.be.equal(expectedTokenId);