difftreelog
chore generate stubs
in: master
9 files changed
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -284,19 +284,33 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {
require(false, stub_error);
dummy;
return Tuple26(false, new uint256[](0));
+=======
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple24 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple24(false, new uint256[](0));
+>>>>>>> 09f69700... chore: generate stubs
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() public view returns (Tuple29[] memory) {
require(false, stub_error);
dummy;
return new Tuple29[](0);
+=======
+ function collectionNestingPermissions() public view returns (Tuple27[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new Tuple27[](0);
+>>>>>>> 09f69700... chore: generate stubs
}
/// Set the collection access method.
@@ -476,13 +490,21 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple29 {
+=======
+struct Tuple27 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple26 {
+=======
+struct Tuple24 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -422,19 +422,33 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {
require(false, stub_error);
dummy;
return Tuple39(false, new uint256[](0));
+=======
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple36 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple36(false, new uint256[](0));
+>>>>>>> 09f69700... chore: generate stubs
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() public view returns (Tuple42[] memory) {
require(false, stub_error);
dummy;
return new Tuple42[](0);
+=======
+ function collectionNestingPermissions() public view returns (Tuple39[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new Tuple39[](0);
+>>>>>>> 09f69700... chore: generate stubs
}
/// Set the collection access method.
@@ -608,24 +622,32 @@
uint256 sub;
}
-<<<<<<< HEAD
enum CollectionPermissions {
CollectionAdmin,
TokenOwner
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple42 {
+=======
+struct Tuple39 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple39 {
+=======
+struct Tuple36 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
+<<<<<<< HEAD
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
enum CollectionLimits {
/// @dev How many tokens can a user have on one account.
@@ -663,6 +685,8 @@
=======
>>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet
+=======
+>>>>>>> 09f69700... chore: generate stubs
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -422,19 +422,33 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
require(false, stub_error);
dummy;
return Tuple38(false, new uint256[](0));
+=======
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple35 memory) {
+ require(false, stub_error);
+ dummy;
+ return Tuple35(false, new uint256[](0));
+>>>>>>> 09f69700... chore: generate stubs
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() public view returns (Tuple41[] memory) {
require(false, stub_error);
dummy;
return new Tuple41[](0);
+=======
+ function collectionNestingPermissions() public view returns (Tuple38[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new Tuple38[](0);
+>>>>>>> 09f69700... chore: generate stubs
}
/// Set the collection access method.
@@ -614,17 +628,26 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple41 {
+=======
+struct Tuple38 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple38 {
+=======
+struct Tuple35 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
+<<<<<<< HEAD
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
enum CollectionLimits {
/// @dev How many tokens can a user have on one account.
@@ -660,6 +683,8 @@
uint256 field_1;
}
+=======
+>>>>>>> 09f69700... chore: generate stubs
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
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 "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": "eth", "type": "address" },323 { "internalType": "uint256", "name": "sub", "type": "uint256" }324 ],325 "internalType": "struct EthCrossAccount",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 Tuple9[]",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 {424 "components": [425 { "internalType": "address", "name": "eth", "type": "address" },426 { "internalType": "uint256", "name": "sub", "type": "uint256" }427 ],428 "internalType": "struct EthCrossAccount",429 "name": "to",430 "type": "tuple"431 },432 { "internalType": "uint256", "name": "amount", "type": "uint256" }433 ],434 "name": "mintCross",435 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],436 "stateMutability": "nonpayable",437 "type": "function"438 },439 {440 "inputs": [],441 "name": "name",442 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],443 "stateMutability": "view",444 "type": "function"445 },446 {447 "inputs": [448 {449 "components": [450 { "internalType": "address", "name": "eth", "type": "address" },451 { "internalType": "uint256", "name": "sub", "type": "uint256" }452 ],453 "internalType": "struct EthCrossAccount",454 "name": "admin",455 "type": "tuple"456 }457 ],458 "name": "removeCollectionAdminCross",459 "outputs": [],460 "stateMutability": "nonpayable",461 "type": "function"462 },463 {464 "inputs": [],465 "name": "removeCollectionSponsor",466 "outputs": [],467 "stateMutability": "nonpayable",468 "type": "function"469 },470 {471 "inputs": [472 {473 "components": [474 { "internalType": "address", "name": "eth", "type": "address" },475 { "internalType": "uint256", "name": "sub", "type": "uint256" }476 ],477 "internalType": "struct EthCrossAccount",478 "name": "user",479 "type": "tuple"480 }481 ],482 "name": "removeFromCollectionAllowListCross",483 "outputs": [],484 "stateMutability": "nonpayable",485 "type": "function"486 },487 {488 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],489 "name": "setCollectionAccess",490 "outputs": [],491 "stateMutability": "nonpayable",492 "type": "function"493 },494 {495 "inputs": [496 {497 "internalType": "enum CollectionLimits",498 "name": "limit",499 "type": "uint8"500 },501 { "internalType": "bool", "name": "status", "type": "bool" },502 { "internalType": "uint256", "name": "value", "type": "uint256" }503 ],504 "name": "setCollectionLimit",505 "outputs": [],506 "stateMutability": "nonpayable",507 "type": "function"508 },509 {510 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],511 "name": "setCollectionMintMode",512 "outputs": [],513 "stateMutability": "nonpayable",514 "type": "function"515 },516 {517 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],518 "name": "setCollectionNesting",519 "outputs": [],520 "stateMutability": "nonpayable",521 "type": "function"522 },523 {524 "inputs": [525 { "internalType": "bool", "name": "enable", "type": "bool" },526 {527 "internalType": "address[]",528 "name": "collections",529 "type": "address[]"530 }531 ],532 "name": "setCollectionNesting",533 "outputs": [],534 "stateMutability": "nonpayable",535 "type": "function"536 },537 {538 "inputs": [539 {540 "components": [541 { "internalType": "string", "name": "key", "type": "string" },542 { "internalType": "bytes", "name": "value", "type": "bytes" }543 ],544 "internalType": "struct Property[]",545 "name": "properties",546 "type": "tuple[]"547 }548 ],549 "name": "setCollectionProperties",550 "outputs": [],551 "stateMutability": "nonpayable",552 "type": "function"553 },554 {555 "inputs": [556 {557 "components": [558 { "internalType": "address", "name": "eth", "type": "address" },559 { "internalType": "uint256", "name": "sub", "type": "uint256" }560 ],561 "internalType": "struct EthCrossAccount",562 "name": "sponsor",563 "type": "tuple"564 }565 ],566 "name": "setCollectionSponsorCross",567 "outputs": [],568 "stateMutability": "nonpayable",569 "type": "function"570 },571 {572 "inputs": [573 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }574 ],575 "name": "supportsInterface",576 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],577 "stateMutability": "view",578 "type": "function"579 },580 {581 "inputs": [],582 "name": "symbol",583 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],584 "stateMutability": "view",585 "type": "function"586 },587 {588 "inputs": [],589 "name": "totalSupply",590 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],591 "stateMutability": "view",592 "type": "function"593 },594 {595 "inputs": [596 { "internalType": "address", "name": "to", "type": "address" },597 { "internalType": "uint256", "name": "amount", "type": "uint256" }598 ],599 "name": "transfer",600 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],601 "stateMutability": "nonpayable",602 "type": "function"603 },604 {605 "inputs": [606 {607 "components": [608 { "internalType": "address", "name": "eth", "type": "address" },609 { "internalType": "uint256", "name": "sub", "type": "uint256" }610 ],611 "internalType": "struct EthCrossAccount",612 "name": "to",613 "type": "tuple"614 },615 { "internalType": "uint256", "name": "amount", "type": "uint256" }616 ],617 "name": "transferCross",618 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],619 "stateMutability": "nonpayable",620 "type": "function"621 },622 {623 "inputs": [624 { "internalType": "address", "name": "from", "type": "address" },625 { "internalType": "address", "name": "to", "type": "address" },626 { "internalType": "uint256", "name": "amount", "type": "uint256" }627 ],628 "name": "transferFrom",629 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],630 "stateMutability": "nonpayable",631 "type": "function"632 },633 {634 "inputs": [635 {636 "components": [637 { "internalType": "address", "name": "eth", "type": "address" },638 { "internalType": "uint256", "name": "sub", "type": "uint256" }639 ],640 "internalType": "struct EthCrossAccount",641 "name": "from",642 "type": "tuple"643 },644 {645 "components": [646 { "internalType": "address", "name": "eth", "type": "address" },647 { "internalType": "uint256", "name": "sub", "type": "uint256" }648 ],649 "internalType": "struct EthCrossAccount",650 "name": "to",651 "type": "tuple"652 },653 { "internalType": "uint256", "name": "amount", "type": "uint256" }654 ],655 "name": "transferFromCross",656 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],657 "stateMutability": "nonpayable",658 "type": "function"659 },660 {661 "inputs": [],662 "name": "uniqueCollectionType",663 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],664 "stateMutability": "view",665 "type": "function"666 }667]tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -271,7 +271,11 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple42[]",
+=======
+ "internalType": "struct Tuple39[]",
+>>>>>>> 09f69700... chore: generate stubs
"name": "",
"type": "tuple[]"
}
@@ -292,7 +296,11 @@
"type": "uint256[]"
}
],
+<<<<<<< HEAD
"internalType": "struct Tuple39",
+=======
+ "internalType": "struct Tuple36",
+>>>>>>> 09f69700... chore: generate stubs
"name": "",
"type": "tuple"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -253,7 +253,11 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple41[]",
+=======
+ "internalType": "struct Tuple38[]",
+>>>>>>> 09f69700... chore: generate stubs
"name": "",
"type": "tuple[]"
}
@@ -274,7 +278,11 @@
"type": "uint256[]"
}
],
+<<<<<<< HEAD
"internalType": "struct Tuple38",
+=======
+ "internalType": "struct Tuple35",
+>>>>>>> 09f69700... chore: generate stubs
"name": "",
"type": "tuple"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -191,12 +191,20 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);
+=======
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple22 memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() external view returns (Tuple27[] memory);
+=======
+ function collectionNestingPermissions() external view returns (Tuple25[] memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Set the collection access method.
/// @param mode Access mode
@@ -311,7 +319,11 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple27 {
+=======
+struct Tuple25 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
@@ -322,7 +334,11 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple24 {
+=======
+struct Tuple22 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -287,12 +287,20 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+=======
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple32 memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() external view returns (Tuple38[] memory);
+=======
+ function collectionNestingPermissions() external view returns (Tuple35[] memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Set the collection access method.
/// @param mode Access mode
@@ -406,9 +414,12 @@
uint256 sub;
}
+/// @dev anonymous struct
<<<<<<< HEAD
-/// @dev anonymous struct
struct Tuple38 {
+=======
+struct Tuple35 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
@@ -419,11 +430,16 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple35 {
+=======
+struct Tuple32 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
+<<<<<<< HEAD
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
enum CollectionLimits {
/// @dev How many tokens can a user have on one account.
@@ -461,6 +477,8 @@
=======
>>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet
+=======
+>>>>>>> 09f69700... chore: generate stubs
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -287,12 +287,20 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
+<<<<<<< HEAD
function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory);
+=======
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple31 memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
+<<<<<<< HEAD
function collectionNestingPermissions() external view returns (Tuple37[] memory);
+=======
+ function collectionNestingPermissions() external view returns (Tuple34[] memory);
+>>>>>>> 09f69700... chore: generate stubs
/// Set the collection access method.
/// @param mode Access mode
@@ -406,9 +414,12 @@
uint256 sub;
}
+/// @dev anonymous struct
<<<<<<< HEAD
-/// @dev anonymous struct
struct Tuple37 {
+=======
+struct Tuple34 {
+>>>>>>> 09f69700... chore: generate stubs
CollectionPermissions field_0;
bool field_1;
}
@@ -419,11 +430,16 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple34 {
+=======
+struct Tuple31 {
+>>>>>>> 09f69700... chore: generate stubs
bool field_0;
uint256[] field_1;
}
+<<<<<<< HEAD
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
enum CollectionLimits {
/// @dev How many tokens can a user have on one account.
@@ -461,6 +477,8 @@
=======
>>>>>>> 0bf15e6f... fixed tests&tuple instead of struct, refactored `refungible` pallet
+=======
+>>>>>>> 09f69700... chore: generate stubs
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
interface ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract