git.delta.rocks / unique-network / refs/commits / 7c531595588c

difftreelog

chore generate stubs

PraetorP2022-12-15parent: #62800e3.patch.diff
in: master

11 files changed

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 0xb5e1747f
+/// @dev the ERC-165 identifier for this interface is 0x81172a75
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -191,6 +191,7 @@
 	///  	"ownerCanTransfer",
 	/// 	"ownerCanDestroy",
 	/// 	"transfersEnabled"
+	/// @param status enable\disable limit. Works only with `true`.
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x88150bd0,
 	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
@@ -283,19 +284,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple21 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple21(false, new uint256[](0));
+		return Tuple26(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) {
+	function collectionNestingPermissions() public view returns (Tuple29[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple24[](0);
+		return new Tuple29[](0);
 	}
 
 	/// Set the collection access method.
@@ -475,17 +476,36 @@
 }
 
 /// @dev anonymous struct
-struct Tuple24 {
+struct Tuple29 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple21 {
+struct Tuple26 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+enum CollectionLimits {
+	AccountTokenOwnership,
+	SponsoredDataSize,
+	SponsoredDataRateLimit,
+	TokenLimit,
+	SponsorTransferTimeout,
+	SponsorApproveTimeout,
+	OwnerCanTransfer,
+	OwnerCanDestroy,
+	TransferEnabled
+}
+
+/// @dev anonymous struct
+struct Tuple20 {
+	CollectionLimits field_0;
+	bool field_1;
+	uint256 field_2;
+}
+
 /// @dev Property struct
 struct Property {
 	string key;
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -151,7 +151,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
+/// @dev the ERC-165 identifier for this interface is 0x81172a75
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -324,6 +324,7 @@
 	///  	"ownerCanTransfer",
 	/// 	"ownerCanDestroy",
 	/// 	"transfersEnabled"
+	/// @param status enable\disable limit. Works only with `true`.
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x88150bd0,
 	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
@@ -416,19 +417,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple34 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple34(false, new uint256[](0));
+		return Tuple39(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) {
+	function collectionNestingPermissions() public view returns (Tuple42[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple37[](0);
+		return new Tuple42[](0);
 	}
 
 	/// Set the collection access method.
@@ -608,17 +609,36 @@
 }
 
 /// @dev anonymous struct
-struct Tuple37 {
+struct Tuple42 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple34 {
+struct Tuple39 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+enum CollectionLimits {
+	AccountTokenOwnership,
+	SponsoredDataSize,
+	SponsoredDataRateLimit,
+	TokenLimit,
+	SponsorTransferTimeout,
+	SponsorApproveTimeout,
+	OwnerCanTransfer,
+	OwnerCanDestroy,
+	TransferEnabled
+}
+
+/// @dev anonymous struct
+struct Tuple33 {
+	CollectionLimits field_0;
+	bool field_1;
+	uint256 field_2;
+}
+
 /// @dev anonymous struct
 struct Tuple30 {
 	address field_0;
modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -152,7 +152,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
+/// @dev the ERC-165 identifier for this interface is 0x81172a75
 contract Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -325,6 +325,7 @@
 	///  	"ownerCanTransfer",
 	/// 	"ownerCanDestroy",
 	/// 	"transfersEnabled"
+	/// @param status enable\disable limit. Works only with `true`.
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x88150bd0,
 	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
@@ -417,19 +418,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple33 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple33(false, new uint256[](0));
+		return Tuple38(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) {
+	function collectionNestingPermissions() public view returns (Tuple41[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple36[](0);
+		return new Tuple41[](0);
 	}
 
 	/// Set the collection access method.
@@ -609,17 +610,36 @@
 }
 
 /// @dev anonymous struct
-struct Tuple36 {
+struct Tuple41 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple33 {
+struct Tuple38 {
 	bool field_0;
 	uint256[] field_1;
 }
 
+enum CollectionLimits {
+	AccountTokenOwnership,
+	SponsoredDataSize,
+	SponsoredDataRateLimit,
+	TokenLimit,
+	SponsorTransferTimeout,
+	SponsorApproveTimeout,
+	OwnerCanTransfer,
+	OwnerCanDestroy,
+	TransferEnabled
+}
+
+/// @dev anonymous struct
+struct Tuple32 {
+	CollectionLimits field_0;
+	bool field_1;
+	uint256 field_2;
+}
+
 /// @dev anonymous struct
 struct Tuple29 {
 	address field_0;
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -208,33 +208,40 @@
   },
   {
     "inputs": [],
-<<<<<<< HEAD
-    "name": "collectionNestingPermissions",
-=======
     "name": "collectionLimits",
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface,  changed signture for `setCollectionLimit`
     "outputs": [
       {
         "components": [
           {
-<<<<<<< HEAD
-            "internalType": "enum CollectionPermissions",
+            "internalType": "enum CollectionLimits",
             "name": "field_0",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "field_1", "type": "bool" }
+          { "internalType": "bool", "name": "field_1", "type": "bool" },
+          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
         ],
-        "internalType": "struct Tuple24[]",
-=======
-            "internalType": "enum CollectionLimits",
+        "internalType": "struct Tuple20[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "collectionNestingPermissions",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionPermissions",
             "name": "field_0",
             "type": "uint8"
           },
-          { "internalType": "bool", "name": "field_1", "type": "bool" },
-          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+          { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple20[]",
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface,  changed signture for `setCollectionLimit`
+        "internalType": "struct Tuple29[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -244,7 +251,6 @@
   },
   {
     "inputs": [],
-<<<<<<< HEAD
     "name": "collectionNestingRestrictedCollectionIds",
     "outputs": [
       {
@@ -256,7 +262,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple21",
+        "internalType": "struct Tuple26",
         "name": "",
         "type": "tuple"
       }
@@ -266,8 +272,6 @@
   },
   {
     "inputs": [],
-=======
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface,  changed signture for `setCollectionLimit`
     "name": "collectionOwner",
     "outputs": [
       {
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -238,6 +238,28 @@
   },
   {
     "inputs": [],
+    "name": "collectionLimits",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionLimits",
+            "name": "field_0",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "field_1", "type": "bool" },
+          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+        ],
+        "internalType": "struct Tuple33[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionNestingPermissions",
     "outputs": [
       {
@@ -249,7 +271,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple37[]",
+        "internalType": "struct Tuple42[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -270,7 +292,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple34",
+        "internalType": "struct Tuple39",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -220,6 +220,28 @@
   },
   {
     "inputs": [],
+    "name": "collectionLimits",
+    "outputs": [
+      {
+        "components": [
+          {
+            "internalType": "enum CollectionLimits",
+            "name": "field_0",
+            "type": "uint8"
+          },
+          { "internalType": "bool", "name": "field_1", "type": "bool" },
+          { "internalType": "uint256", "name": "field_2", "type": "uint256" }
+        ],
+        "internalType": "struct Tuple32[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
     "name": "collectionNestingPermissions",
     "outputs": [
       {
@@ -231,7 +253,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple36[]",
+        "internalType": "struct Tuple41[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -252,7 +274,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple33",
+        "internalType": "struct Tuple38",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
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 0x81172a7517interface 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	/// Get current collection limits.108	///109	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:110	/// 	"accountTokenOwnershipLimit",111	/// 	"sponsoredDataSize",112	/// 	"sponsoredDataRateLimit",113	/// 	"tokenLimit",114	/// 	"sponsorTransferTimeout",115	/// 	"sponsorApproveTimeout"116	///  	"ownerCanTransfer",117	/// 	"ownerCanDestroy",118	/// 	"transfersEnabled"119	/// Return `false` if a limit not set.120	/// @dev EVM selector for this function is: 0xf63bc572,121	///  or in textual repr: collectionLimits()122	function collectionLimits() external view returns (Tuple19[] memory);123124	/// Set limits for the collection.125	/// @dev Throws error if limit not found.126	/// @param limit Name of the limit. Valid names:127	/// 	"accountTokenOwnershipLimit",128	/// 	"sponsoredDataSize",129	/// 	"sponsoredDataRateLimit",130	/// 	"tokenLimit",131	/// 	"sponsorTransferTimeout",132	/// 	"sponsorApproveTimeout"133	///  	"ownerCanTransfer",134	/// 	"ownerCanDestroy",135	/// 	"transfersEnabled"136	/// @param status enable\disable limit. Works only with `true`.137	/// @param value Value of the limit.138	/// @dev EVM selector for this function is: 0x88150bd0,139	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)140	function setCollectionLimit(141		CollectionLimits limit,142		bool status,143		uint256 value144	) external;145146	/// Get contract address.147	/// @dev EVM selector for this function is: 0xf6b4dfb4,148	///  or in textual repr: contractAddress()149	function contractAddress() external view returns (address);150151	/// Add collection admin.152	/// @param newAdmin Cross account administrator address.153	/// @dev EVM selector for this function is: 0x859aa7d6,154	///  or in textual repr: addCollectionAdminCross((address,uint256))155	function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;156157	/// Remove collection admin.158	/// @param admin Cross account administrator address.159	/// @dev EVM selector for this function is: 0x6c0cd173,160	///  or in textual repr: removeCollectionAdminCross((address,uint256))161	function removeCollectionAdminCross(EthCrossAccount memory admin) external;162163	// /// Add collection admin.164	// /// @param newAdmin Address of the added administrator.165	// /// @dev EVM selector for this function is: 0x92e462c7,166	// ///  or in textual repr: addCollectionAdmin(address)167	// function addCollectionAdmin(address newAdmin) external;168169	// /// Remove collection admin.170	// ///171	// /// @param admin Address of the removed administrator.172	// /// @dev EVM selector for this function is: 0xfafd7b42,173	// ///  or in textual repr: removeCollectionAdmin(address)174	// function removeCollectionAdmin(address admin) external;175176	/// Toggle accessibility of collection nesting.177	///178	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'179	/// @dev EVM selector for this function is: 0x112d4586,180	///  or in textual repr: setCollectionNesting(bool)181	function setCollectionNesting(bool enable) external;182183	/// Toggle accessibility of collection nesting.184	///185	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'186	/// @param collections Addresses of collections that will be available for nesting.187	/// @dev EVM selector for this function is: 0x64872396,188	///  or in textual repr: setCollectionNesting(bool,address[])189	function setCollectionNesting(bool enable, address[] memory collections) external;190191	/// Returns nesting for a collection192	/// @dev EVM selector for this function is: 0x22d25bfe,193	///  or in textual repr: collectionNestingRestrictedCollectionIds()194	function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);195196	/// Returns permissions for a collection197	/// @dev EVM selector for this function is: 0x5b2eaf4b,198	///  or in textual repr: collectionNestingPermissions()199	function collectionNestingPermissions() external view returns (Tuple27[] memory);200201	/// Set the collection access method.202	/// @param mode Access mode203	/// 	0 for Normal204	/// 	1 for AllowList205	/// @dev EVM selector for this function is: 0x41835d4c,206	///  or in textual repr: setCollectionAccess(uint8)207	function setCollectionAccess(uint8 mode) external;208209	/// Checks that user allowed to operate with collection.210	///211	/// @param user User address to check.212	/// @dev EVM selector for this function is: 0x91b6df49,213	///  or in textual repr: allowlistedCross((address,uint256))214	function allowlistedCross(EthCrossAccount memory user) external view returns (bool);215216	// /// Add the user to the allowed list.217	// ///218	// /// @param user Address of a trusted user.219	// /// @dev EVM selector for this function is: 0x67844fe6,220	// ///  or in textual repr: addToCollectionAllowList(address)221	// function addToCollectionAllowList(address user) external;222223	/// Add user to allowed list.224	///225	/// @param user User cross account address.226	/// @dev EVM selector for this function is: 0xa0184a3a,227	///  or in textual repr: addToCollectionAllowListCross((address,uint256))228	function addToCollectionAllowListCross(EthCrossAccount memory user) external;229230	// /// Remove the user from the allowed list.231	// ///232	// /// @param user Address of a removed user.233	// /// @dev EVM selector for this function is: 0x85c51acb,234	// ///  or in textual repr: removeFromCollectionAllowList(address)235	// function removeFromCollectionAllowList(address user) external;236237	/// Remove user from allowed list.238	///239	/// @param user User cross account address.240	/// @dev EVM selector for this function is: 0x09ba452a,241	///  or in textual repr: removeFromCollectionAllowListCross((address,uint256))242	function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;243244	/// Switch permission for minting.245	///246	/// @param mode Enable if "true".247	/// @dev EVM selector for this function is: 0x00018e84,248	///  or in textual repr: setCollectionMintMode(bool)249	function setCollectionMintMode(bool mode) external;250251	// /// Check that account is the owner or admin of the collection252	// ///253	// /// @param user account to verify254	// /// @return "true" if account is the owner or admin255	// /// @dev EVM selector for this function is: 0x9811b0c7,256	// ///  or in textual repr: isOwnerOrAdmin(address)257	// function isOwnerOrAdmin(address user) external view returns (bool);258259	/// Check that account is the owner or admin of the collection260	///261	/// @param user User cross account to verify262	/// @return "true" if account is the owner or admin263	/// @dev EVM selector for this function is: 0x3e75a905,264	///  or in textual repr: isOwnerOrAdminCross((address,uint256))265	function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);266267	/// Returns collection type268	///269	/// @return `Fungible` or `NFT` or `ReFungible`270	/// @dev EVM selector for this function is: 0xd34b55b8,271	///  or in textual repr: uniqueCollectionType()272	function uniqueCollectionType() external view returns (string memory);273274	/// Get collection owner.275	///276	/// @return Tuble with sponsor address and his substrate mirror.277	/// If address is canonical then substrate mirror is zero and vice versa.278	/// @dev EVM selector for this function is: 0xdf727d3b,279	///  or in textual repr: collectionOwner()280	function collectionOwner() external view returns (EthCrossAccount memory);281282	// /// Changes collection owner to another account283	// ///284	// /// @dev Owner can be changed only by current owner285	// /// @param newOwner new owner account286	// /// @dev EVM selector for this function is: 0x4f53e226,287	// ///  or in textual repr: changeCollectionOwner(address)288	// function changeCollectionOwner(address newOwner) external;289290	/// Get collection administrators291	///292	/// @return Vector of tuples with admins address and his substrate mirror.293	/// If address is canonical then substrate mirror is zero and vice versa.294	/// @dev EVM selector for this function is: 0x5813216b,295	///  or in textual repr: collectionAdmins()296	function collectionAdmins() external view returns (EthCrossAccount[] memory);297298	/// Changes collection owner to another account299	///300	/// @dev Owner can be changed only by current owner301	/// @param newOwner new owner cross account302	/// @dev EVM selector for this function is: 0x6496c497,303	///  or in textual repr: changeCollectionOwnerCross((address,uint256))304	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;305}306307/// @dev Cross account struct308struct EthCrossAccount {309	address eth;310	uint256 sub;311}312313/// @dev anonymous struct314struct Tuple27 {315	CollectionPermissions field_0;316	bool field_1;317}318319enum CollectionPermissions {320	CollectionAdmin,321	TokenOwner322}323324/// @dev anonymous struct325struct Tuple24 {326	bool field_0;327	uint256[] field_1;328}329330enum CollectionLimits {331	AccountTokenOwnership,332	SponsoredDataSize,333	SponsoredDataRateLimit,334	TokenLimit,335	SponsorTransferTimeout,336	SponsorApproveTimeout,337	OwnerCanTransfer,338	OwnerCanDestroy,339	TransferEnabled340}341342/// @dev anonymous struct343struct Tuple19 {344	CollectionLimits field_0;345	bool field_1;346	uint256 field_2;347}348349/// @dev Property struct350struct Property {351	string key;352	bytes value;353}354355/// @dev the ERC-165 identifier for this interface is 0x5b7038cf356interface ERC20UniqueExtensions is Dummy, ERC165 {357	/// @notice A description for the collection.358	/// @dev EVM selector for this function is: 0x7284e416,359	///  or in textual repr: description()360	function description() external view returns (string memory);361362	/// @dev EVM selector for this function is: 0x0ecd0ab0,363	///  or in textual repr: approveCross((address,uint256),uint256)364	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);365366	// /// Burn tokens from account367	// /// @dev Function that burns an `amount` of the tokens of a given account,368	// /// deducting from the sender's allowance for said account.369	// /// @param from The account whose tokens will be burnt.370	// /// @param amount The amount that will be burnt.371	// /// @dev EVM selector for this function is: 0x79cc6790,372	// ///  or in textual repr: burnFrom(address,uint256)373	// function burnFrom(address from, uint256 amount) external returns (bool);374375	/// Burn tokens from account376	/// @dev Function that burns an `amount` of the tokens of a given account,377	/// deducting from the sender's allowance for said account.378	/// @param from The account whose tokens will be burnt.379	/// @param amount The amount that will be burnt.380	/// @dev EVM selector for this function is: 0xbb2f5a58,381	///  or in textual repr: burnFromCross((address,uint256),uint256)382	function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);383384	/// Mint tokens for multiple accounts.385	/// @param amounts array of pairs of account address and amount386	/// @dev EVM selector for this function is: 0x1acf2d55,387	///  or in textual repr: mintBulk((address,uint256)[])388	function mintBulk(Tuple8[] memory amounts) external returns (bool);389390	/// @dev EVM selector for this function is: 0x2ada85ff,391	///  or in textual repr: transferCross((address,uint256),uint256)392	function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);393394	/// @dev EVM selector for this function is: 0xd5cf430b,395	///  or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)396	function transferFromCross(397		EthCrossAccount memory from,398		EthCrossAccount memory to,399		uint256 amount400	) external returns (bool);401}402403/// @dev anonymous struct404struct Tuple8 {405	address field_0;406	uint256 field_1;407}408409/// @dev the ERC-165 identifier for this interface is 0x40c10f19410interface ERC20Mintable is Dummy, ERC165 {411	/// Mint tokens for `to` account.412	/// @param to account that will receive minted tokens413	/// @param amount amount of tokens to mint414	/// @dev EVM selector for this function is: 0x40c10f19,415	///  or in textual repr: mint(address,uint256)416	function mint(address to, uint256 amount) external returns (bool);417}418419/// @dev inlined interface420interface ERC20Events {421	event Transfer(address indexed from, address indexed to, uint256 value);422	event Approval(address indexed owner, address indexed spender, uint256 value);423}424425/// @dev the ERC-165 identifier for this interface is 0x8cb847c4426interface ERC20 is Dummy, ERC165, ERC20Events {427	/// @dev EVM selector for this function is: 0x06fdde03,428	///  or in textual repr: name()429	function name() external view returns (string memory);430431	/// @dev EVM selector for this function is: 0x95d89b41,432	///  or in textual repr: symbol()433	function symbol() external view returns (string memory);434435	/// @dev EVM selector for this function is: 0x18160ddd,436	///  or in textual repr: totalSupply()437	function totalSupply() external view returns (uint256);438439	/// @dev EVM selector for this function is: 0x313ce567,440	///  or in textual repr: decimals()441	function decimals() external view returns (uint8);442443	/// @dev EVM selector for this function is: 0x70a08231,444	///  or in textual repr: balanceOf(address)445	function balanceOf(address owner) external view returns (uint256);446447	/// @dev EVM selector for this function is: 0xa9059cbb,448	///  or in textual repr: transfer(address,uint256)449	function transfer(address to, uint256 amount) external returns (bool);450451	/// @dev EVM selector for this function is: 0x23b872dd,452	///  or in textual repr: transferFrom(address,address,uint256)453	function transferFrom(454		address from,455		address to,456		uint256 amount457	) external returns (bool);458459	/// @dev EVM selector for this function is: 0x095ea7b3,460	///  or in textual repr: approve(address,uint256)461	function approve(address spender, uint256 amount) external returns (bool);462463	/// @dev EVM selector for this function is: 0xdd62ed3e,464	///  or in textual repr: allowance(address,address)465	function allowance(address owner, address spender) external view returns (uint256);466467	/// @notice Returns collection helper contract address468	/// @dev EVM selector for this function is: 0x1896cce6,469	///  or in textual repr: collectionHelperAddress()470	function collectionHelperAddress() external view returns (address);471}472473interface 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
@@ -104,11 +104,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-<<<<<<< HEAD
-/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
-=======
-/// @dev the ERC-165 identifier for this interface is 0xf8ebdec0
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface,  changed signture for `setCollectionLimit`
+/// @dev the ERC-165 identifier for this interface is 0x81172a75
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -228,6 +224,7 @@
 	///  	"ownerCanTransfer",
 	/// 	"ownerCanDestroy",
 	/// 	"transfersEnabled"
+	/// @param status enable\disable limit. Works only with `true`.
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x88150bd0,
 	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
@@ -285,12 +282,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple31 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 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);
+	function collectionNestingPermissions() external view returns (Tuple38[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -404,6 +401,23 @@
 	uint256 sub;
 }
 
+/// @dev anonymous struct
+struct Tuple38 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
+struct Tuple35 {
+	bool field_0;
+	uint256[] field_1;
+}
+
 enum CollectionLimits {
 	AccountTokenOwnership,
 	SponsoredDataSize,
@@ -421,23 +435,6 @@
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
-}
-
-/// @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;
 }
 
 /// @dev anonymous struct
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -105,11 +105,7 @@
 }
 
 /// @title A contract that allows you to work with collections.
-<<<<<<< HEAD
-/// @dev the ERC-165 identifier for this interface is 0xb5e1747f
-=======
-/// @dev the ERC-165 identifier for this interface is 0xf8ebdec0
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface,  changed signture for `setCollectionLimit`
+/// @dev the ERC-165 identifier for this interface is 0x81172a75
 interface Collection is Dummy, ERC165 {
 	// /// Set collection property.
 	// ///
@@ -229,6 +225,7 @@
 	///  	"ownerCanTransfer",
 	/// 	"ownerCanDestroy",
 	/// 	"transfersEnabled"
+	/// @param status enable\disable limit. Works only with `true`.
 	/// @param value Value of the limit.
 	/// @dev EVM selector for this function is: 0x88150bd0,
 	///  or in textual repr: setCollectionLimit(uint8,bool,uint256)
@@ -286,12 +283,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple30 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 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);
+	function collectionNestingPermissions() external view returns (Tuple37[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -405,6 +402,23 @@
 	uint256 sub;
 }
 
+/// @dev anonymous struct
+struct Tuple37 {
+	CollectionPermissions field_0;
+	bool field_1;
+}
+
+enum CollectionPermissions {
+	CollectionAdmin,
+	TokenOwner
+}
+
+/// @dev anonymous struct
+struct Tuple34 {
+	bool field_0;
+	uint256[] field_1;
+}
+
 enum CollectionLimits {
 	AccountTokenOwnership,
 	SponsoredDataSize,
@@ -422,23 +436,6 @@
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
-}
-
-/// @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;
 }
 
 /// @dev anonymous struct