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.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": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",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": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct EthCrossAccount",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct EthCrossAccount",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 {120 "components": [121 { "internalType": "address", "name": "eth", "type": "address" },122 { "internalType": "uint256", "name": "sub", "type": "uint256" }123 ],124 "internalType": "struct EthCrossAccount",125 "name": "user",126 "type": "tuple"127 }128 ],129 "name": "allowlistedCross",130 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],131 "stateMutability": "view",132 "type": "function"133 },134 {135 "inputs": [136 { "internalType": "address", "name": "approved", "type": "address" },137 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }138 ],139 "name": "approve",140 "outputs": [],141 "stateMutability": "nonpayable",142 "type": "function"143 },144 {145 "inputs": [146 { "internalType": "address", "name": "owner", "type": "address" }147 ],148 "name": "balanceOf",149 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],150 "stateMutability": "view",151 "type": "function"152 },153 {154 "inputs": [155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "burn",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 {165 "components": [166 { "internalType": "address", "name": "eth", "type": "address" },167 { "internalType": "uint256", "name": "sub", "type": "uint256" }168 ],169 "internalType": "struct EthCrossAccount",170 "name": "from",171 "type": "tuple"172 },173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burnFromCross",176 "outputs": [],177 "stateMutability": "nonpayable",178 "type": "function"179 },180 {181 "inputs": [182 {183 "components": [184 { "internalType": "address", "name": "eth", "type": "address" },185 { "internalType": "uint256", "name": "sub", "type": "uint256" }186 ],187 "internalType": "struct EthCrossAccount",188 "name": "newOwner",189 "type": "tuple"190 }191 ],192 "name": "changeCollectionOwnerCross",193 "outputs": [],194 "stateMutability": "nonpayable",195 "type": "function"196 },197 {198 "inputs": [],199 "name": "collectionAdmins",200 "outputs": [201 {202 "components": [203 { "internalType": "address", "name": "eth", "type": "address" },204 { "internalType": "uint256", "name": "sub", "type": "uint256" }205 ],206 "internalType": "struct EthCrossAccount[]",207 "name": "",208 "type": "tuple[]"209 }210 ],211 "stateMutability": "view",212 "type": "function"213 },214 {215 "inputs": [],216 "name": "collectionHelperAddress",217 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],218 "stateMutability": "view",219 "type": "function"220 },221 {222 "inputs": [],223 "name": "collectionNestingPermissions",224 "outputs": [225 {226 "components": [227 {228 "internalType": "enum CollectionPermissions",229 "name": "field_0",230 "type": "uint8"231 },232 { "internalType": "bool", "name": "field_1", "type": "bool" }233 ],234 "internalType": "struct Tuple36[]",235 "name": "",236 "type": "tuple[]"237 }238 ],239 "stateMutability": "view",240 "type": "function"241 },242 {243 "inputs": [],244 "name": "collectionNestingRestrictedCollectionIds",245 "outputs": [246 {247 "components": [248 { "internalType": "bool", "name": "field_0", "type": "bool" },249 {250 "internalType": "uint256[]",251 "name": "field_1",252 "type": "uint256[]"253 }254 ],255 "internalType": "struct Tuple33",256 "name": "",257 "type": "tuple"258 }259 ],260 "stateMutability": "view",261 "type": "function"262 },263 {264 "inputs": [],265 "name": "collectionOwner",266 "outputs": [267 {268 "components": [269 { "internalType": "address", "name": "eth", "type": "address" },270 { "internalType": "uint256", "name": "sub", "type": "uint256" }271 ],272 "internalType": "struct EthCrossAccount",273 "name": "",274 "type": "tuple"275 }276 ],277 "stateMutability": "view",278 "type": "function"279 },280 {281 "inputs": [282 { "internalType": "string[]", "name": "keys", "type": "string[]" }283 ],284 "name": "collectionProperties",285 "outputs": [286 {287 "components": [288 { "internalType": "string", "name": "key", "type": "string" },289 { "internalType": "bytes", "name": "value", "type": "bytes" }290 ],291 "internalType": "struct Property[]",292 "name": "",293 "type": "tuple[]"294 }295 ],296 "stateMutability": "view",297 "type": "function"298 },299 {300 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],301 "name": "collectionProperty",302 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],303 "stateMutability": "view",304 "type": "function"305 },306 {307 "inputs": [],308 "name": "collectionSponsor",309 "outputs": [310 {311 "components": [312 { "internalType": "address", "name": "field_0", "type": "address" },313 { "internalType": "uint256", "name": "field_1", "type": "uint256" }314 ],315 "internalType": "struct Tuple29",316 "name": "",317 "type": "tuple"318 }319 ],320 "stateMutability": "view",321 "type": "function"322 },323 {324 "inputs": [],325 "name": "confirmCollectionSponsorship",326 "outputs": [],327 "stateMutability": "nonpayable",328 "type": "function"329 },330 {331 "inputs": [],332 "name": "contractAddress",333 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],334 "stateMutability": "view",335 "type": "function"336 },337 {338 "inputs": [339 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }340 ],341 "name": "crossOwnerOf",342 "outputs": [343 {344 "components": [345 { "internalType": "address", "name": "eth", "type": "address" },346 { "internalType": "uint256", "name": "sub", "type": "uint256" }347 ],348 "internalType": "struct EthCrossAccount",349 "name": "",350 "type": "tuple"351 }352 ],353 "stateMutability": "view",354 "type": "function"355 },356 {357 "inputs": [358 { "internalType": "string[]", "name": "keys", "type": "string[]" }359 ],360 "name": "deleteCollectionProperties",361 "outputs": [],362 "stateMutability": "nonpayable",363 "type": "function"364 },365 {366 "inputs": [367 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },368 { "internalType": "string[]", "name": "keys", "type": "string[]" }369 ],370 "name": "deleteProperties",371 "outputs": [],372 "stateMutability": "nonpayable",373 "type": "function"374 },375 {376 "inputs": [],377 "name": "description",378 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],379 "stateMutability": "view",380 "type": "function"381 },382 {383 "inputs": [],384 "name": "finishMinting",385 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],386 "stateMutability": "nonpayable",387 "type": "function"388 },389 {390 "inputs": [391 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }392 ],393 "name": "getApproved",394 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],395 "stateMutability": "view",396 "type": "function"397 },398 {399 "inputs": [],400 "name": "hasCollectionPendingSponsor",401 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],402 "stateMutability": "view",403 "type": "function"404 },405 {406 "inputs": [407 { "internalType": "address", "name": "owner", "type": "address" },408 { "internalType": "address", "name": "operator", "type": "address" }409 ],410 "name": "isApprovedForAll",411 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],412 "stateMutability": "view",413 "type": "function"414 },415 {416 "inputs": [417 {418 "components": [419 { "internalType": "address", "name": "eth", "type": "address" },420 { "internalType": "uint256", "name": "sub", "type": "uint256" }421 ],422 "internalType": "struct EthCrossAccount",423 "name": "user",424 "type": "tuple"425 }426 ],427 "name": "isOwnerOrAdminCross",428 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],429 "stateMutability": "view",430 "type": "function"431 },432 {433 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],434 "name": "mint",435 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],436 "stateMutability": "nonpayable",437 "type": "function"438 },439 {440 "inputs": [441 { "internalType": "address", "name": "to", "type": "address" },442 { "internalType": "string", "name": "tokenUri", "type": "string" }443 ],444 "name": "mintWithTokenURI",445 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],446 "stateMutability": "nonpayable",447 "type": "function"448 },449 {450 "inputs": [],451 "name": "mintingFinished",452 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],453 "stateMutability": "view",454 "type": "function"455 },456 {457 "inputs": [],458 "name": "name",459 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],460 "stateMutability": "view",461 "type": "function"462 },463 {464 "inputs": [],465 "name": "nextTokenId",466 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],467 "stateMutability": "view",468 "type": "function"469 },470 {471 "inputs": [472 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }473 ],474 "name": "ownerOf",475 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],476 "stateMutability": "view",477 "type": "function"478 },479 {480 "inputs": [481 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },482 { "internalType": "string[]", "name": "keys", "type": "string[]" }483 ],484 "name": "properties",485 "outputs": [486 {487 "components": [488 { "internalType": "string", "name": "key", "type": "string" },489 { "internalType": "bytes", "name": "value", "type": "bytes" }490 ],491 "internalType": "struct Property[]",492 "name": "",493 "type": "tuple[]"494 }495 ],496 "stateMutability": "view",497 "type": "function"498 },499 {500 "inputs": [501 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },502 { "internalType": "string", "name": "key", "type": "string" }503 ],504 "name": "property",505 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],506 "stateMutability": "view",507 "type": "function"508 },509 {510 "inputs": [511 {512 "components": [513 { "internalType": "address", "name": "eth", "type": "address" },514 { "internalType": "uint256", "name": "sub", "type": "uint256" }515 ],516 "internalType": "struct EthCrossAccount",517 "name": "admin",518 "type": "tuple"519 }520 ],521 "name": "removeCollectionAdminCross",522 "outputs": [],523 "stateMutability": "nonpayable",524 "type": "function"525 },526 {527 "inputs": [],528 "name": "removeCollectionSponsor",529 "outputs": [],530 "stateMutability": "nonpayable",531 "type": "function"532 },533 {534 "inputs": [535 {536 "components": [537 { "internalType": "address", "name": "eth", "type": "address" },538 { "internalType": "uint256", "name": "sub", "type": "uint256" }539 ],540 "internalType": "struct EthCrossAccount",541 "name": "user",542 "type": "tuple"543 }544 ],545 "name": "removeFromCollectionAllowListCross",546 "outputs": [],547 "stateMutability": "nonpayable",548 "type": "function"549 },550 {551 "inputs": [552 { "internalType": "address", "name": "from", "type": "address" },553 { "internalType": "address", "name": "to", "type": "address" },554 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }555 ],556 "name": "safeTransferFrom",557 "outputs": [],558 "stateMutability": "nonpayable",559 "type": "function"560 },561 {562 "inputs": [563 { "internalType": "address", "name": "from", "type": "address" },564 { "internalType": "address", "name": "to", "type": "address" },565 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },566 { "internalType": "bytes", "name": "data", "type": "bytes" }567 ],568 "name": "safeTransferFromWithData",569 "outputs": [],570 "stateMutability": "nonpayable",571 "type": "function"572 },573 {574 "inputs": [575 { "internalType": "address", "name": "operator", "type": "address" },576 { "internalType": "bool", "name": "approved", "type": "bool" }577 ],578 "name": "setApprovalForAll",579 "outputs": [],580 "stateMutability": "nonpayable",581 "type": "function"582 },583 {584 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],585 "name": "setCollectionAccess",586 "outputs": [],587 "stateMutability": "nonpayable",588 "type": "function"589 },590 {591 "inputs": [592 {593 "internalType": "enum CollectionLimits",594 "name": "limit",595 "type": "uint8"596 },597 { "internalType": "bool", "name": "status", "type": "bool" },598 { "internalType": "uint256", "name": "value", "type": "uint256" }599 ],600 "name": "setCollectionLimit",601 "outputs": [],602 "stateMutability": "nonpayable",603 "type": "function"604 },605 {606 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],607 "name": "setCollectionMintMode",608 "outputs": [],609 "stateMutability": "nonpayable",610 "type": "function"611 },612 {613 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],614 "name": "setCollectionNesting",615 "outputs": [],616 "stateMutability": "nonpayable",617 "type": "function"618 },619 {620 "inputs": [621 { "internalType": "bool", "name": "enable", "type": "bool" },622 {623 "internalType": "address[]",624 "name": "collections",625 "type": "address[]"626 }627 ],628 "name": "setCollectionNesting",629 "outputs": [],630 "stateMutability": "nonpayable",631 "type": "function"632 },633 {634 "inputs": [635 {636 "components": [637 { "internalType": "string", "name": "key", "type": "string" },638 { "internalType": "bytes", "name": "value", "type": "bytes" }639 ],640 "internalType": "struct Property[]",641 "name": "properties",642 "type": "tuple[]"643 }644 ],645 "name": "setCollectionProperties",646 "outputs": [],647 "stateMutability": "nonpayable",648 "type": "function"649 },650 {651 "inputs": [652 {653 "components": [654 { "internalType": "address", "name": "eth", "type": "address" },655 { "internalType": "uint256", "name": "sub", "type": "uint256" }656 ],657 "internalType": "struct EthCrossAccount",658 "name": "sponsor",659 "type": "tuple"660 }661 ],662 "name": "setCollectionSponsorCross",663 "outputs": [],664 "stateMutability": "nonpayable",665 "type": "function"666 },667 {668 "inputs": [669 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },670 {671 "components": [672 { "internalType": "string", "name": "key", "type": "string" },673 { "internalType": "bytes", "name": "value", "type": "bytes" }674 ],675 "internalType": "struct Property[]",676 "name": "properties",677 "type": "tuple[]"678 }679 ],680 "name": "setProperties",681 "outputs": [],682 "stateMutability": "nonpayable",683 "type": "function"684 },685 {686 "inputs": [687 {688 "components": [689 { "internalType": "string", "name": "field_0", "type": "string" },690 {691 "components": [692 {693 "internalType": "enum EthTokenPermissions",694 "name": "field_0",695 "type": "uint8"696 },697 { "internalType": "bool", "name": "field_1", "type": "bool" }698 ],699 "internalType": "struct Tuple51[]",700 "name": "field_1",701 "type": "tuple[]"702 }703 ],704 "internalType": "struct Tuple53[]",705 "name": "permissions",706 "type": "tuple[]"707 }708 ],709 "name": "setTokenPropertyPermissions",710 "outputs": [],711 "stateMutability": "nonpayable",712 "type": "function"713 },714 {715 "inputs": [716 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }717 ],718 "name": "supportsInterface",719 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],720 "stateMutability": "view",721 "type": "function"722 },723 {724 "inputs": [],725 "name": "symbol",726 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],727 "stateMutability": "view",728 "type": "function"729 },730 {731 "inputs": [732 { "internalType": "uint256", "name": "index", "type": "uint256" }733 ],734 "name": "tokenByIndex",735 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],736 "stateMutability": "view",737 "type": "function"738 },739 {740 "inputs": [741 { "internalType": "uint256", "name": "token", "type": "uint256" }742 ],743 "name": "tokenContractAddress",744 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],745 "stateMutability": "view",746 "type": "function"747 },748 {749 "inputs": [750 { "internalType": "address", "name": "owner", "type": "address" },751 { "internalType": "uint256", "name": "index", "type": "uint256" }752 ],753 "name": "tokenOfOwnerByIndex",754 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],755 "stateMutability": "view",756 "type": "function"757 },758 {759 "inputs": [],760 "name": "tokenPropertyPermissions",761 "outputs": [762 {763 "components": [764 { "internalType": "string", "name": "field_0", "type": "string" },765 {766 "components": [767 {768 "internalType": "enum EthTokenPermissions",769 "name": "field_0",770 "type": "uint8"771 },772 { "internalType": "bool", "name": "field_1", "type": "bool" }773 ],774 "internalType": "struct Tuple51[]",775 "name": "field_1",776 "type": "tuple[]"777 }778 ],779 "internalType": "struct Tuple53[]",780 "name": "",781 "type": "tuple[]"782 }783 ],784 "stateMutability": "view",785 "type": "function"786 },787 {788 "inputs": [789 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }790 ],791 "name": "tokenURI",792 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],793 "stateMutability": "view",794 "type": "function"795 },796 {797 "inputs": [],798 "name": "totalSupply",799 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],800 "stateMutability": "view",801 "type": "function"802 },803 {804 "inputs": [805 { "internalType": "address", "name": "to", "type": "address" },806 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }807 ],808 "name": "transfer",809 "outputs": [],810 "stateMutability": "nonpayable",811 "type": "function"812 },813 {814 "inputs": [815 {816 "components": [817 { "internalType": "address", "name": "eth", "type": "address" },818 { "internalType": "uint256", "name": "sub", "type": "uint256" }819 ],820 "internalType": "struct EthCrossAccount",821 "name": "to",822 "type": "tuple"823 },824 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }825 ],826 "name": "transferCross",827 "outputs": [],828 "stateMutability": "nonpayable",829 "type": "function"830 },831 {832 "inputs": [833 { "internalType": "address", "name": "from", "type": "address" },834 { "internalType": "address", "name": "to", "type": "address" },835 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }836 ],837 "name": "transferFrom",838 "outputs": [],839 "stateMutability": "nonpayable",840 "type": "function"841 },842 {843 "inputs": [844 {845 "components": [846 { "internalType": "address", "name": "eth", "type": "address" },847 { "internalType": "uint256", "name": "sub", "type": "uint256" }848 ],849 "internalType": "struct EthCrossAccount",850 "name": "from",851 "type": "tuple"852 },853 {854 "components": [855 { "internalType": "address", "name": "eth", "type": "address" },856 { "internalType": "uint256", "name": "sub", "type": "uint256" }857 ],858 "internalType": "struct EthCrossAccount",859 "name": "to",860 "type": "tuple"861 },862 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }863 ],864 "name": "transferFromCross",865 "outputs": [],866 "stateMutability": "nonpayable",867 "type": "function"868 },869 {870 "inputs": [],871 "name": "uniqueCollectionType",872 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],873 "stateMutability": "view",874 "type": "function"875 }876]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