git.delta.rocks / unique-network / refs/commits / ba711a7b1711

difftreelog

added `collectionNestingPermissions` funtion in `Collection` interface

PraetorP2022-12-06parent: #5223dbe.patch.diff
in: master

13 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -26,7 +26,7 @@
 	weight,
 };
 use pallet_evm_coder_substrate::dispatch_to_evm;
-use sp_std::vec::Vec;
+use sp_std::{vec, vec::Vec};
 use up_data_structs::{
 	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,
 	SponsoringRateLimit, SponsorshipState,
@@ -35,7 +35,9 @@
 
 use crate::{
 	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
-	eth::{EthCrossAccount, convert_cross_account_to_uint256},
+	eth::{
+		EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,
+	},
 	weights::WeightInfo,
 };
 
@@ -508,6 +510,14 @@
 		))
 	}
 
+	/// Returns permissions for a collection
+	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {
+		let nesting = self.collection.permissions.nesting();
+		Ok(vec![
+			(EvmPermissions::CollectionAdmin, nesting.collection_admin),
+			(EvmPermissions::TokenOwner, nesting.token_owner),
+		])
+	}
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -155,3 +155,10 @@
 		}
 	}
 }
+#[derive(Default, Debug, Clone, Copy, AbiCoder)]
+#[repr(u8)]
+pub enum CollectionPermissions {
+	#[default]
+	CollectionAdmin,
+	TokenOwner,
+}
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
@@ -18,7 +18,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xeecfdb34
+/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -263,6 +263,15 @@
 		return Tuple21(false, new uint256[](0));
 	}
 
+	/// Returns permissions for a collection
+	/// @dev EVM selector for this function is: 0x5b2eaf4b,
+	///  or in textual repr: collectionNestingPermissions()
+	function collectionNestingPermissions() public view returns (Tuple24[] memory) {
+		require(false, stub_error);
+		dummy;
+		return new Tuple24[](0);
+	}
+
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
@@ -434,6 +443,17 @@
 	uint256 sub;
 }
 
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
+struct Tuple24 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
 /// @dev anonymous struct
 struct Tuple21 {
 	bool field_0;
modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -119,7 +119,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xeecfdb34
+/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -364,6 +364,15 @@
 		return Tuple34(false, new uint256[](0));
 	}
 
+	/// Returns permissions for a collection
+	/// @dev EVM selector for this function is: 0x5b2eaf4b,
+	///  or in textual repr: collectionNestingPermissions()
+	function collectionNestingPermissions() public view returns (Tuple37[] memory) {
+		require(false, stub_error);
+		dummy;
+		return new Tuple37[](0);
+	}
+
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
@@ -535,6 +544,17 @@
 	uint256 sub;
 }
 
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
+struct Tuple37 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
 /// @dev anonymous struct
 struct Tuple34 {
 	bool field_0;
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -119,7 +119,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xeecfdb34
+/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -364,6 +364,15 @@
 		return Tuple33(false, new uint256[](0));
 	}
 
