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.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "spender",15 "type": "address"16 },17 {18 "indexed": false,19 "internalType": "uint256",20 "name": "value",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "from",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "to",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "uint256",45 "name": "value",46 "type": "uint256"47 }48 ],49 "name": "Transfer",50 "type": "event"51 },52 {53 "inputs": [54 {55 "components": [56 { "internalType": "address", "name": "eth", "type": "address" },57 { "internalType": "uint256", "name": "sub", "type": "uint256" }58 ],59 "internalType": "struct EthCrossAccount",60 "name": "newAdmin",61 "type": "tuple"62 }63 ],64 "name": "addCollectionAdminCross",65 "outputs": [],66 "stateMutability": "nonpayable",67 "type": "function"68 },69 {70 "inputs": [71 {72 "components": [73 { "internalType": "address", "name": "eth", "type": "address" },74 { "internalType": "uint256", "name": "sub", "type": "uint256" }75 ],76 "internalType": "struct EthCrossAccount",77 "name": "user",78 "type": "tuple"79 }80 ],81 "name": "addToCollectionAllowListCross",82 "outputs": [],83 "stateMutability": "nonpayable",84 "type": "function"85 },86 {87 "inputs": [88 { "internalType": "address", "name": "owner", "type": "address" },89 { "internalType": "address", "name": "spender", "type": "address" }90 ],91 "name": "allowance",92 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],93 "stateMutability": "view",94 "type": "function"95 },96 {97 "inputs": [98 {99 "components": [100 { "internalType": "address", "name": "eth", "type": "address" },101 { "internalType": "uint256", "name": "sub", "type": "uint256" }102 ],103 "internalType": "struct EthCrossAccount",104 "name": "user",105 "type": "tuple"106 }107 ],108 "name": "allowlistedCross",109 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],110 "stateMutability": "view",111 "type": "function"112 },113 {114 "inputs": [115 { "internalType": "address", "name": "spender", "type": "address" },116 { "internalType": "uint256", "name": "amount", "type": "uint256" }117 ],118 "name": "approve",119 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],120 "stateMutability": "nonpayable",121 "type": "function"122 },123 {124 "inputs": [125 {126 "components": [127 { "internalType": "address", "name": "eth", "type": "address" },128 { "internalType": "uint256", "name": "sub", "type": "uint256" }129 ],130 "internalType": "struct EthCrossAccount",131 "name": "spender",132 "type": "tuple"133 },134 { "internalType": "uint256", "name": "amount", "type": "uint256" }135 ],136 "name": "approveCross",137 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],138 "stateMutability": "nonpayable",139 "type": "function"140 },141 {142 "inputs": [143 { "internalType": "address", "name": "owner", "type": "address" }144 ],145 "name": "balanceOf",146 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],147 "stateMutability": "view",148 "type": "function"149 },150 {151 "inputs": [152 {153 "components": [154 { "internalType": "address", "name": "eth", "type": "address" },155 { "internalType": "uint256", "name": "sub", "type": "uint256" }156 ],157 "internalType": "struct EthCrossAccount",158 "name": "from",159 "type": "tuple"160 },161 { "internalType": "uint256", "name": "amount", "type": "uint256" }162 ],163 "name": "burnFromCross",164 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],165 "stateMutability": "nonpayable",166 "type": "function"167 },168 {169 "inputs": [170 {171 "components": [172 { "internalType": "address", "name": "eth", "type": "address" },173 { "internalType": "uint256", "name": "sub", "type": "uint256" }174 ],175 "internalType": "struct EthCrossAccount",176 "name": "newOwner",177 "type": "tuple"178 }179 ],180 "name": "changeCollectionOwnerCross",181 "outputs": [],182 "stateMutability": "nonpayable",183 "type": "function"184 },185 {186 "inputs": [],187 "name": "collectionAdmins",188 "outputs": [189 {190 "components": [191 { "internalType": "address", "name": "eth", "type": "address" },192 { "internalType": "uint256", "name": "sub", "type": "uint256" }193 ],194 "internalType": "struct EthCrossAccount[]",195 "name": "",196 "type": "tuple[]"197 }198 ],199 "stateMutability": "view",200 "type": "function"201 },202 {203 "inputs": [],204 "name": "collectionHelperAddress",205 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],206 "stateMutability": "view",207 "type": "function"208 },209 {210 "inputs": [],211<<<<<<< HEAD212 "name": "collectionNestingPermissions",213=======214 "name": "collectionLimits",215>>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`216 "outputs": [217 {218 "components": [219 {220<<<<<<< HEAD221 "internalType": "enum CollectionPermissions",222 "name": "field_0",223 "type": "uint8"224 },225 { "internalType": "bool", "name": "field_1", "type": "bool" }226 ],227 "internalType": "struct Tuple24[]",228=======229 "internalType": "enum CollectionLimits",230 "name": "field_0",231 "type": "uint8"232 },233 { "internalType": "bool", "name": "field_1", "type": "bool" },234 { "internalType": "uint256", "name": "field_2", "type": "uint256" }235 ],236 "internalType": "struct Tuple20[]",237>>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`238 "name": "",239 "type": "tuple[]"240 }241 ],242 "stateMutability": "view",243 "type": "function"244 },245 {246 "inputs": [],247<<<<<<< HEAD248 "name": "collectionNestingRestrictedCollectionIds",249 "outputs": [250 {251 "components": [252 { "internalType": "bool", "name": "field_0", "type": "bool" },253 {254 "internalType": "uint256[]",255 "name": "field_1",256 "type": "uint256[]"257 }258 ],259 "internalType": "struct Tuple21",260 "name": "",261 "type": "tuple"262 }263 ],264 "stateMutability": "view",265 "type": "function"266 },267 {268 "inputs": [],269=======270>>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`271 "name": "collectionOwner",272 "outputs": [273 {274 "components": [275 { "internalType": "address", "name": "eth", "type": "address" },276 { "internalType": "uint256", "name": "sub", "type": "uint256" }277 ],278 "internalType": "struct EthCrossAccount",279 "name": "",280 "type": "tuple"281 }282 ],283 "stateMutability": "view",284 "type": "function"285 },286 {287 "inputs": [288 { "internalType": "string[]", "name": "keys", "type": "string[]" }289 ],290 "name": "collectionProperties",291 "outputs": [292 {293 "components": [294 { "internalType": "string", "name": "key", "type": "string" },295 { "internalType": "bytes", "name": "value", "type": "bytes" }296 ],297 "internalType": "struct Property[]",298 "name": "",299 "type": "tuple[]"300 }301 ],302 "stateMutability": "view",303 "type": "function"304 },305 {306 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],307 "name": "collectionProperty",308 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],309 "stateMutability": "view",310 "type": "function"311 },312 {313 "inputs": [],314 "name": "collectionSponsor",315 "outputs": [316 {317 "components": [318 { "internalType": "address", "name": "field_0", "type": "address" },319 { "internalType": "uint256", "name": "field_1", "type": "uint256" }320 ],321 "internalType": "struct Tuple8",322 "name": "",323 "type": "tuple"324 }325 ],326 "stateMutability": "view",327 "type": "function"328 },329 {330 "inputs": [],331 "name": "confirmCollectionSponsorship",332 "outputs": [],333 "stateMutability": "nonpayable",334 "type": "function"335 },336 {337 "inputs": [],338 "name": "contractAddress",339 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],340 "stateMutability": "view",341 "type": "function"342 },343 {344 "inputs": [],345 "name": "decimals",346 "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }],347 "stateMutability": "view",348 "type": "function"349 },350 {351 "inputs": [352 { "internalType": "string[]", "name": "keys", "type": "string[]" }353 ],354 "name": "deleteCollectionProperties",355 "outputs": [],356 "stateMutability": "nonpayable",357 "type": "function"358 },359 {360 "inputs": [],361 "name": "description",362 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],363 "stateMutability": "view",364 "type": "function"365 },366 {367 "inputs": [],368 "name": "hasCollectionPendingSponsor",369 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],370 "stateMutability": "view",371 "type": "function"372 },373 {374 "inputs": [375 {376 "components": [377 { "internalType": "address", "name": "eth", "type": "address" },378 { "internalType": "uint256", "name": "sub", "type": "uint256" }379 ],380 "internalType": "struct EthCrossAccount",381 "name": "user",382 "type": "tuple"383 }384 ],385 "name": "isOwnerOrAdminCross",386 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],387 "stateMutability": "view",388 "type": "function"389 },390 {391 "inputs": [392 { "internalType": "address", "name": "to", "type": "address" },393 { "internalType": "uint256", "name": "amount", "type": "uint256" }394 ],395 "name": "mint",396 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],397 "stateMutability": "nonpayable",398 "type": "function"399 },400 {401 "inputs": [402 {403 "components": [404 { "internalType": "address", "name": "field_0", "type": "address" },405 { "internalType": "uint256", "name": "field_1", "type": "uint256" }406 ],407 "internalType": "struct Tuple8[]",408 "name": "amounts",409 "type": "tuple[]"410 }411 ],412 "name": "mintBulk",413 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],414 "stateMutability": "nonpayable",415 "type": "function"416 },417 {418 "inputs": [],419 "name": "name",420 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],421 "stateMutability": "view",422 "type": "function"423 },424 {425 "inputs": [426 {427 "components": [428 { "internalType": "address", "name": "eth", "type": "address" },429 { "internalType": "uint256", "name": "sub", "type": "uint256" }430 ],431 "internalType": "struct EthCrossAccount",432 "name": "admin",433 "type": "tuple"434 }435 ],436 "name": "removeCollectionAdminCross",437 "outputs": [],438 "stateMutability": "nonpayable",439 "type": "function"440 },441 {442 "inputs": [],443 "name": "removeCollectionSponsor",444 "outputs": [],445 "stateMutability": "nonpayable",446 "type": "function"447 },448 {449 "inputs": [450 {451 "components": [452 { "internalType": "address", "name": "eth", "type": "address" },453 { "internalType": "uint256", "name": "sub", "type": "uint256" }454 ],455 "internalType": "struct EthCrossAccount",456 "name": "user",457 "type": "tuple"458 }459 ],460 "name": "removeFromCollectionAllowListCross",461 "outputs": [],462 "stateMutability": "nonpayable",463 "type": "function"464 },465 {466 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],467 "name": "setCollectionAccess",468 "outputs": [],469 "stateMutability": "nonpayable",470 "type": "function"471 },472 {473 "inputs": [474 {475 "internalType": "enum CollectionLimits",476 "name": "limit",477 "type": "uint8"478 },479 { "internalType": "bool", "name": "status", "type": "bool" },480 { "internalType": "uint256", "name": "value", "type": "uint256" }481 ],482 "name": "setCollectionLimit",483 "outputs": [],484 "stateMutability": "nonpayable",485 "type": "function"486 },487 {488 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],489 "name": "setCollectionMintMode",490 "outputs": [],491 "stateMutability": "nonpayable",492 "type": "function"493 },494 {495 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],496 "name": "setCollectionNesting",497 "outputs": [],498 "stateMutability": "nonpayable",499 "type": "function"500 },501 {502 "inputs": [503 { "internalType": "bool", "name": "enable", "type": "bool" },504 {505 "internalType": "address[]",506 "name": "collections",507 "type": "address[]"508 }509 ],510 "name": "setCollectionNesting",511 "outputs": [],512 "stateMutability": "nonpayable",513 "type": "function"514 },515 {516 "inputs": [517 {518 "components": [519 { "internalType": "string", "name": "key", "type": "string" },520 { "internalType": "bytes", "name": "value", "type": "bytes" }521 ],522 "internalType": "struct Property[]",523 "name": "properties",524 "type": "tuple[]"525 }526 ],527 "name": "setCollectionProperties",528 "outputs": [],529 "stateMutability": "nonpayable",530 "type": "function"531 },532 {533 "inputs": [534 {535 "components": [536 { "internalType": "address", "name": "eth", "type": "address" },537 { "internalType": "uint256", "name": "sub", "type": "uint256" }538 ],539 "internalType": "struct EthCrossAccount",540 "name": "sponsor",541 "type": "tuple"542 }543 ],544 "name": "setCollectionSponsorCross",545 "outputs": [],546 "stateMutability": "nonpayable",547 "type": "function"548 },549 {550 "inputs": [551 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }552 ],553 "name": "supportsInterface",554 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],555 "stateMutability": "view",556 "type": "function"557 },558 {559 "inputs": [],560 "name": "symbol",561 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],562 "stateMutability": "view",563 "type": "function"564 },565 {566 "inputs": [],567 "name": "totalSupply",568 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],569 "stateMutability": "view",570 "type": "function"571 },572 {573 "inputs": [574 { "internalType": "address", "name": "to", "type": "address" },575 { "internalType": "uint256", "name": "amount", "type": "uint256" }576 ],577 "name": "transfer",578 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],579 "stateMutability": "nonpayable",580 "type": "function"581 },582 {583 "inputs": [584 {585 "components": [586 { "internalType": "address", "name": "eth", "type": "address" },587 { "internalType": "uint256", "name": "sub", "type": "uint256" }588 ],589 "internalType": "struct EthCrossAccount",590 "name": "to",591 "type": "tuple"592 },593 { "internalType": "uint256", "name": "amount", "type": "uint256" }594 ],595 "name": "transferCross",596 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],597 "stateMutability": "nonpayable",598 "type": "function"599 },600 {601 "inputs": [602 { "internalType": "address", "name": "from", "type": "address" },603 { "internalType": "address", "name": "to", "type": "address" },604 { "internalType": "uint256", "name": "amount", "type": "uint256" }605 ],606 "name": "transferFrom",607 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],608 "stateMutability": "nonpayable",609 "type": "function"610 },611 {612 "inputs": [613 {614 "components": [615 { "internalType": "address", "name": "eth", "type": "address" },616 { "internalType": "uint256", "name": "sub", "type": "uint256" }617 ],618 "internalType": "struct EthCrossAccount",619 "name": "from",620 "type": "tuple"621 },622 {623 "components": [624 { "internalType": "address", "name": "eth", "type": "address" },625 { "internalType": "uint256", "name": "sub", "type": "uint256" }626 ],627 "internalType": "struct EthCrossAccount",628 "name": "to",629 "type": "tuple"630 },631 { "internalType": "uint256", "name": "amount", "type": "uint256" }632 ],633 "name": "transferFromCross",634 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],635 "stateMutability": "nonpayable",636 "type": "function"637 },638 {639 "inputs": [],640 "name": "uniqueCollectionType",641 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],642 "stateMutability": "view",643 "type": "function"644 }645]1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "spender",15 "type": "address"16 },17 {18 "indexed": false,19 "internalType": "uint256",20 "name": "value",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "from",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "to",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "uint256",45 "name": "value",46 "type": "uint256"47 }48 ],49 "name": "Transfer",50 "type": "event"51 },52 {53 "inputs": [54 {55 "components": [56 { "internalType": "address", "name": "eth", "type": "address" },57 { "internalType": "uint256", "name": "sub", "type": "uint256" }58 ],59 "internalType": "struct EthCrossAccount",60 "name": "newAdmin",61 "type": "tuple"62 }63 ],64 "name": "addCollectionAdminCross",65 "outputs": [],66 "stateMutability": "nonpayable",67 "type": "function"68 },69 {70 "inputs": [71 {72 "components": [73 { "internalType": "address", "name": "eth", "type": "address" },74 { "internalType": "uint256", "name": "sub", "type": "uint256" }75 ],76 "internalType": "struct EthCrossAccount",77 "name": "user",78 "type": "tuple"79 }80 ],81 "name": "addToCollectionAllowListCross",82 "outputs": [],83 "stateMutability": "nonpayable",84 "type": "function"85 },86 {87 "inputs": [88 { "internalType": "address", "name": "owner", "type": "address" },89 { "internalType": "address", "name": "spender", "type": "address" }90 ],91 "name": "allowance",92 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],93 "stateMutability": "view",94 "type": "function"95 },96 {97 "inputs": [98 {99 "components": [100 { "internalType": "address", "name": "eth", "type": "address" },101 { "internalType": "uint256", "name": "sub", "type": "uint256" }102 ],103 "internalType": "struct EthCrossAccount",104 "name": "user",105 "type": "tuple"106 }107 ],108 "name": "allowlistedCross",109 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],110 "stateMutability": "view",111 "type": "function"112 },113 {114 "inputs": [115 { "internalType": "address", "name": "spender", "type": "address" },116 { "internalType": "uint256", "name": "amount", "type": "uint256" }117 ],118 "name": "approve",119 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],120 "stateMutability": "nonpayable",121 "type": "function"122 },123 {124 "inputs": [125 {126 "components": [127 { "internalType": "address", "name": "eth", "type": "address" },128 { "internalType": "uint256", "name": "sub", "type": "uint256" }129 ],130 "internalType": "struct EthCrossAccount",131 "name": "spender",132 "type": "tuple"133 },134 { "internalType": "uint256", "name": "amount", "type": "uint256" }135 ],136 "name": "approveCross",137 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],138 "stateMutability": "nonpayable",139 "type": "function"140 },141 {142 "inputs": [143 { "internalType": "address", "name": "owner", "type": "address" }144 ],145 "name": "balanceOf",146 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],147 "stateMutability": "view",148 "type": "function"149 },150 {151 "inputs": [152 {153 "components": [154 { "internalType": "address", "name": "eth", "type": "address" },155 { "internalType": "uint256", "name": "sub", "type": "uint256" }156 ],157 "internalType": "struct EthCrossAccount",158 "name": "from",159 "type": "tuple"160 },161 { "internalType": "uint256", "name": "amount", "type": "uint256" }162 ],163 "name": "burnFromCross",164 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],165 "stateMutability": "nonpayable",166 "type": "function"167 },168 {169 "inputs": [170 {171 "components": [172 { "internalType": "address", "name": "eth", "type": "address" },173 { "internalType": "uint256", "name": "sub", "type": "uint256" }174 ],175 "internalType": "struct EthCrossAccount",176 "name": "newOwner",177 "type": "tuple"178 }179 ],180 "name": "changeCollectionOwnerCross",181 "outputs": [],182 "stateMutability": "nonpayable",183 "type": "function"184 },185 {186 "inputs": [],187 "name": "collectionAdmins",188 "outputs": [189 {190 "components": [191 { "internalType": "address", "name": "eth", "type": "address" },192 { "internalType": "uint256", "name": "sub", "type": "uint256" }193 ],194 "internalType": "struct EthCrossAccount[]",195 "name": "",196 "type": "tuple[]"197 }198 ],199 "stateMutability": "view",200 "type": "function"201 },202 {203 "inputs": [],204 "name": "collectionHelperAddress",205 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],206 "stateMutability": "view",207 "type": "function"208 },209 {210 "inputs": [],211 "name": "collectionLimits",212 "outputs": [213 {214 "components": [215 {216 "internalType": "enum CollectionLimits",217 "name": "field_0",218 "type": "uint8"219 },220 { "internalType": "bool", "name": "field_1", "type": "bool" },221 { "internalType": "uint256", "name": "field_2", "type": "uint256" }222 ],223 "internalType": "struct Tuple20[]",224 "name": "",225 "type": "tuple[]"226 }227 ],228 "stateMutability": "view",229 "type": "function"230 },231 {232 "inputs": [],233 "name": "collectionNestingPermissions",234 "outputs": [235 {236 "components": [237 {238 "internalType": "enum CollectionPermissions",239 "name": "field_0",240 "type": "uint8"241 },242 { "internalType": "bool", "name": "field_1", "type": "bool" }243 ],244 "internalType": "struct Tuple29[]",245 "name": "",246 "type": "tuple[]"247 }248 ],249 "stateMutability": "view",250 "type": "function"251 },252 {253 "inputs": [],254 "name": "collectionNestingRestrictedCollectionIds",255 "outputs": [256 {257 "components": [258 { "internalType": "bool", "name": "field_0", "type": "bool" },259 {260 "internalType": "uint256[]",261 "name": "field_1",262 "type": "uint256[]"263 }264 ],265 "internalType": "struct Tuple26",266 "name": "",267 "type": "tuple"268 }269 ],270 "stateMutability": "view",271 "type": "function"272 },273 {274 "inputs": [],275 "name": "collectionOwner",276 "outputs": [277 {278 "components": [279 { "internalType": "address", "name": "eth", "type": "address" },280 { "internalType": "uint256", "name": "sub", "type": "uint256" }281 ],282 "internalType": "struct EthCrossAccount",283 "name": "",284 "type": "tuple"285 }286 ],287 "stateMutability": "view",288 "type": "function"289 },290 {291 "inputs": [292 { "internalType": "string[]", "name": "keys", "type": "string[]" }293 ],294 "name": "collectionProperties",295 "outputs": [296 {297 "components": [298 { "internalType": "string", "name": "key", "type": "string" },299 { "internalType": "bytes", "name": "value", "type": "bytes" }300 ],301 "internalType": "struct Property[]",302 "name": "",303 "type": "tuple[]"304 }305 ],306 "stateMutability": "view",307 "type": "function"308 },309 {310 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],311 "name": "collectionProperty",312 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],313 "stateMutability": "view",314 "type": "function"315 },316 {317 "inputs": [],318 "name": "collectionSponsor",319 "outputs": [320 {321 "components": [322 { "internalType": "address", "name": "field_0", "type": "address" },323 { "internalType": "uint256", "name": "field_1", "type": "uint256" }324 ],325 "internalType": "struct Tuple8",326 "name": "",327 "type": "tuple"328 }329 ],330 "stateMutability": "view",331 "type": "function"332 },333 {334 "inputs": [],335 "name": "confirmCollectionSponsorship",336 "outputs": [],337 "stateMutability": "nonpayable",338 "type": "function"339 },340 {341 "inputs": [],342 "name": "contractAddress",343 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],344 "stateMutability": "view",345 "type": "function"346 },347 {348 "inputs": [],349 "name": "decimals",350 "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }],351 "stateMutability": "view",352 "type": "function"353 },354 {355 "inputs": [356 { "internalType": "string[]", "name": "keys", "type": "string[]" }357 ],358 "name": "deleteCollectionProperties",359 "outputs": [],360 "stateMutability": "nonpayable",361 "type": "function"362 },363 {364 "inputs": [],365 "name": "description",366 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],367 "stateMutability": "view",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "hasCollectionPendingSponsor",373 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],374 "stateMutability": "view",375 "type": "function"376 },377 {378 "inputs": [379 {380 "components": [381 { "internalType": "address", "name": "eth", "type": "address" },382 { "internalType": "uint256", "name": "sub", "type": "uint256" }383 ],384 "internalType": "struct EthCrossAccount",385 "name": "user",386 "type": "tuple"387 }388 ],389 "name": "isOwnerOrAdminCross",390 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],391 "stateMutability": "view",392 "type": "function"393 },394 {395 "inputs": [396 { "internalType": "address", "name": "to", "type": "address" },397 { "internalType": "uint256", "name": "amount", "type": "uint256" }398 ],399 "name": "mint",400 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],401 "stateMutability": "nonpayable",402 "type": "function"403 },404 {405 "inputs": [406 {407 "components": [408 { "internalType": "address", "name": "field_0", "type": "address" },409 { "internalType": "uint256", "name": "field_1", "type": "uint256" }410 ],411 "internalType": "struct Tuple8[]",412 "name": "amounts",413 "type": "tuple[]"414 }415 ],416 "name": "mintBulk",417 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],418 "stateMutability": "nonpayable",419 "type": "function"420 },421 {422 "inputs": [],423 "name": "name",424 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],425 "stateMutability": "view",426 "type": "function"427 },428 {429 "inputs": [430 {431 "components": [432 { "internalType": "address", "name": "eth", "type": "address" },433 { "internalType": "uint256", "name": "sub", "type": "uint256" }434 ],435 "internalType": "struct EthCrossAccount",436 "name": "admin",437 "type": "tuple"438 }439 ],440 "name": "removeCollectionAdminCross",441 "outputs": [],442 "stateMutability": "nonpayable",443 "type": "function"444 },445 {446 "inputs": [],447 "name": "removeCollectionSponsor",448 "outputs": [],449 "stateMutability": "nonpayable",450 "type": "function"451 },452 {453 "inputs": [454 {455 "components": [456 { "internalType": "address", "name": "eth", "type": "address" },457 { "internalType": "uint256", "name": "sub", "type": "uint256" }458 ],459 "internalType": "struct EthCrossAccount",460 "name": "user",461 "type": "tuple"462 }463 ],464 "name": "removeFromCollectionAllowListCross",465 "outputs": [],466 "stateMutability": "nonpayable",467 "type": "function"468 },469 {470 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],471 "name": "setCollectionAccess",472 "outputs": [],473 "stateMutability": "nonpayable",474 "type": "function"475 },476 {477 "inputs": [478 {479 "internalType": "enum CollectionLimits",480 "name": "limit",481 "type": "uint8"482 },483 { "internalType": "bool", "name": "status", "type": "bool" },484 { "internalType": "uint256", "name": "value", "type": "uint256" }485 ],486 "name": "setCollectionLimit",487 "outputs": [],488 "stateMutability": "nonpayable",489 "type": "function"490 },491 {492 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],493 "name": "setCollectionMintMode",494 "outputs": [],495 "stateMutability": "nonpayable",496 "type": "function"497 },498 {499 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],500 "name": "setCollectionNesting",501 "outputs": [],502 "stateMutability": "nonpayable",503 "type": "function"504 },505 {506 "inputs": [507 { "internalType": "bool", "name": "enable", "type": "bool" },508 {509 "internalType": "address[]",510 "name": "collections",511 "type": "address[]"512 }513 ],514 "name": "setCollectionNesting",515 "outputs": [],516 "stateMutability": "nonpayable",517 "type": "function"518 },519 {520 "inputs": [521 {522 "components": [523 { "internalType": "string", "name": "key", "type": "string" },524 { "internalType": "bytes", "name": "value", "type": "bytes" }525 ],526 "internalType": "struct Property[]",527 "name": "properties",528 "type": "tuple[]"529 }530 ],531 "name": "setCollectionProperties",532 "outputs": [],533 "stateMutability": "nonpayable",534 "type": "function"535 },536 {537 "inputs": [538 {539 "components": [540 { "internalType": "address", "name": "eth", "type": "address" },541 { "internalType": "uint256", "name": "sub", "type": "uint256" }542 ],543 "internalType": "struct EthCrossAccount",544 "name": "sponsor",545 "type": "tuple"546 }547 ],548 "name": "setCollectionSponsorCross",549 "outputs": [],550 "stateMutability": "nonpayable",551 "type": "function"552 },553 {554 "inputs": [555 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }556 ],557 "name": "supportsInterface",558 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],559 "stateMutability": "view",560 "type": "function"561 },562 {563 "inputs": [],564 "name": "symbol",565 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],566 "stateMutability": "view",567 "type": "function"568 },569 {570 "inputs": [],571 "name": "totalSupply",572 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],573 "stateMutability": "view",574 "type": "function"575 },576 {577 "inputs": [578 { "internalType": "address", "name": "to", "type": "address" },579 { "internalType": "uint256", "name": "amount", "type": "uint256" }580 ],581 "name": "transfer",582 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],583 "stateMutability": "nonpayable",584 "type": "function"585 },586 {587 "inputs": [588 {589 "components": [590 { "internalType": "address", "name": "eth", "type": "address" },591 { "internalType": "uint256", "name": "sub", "type": "uint256" }592 ],593 "internalType": "struct EthCrossAccount",594 "name": "to",595 "type": "tuple"596 },597 { "internalType": "uint256", "name": "amount", "type": "uint256" }598 ],599 "name": "transferCross",600 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],601 "stateMutability": "nonpayable",602 "type": "function"603 },604 {605 "inputs": [606 { "internalType": "address", "name": "from", "type": "address" },607 { "internalType": "address", "name": "to", "type": "address" },608 { "internalType": "uint256", "name": "amount", "type": "uint256" }609 ],610 "name": "transferFrom",611 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],612 "stateMutability": "nonpayable",613 "type": "function"614 },615 {616 "inputs": [617 {618 "components": [619 { "internalType": "address", "name": "eth", "type": "address" },620 { "internalType": "uint256", "name": "sub", "type": "uint256" }621 ],622 "internalType": "struct EthCrossAccount",623 "name": "from",624 "type": "tuple"625 },626 {627 "components": [628 { "internalType": "address", "name": "eth", "type": "address" },629 { "internalType": "uint256", "name": "sub", "type": "uint256" }630 ],631 "internalType": "struct EthCrossAccount",632 "name": "to",633 "type": "tuple"634 },635 { "internalType": "uint256", "name": "amount", "type": "uint256" }636 ],637 "name": "transferFromCross",638 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],639 "stateMutability": "nonpayable",640 "type": "function"641 },642 {643 "inputs": [],644 "name": "uniqueCollectionType",645 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],646 "stateMutability": "view",647 "type": "function"648 }649]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.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,11 +13,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.
// ///
@@ -137,6 +133,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)
@@ -194,12 +191,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple20 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple23[] memory);
+ function collectionNestingPermissions() external view returns (Tuple27[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -313,9 +310,8 @@
uint256 sub;
}
-<<<<<<< HEAD
/// @dev anonymous struct
-struct Tuple23 {
+struct Tuple27 {
CollectionPermissions field_0;
bool field_1;
}
@@ -326,10 +322,11 @@
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple24 {
bool field_0;
uint256[] field_1;
-=======
+}
+
enum CollectionLimits {
AccountTokenOwnership,
SponsoredDataSize,
@@ -347,7 +344,6 @@
CollectionLimits field_0;
bool field_1;
uint256 field_2;
->>>>>>> 32e011ce... added `collectionLimits` function in `Collection` interface, changed signture for `setCollectionLimit`
}
/// @dev Property struct
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