difftreelog
chore generate stubs
in: master
11 files changed
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/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;
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/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;
pallets/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;
tests/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": [
{
tests/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"
}
tests/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"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth1// 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<<<<<<< HEAD17/// @dev the ERC-165 identifier for this interface is 0xb5e1747f18=======19/// @dev the ERC-165 identifier for this interface is 0xf8ebdec020>>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`21interface Collection is Dummy, ERC165 {22 // /// Set collection property.23 // ///24 // /// @param key Property key.25 // /// @param value Propery value.26 // /// @dev EVM selector for this function is: 0x2f073f66,27 // /// or in textual repr: setCollectionProperty(string,bytes)28 // function setCollectionProperty(string memory key, bytes memory value) external;2930 /// Set collection properties.31 ///32 /// @param properties Vector of properties key/value pair.33 /// @dev EVM selector for this function is: 0x50b26b2a,34 /// or in textual repr: setCollectionProperties((string,bytes)[])35 function setCollectionProperties(Property[] memory properties) external;3637 // /// Delete collection property.38 // ///39 // /// @param key Property key.40 // /// @dev EVM selector for this function is: 0x7b7debce,41 // /// or in textual repr: deleteCollectionProperty(string)42 // function deleteCollectionProperty(string memory key) external;4344 /// Delete collection properties.45 ///46 /// @param keys Properties keys.47 /// @dev EVM selector for this function is: 0xee206ee3,48 /// or in textual repr: deleteCollectionProperties(string[])49 function deleteCollectionProperties(string[] memory keys) external;5051 /// Get collection property.52 ///53 /// @dev Throws error if key not found.54 ///55 /// @param key Property key.56 /// @return bytes The property corresponding to the key.57 /// @dev EVM selector for this function is: 0xcf24fd6d,58 /// or in textual repr: collectionProperty(string)59 function collectionProperty(string memory key) external view returns (bytes memory);6061 /// Get collection properties.62 ///63 /// @param keys Properties keys. Empty keys for all propertyes.64 /// @return Vector of properties key/value pairs.65 /// @dev EVM selector for this function is: 0x285fb8e6,66 /// or in textual repr: collectionProperties(string[])67 function collectionProperties(string[] memory keys) external view returns (Property[] memory);6869 // /// Set the sponsor of the collection.70 // ///71 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.72 // ///73 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.74 // /// @dev EVM selector for this function is: 0x7623402e,75 // /// or in textual repr: setCollectionSponsor(address)76 // function setCollectionSponsor(address sponsor) external;7778 /// Set the sponsor of the collection.79 ///80 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.81 ///82 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.83 /// @dev EVM selector for this function is: 0x84a1d5a8,84 /// or in textual repr: setCollectionSponsorCross((address,uint256))85 function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;8687 /// Whether there is a pending sponsor.88 /// @dev EVM selector for this function is: 0x058ac185,89 /// or in textual repr: hasCollectionPendingSponsor()90 function hasCollectionPendingSponsor() external view returns (bool);9192 /// Collection sponsorship confirmation.93 ///94 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.95 /// @dev EVM selector for this function is: 0x3c50e97a,96 /// or in textual repr: confirmCollectionSponsorship()97 function confirmCollectionSponsorship() external;9899 /// Remove collection sponsor.100 /// @dev EVM selector for this function is: 0x6e0326a3,101 /// or in textual repr: removeCollectionSponsor()102 function removeCollectionSponsor() external;103104 /// Get current sponsor.105 ///106 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.107 /// @dev EVM selector for this function is: 0x6ec0a9f1,108 /// or in textual repr: collectionSponsor()109 function collectionSponsor() external view returns (Tuple8 memory);110111 /// Get current collection limits.112 ///113 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:114 /// "accountTokenOwnershipLimit",115 /// "sponsoredDataSize",116 /// "sponsoredDataRateLimit",117 /// "tokenLimit",118 /// "sponsorTransferTimeout",119 /// "sponsorApproveTimeout"120 /// "ownerCanTransfer",121 /// "ownerCanDestroy",122 /// "transfersEnabled"123 /// Return `false` if a limit not set.124 /// @dev EVM selector for this function is: 0xf63bc572,125 /// or in textual repr: collectionLimits()126 function collectionLimits() external view returns (Tuple19[] memory);127128 /// Set limits for the collection.129 /// @dev Throws error if limit not found.130 /// @param limit Name of the limit. Valid names:131 /// "accountTokenOwnershipLimit",132 /// "sponsoredDataSize",133 /// "sponsoredDataRateLimit",134 /// "tokenLimit",135 /// "sponsorTransferTimeout",136 /// "sponsorApproveTimeout"137 /// "ownerCanTransfer",138 /// "ownerCanDestroy",139 /// "transfersEnabled"140 /// @param value Value of the limit.141 /// @dev EVM selector for this function is: 0x88150bd0,142 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)143 function setCollectionLimit(144 CollectionLimits limit,145 bool status,146 uint256 value147 ) external;148149 /// Get contract address.150 /// @dev EVM selector for this function is: 0xf6b4dfb4,151 /// or in textual repr: contractAddress()152 function contractAddress() external view returns (address);153154 /// Add collection admin.155 /// @param newAdmin Cross account administrator address.156 /// @dev EVM selector for this function is: 0x859aa7d6,157 /// or in textual repr: addCollectionAdminCross((address,uint256))158 function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;159160 /// Remove collection admin.161 /// @param admin Cross account administrator address.162 /// @dev EVM selector for this function is: 0x6c0cd173,163 /// or in textual repr: removeCollectionAdminCross((address,uint256))164 function removeCollectionAdminCross(EthCrossAccount memory admin) external;165166 // /// Add collection admin.167 // /// @param newAdmin Address of the added administrator.168 // /// @dev EVM selector for this function is: 0x92e462c7,169 // /// or in textual repr: addCollectionAdmin(address)170 // function addCollectionAdmin(address newAdmin) external;171172 // /// Remove collection admin.173 // ///174 // /// @param admin Address of the removed administrator.175 // /// @dev EVM selector for this function is: 0xfafd7b42,176 // /// or in textual repr: removeCollectionAdmin(address)177 // function removeCollectionAdmin(address admin) external;178179 /// Toggle accessibility of collection nesting.180 ///181 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'182 /// @dev EVM selector for this function is: 0x112d4586,183 /// or in textual repr: setCollectionNesting(bool)184 function setCollectionNesting(bool enable) external;185186 /// Toggle accessibility of collection nesting.187 ///188 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'189 /// @param collections Addresses of collections that will be available for nesting.190 /// @dev EVM selector for this function is: 0x64872396,191 /// or in textual repr: setCollectionNesting(bool,address[])192 function setCollectionNesting(bool enable, address[] memory collections) external;193194 /// Returns nesting for a collection195 /// @dev EVM selector for this function is: 0x22d25bfe,196 /// or in textual repr: collectionNestingRestrictedCollectionIds()197 function collectionNestingRestrictedCollectionIds() external view returns (Tuple20 memory);198199 /// Returns permissions for a collection200 /// @dev EVM selector for this function is: 0x5b2eaf4b,201 /// or in textual repr: collectionNestingPermissions()202 function collectionNestingPermissions() external view returns (Tuple23[] memory);203204 /// Set the collection access method.205 /// @param mode Access mode206 /// 0 for Normal207 /// 1 for AllowList208 /// @dev EVM selector for this function is: 0x41835d4c,209 /// or in textual repr: setCollectionAccess(uint8)210 function setCollectionAccess(uint8 mode) external;211212 /// Checks that user allowed to operate with collection.213 ///214 /// @param user User address to check.215 /// @dev EVM selector for this function is: 0x91b6df49,216 /// or in textual repr: allowlistedCross((address,uint256))217 function allowlistedCross(EthCrossAccount memory user) external view returns (bool);218219 // /// Add the user to the allowed list.220 // ///221 // /// @param user Address of a trusted user.222 // /// @dev EVM selector for this function is: 0x67844fe6,223 // /// or in textual repr: addToCollectionAllowList(address)224 // function addToCollectionAllowList(address user) external;225226 /// Add user to allowed list.227 ///228 /// @param user User cross account address.229 /// @dev EVM selector for this function is: 0xa0184a3a,230 /// or in textual repr: addToCollectionAllowListCross((address,uint256))231 function addToCollectionAllowListCross(EthCrossAccount memory user) external;232233 // /// Remove the user from the allowed list.234 // ///235 // /// @param user Address of a removed user.236 // /// @dev EVM selector for this function is: 0x85c51acb,237 // /// or in textual repr: removeFromCollectionAllowList(address)238 // function removeFromCollectionAllowList(address user) external;239240 /// Remove user from allowed list.241 ///242 /// @param user User cross account address.243 /// @dev EVM selector for this function is: 0x09ba452a,244 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))245 function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;246247 /// Switch permission for minting.248 ///249 /// @param mode Enable if "true".250 /// @dev EVM selector for this function is: 0x00018e84,251 /// or in textual repr: setCollectionMintMode(bool)252 function setCollectionMintMode(bool mode) external;253254 // /// Check that account is the owner or admin of the collection255 // ///256 // /// @param user account to verify257 // /// @return "true" if account is the owner or admin258 // /// @dev EVM selector for this function is: 0x9811b0c7,259 // /// or in textual repr: isOwnerOrAdmin(address)260 // function isOwnerOrAdmin(address user) external view returns (bool);261262 /// Check that account is the owner or admin of the collection263 ///264 /// @param user User cross account to verify265 /// @return "true" if account is the owner or admin266 /// @dev EVM selector for this function is: 0x3e75a905,267 /// or in textual repr: isOwnerOrAdminCross((address,uint256))268 function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);269270 /// Returns collection type271 ///272 /// @return `Fungible` or `NFT` or `ReFungible`273 /// @dev EVM selector for this function is: 0xd34b55b8,274 /// or in textual repr: uniqueCollectionType()275 function uniqueCollectionType() external view returns (string memory);276277 /// Get collection owner.278 ///279 /// @return Tuble with sponsor address and his substrate mirror.280 /// If address is canonical then substrate mirror is zero and vice versa.281 /// @dev EVM selector for this function is: 0xdf727d3b,282 /// or in textual repr: collectionOwner()283 function collectionOwner() external view returns (EthCrossAccount memory);284285 // /// Changes collection owner to another account286 // ///287 // /// @dev Owner can be changed only by current owner288 // /// @param newOwner new owner account289 // /// @dev EVM selector for this function is: 0x4f53e226,290 // /// or in textual repr: changeCollectionOwner(address)291 // function changeCollectionOwner(address newOwner) external;292293 /// Get collection administrators294 ///295 /// @return Vector of tuples with admins address and his substrate mirror.296 /// If address is canonical then substrate mirror is zero and vice versa.297 /// @dev EVM selector for this function is: 0x5813216b,298 /// or in textual repr: collectionAdmins()299 function collectionAdmins() external view returns (EthCrossAccount[] memory);300301 /// Changes collection owner to another account302 ///303 /// @dev Owner can be changed only by current owner304 /// @param newOwner new owner cross account305 /// @dev EVM selector for this function is: 0x6496c497,306 /// or in textual repr: changeCollectionOwnerCross((address,uint256))307 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;308}309310/// @dev Cross account struct311struct EthCrossAccount {312 address eth;313 uint256 sub;314}315316<<<<<<< HEAD317/// @dev anonymous struct318struct Tuple23 {319 CollectionPermissions field_0;320 bool field_1;321}322323enum CollectionPermissions {324 CollectionAdmin,325 TokenOwner326}327328/// @dev anonymous struct329struct Tuple20 {330 bool field_0;331 uint256[] field_1;332=======333enum CollectionLimits {334 AccountTokenOwnership,335 SponsoredDataSize,336 SponsoredDataRateLimit,337 TokenLimit,338 SponsorTransferTimeout,339 SponsorApproveTimeout,340 OwnerCanTransfer,341 OwnerCanDestroy,342 TransferEnabled343}344345/// @dev anonymous struct346struct Tuple19 {347 CollectionLimits field_0;348 bool field_1;349 uint256 field_2;350>>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`351}352353/// @dev Property struct354struct Property {355 string key;356 bytes value;357}358359/// @dev the ERC-165 identifier for this interface is 0x5b7038cf360interface ERC20UniqueExtensions is Dummy, ERC165 {361 /// @notice A description for the collection.362 /// @dev EVM selector for this function is: 0x7284e416,363 /// or in textual repr: description()364 function description() external view returns (string memory);365366 /// @dev EVM selector for this function is: 0x0ecd0ab0,367 /// or in textual repr: approveCross((address,uint256),uint256)368 function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);369370 // /// Burn tokens from account371 // /// @dev Function that burns an `amount` of the tokens of a given account,372 // /// deducting from the sender's allowance for said account.373 // /// @param from The account whose tokens will be burnt.374 // /// @param amount The amount that will be burnt.375 // /// @dev EVM selector for this function is: 0x79cc6790,376 // /// or in textual repr: burnFrom(address,uint256)377 // function burnFrom(address from, uint256 amount) external returns (bool);378379 /// Burn tokens from account380 /// @dev Function that burns an `amount` of the tokens of a given account,381 /// deducting from the sender's allowance for said account.382 /// @param from The account whose tokens will be burnt.383 /// @param amount The amount that will be burnt.384 /// @dev EVM selector for this function is: 0xbb2f5a58,385 /// or in textual repr: burnFromCross((address,uint256),uint256)386 function burnFromCross(EthCrossAccount memory from, uint256 amount) external returns (bool);387388 /// Mint tokens for multiple accounts.389 /// @param amounts array of pairs of account address and amount390 /// @dev EVM selector for this function is: 0x1acf2d55,391 /// or in textual repr: mintBulk((address,uint256)[])392 function mintBulk(Tuple8[] memory amounts) external returns (bool);393394 /// @dev EVM selector for this function is: 0x2ada85ff,395 /// or in textual repr: transferCross((address,uint256),uint256)396 function transferCross(EthCrossAccount memory to, uint256 amount) external returns (bool);397398 /// @dev EVM selector for this function is: 0xd5cf430b,399 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)400 function transferFromCross(401 EthCrossAccount memory from,402 EthCrossAccount memory to,403 uint256 amount404 ) external returns (bool);405}406407/// @dev anonymous struct408struct Tuple8 {409 address field_0;410 uint256 field_1;411}412413/// @dev the ERC-165 identifier for this interface is 0x40c10f19414interface ERC20Mintable is Dummy, ERC165 {415 /// Mint tokens for `to` account.416 /// @param to account that will receive minted tokens417 /// @param amount amount of tokens to mint418 /// @dev EVM selector for this function is: 0x40c10f19,419 /// or in textual repr: mint(address,uint256)420 function mint(address to, uint256 amount) external returns (bool);421}422423/// @dev inlined interface424interface ERC20Events {425 event Transfer(address indexed from, address indexed to, uint256 value);426 event Approval(address indexed owner, address indexed spender, uint256 value);427}428429/// @dev the ERC-165 identifier for this interface is 0x8cb847c4430interface ERC20 is Dummy, ERC165, ERC20Events {431 /// @dev EVM selector for this function is: 0x06fdde03,432 /// or in textual repr: name()433 function name() external view returns (string memory);434435 /// @dev EVM selector for this function is: 0x95d89b41,436 /// or in textual repr: symbol()437 function symbol() external view returns (string memory);438439 /// @dev EVM selector for this function is: 0x18160ddd,440 /// or in textual repr: totalSupply()441 function totalSupply() external view returns (uint256);442443 /// @dev EVM selector for this function is: 0x313ce567,444 /// or in textual repr: decimals()445 function decimals() external view returns (uint8);446447 /// @dev EVM selector for this function is: 0x70a08231,448 /// or in textual repr: balanceOf(address)449 function balanceOf(address owner) external view returns (uint256);450451 /// @dev EVM selector for this function is: 0xa9059cbb,452 /// or in textual repr: transfer(address,uint256)453 function transfer(address to, uint256 amount) external returns (bool);454455 /// @dev EVM selector for this function is: 0x23b872dd,456 /// or in textual repr: transferFrom(address,address,uint256)457 function transferFrom(458 address from,459 address to,460 uint256 amount461 ) external returns (bool);462463 /// @dev EVM selector for this function is: 0x095ea7b3,464 /// or in textual repr: approve(address,uint256)465 function approve(address spender, uint256 amount) external returns (bool);466467 /// @dev EVM selector for this function is: 0xdd62ed3e,468 /// or in textual repr: allowance(address,address)469 function allowance(address owner, address spender) external view returns (uint256);470471 /// @notice Returns collection helper contract address472 /// @dev EVM selector for this function is: 0x1896cce6,473 /// or in textual repr: collectionHelperAddress()474 function collectionHelperAddress() external view returns (address);475}476477interface UniqueFungible is Dummy, ERC165, ERC20, ERC20Mintable, ERC20UniqueExtensions, Collection {}tests/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
tests/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