+	/// Returns permissions for a collection
+	/// @dev EVM selector for this function is: 0x5b2eaf4b,
+	///  or in textual repr: collectionNestingPermissions()
+	function collectionNestingPermissions() public view returns (Tuple36[] memory) {
+		require(false, stub_error);
+		dummy;
+		return new Tuple36[](0);
+	}
+
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
@@ -535,6 +544,17 @@
 	uint256 sub;
 }
 
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
+struct Tuple36 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
 /// @dev anonymous struct
 struct Tuple33 {
 	bool field_0;
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -208,6 +208,27 @@
   },
   {
     "inputs": [],
+    "name": "collectionNestingPermissions",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionPermissions",
+            "name": "field_0",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "field_1", "type": "bool" }
+        ],
+        "internalType": "struct Tuple24[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionNestingRestrictedCollectionIds",
     "outputs": [
       {
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -238,6 +238,27 @@
   },
   {
     "inputs": [],
+    "name": "collectionNestingPermissions",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionPermissions",
+            "name": "field_0",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "field_1", "type": "bool" }
+        ],
+        "internalType": "struct Tuple37[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionNestingRestrictedCollectionIds",
     "outputs": [
       {
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -220,6 +220,27 @@
   },
   {
     "inputs": [],
+    "name": "collectionNestingPermissions",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionPermissions",
+            "name": "field_0",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "field_1", "type": "bool" }
+        ],
+        "internalType": "struct Tuple36[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionNestingRestrictedCollectionIds",
     "outputs": [
       {
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
before · tests/src/eth/api/UniqueFungible.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 you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xeecfdb3417interface Collection is Dummy, ERC165 {18	// /// Set collection property.19	// ///20	// /// @param key Property key.21	// /// @param value Propery value.22	// /// @dev EVM selector for this function is: 0x2f073f66,23	// ///  or in textual repr: setCollectionProperty(string,bytes)24	// function setCollectionProperty(string memory key, bytes memory value) external;2526	/// Set collection properties.27	///28	/// @param properties Vector of properties key/value pair.29	/// @dev EVM selector for this function is: 0x50b26b2a,30	///  or in textual repr: setCollectionProperties((string,bytes)[])31	function setCollectionProperties(Property[] memory properties) external;3233	// /// Delete collection property.34	// ///35	// /// @param key Property key.36	// /// @dev EVM selector for this function is: 0x7b7debce,37	// ///  or in textual repr: deleteCollectionProperty(string)38	// function deleteCollectionProperty(string memory key) external;3940	/// Delete collection properties.41	///42	/// @param keys Properties keys.43	/// @dev EVM selector for this function is: 0xee206ee3,44	///  or in textual repr: deleteCollectionProperties(string[])45	function deleteCollectionProperties(string[] memory keys) external;4647	/// Get collection property.48	///49	/// @dev Throws error if key not found.50	///51	/// @param key Property key.52	/// @return bytes The property corresponding to the key.53	/// @dev EVM selector for this function is: 0xcf24fd6d,54	///  or in textual repr: collectionProperty(string)55	function collectionProperty(string memory key) external view returns (bytes memory);5657	/// Get collection properties.58	///59	/// @param keys Properties keys. Empty keys for all propertyes.60	/// @return Vector of properties key/value pairs.61	/// @dev EVM selector for this function is: 0x285fb8e6,62	///  or in textual repr: collectionProperties(string[])63	function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465	// /// Set the sponsor of the collection.66	// ///67	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68	// ///69	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70	// /// @dev EVM selector for this function is: 0x7623402e,71	// ///  or in textual repr: setCollectionSponsor(address)72	// function setCollectionSponsor(address sponsor) external;7374	/// Set the sponsor of the collection.75	///76	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77	///78	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79	/// @dev EVM selector for this function is: 0x84a1d5a8,80	///  or in textual repr: setCollectionSponsorCross((address,uint256))81	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283	/// Whether there is a pending sponsor.84	/// @dev EVM selector for this function is: 0x058ac185,85	///  or in textual repr: hasCollectionPendingSponsor()86	function hasCollectionPendingSponsor() external view returns (bool);8788	/// Collection sponsorship confirmation.89	///90	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.91	/// @dev EVM selector for this function is: 0x3c50e97a,92	///  or in textual repr: confirmCollectionSponsorship()93	function confirmCollectionSponsorship() external;9495	/// Remove collection sponsor.96	/// @dev EVM selector for this function is: 0x6e0326a3,97	///  or in textual repr: removeCollectionSponsor()98	function removeCollectionSponsor() external;99100	/// Get current sponsor.101	///102	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103	/// @dev EVM selector for this function is: 0x6ec0a9f1,104	///  or in textual repr: collectionSponsor()105	function collectionSponsor() external view returns (Tuple8 memory);106107	/// Set limits for the collection.108	/// @dev Throws error if limit not found.109	/// @param limit Name of the limit. Valid names:110	/// 	"accountTokenOwnershipLimit",111	/// 	"sponsoredDataSize",112	/// 	"sponsoredDataRateLimit",113	/// 	"tokenLimit",114	/// 	"sponsorTransferTimeout",115	/// 	"sponsorApproveTimeout"116	///  	"ownerCanTransfer",117	/// 	"ownerCanDestroy",118	/// 	"transfersEnabled"119	/// @param value Value of the limit.120	/// @dev EVM selector for this function is: 0x4ad890a8,121	///  or in textual repr: setCollectionLimit(string,uint256)122	function setCollectionLimit(string memory limit, uint256 value) external;123124	/// Get contract address.125	/// @dev EVM selector for this function is: 0xf6b4dfb4,126	///  or in textual repr: contractAddress()127	function contractAddress() external view returns (address);128129	/// Add collection admin.130	/// @param newAdmin Cross account administrator address.131	/// @dev EVM selector for this function is: 0x859aa7d6,132	///  or in textual repr: addCollectionAdminCross((address,uint256))133	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;134135	/// Remove collection admin.136	/// @param admin Cross account administrator address.137	/// @dev EVM selector for this function is: 0x6c0cd173,138	///  or in textual repr: removeCollectionAdminCross((address,uint256))139	function removeCollectionAdminCross(EthCrossAccount memory admin) external;140141	// /// Add collection admin.142	// /// @param newAdmin Address of the added administrator.143	// /// @dev EVM selector for this function is: 0x92e462c7,144	// ///  or in textual repr: addCollectionAdmin(address)145	// function addCollectionAdmin(address newAdmin) external;146147	// /// Remove collection admin.148	// ///149	// /// @param admin Address of the removed administrator.150	// /// @dev EVM selector for this function is: 0xfafd7b42,151	// ///  or in textual repr: removeCollectionAdmin(address)152	// function removeCollectionAdmin(address admin) external;153154	/// Toggle accessibility of collection nesting.155	///156	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'157	/// @dev EVM selector for this function is: 0x112d4586,158	///  or in textual repr: setCollectionNesting(bool)159	function setCollectionNesting(bool enable) external;160161	/// Toggle accessibility of collection nesting.162	///163	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'164	/// @param collections Addresses of collections that will be available for nesting.165	/// @dev EVM selector for this function is: 0x64872396,166	///  or in textual repr: setCollectionNesting(bool,address[])167	function setCollectionNesting(bool enable, address[] memory collections) external;168169	/// Returns nesting for a collection170	/// @dev EVM selector for this function is: 0x22d25bfe,171	///  or in textual repr: collectionNestingRestrictedCollectionIds()172	function collectionNestingRestrictedCollectionIds() external view returns (Tuple20 memory);173174	/// Set the collection access method.175	/// @param mode Access mode176	/// 	0 for Normal177	/// 	1 for AllowList178	/// @dev EVM selector for this function is: 0x41835d4c,179	///  or in textual repr: setCollectionAccess(uint8)180	function setCollectionAccess(uint8 mode) external;181182	/// Checks that user allowed to operate with collection.183	///184	/// @param user User address to check.185	/// @dev EVM selector for this function is: 0x91b6df49,186	///  or in textual repr: allowlistedCross((address,uint256))187	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);188189	// /// Add the user to the allowed list.190	// ///191	// /// @param user Address of a trusted user.192	// /// @dev EVM selector for this function is: 0x67844fe6,193	// ///  or in textual repr: addToCollectionAllowList(address)194	// function addToCollectionAllowList(address user) external;195196	/// Add user to allowed list.197	///198	/// @param user User cross account address.199	/// @dev EVM selector for this function is: 0xa0184a3a,200	///  or in textual repr: addToCollectionAllowListCross((address,uint256))201	function addToCollectionAllowListCross(EthCrossAccount memory user) external;202203	// /// Remove the user from the allowed list.204	// ///205	// /// @param user Address of a removed user.206	// /// @dev EVM selector for this function is: 0x85c51acb,207	// ///  or in textual repr: removeFromCollectionAllowList(address)208	// function removeFromCollectionAllowList(address user) external;209210	/// Remove user from allowed list.211	///212	/// @param user User cross account address.213	/// @dev EVM selector for this function is: 0x09ba452a,214	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))215	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;216217	/// Switch permission for minting.218	///219	/// @param mode Enable if "true".220	/// @dev EVM selector for this function is: 0x00018e84,221	///  or in textual repr: setCollectionMintMode(bool)222	function setCollectionMintMode(bool mode) external;223224	// /// Check that account is the owner or admin of the collection225	// ///226	// /// @param user account to verify227	// /// @return "true" if account is the owner or admin228	// /// @dev EVM selector for this function is: 0x9811b0c7,229	// ///  or in textual repr: isOwnerOrAdmin(address)230	// function isOwnerOrAdmin(address user) external view returns (bool);231232	/// Check that account is the owner or admin of the collection233	///234	/// @param user User cross account to verify235	/// @return "true" if account is the owner or admin236	/// @dev EVM selector for this function is: 0x3e75a905,237	///  or in textual repr: isOwnerOrAdminCross((address,uint256))238	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);239240	/// Returns collection type241	///242	/// @return `Fungible` or `NFT` or `ReFungible`243	/// @dev EVM selector for this function is: 0xd34b55b8,244	///  or in textual repr: uniqueCollectionType()245	function uniqueCollectionType() external view returns (string memory);246247	/// Get collection owner.248	///249	/// @return Tuble with sponsor address and his substrate mirror.250	/// If address is canonical then substrate mirror is zero and vice versa.251	/// @dev EVM selector for this function is: 0xdf727d3b,252	///  or in textual repr: collectionOwner()253	function collectionOwner() external view returns (EthCrossAccount memory);254255	// /// Changes collection owner to another account256	// ///257	// /// @dev Owner can be changed only by current owner258	// /// @param newOwner new owner account259	// /// @dev EVM selector for this function is: 0x4f53e226,260	// ///  or in textual repr: changeCollectionOwner(address)261	// function changeCollectionOwner(address newOwner) external;262263	/// Get collection administrators264	///265	/// @return Vector of tuples with admins address and his substrate mirror.266	/// If address is canonical then substrate mirror is zero and vice versa.267	/// @dev EVM selector for this function is: 0x5813216b,268	///  or in textual repr: collectionAdmins()269	function collectionAdmins() external view returns (EthCrossAccount[] memory);270271	/// Changes collection owner to another account272	///273	/// @dev Owner can be changed only by current owner274	/// @param newOwner new owner cross account275	/// @dev EVM selector for this function is: 0x6496c497,276	///  or in textual repr: changeCollectionOwnerCross((address,uint256))277	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;278}279280/// @dev Cross account struct281struct EthCrossAccount {282	address eth;283	uint256 sub;284}285286/// @dev anonymous struct287struct Tuple20 {288	bool field_0;289	uint256[] field_1;290}291292/// @dev Property struct293struct Property {294	string key;295	bytes value;296}297298/// @dev the ERC-165 identifier for this interface is 0x5b7038cf299interface ERC20UniqueExtensions is Dummy, ERC165 {300	/// @notice A description for the collection.301	/// @dev EVM selector for this function is: 0x7284e416,302	///  or in textual repr: description()303	function description() external view returns (string memory);304305	/// @dev EVM selector for this function is: 0x0ecd0ab0,306	///  or in textual repr: approveCross((address,uint256),uint256)307	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);308309	// /// Burn tokens from account310	// /// @dev Function that burns an `amount` of the tokens of a given account,311	// /// deducting from the sender's allowance for said account.312	// /// @param from The account whose tokens will be burnt.313	// /// @param amount The amount that will be burnt.314	// /// @dev EVM selector for this function is: 0x79cc6790,315	// ///  or in textual repr: burnFrom(address,uint256)316	// function burnFrom(address from, uint256 amount) external returns (bool);317318	/// Burn tokens from account319	/// @dev Function that burns an `amount` of the tokens of a given account,320	/// deducting from the sender's allowance for said account.321	/// @param from The account whose tokens will be burnt.322	/// @param amount The amount that will be burnt.323	/// @dev EVM selector for this function is: 0xbb2f5a58,324	///  or in textual repr: burnFromCross((address,uint256),uint256)325	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);326327	/// Mint tokens for multiple accounts.328	/// @param amounts array of pairs of account address and amount329	/// @dev EVM selector for this function is: 0x1acf2d55,330	///  or in textual repr: mintBulk((address,uint256)[])331	function mintBulk(Tuple8[] memory amounts) external returns (bool);332333	/// @dev EVM selector for this function is: 0x2ada85ff,334	///  or in textual repr: transferCross((address,uint256),uint256)335	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);336337	/// @dev EVM selector for this function is: 0xd5cf430b,338	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)339	function transferFromCross(340		EthCrossAccount memory from,341		EthCrossAccount memory to,342		uint256 amount343	) external returns (bool);344}345346/// @dev anonymous struct347struct Tuple8 {348	address field_0;349	uint256 field_1;350}351352/// @dev the ERC-165 identifier for this interface is 0x40c10f19353interface ERC20Mintable is Dummy, ERC165 {354	/// Mint tokens for `to` account.355	/// @param to account that will receive minted tokens356	/// @param amount amount of tokens to mint357	/// @dev EVM selector for this function is: 0x40c10f19,358	///  or in textual repr: mint(address,uint256)359	function mint(address to, uint256 amount) external returns (bool);360}361362/// @dev inlined interface363interface ERC20Events {364	event Transfer(address indexed from, address indexed to, uint256 value);365	event Approval(address indexed owner, address indexed spender, uint256 value);366}367368/// @dev the ERC-165 identifier for this interface is 0x8cb847c4369interface ERC20 is Dummy, ERC165, ERC20Events {370	/// @dev EVM selector for this function is: 0x06fdde03,371	///  or in textual repr: name()372	function name() external view returns (string memory);373374	/// @dev EVM selector for this function is: 0x95d89b41,375	///  or in textual repr: symbol()376	function symbol() external view returns (string memory);377378	/// @dev EVM selector for this function is: 0x18160ddd,379	///  or in textual repr: totalSupply()380	function totalSupply() external view returns (uint256);381382	/// @dev EVM selector for this function is: 0x313ce567,383	///  or in textual repr: decimals()384	function decimals() external view returns (uint8);385386	/// @dev EVM selector for this function is: 0x70a08231,387	///  or in textual repr: balanceOf(address)388	function balanceOf(address owner) external view returns (uint256);389390	/// @dev EVM selector for this function is: 0xa9059cbb,391	///  or in textual repr: transfer(address,uint256)392	function transfer(address to, uint256 amount) external returns (bool);393394	/// @dev EVM selector for this function is: 0x23b872dd,395	///  or in textual repr: transferFrom(address,address,uint256)396	function transferFrom(397		address from,398		address to,399		uint256 amount400	) external returns (bool);401402	/// @dev EVM selector for this function is: 0x095ea7b3,403	///  or in textual repr: approve(address,uint256)404	function approve(address spender, uint256 amount) external returns (bool);405406	/// @dev EVM selector for this function is: 0xdd62ed3e,407	///  or in textual repr: allowance(address,address)408	function allowance(address owner, address spender) external view returns (uint256);409410	/// @notice Returns collection helper contract address411	/// @dev EVM selector for this function is: 0x1896cce6,412	///  or in textual repr: collectionHelperAddress()413	function collectionHelperAddress() external view returns (address);414}415416interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
after · tests/src/eth/api/UniqueFungible.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 you to work with collections.16/// @dev the ERC-165 identifier for this interface is 0xb5e1747f17interface Collection is Dummy, ERC165 {18	// /// Set collection property.19	// ///20	// /// @param key Property key.21	// /// @param value Propery value.22	// /// @dev EVM selector for this function is: 0x2f073f66,23	// ///  or in textual repr: setCollectionProperty(string,bytes)24	// function setCollectionProperty(string memory key, bytes memory value) external;2526	/// Set collection properties.27	///28	/// @param properties Vector of properties key/value pair.29	/// @dev EVM selector for this function is: 0x50b26b2a,30	///  or in textual repr: setCollectionProperties((string,bytes)[])31	function setCollectionProperties(Property[] memory properties) external;3233	// /// Delete collection property.34	// ///35	// /// @param key Property key.36	// /// @dev EVM selector for this function is: 0x7b7debce,37	// ///  or in textual repr: deleteCollectionProperty(string)38	// function deleteCollectionProperty(string memory key) external;3940	/// Delete collection properties.41	///42	/// @param keys Properties keys.43	/// @dev EVM selector for this function is: 0xee206ee3,44	///  or in textual repr: deleteCollectionProperties(string[])45	function deleteCollectionProperties(string[] memory keys) external;4647	/// Get collection property.48	///49	/// @dev Throws error if key not found.50	///51	/// @param key Property key.52	/// @return bytes The property corresponding to the key.53	/// @dev EVM selector for this function is: 0xcf24fd6d,54	///  or in textual repr: collectionProperty(string)55	function collectionProperty(string memory key) external view returns (bytes memory);5657	/// Get collection properties.58	///59	/// @param keys Properties keys. Empty keys for all propertyes.60	/// @return Vector of properties key/value pairs.61	/// @dev EVM selector for this function is: 0x285fb8e6,62	///  or in textual repr: collectionProperties(string[])63	function collectionProperties(string[] memory keys) external view returns (Property[] memory);6465	// /// Set the sponsor of the collection.66	// ///67	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.68	// ///69	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.70	// /// @dev EVM selector for this function is: 0x7623402e,71	// ///  or in textual repr: setCollectionSponsor(address)72	// function setCollectionSponsor(address sponsor) external;7374	/// Set the sponsor of the collection.75	///76	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.77	///78	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.79	/// @dev EVM selector for this function is: 0x84a1d5a8,80	///  or in textual repr: setCollectionSponsorCross((address,uint256))81	function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8283	/// Whether there is a pending sponsor.84	/// @dev EVM selector for this function is: 0x058ac185,85	///  or in textual repr: hasCollectionPendingSponsor()86	function hasCollectionPendingSponsor() external view returns (bool);8788	/// Collection sponsorship confirmation.89	///90	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.91	/// @dev EVM selector for this function is: 0x3c50e97a,92	///  or in textual repr: confirmCollectionSponsorship()93	function confirmCollectionSponsorship() external;9495	/// Remove collection sponsor.96	/// @dev EVM selector for this function is: 0x6e0326a3,97	///  or in textual repr: removeCollectionSponsor()98	function removeCollectionSponsor() external;99100	/// Get current sponsor.101	///102	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.103	/// @dev EVM selector for this function is: 0x6ec0a9f1,104	///  or in textual repr: collectionSponsor()105	function collectionSponsor() external view returns (Tuple8 memory);106107	/// Set limits for the collection.108	/// @dev Throws error if limit not found.109	/// @param limit Name of the limit. Valid names:110	/// 	"accountTokenOwnershipLimit",111	/// 	"sponsoredDataSize",112	/// 	"sponsoredDataRateLimit",113	/// 	"tokenLimit",114	/// 	"sponsorTransferTimeout",115	/// 	"sponsorApproveTimeout"116	///  	"ownerCanTransfer",117	/// 	"ownerCanDestroy",118	/// 	"transfersEnabled"119	/// @param value Value of the limit.120	/// @dev EVM selector for this function is: 0x4ad890a8,121	///  or in textual repr: setCollectionLimit(string,uint256)122	function setCollectionLimit(string memory limit, uint256 value) external;123124	/// Get contract address.125	/// @dev EVM selector for this function is: 0xf6b4dfb4,126	///  or in textual repr: contractAddress()127	function contractAddress() external view returns (address);128129	/// Add collection admin.130	/// @param newAdmin Cross account administrator address.131	/// @dev EVM selector for this function is: 0x859aa7d6,132	///  or in textual repr: addCollectionAdminCross((address,uint256))133	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;134135	/// Remove collection admin.136	/// @param admin Cross account administrator address.137	/// @dev EVM selector for this function is: 0x6c0cd173,138	///  or in textual repr: removeCollectionAdminCross((address,uint256))139	function removeCollectionAdminCross(EthCrossAccount memory admin) external;140141	// /// Add collection admin.142	// /// @param newAdmin Address of the added administrator.143	// /// @dev EVM selector for this function is: 0x92e462c7,144	// ///  or in textual repr: addCollectionAdmin(address)145	// function addCollectionAdmin(address newAdmin) external;146147	// /// Remove collection admin.148	// ///149	// /// @param admin Address of the removed administrator.150	// /// @dev EVM selector for this function is: 0xfafd7b42,151	// ///  or in textual repr: removeCollectionAdmin(address)152	// function removeCollectionAdmin(address admin) external;153154	/// Toggle accessibility of collection nesting.155	///156	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'157	/// @dev EVM selector for this function is: 0x112d4586,158	///  or in textual repr: setCollectionNesting(bool)159	function setCollectionNesting(bool enable) external;160161	/// Toggle accessibility of collection nesting.162	///163	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'164	/// @param collections Addresses of collections that will be available for nesting.165	/// @dev EVM selector for this function is: 0x64872396,166	///  or in textual repr: setCollectionNesting(bool,address[])167	function setCollectionNesting(bool enable, address[] memory collections) external;168169	/// Returns nesting for a collection170	/// @dev EVM selector for this function is: 0x22d25bfe,171	///  or in textual repr: collectionNestingRestrictedCollectionIds()172	function collectionNestingRestrictedCollectionIds() external view returns (Tuple20 memory);173174	/// Returns permissions for a collection175	/// @dev EVM selector for this function is: 0x5b2eaf4b,176	///  or in textual repr: collectionNestingPermissions()177	function collectionNestingPermissions() external view returns (Tuple23[] memory);178179	/// Set the collection access method.180	/// @param mode Access mode181	/// 	0 for Normal182	/// 	1 for AllowList183	/// @dev EVM selector for this function is: 0x41835d4c,184	///  or in textual repr: setCollectionAccess(uint8)185	function setCollectionAccess(uint8 mode) external;186187	/// Checks that user allowed to operate with collection.188	///189	/// @param user User address to check.190	/// @dev EVM selector for this function is: 0x91b6df49,191	///  or in textual repr: allowlistedCross((address,uint256))192	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);193194	// /// Add the user to the allowed list.195	// ///196	// /// @param user Address of a trusted user.197	// /// @dev EVM selector for this function is: 0x67844fe6,198	// ///  or in textual repr: addToCollectionAllowList(address)199	// function addToCollectionAllowList(address user) external;200201	/// Add user to allowed list.202	///203	/// @param user User cross account address.204	/// @dev EVM selector for this function is: 0xa0184a3a,205	///  or in textual repr: addToCollectionAllowListCross((address,uint256))206	function addToCollectionAllowListCross(EthCrossAccount memory user) external;207208	// /// Remove the user from the allowed list.209	// ///210	// /// @param user Address of a removed user.211	// /// @dev EVM selector for this function is: 0x85c51acb,212	// ///  or in textual repr: removeFromCollectionAllowList(address)213	// function removeFromCollectionAllowList(address user) external;214215	/// Remove user from allowed list.216	///217	/// @param user User cross account address.218	/// @dev EVM selector for this function is: 0x09ba452a,219	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))220	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;221222	/// Switch permission for minting.223	///224	/// @param mode Enable if "true".225	/// @dev EVM selector for this function is: 0x00018e84,226	///  or in textual repr: setCollectionMintMode(bool)227	function setCollectionMintMode(bool mode) external;228229	// /// Check that account is the owner or admin of the collection230	// ///231	// /// @param user account to verify232	// /// @return "true" if account is the owner or admin233	// /// @dev EVM selector for this function is: 0x9811b0c7,234	// ///  or in textual repr: isOwnerOrAdmin(address)235	// function isOwnerOrAdmin(address user) external view returns (bool);236237	/// Check that account is the owner or admin of the collection238	///239	/// @param user User cross account to verify240	/// @return "true" if account is the owner or admin241	/// @dev EVM selector for this function is: 0x3e75a905,242	///  or in textual repr: isOwnerOrAdminCross((address,uint256))243	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);244245	/// Returns collection type246	///247	/// @return `Fungible` or `NFT` or `ReFungible`248	/// @dev EVM selector for this function is: 0xd34b55b8,249	///  or in textual repr: uniqueCollectionType()250	function uniqueCollectionType() external view returns (string memory);251252	/// Get collection owner.253	///254	/// @return Tuble with sponsor address and his substrate mirror.255	/// If address is canonical then substrate mirror is zero and vice versa.256	/// @dev EVM selector for this function is: 0xdf727d3b,257	///  or in textual repr: collectionOwner()258	function collectionOwner() external view returns (EthCrossAccount memory);259260	// /// Changes collection owner to another account261	// ///262	// /// @dev Owner can be changed only by current owner263	// /// @param newOwner new owner account264	// /// @dev EVM selector for this function is: 0x4f53e226,265	// ///  or in textual repr: changeCollectionOwner(address)266	// function changeCollectionOwner(address newOwner) external;267268	/// Get collection administrators269	///270	/// @return Vector of tuples with admins address and his substrate mirror.271	/// If address is canonical then substrate mirror is zero and vice versa.272	/// @dev EVM selector for this function is: 0x5813216b,273	///  or in textual repr: collectionAdmins()274	function collectionAdmins() external view returns (EthCrossAccount[] memory);275276	/// Changes collection owner to another account277	///278	/// @dev Owner can be changed only by current owner279	/// @param newOwner new owner cross account280	/// @dev EVM selector for this function is: 0x6496c497,281	///  or in textual repr: changeCollectionOwnerCross((address,uint256))282	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;283}284285/// @dev Cross account struct286struct EthCrossAccount {287	address eth;288	uint256 sub;289}290291/// @dev anonymous struct292struct Tuple23 {293	CollectionPermissions field_0;294	bool field_1;295}296297enum CollectionPermissions {298	CollectionAdmin,299	TokenOwner300}301302/// @dev anonymous struct303struct Tuple20 {304	bool field_0;305	uint256[] field_1;306}307308/// @dev Property struct309struct Property {310	string key;311	bytes value;312}313314/// @dev the ERC-165 identifier for this interface is 0x5b7038cf315interface ERC20UniqueExtensions is Dummy, ERC165 {316	/// @notice A description for the collection.317	/// @dev EVM selector for this function is: 0x7284e416,318	///  or in textual repr: description()319	function description() external view returns (string memory);320321	/// @dev EVM selector for this function is: 0x0ecd0ab0,322	///  or in textual repr: approveCross((address,uint256),uint256)323	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);324325	// /// Burn tokens from account326	// /// @dev Function that burns an `amount` of the tokens of a given account,327	// /// deducting from the sender's allowance for said account.328	// /// @param from The account whose tokens will be burnt.329	// /// @param amount The amount that will be burnt.330	// /// @dev EVM selector for this function is: 0x79cc6790,331	// ///  or in textual repr: burnFrom(address,uint256)332	// function burnFrom(address from, uint256 amount) external returns (bool);333334	/// Burn tokens from account335	/// @dev Function that burns an `amount` of the tokens of a given account,336	/// deducting from the sender's allowance for said account.337	/// @param from The account whose tokens will be burnt.338	/// @param amount The amount that will be burnt.339	/// @dev EVM selector for this function is: 0xbb2f5a58,340	///  or in textual repr: burnFromCross((address,uint256),uint256)341	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);342343	/// Mint tokens for multiple accounts.344	/// @param amounts array of pairs of account address and amount345	/// @dev EVM selector for this function is: 0x1acf2d55,346	///  or in textual repr: mintBulk((address,uint256)[])347	function mintBulk(Tuple8[] memory amounts) external returns (bool);348349	/// @dev EVM selector for this function is: 0x2ada85ff,350	///  or in textual repr: transferCross((address,uint256),uint256)351	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);352353	/// @dev EVM selector for this function is: 0xd5cf430b,354	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)355	function transferFromCross(356		EthCrossAccount memory from,357		EthCrossAccount memory to,358		uint256 amount359	) external returns (bool);360}361362/// @dev anonymous struct363struct Tuple8 {364	address field_0;365	uint256 field_1;366}367368/// @dev the ERC-165 identifier for this interface is 0x40c10f19369interface ERC20Mintable is Dummy, ERC165 {370	/// Mint tokens for `to` account.371	/// @param to account that will receive minted tokens372	/// @param amount amount of tokens to mint373	/// @dev EVM selector for this function is: 0x40c10f19,374	///  or in textual repr: mint(address,uint256)375	function mint(address to, uint256 amount) external returns (bool);376}377378/// @dev inlined interface379interface ERC20Events {380	event Transfer(address indexed from, address indexed to, uint256 value);381	event Approval(address indexed owner, address indexed spender, uint256 value);382}383384/// @dev the ERC-165 identifier for this interface is 0x8cb847c4385interface ERC20 is Dummy, ERC165, ERC20Events {386	/// @dev EVM selector for this function is: 0x06fdde03,387	///  or in textual repr: name()388	function name() external view returns (string memory);389390	/// @dev EVM selector for this function is: 0x95d89b41,391	///  or in textual repr: symbol()392	function symbol() external view returns (string memory);393394	/// @dev EVM selector for this function is: 0x18160ddd,395	///  or in textual repr: totalSupply()396	function totalSupply() external view returns (uint256);397398	/// @dev EVM selector for this function is: 0x313ce567,399	///  or in textual repr: decimals()400	function decimals() external view returns (uint8);401402	/// @dev EVM selector for this function is: 0x70a08231,403	///  or in textual repr: balanceOf(address)404	function balanceOf(address owner) external view returns (uint256);405406	/// @dev EVM selector for this function is: 0xa9059cbb,407	///  or in textual repr: transfer(address,uint256)408	function transfer(address to, uint256 amount) external returns (bool);409410	/// @dev EVM selector for this function is: 0x23b872dd,411	///  or in textual repr: transferFrom(address,address,uint256)412	function transferFrom(413		address from,414		address to,415		uint256 amount416	) external returns (bool);417418	/// @dev EVM selector for this function is: 0x095ea7b3,419	///  or in textual repr: approve(address,uint256)420	function approve(address spender, uint256 amount) external returns (bool);421422	/// @dev EVM selector for this function is: 0xdd62ed3e,423	///  or in textual repr: allowance(address,address)424	function allowance(address owner, address spender) external view returns (uint256);425426	/// @notice Returns collection helper contract address427	/// @dev EVM selector for this function is: 0x1896cce6,428	///  or in textual repr: collectionHelperAddress()429	function collectionHelperAddress() external view returns (address);430}431432interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -80,7 +80,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xeecfdb34
+/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -238,6 +238,11 @@
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
 	function collectionNestingRestrictedCollectionIds() external view returns (Tuple31 memory);
 
+	/// Returns permissions for a collection
+	/// @dev EVM selector for this function is: 0x5b2eaf4b,
+	///  or in textual repr: collectionNestingPermissions()
+	function collectionNestingPermissions() external view returns (Tuple34[] memory);
+
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
@@ -351,6 +356,17 @@
 }
 
 /// @dev anonymous struct
+struct Tuple34 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
 struct Tuple31 {
 	bool field_0;
 	uint256[] field_1;
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -80,7 +80,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xeecfdb34
+/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -238,6 +238,11 @@
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
 	function collectionNestingRestrictedCollectionIds() external view returns (Tuple30 memory);
 
+	/// Returns permissions for a collection
+	/// @dev EVM selector for this function is: 0x5b2eaf4b,
+	///  or in textual repr: collectionNestingPermissions()
+	function collectionNestingPermissions() external view returns (Tuple33[] memory);
+
 	/// Set the collection access method.
 	/// @param mode Access mode
 	/// 	0 for Normal
@@ -351,6 +356,17 @@
 }
 
 /// @dev anonymous struct
+struct Tuple33 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
 struct Tuple30 {
 	bool field_0;
 	uint256[] field_1;
modifiedtests/src/eth/nesting/nest.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -52,7 +52,7 @@
       expect(await contract.methods.ownerOf(secondTokenId).call()).to.be.equal(owner);
     });
     
-    itEth('NFT: collectionNestingRestrictedCollectionIds()', async ({helper}) => {
+    itEth('NFT: collectionNestingRestrictedCollectionIds() & collectionNestingPermissions', async ({helper}) => {
       const owner = await helper.eth.createAccountWithBalance(donor);
       const {collectionId: unnestedCollsectionId, collectionAddress: unnsetedCollectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
       const unnestedContract = helper.ethNativeContract.collection(unnsetedCollectionAddress, 'nft', owner);
@@ -62,7 +62,9 @@
       expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, []]);
       await contract.methods.setCollectionNesting(true, [unnsetedCollectionAddress]).send({from: owner});
       expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, [unnestedCollsectionId.toString()]]);
-      
+      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', true]]);
+      await contract.methods.setCollectionNesting(false).send({from: owner});
+      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', false]]);
     });
     
     itEth('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async ({helper}) => {