difftreelog
chore generate stubs & types
in: master
11 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6342,7 +6342,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6501,7 +6501,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
dependencies = [
"derivative",
"ethereum 0.14.0",
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,7 +42,11 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
function setTokenPropertyPermissions(Tuple59[] memory permissions) public {
+=======
+ function setTokenPropertyPermissions(Tuple56[] memory permissions) public {
+>>>>>>> 9e929f90... chore: generate stubs & types
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +55,17 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
function tokenPropertyPermissions() public view returns (Tuple59[] memory) {
require(false, stub_error);
dummy;
return new Tuple59[](0);
+=======
+ function tokenPropertyPermissions() public view returns (Tuple56[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new Tuple56[](0);
+>>>>>>> 9e929f90... chore: generate stubs & types
}
// /// @notice Set token property value.
@@ -144,6 +155,7 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple59 {
string field_0;
Tuple57[] field_1;
@@ -151,6 +163,15 @@
/// @dev anonymous struct
struct Tuple57 {
+=======
+struct Tuple56 {
+ string field_0;
+ Tuple54[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple54 {
+>>>>>>> 9e929f90... chore: generate stubs & types
EthTokenPermissions field_0;
bool field_1;
}
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -113,7 +113,8 @@
AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,
CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
- PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap, CreateRefungibleExMultipleOwners,
+ PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+ CreateRefungibleExMultipleOwners,
};
pub use pallet::*;
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -42,7 +42,11 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
function setTokenPropertyPermissions(Tuple58[] memory permissions) public {
+=======
+ function setTokenPropertyPermissions(Tuple55[] memory permissions) public {
+>>>>>>> 9e929f90... chore: generate stubs & types
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +55,17 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
function tokenPropertyPermissions() public view returns (Tuple58[] memory) {
require(false, stub_error);
dummy;
return new Tuple58[](0);
+=======
+ function tokenPropertyPermissions() public view returns (Tuple55[] memory) {
+ require(false, stub_error);
+ dummy;
+ return new Tuple55[](0);
+>>>>>>> 9e929f90... chore: generate stubs & types
}
// /// @notice Set token property value.
@@ -144,6 +155,7 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple58 {
string field_0;
Tuple56[] field_1;
@@ -151,6 +163,15 @@
/// @dev anonymous struct
struct Tuple56 {
+=======
+struct Tuple55 {
+ string field_0;
+ Tuple53[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple53 {
+>>>>>>> 9e929f90... chore: generate stubs & types
EthTokenPermissions field_0;
bool field_1;
}
tests/src/eth/abi/nonFungible.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 {147 "components": [148 { "internalType": "address", "name": "eth", "type": "address" },149 { "internalType": "uint256", "name": "sub", "type": "uint256" }150 ],151 "internalType": "struct EthCrossAccount",152 "name": "approved",153 "type": "tuple"154 },155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "approveCross",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 { "internalType": "address", "name": "owner", "type": "address" }165 ],166 "name": "balanceOf",167 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],168 "stateMutability": "view",169 "type": "function"170 },171 {172 "inputs": [173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burn",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": "from",189 "type": "tuple"190 },191 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }192 ],193 "name": "burnFromCross",194 "outputs": [],195 "stateMutability": "nonpayable",196 "type": "function"197 },198 {199 "inputs": [200 {201 "components": [202 { "internalType": "address", "name": "eth", "type": "address" },203 { "internalType": "uint256", "name": "sub", "type": "uint256" }204 ],205 "internalType": "struct EthCrossAccount",206 "name": "newOwner",207 "type": "tuple"208 }209 ],210 "name": "changeCollectionOwnerCross",211 "outputs": [],212 "stateMutability": "nonpayable",213 "type": "function"214 },215 {216 "inputs": [],217 "name": "collectionAdmins",218 "outputs": [219 {220 "components": [221 { "internalType": "address", "name": "eth", "type": "address" },222 { "internalType": "uint256", "name": "sub", "type": "uint256" }223 ],224 "internalType": "struct EthCrossAccount[]",225 "name": "",226 "type": "tuple[]"227 }228 ],229 "stateMutability": "view",230 "type": "function"231 },232 {233 "inputs": [],234 "name": "collectionHelperAddress",235 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],236 "stateMutability": "view",237 "type": "function"238 },239 {240 "inputs": [],241 "name": "collectionLimits",242 "outputs": [243 {244 "components": [245 {246 "internalType": "enum CollectionLimits",247 "name": "field_0",248 "type": "uint8"249 },250 { "internalType": "bool", "name": "field_1", "type": "bool" },251 { "internalType": "uint256", "name": "field_2", "type": "uint256" }252 ],253 "internalType": "struct Tuple33[]",254 "name": "",255 "type": "tuple[]"256 }257 ],258 "stateMutability": "view",259 "type": "function"260 },261 {262 "inputs": [],263 "name": "collectionNestingPermissions",264 "outputs": [265 {266 "components": [267 {268 "internalType": "enum CollectionPermissions",269 "name": "field_0",270 "type": "uint8"271 },272 { "internalType": "bool", "name": "field_1", "type": "bool" }273 ],274<<<<<<< HEAD275 "internalType": "struct Tuple42[]",276=======277 "internalType": "struct Tuple39[]",278>>>>>>> 09f69700... chore: generate stubs279 "name": "",280 "type": "tuple[]"281 }282 ],283 "stateMutability": "view",284 "type": "function"285 },286 {287 "inputs": [],288 "name": "collectionNestingRestrictedCollectionIds",289 "outputs": [290 {291 "components": [292 { "internalType": "bool", "name": "field_0", "type": "bool" },293 {294 "internalType": "uint256[]",295 "name": "field_1",296 "type": "uint256[]"297 }298 ],299<<<<<<< HEAD300 "internalType": "struct Tuple39",301=======302 "internalType": "struct Tuple36",303>>>>>>> 09f69700... chore: generate stubs304 "name": "",305 "type": "tuple"306 }307 ],308 "stateMutability": "view",309 "type": "function"310 },311 {312 "inputs": [],313 "name": "collectionOwner",314 "outputs": [315 {316 "components": [317 { "internalType": "address", "name": "eth", "type": "address" },318 { "internalType": "uint256", "name": "sub", "type": "uint256" }319 ],320 "internalType": "struct EthCrossAccount",321 "name": "",322 "type": "tuple"323 }324 ],325 "stateMutability": "view",326 "type": "function"327 },328 {329 "inputs": [330 { "internalType": "string[]", "name": "keys", "type": "string[]" }331 ],332 "name": "collectionProperties",333 "outputs": [334 {335 "components": [336 { "internalType": "string", "name": "key", "type": "string" },337 { "internalType": "bytes", "name": "value", "type": "bytes" }338 ],339 "internalType": "struct Property[]",340 "name": "",341 "type": "tuple[]"342 }343 ],344 "stateMutability": "view",345 "type": "function"346 },347 {348 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],349 "name": "collectionProperty",350 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],351 "stateMutability": "view",352 "type": "function"353 },354 {355 "inputs": [],356 "name": "collectionSponsor",357 "outputs": [358 {359 "components": [360 { "internalType": "address", "name": "eth", "type": "address" },361 { "internalType": "uint256", "name": "sub", "type": "uint256" }362 ],363 "internalType": "struct EthCrossAccount",364 "name": "",365 "type": "tuple"366 }367 ],368 "stateMutability": "view",369 "type": "function"370 },371 {372 "inputs": [],373 "name": "confirmCollectionSponsorship",374 "outputs": [],375 "stateMutability": "nonpayable",376 "type": "function"377 },378 {379 "inputs": [],380 "name": "contractAddress",381 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],382 "stateMutability": "view",383 "type": "function"384 },385 {386 "inputs": [387 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }388 ],389 "name": "crossOwnerOf",390 "outputs": [391 {392 "components": [393 { "internalType": "address", "name": "eth", "type": "address" },394 { "internalType": "uint256", "name": "sub", "type": "uint256" }395 ],396 "internalType": "struct EthCrossAccount",397 "name": "",398 "type": "tuple"399 }400 ],401 "stateMutability": "view",402 "type": "function"403 },404 {405 "inputs": [406 { "internalType": "string[]", "name": "keys", "type": "string[]" }407 ],408 "name": "deleteCollectionProperties",409 "outputs": [],410 "stateMutability": "nonpayable",411 "type": "function"412 },413 {414 "inputs": [415 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },416 { "internalType": "string[]", "name": "keys", "type": "string[]" }417 ],418 "name": "deleteProperties",419 "outputs": [],420 "stateMutability": "nonpayable",421 "type": "function"422 },423 {424 "inputs": [],425 "name": "description",426 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],427 "stateMutability": "view",428 "type": "function"429 },430 {431 "inputs": [],432 "name": "finishMinting",433 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],434 "stateMutability": "nonpayable",435 "type": "function"436 },437 {438 "inputs": [439 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }440 ],441 "name": "getApproved",442 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],443 "stateMutability": "view",444 "type": "function"445 },446 {447 "inputs": [],448 "name": "hasCollectionPendingSponsor",449 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],450 "stateMutability": "view",451 "type": "function"452 },453 {454 "inputs": [455 { "internalType": "address", "name": "owner", "type": "address" },456 { "internalType": "address", "name": "operator", "type": "address" }457 ],458 "name": "isApprovedForAll",459 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],460 "stateMutability": "view",461 "type": "function"462 },463 {464 "inputs": [465 {466 "components": [467 { "internalType": "address", "name": "eth", "type": "address" },468 { "internalType": "uint256", "name": "sub", "type": "uint256" }469 ],470 "internalType": "struct EthCrossAccount",471 "name": "user",472 "type": "tuple"473 }474 ],475 "name": "isOwnerOrAdminCross",476 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],477 "stateMutability": "view",478 "type": "function"479 },480 {481 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],482 "name": "mint",483 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],484 "stateMutability": "nonpayable",485 "type": "function"486 },487 {488 "inputs": [489 {490 "components": [491 { "internalType": "address", "name": "eth", "type": "address" },492 { "internalType": "uint256", "name": "sub", "type": "uint256" }493 ],494 "internalType": "struct EthCrossAccount",495 "name": "to",496 "type": "tuple"497 },498 {499 "components": [500 { "internalType": "string", "name": "key", "type": "string" },501 { "internalType": "bytes", "name": "value", "type": "bytes" }502 ],503 "internalType": "struct Property[]",504 "name": "properties",505 "type": "tuple[]"506 }507 ],508 "name": "mintCross",509 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],510 "stateMutability": "nonpayable",511 "type": "function"512 },513 {514 "inputs": [515 { "internalType": "address", "name": "to", "type": "address" },516 { "internalType": "string", "name": "tokenUri", "type": "string" }517 ],518 "name": "mintWithTokenURI",519 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],520 "stateMutability": "nonpayable",521 "type": "function"522 },523 {524 "inputs": [],525 "name": "mintingFinished",526 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],527 "stateMutability": "view",528 "type": "function"529 },530 {531 "inputs": [],532 "name": "name",533 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],534 "stateMutability": "view",535 "type": "function"536 },537 {538 "inputs": [],539 "name": "nextTokenId",540 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],541 "stateMutability": "view",542 "type": "function"543 },544 {545 "inputs": [546 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }547 ],548 "name": "ownerOf",549 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],550 "stateMutability": "view",551 "type": "function"552 },553 {554 "inputs": [555 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },556 { "internalType": "string[]", "name": "keys", "type": "string[]" }557 ],558 "name": "properties",559 "outputs": [560 {561 "components": [562 { "internalType": "string", "name": "key", "type": "string" },563 { "internalType": "bytes", "name": "value", "type": "bytes" }564 ],565 "internalType": "struct Property[]",566 "name": "",567 "type": "tuple[]"568 }569 ],570 "stateMutability": "view",571 "type": "function"572 },573 {574 "inputs": [575 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },576 { "internalType": "string", "name": "key", "type": "string" }577 ],578 "name": "property",579 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],580 "stateMutability": "view",581 "type": "function"582 },583 {584 "inputs": [585 {586 "components": [587 { "internalType": "address", "name": "eth", "type": "address" },588 { "internalType": "uint256", "name": "sub", "type": "uint256" }589 ],590 "internalType": "struct EthCrossAccount",591 "name": "admin",592 "type": "tuple"593 }594 ],595 "name": "removeCollectionAdminCross",596 "outputs": [],597 "stateMutability": "nonpayable",598 "type": "function"599 },600 {601 "inputs": [],602 "name": "removeCollectionSponsor",603 "outputs": [],604 "stateMutability": "nonpayable",605 "type": "function"606 },607 {608 "inputs": [609 {610 "components": [611 { "internalType": "address", "name": "eth", "type": "address" },612 { "internalType": "uint256", "name": "sub", "type": "uint256" }613 ],614 "internalType": "struct EthCrossAccount",615 "name": "user",616 "type": "tuple"617 }618 ],619 "name": "removeFromCollectionAllowListCross",620 "outputs": [],621 "stateMutability": "nonpayable",622 "type": "function"623 },624 {625 "inputs": [626 { "internalType": "address", "name": "from", "type": "address" },627 { "internalType": "address", "name": "to", "type": "address" },628 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }629 ],630 "name": "safeTransferFrom",631 "outputs": [],632 "stateMutability": "nonpayable",633 "type": "function"634 },635 {636 "inputs": [637 { "internalType": "address", "name": "from", "type": "address" },638 { "internalType": "address", "name": "to", "type": "address" },639 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },640 { "internalType": "bytes", "name": "data", "type": "bytes" }641 ],642 "name": "safeTransferFrom",643 "outputs": [],644 "stateMutability": "nonpayable",645 "type": "function"646 },647 {648 "inputs": [649 { "internalType": "address", "name": "operator", "type": "address" },650 { "internalType": "bool", "name": "approved", "type": "bool" }651 ],652 "name": "setApprovalForAll",653 "outputs": [],654 "stateMutability": "nonpayable",655 "type": "function"656 },657 {658 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],659 "name": "setCollectionAccess",660 "outputs": [],661 "stateMutability": "nonpayable",662 "type": "function"663 },664 {665 "inputs": [666 {667 "internalType": "enum CollectionLimits",668 "name": "limit",669 "type": "uint8"670 },671 { "internalType": "bool", "name": "status", "type": "bool" },672 { "internalType": "uint256", "name": "value", "type": "uint256" }673 ],674 "name": "setCollectionLimit",675 "outputs": [],676 "stateMutability": "nonpayable",677 "type": "function"678 },679 {680 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],681 "name": "setCollectionMintMode",682 "outputs": [],683 "stateMutability": "nonpayable",684 "type": "function"685 },686 {687 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],688 "name": "setCollectionNesting",689 "outputs": [],690 "stateMutability": "nonpayable",691 "type": "function"692 },693 {694 "inputs": [695 { "internalType": "bool", "name": "enable", "type": "bool" },696 {697 "internalType": "address[]",698 "name": "collections",699 "type": "address[]"700 }701 ],702 "name": "setCollectionNesting",703 "outputs": [],704 "stateMutability": "nonpayable",705 "type": "function"706 },707 {708 "inputs": [709 {710 "components": [711 { "internalType": "string", "name": "key", "type": "string" },712 { "internalType": "bytes", "name": "value", "type": "bytes" }713 ],714 "internalType": "struct Property[]",715 "name": "properties",716 "type": "tuple[]"717 }718 ],719 "name": "setCollectionProperties",720 "outputs": [],721 "stateMutability": "nonpayable",722 "type": "function"723 },724 {725 "inputs": [726 {727 "components": [728 { "internalType": "address", "name": "eth", "type": "address" },729 { "internalType": "uint256", "name": "sub", "type": "uint256" }730 ],731 "internalType": "struct EthCrossAccount",732 "name": "sponsor",733 "type": "tuple"734 }735 ],736 "name": "setCollectionSponsorCross",737 "outputs": [],738 "stateMutability": "nonpayable",739 "type": "function"740 },741 {742 "inputs": [743 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },744 {745 "components": [746 { "internalType": "string", "name": "key", "type": "string" },747 { "internalType": "bytes", "name": "value", "type": "bytes" }748 ],749 "internalType": "struct Property[]",750 "name": "properties",751 "type": "tuple[]"752 }753 ],754 "name": "setProperties",755 "outputs": [],756 "stateMutability": "nonpayable",757 "type": "function"758 },759 {760 "inputs": [761 {762 "components": [763 { "internalType": "string", "name": "field_0", "type": "string" },764 {765 "components": [766 {767 "internalType": "enum EthTokenPermissions",768 "name": "field_0",769 "type": "uint8"770 },771 { "internalType": "bool", "name": "field_1", "type": "bool" }772 ],773 "internalType": "struct Tuple57[]",774 "name": "field_1",775 "type": "tuple[]"776 }777 ],778 "internalType": "struct Tuple59[]",779 "name": "permissions",780 "type": "tuple[]"781 }782 ],783 "name": "setTokenPropertyPermissions",784 "outputs": [],785 "stateMutability": "nonpayable",786 "type": "function"787 },788 {789 "inputs": [790 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }791 ],792 "name": "supportsInterface",793 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],794 "stateMutability": "view",795 "type": "function"796 },797 {798 "inputs": [],799 "name": "symbol",800 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],801 "stateMutability": "view",802 "type": "function"803 },804 {805 "inputs": [806 { "internalType": "uint256", "name": "index", "type": "uint256" }807 ],808 "name": "tokenByIndex",809 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],810 "stateMutability": "view",811 "type": "function"812 },813 {814 "inputs": [815 { "internalType": "address", "name": "owner", "type": "address" },816 { "internalType": "uint256", "name": "index", "type": "uint256" }817 ],818 "name": "tokenOfOwnerByIndex",819 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],820 "stateMutability": "view",821 "type": "function"822 },823 {824 "inputs": [],825 "name": "tokenPropertyPermissions",826 "outputs": [827 {828 "components": [829 { "internalType": "string", "name": "field_0", "type": "string" },830 {831 "components": [832 {833 "internalType": "enum EthTokenPermissions",834 "name": "field_0",835 "type": "uint8"836 },837 { "internalType": "bool", "name": "field_1", "type": "bool" }838 ],839 "internalType": "struct Tuple57[]",840 "name": "field_1",841 "type": "tuple[]"842 }843 ],844 "internalType": "struct Tuple59[]",845 "name": "",846 "type": "tuple[]"847 }848 ],849 "stateMutability": "view",850 "type": "function"851 },852 {853 "inputs": [854 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }855 ],856 "name": "tokenURI",857 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],858 "stateMutability": "view",859 "type": "function"860 },861 {862 "inputs": [],863 "name": "totalSupply",864 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],865 "stateMutability": "view",866 "type": "function"867 },868 {869 "inputs": [870 { "internalType": "address", "name": "to", "type": "address" },871 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }872 ],873 "name": "transfer",874 "outputs": [],875 "stateMutability": "nonpayable",876 "type": "function"877 },878 {879 "inputs": [880 {881 "components": [882 { "internalType": "address", "name": "eth", "type": "address" },883 { "internalType": "uint256", "name": "sub", "type": "uint256" }884 ],885 "internalType": "struct EthCrossAccount",886 "name": "to",887 "type": "tuple"888 },889 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }890 ],891 "name": "transferCross",892 "outputs": [],893 "stateMutability": "nonpayable",894 "type": "function"895 },896 {897 "inputs": [898 { "internalType": "address", "name": "from", "type": "address" },899 { "internalType": "address", "name": "to", "type": "address" },900 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }901 ],902 "name": "transferFrom",903 "outputs": [],904 "stateMutability": "nonpayable",905 "type": "function"906 },907 {908 "inputs": [909 {910 "components": [911 { "internalType": "address", "name": "eth", "type": "address" },912 { "internalType": "uint256", "name": "sub", "type": "uint256" }913 ],914 "internalType": "struct EthCrossAccount",915 "name": "from",916 "type": "tuple"917 },918 {919 "components": [920 { "internalType": "address", "name": "eth", "type": "address" },921 { "internalType": "uint256", "name": "sub", "type": "uint256" }922 ],923 "internalType": "struct EthCrossAccount",924 "name": "to",925 "type": "tuple"926 },927 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }928 ],929 "name": "transferFromCross",930 "outputs": [],931 "stateMutability": "nonpayable",932 "type": "function"933 },934 {935 "inputs": [],936 "name": "uniqueCollectionType",937 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],938 "stateMutability": "view",939 "type": "function"940 }941]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -752,12 +752,20 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple56[]",
+=======
+ "internalType": "struct Tuple53[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
"name": "field_1",
"type": "tuple[]"
}
],
+<<<<<<< HEAD
"internalType": "struct Tuple58[]",
+=======
+ "internalType": "struct Tuple55[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
"name": "permissions",
"type": "tuple[]"
}
@@ -827,12 +835,20 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
+<<<<<<< HEAD
"internalType": "struct Tuple56[]",
+=======
+ "internalType": "struct Tuple53[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
"name": "field_1",
"type": "tuple[]"
}
],
+<<<<<<< HEAD
"internalType": "struct Tuple58[]",
+=======
+ "internalType": "struct Tuple55[]",
+>>>>>>> 9e929f90... chore: generate stubs & types
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,20 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+=======
+ function setTokenPropertyPermissions(Tuple49[] memory permissions) external;
+>>>>>>> 9e929f90... chore: generate stubs & types
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+=======
+ function tokenPropertyPermissions() external view returns (Tuple49[] memory);
+>>>>>>> 9e929f90... chore: generate stubs & types
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,6 +105,7 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple52 {
string field_0;
Tuple50[] field_1;
@@ -104,6 +113,15 @@
/// @dev anonymous struct
struct Tuple50 {
+=======
+struct Tuple49 {
+ string field_0;
+ Tuple47[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple47 {
+>>>>>>> 9e929f90... chore: generate stubs & types
EthTokenPermissions field_0;
bool field_1;
}
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,20 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
+<<<<<<< HEAD
function setTokenPropertyPermissions(Tuple51[] memory permissions) external;
+=======
+ function setTokenPropertyPermissions(Tuple48[] memory permissions) external;
+>>>>>>> 9e929f90... chore: generate stubs & types
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
+<<<<<<< HEAD
function tokenPropertyPermissions() external view returns (Tuple51[] memory);
+=======
+ function tokenPropertyPermissions() external view returns (Tuple48[] memory);
+>>>>>>> 9e929f90... chore: generate stubs & types
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,6 +105,7 @@
}
/// @dev anonymous struct
+<<<<<<< HEAD
struct Tuple51 {
string field_0;
Tuple49[] field_1;
@@ -104,6 +113,15 @@
/// @dev anonymous struct
struct Tuple49 {
+=======
+struct Tuple48 {
+ string field_0;
+ Tuple46[] field_1;
+}
+
+/// @dev anonymous struct
+struct Tuple46 {
+>>>>>>> 9e929f90... chore: generate stubs & types
EthTokenPermissions field_0;
bool field_1;
}
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -83,7 +83,7 @@
dayRelayBlocks: u32 & AugmentedConst<ApiType>;
defaultMinGasPrice: u64 & AugmentedConst<ApiType>;
defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;
- maxOverridedAllowedLocations: u32 & AugmentedConst<ApiType>;
+ maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;
/**
* Generic const
**/