difftreelog
chore generate stubs & fix docs
in: master
13 files changed
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -147,29 +147,41 @@
/// How many tokens can a user have on one account.
#[default]
AccountTokenOwnership,
+
/// How many bytes of data are available for sponsorship.
SponsoredDataSize,
+
/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
SponsoredDataRateLimit,
+
/// How many tokens can be mined into this collection.
TokenLimit,
+
/// Timeouts for transfer sponsoring.
SponsorTransferTimeout,
+
/// Timeout for sponsoring an approval in passed blocks.
SponsorApproveTimeout,
+
/// Whether the collection owner of the collection can send tokens (which belong to other users).
OwnerCanTransfer,
+
/// Can the collection owner burn other people's tokens.
OwnerCanDestroy,
+
/// Is it possible to send tokens from this collection between users.
TransferEnabled,
}
+/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
#[derive(Default, Debug, Clone, Copy, AbiCoder)]
#[repr(u8)]
pub enum CollectionPermissions {
+ /// Owner of token can nest tokens under it.
#[default]
- CollectionAdmin,
TokenOwner,
+
+ /// Admin of token collection can nest tokens under token.
+ CollectionAdmin,
}
/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
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
@@ -173,10 +173,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple20[] memory) {
+ function collectionLimits() public view returns (Tuple23[] memory) {
require(false, stub_error);
dummy;
- return new Tuple20[](0);
+ return new Tuple23[](0);
}
/// Set limits for the collection.
@@ -284,33 +284,19 @@
/// 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) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 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
+ return Tuple29(false, new uint256[](0));
}
/// 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) {
+ function collectionNestingPermissions() public view returns (Tuple32[] 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
+ return new Tuple32[](0);
}
/// Set the collection access method.
@@ -490,21 +476,13 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple29 {
-=======
-struct Tuple27 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple32 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple26 {
-=======
-struct Tuple24 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple29 {
bool field_0;
uint256[] field_1;
}
@@ -532,7 +510,7 @@
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple23 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
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
@@ -42,11 +42,7 @@
/// @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
+ function setTokenPropertyPermissions(Tuple61[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -55,17 +51,10 @@
/// @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) {
+ function tokenPropertyPermissions() public view returns (Tuple61[] memory) {
require(false, stub_error);
dummy;
- return new Tuple56[](0);
->>>>>>> 9e929f90... chore: generate stubs & types
+ return new Tuple61[](0);
}
// /// @notice Set token property value.
@@ -155,23 +144,13 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple59 {
+struct Tuple61 {
string field_0;
- Tuple57[] field_1;
+ Tuple59[] field_1;
}
/// @dev anonymous struct
-struct Tuple57 {
-=======
-struct Tuple56 {
- string field_0;
- Tuple54[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple54 {
->>>>>>> 9e929f90... chore: generate stubs & types
+struct Tuple59 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -332,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple33[] memory) {
+ function collectionLimits() public view returns (Tuple35[] memory) {
require(false, stub_error);
dummy;
- return new Tuple33[](0);
+ return new Tuple35[](0);
}
/// Set limits for the collection.
@@ -443,33 +422,19 @@
/// 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) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 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
+ return Tuple41(false, new uint256[](0));
}
/// 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) {
+ function collectionNestingPermissions() public view returns (Tuple44[] memory) {
require(false, stub_error);
dummy;
- return new Tuple39[](0);
->>>>>>> 09f69700... chore: generate stubs
+ return new Tuple44[](0);
}
/// Set the collection access method.
@@ -649,26 +614,17 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple42 {
-=======
-struct Tuple39 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple44 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple39 {
-=======
-struct Tuple36 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple41 {
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.
@@ -692,22 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple33 {
+struct Tuple35 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple32 {
- address field_0;
- uint256 field_1;
-}
-
-=======
->>>>>>> 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.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -42,11 +42,7 @@
/// @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
+ function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -55,17 +51,10 @@
/// @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) {
+ function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
require(false, stub_error);
dummy;
- return new Tuple55[](0);
->>>>>>> 9e929f90... chore: generate stubs & types
+ return new Tuple60[](0);
}
// /// @notice Set token property value.
@@ -155,23 +144,13 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple58 {
- string field_0;
- Tuple56[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple56 {
-=======
-struct Tuple55 {
+struct Tuple60 {
string field_0;
- Tuple53[] field_1;
+ Tuple58[] field_1;
}
/// @dev anonymous struct
-struct Tuple53 {
->>>>>>> 9e929f90... chore: generate stubs & types
+struct Tuple58 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -332,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple32[] memory) {
+ function collectionLimits() public view returns (Tuple34[] memory) {
require(false, stub_error);
dummy;
- return new Tuple32[](0);
+ return new Tuple34[](0);
}
/// Set limits for the collection.
@@ -443,33 +422,19 @@
/// 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) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple40 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
+ return Tuple40(false, new uint256[](0));
}
/// 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) {
+ function collectionNestingPermissions() public view returns (Tuple43[] memory) {
require(false, stub_error);
dummy;
- return new Tuple38[](0);
->>>>>>> 09f69700... chore: generate stubs
+ return new Tuple43[](0);
}
/// Set the collection access method.
@@ -649,26 +614,17 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple41 {
-=======
-struct Tuple38 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple43 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple38 {
-=======
-struct Tuple35 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple40 {
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.
@@ -692,20 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple32 {
+struct Tuple34 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
-}
-
-/// @dev anonymous struct
-struct Tuple31 {
- address field_0;
- 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.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -220,7 +220,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple23[]",
"name": "",
"type": "tuple[]"
}
@@ -241,11 +241,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple29[]",
-=======
- "internalType": "struct Tuple27[]",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple32[]",
"name": "",
"type": "tuple[]"
}
@@ -266,11 +262,7 @@
"type": "uint256[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple26",
-=======
- "internalType": "struct Tuple24",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple29",
"name": "",
"type": "tuple"
}
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<<<<<<< HEAD774 "internalType": "struct Tuple57[]",775=======776 "internalType": "struct Tuple54[]",777>>>>>>> 9e929f90... chore: generate stubs & types778 "name": "field_1",779 "type": "tuple[]"780 }781 ],782<<<<<<< HEAD783 "internalType": "struct Tuple59[]",784=======785 "internalType": "struct Tuple56[]",786>>>>>>> 9e929f90... chore: generate stubs & types787 "name": "permissions",788 "type": "tuple[]"789 }790 ],791 "name": "setTokenPropertyPermissions",792 "outputs": [],793 "stateMutability": "nonpayable",794 "type": "function"795 },796 {797 "inputs": [798 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }799 ],800 "name": "supportsInterface",801 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],802 "stateMutability": "view",803 "type": "function"804 },805 {806 "inputs": [],807 "name": "symbol",808 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],809 "stateMutability": "view",810 "type": "function"811 },812 {813 "inputs": [814 { "internalType": "uint256", "name": "index", "type": "uint256" }815 ],816 "name": "tokenByIndex",817 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],818 "stateMutability": "view",819 "type": "function"820 },821 {822 "inputs": [823 { "internalType": "address", "name": "owner", "type": "address" },824 { "internalType": "uint256", "name": "index", "type": "uint256" }825 ],826 "name": "tokenOfOwnerByIndex",827 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],828 "stateMutability": "view",829 "type": "function"830 },831 {832 "inputs": [],833 "name": "tokenPropertyPermissions",834 "outputs": [835 {836 "components": [837 { "internalType": "string", "name": "field_0", "type": "string" },838 {839 "components": [840 {841 "internalType": "enum EthTokenPermissions",842 "name": "field_0",843 "type": "uint8"844 },845 { "internalType": "bool", "name": "field_1", "type": "bool" }846 ],847<<<<<<< HEAD848 "internalType": "struct Tuple57[]",849=======850 "internalType": "struct Tuple54[]",851>>>>>>> 9e929f90... chore: generate stubs & types852 "name": "field_1",853 "type": "tuple[]"854 }855 ],856<<<<<<< HEAD857 "internalType": "struct Tuple59[]",858=======859 "internalType": "struct Tuple56[]",860>>>>>>> 9e929f90... chore: generate stubs & types861 "name": "",862 "type": "tuple[]"863 }864 ],865 "stateMutability": "view",866 "type": "function"867 },868 {869 "inputs": [870 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }871 ],872 "name": "tokenURI",873 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],874 "stateMutability": "view",875 "type": "function"876 },877 {878 "inputs": [],879 "name": "totalSupply",880 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],881 "stateMutability": "view",882 "type": "function"883 },884 {885 "inputs": [886 { "internalType": "address", "name": "to", "type": "address" },887 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }888 ],889 "name": "transfer",890 "outputs": [],891 "stateMutability": "nonpayable",892 "type": "function"893 },894 {895 "inputs": [896 {897 "components": [898 { "internalType": "address", "name": "eth", "type": "address" },899 { "internalType": "uint256", "name": "sub", "type": "uint256" }900 ],901 "internalType": "struct EthCrossAccount",902 "name": "to",903 "type": "tuple"904 },905 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }906 ],907 "name": "transferCross",908 "outputs": [],909 "stateMutability": "nonpayable",910 "type": "function"911 },912 {913 "inputs": [914 { "internalType": "address", "name": "from", "type": "address" },915 { "internalType": "address", "name": "to", "type": "address" },916 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }917 ],918 "name": "transferFrom",919 "outputs": [],920 "stateMutability": "nonpayable",921 "type": "function"922 },923 {924 "inputs": [925 {926 "components": [927 { "internalType": "address", "name": "eth", "type": "address" },928 { "internalType": "uint256", "name": "sub", "type": "uint256" }929 ],930 "internalType": "struct EthCrossAccount",931 "name": "from",932 "type": "tuple"933 },934 {935 "components": [936 { "internalType": "address", "name": "eth", "type": "address" },937 { "internalType": "uint256", "name": "sub", "type": "uint256" }938 ],939 "internalType": "struct EthCrossAccount",940 "name": "to",941 "type": "tuple"942 },943 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }944 ],945 "name": "transferFromCross",946 "outputs": [],947 "stateMutability": "nonpayable",948 "type": "function"949 },950 {951 "inputs": [],952 "name": "uniqueCollectionType",953 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],954 "stateMutability": "view",955 "type": "function"956 }957]1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "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 Tuple35[]",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 "internalType": "struct Tuple44[]",275 "name": "",276 "type": "tuple[]"277 }278 ],279 "stateMutability": "view",280 "type": "function"281 },282 {283 "inputs": [],284 "name": "collectionNestingRestrictedCollectionIds",285 "outputs": [286 {287 "components": [288 { "internalType": "bool", "name": "field_0", "type": "bool" },289 {290 "internalType": "uint256[]",291 "name": "field_1",292 "type": "uint256[]"293 }294 ],295 "internalType": "struct Tuple41",296 "name": "",297 "type": "tuple"298 }299 ],300 "stateMutability": "view",301 "type": "function"302 },303 {304 "inputs": [],305 "name": "collectionOwner",306 "outputs": [307 {308 "components": [309 { "internalType": "address", "name": "eth", "type": "address" },310 { "internalType": "uint256", "name": "sub", "type": "uint256" }311 ],312 "internalType": "struct EthCrossAccount",313 "name": "",314 "type": "tuple"315 }316 ],317 "stateMutability": "view",318 "type": "function"319 },320 {321 "inputs": [322 { "internalType": "string[]", "name": "keys", "type": "string[]" }323 ],324 "name": "collectionProperties",325 "outputs": [326 {327 "components": [328 { "internalType": "string", "name": "key", "type": "string" },329 { "internalType": "bytes", "name": "value", "type": "bytes" }330 ],331 "internalType": "struct Property[]",332 "name": "",333 "type": "tuple[]"334 }335 ],336 "stateMutability": "view",337 "type": "function"338 },339 {340 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],341 "name": "collectionProperty",342 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],343 "stateMutability": "view",344 "type": "function"345 },346 {347 "inputs": [],348 "name": "collectionSponsor",349 "outputs": [350 {351 "components": [352 { "internalType": "address", "name": "eth", "type": "address" },353 { "internalType": "uint256", "name": "sub", "type": "uint256" }354 ],355 "internalType": "struct EthCrossAccount",356 "name": "",357 "type": "tuple"358 }359 ],360 "stateMutability": "view",361 "type": "function"362 },363 {364 "inputs": [],365 "name": "confirmCollectionSponsorship",366 "outputs": [],367 "stateMutability": "nonpayable",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "contractAddress",373 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],374 "stateMutability": "view",375 "type": "function"376 },377 {378 "inputs": [379 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }380 ],381 "name": "crossOwnerOf",382 "outputs": [383 {384 "components": [385 { "internalType": "address", "name": "eth", "type": "address" },386 { "internalType": "uint256", "name": "sub", "type": "uint256" }387 ],388 "internalType": "struct EthCrossAccount",389 "name": "",390 "type": "tuple"391 }392 ],393 "stateMutability": "view",394 "type": "function"395 },396 {397 "inputs": [398 { "internalType": "string[]", "name": "keys", "type": "string[]" }399 ],400 "name": "deleteCollectionProperties",401 "outputs": [],402 "stateMutability": "nonpayable",403 "type": "function"404 },405 {406 "inputs": [407 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },408 { "internalType": "string[]", "name": "keys", "type": "string[]" }409 ],410 "name": "deleteProperties",411 "outputs": [],412 "stateMutability": "nonpayable",413 "type": "function"414 },415 {416 "inputs": [],417 "name": "description",418 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],419 "stateMutability": "view",420 "type": "function"421 },422 {423 "inputs": [],424 "name": "finishMinting",425 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],426 "stateMutability": "nonpayable",427 "type": "function"428 },429 {430 "inputs": [431 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }432 ],433 "name": "getApproved",434 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],435 "stateMutability": "view",436 "type": "function"437 },438 {439 "inputs": [],440 "name": "hasCollectionPendingSponsor",441 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],442 "stateMutability": "view",443 "type": "function"444 },445 {446 "inputs": [447 { "internalType": "address", "name": "owner", "type": "address" },448 { "internalType": "address", "name": "operator", "type": "address" }449 ],450 "name": "isApprovedForAll",451 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],452 "stateMutability": "view",453 "type": "function"454 },455 {456 "inputs": [457 {458 "components": [459 { "internalType": "address", "name": "eth", "type": "address" },460 { "internalType": "uint256", "name": "sub", "type": "uint256" }461 ],462 "internalType": "struct EthCrossAccount",463 "name": "user",464 "type": "tuple"465 }466 ],467 "name": "isOwnerOrAdminCross",468 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],469 "stateMutability": "view",470 "type": "function"471 },472 {473 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],474 "name": "mint",475 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],476 "stateMutability": "nonpayable",477 "type": "function"478 },479 {480 "inputs": [481 {482 "components": [483 { "internalType": "address", "name": "eth", "type": "address" },484 { "internalType": "uint256", "name": "sub", "type": "uint256" }485 ],486 "internalType": "struct EthCrossAccount",487 "name": "to",488 "type": "tuple"489 },490 {491 "components": [492 { "internalType": "string", "name": "key", "type": "string" },493 { "internalType": "bytes", "name": "value", "type": "bytes" }494 ],495 "internalType": "struct Property[]",496 "name": "properties",497 "type": "tuple[]"498 }499 ],500 "name": "mintCross",501 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],502 "stateMutability": "nonpayable",503 "type": "function"504 },505 {506 "inputs": [507 { "internalType": "address", "name": "to", "type": "address" },508 { "internalType": "string", "name": "tokenUri", "type": "string" }509 ],510 "name": "mintWithTokenURI",511 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],512 "stateMutability": "nonpayable",513 "type": "function"514 },515 {516 "inputs": [],517 "name": "mintingFinished",518 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],519 "stateMutability": "view",520 "type": "function"521 },522 {523 "inputs": [],524 "name": "name",525 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],526 "stateMutability": "view",527 "type": "function"528 },529 {530 "inputs": [],531 "name": "nextTokenId",532 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],533 "stateMutability": "view",534 "type": "function"535 },536 {537 "inputs": [538 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }539 ],540 "name": "ownerOf",541 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],542 "stateMutability": "view",543 "type": "function"544 },545 {546 "inputs": [547 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },548 { "internalType": "string[]", "name": "keys", "type": "string[]" }549 ],550 "name": "properties",551 "outputs": [552 {553 "components": [554 { "internalType": "string", "name": "key", "type": "string" },555 { "internalType": "bytes", "name": "value", "type": "bytes" }556 ],557 "internalType": "struct Property[]",558 "name": "",559 "type": "tuple[]"560 }561 ],562 "stateMutability": "view",563 "type": "function"564 },565 {566 "inputs": [567 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },568 { "internalType": "string", "name": "key", "type": "string" }569 ],570 "name": "property",571 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],572 "stateMutability": "view",573 "type": "function"574 },575 {576 "inputs": [577 {578 "components": [579 { "internalType": "address", "name": "eth", "type": "address" },580 { "internalType": "uint256", "name": "sub", "type": "uint256" }581 ],582 "internalType": "struct EthCrossAccount",583 "name": "admin",584 "type": "tuple"585 }586 ],587 "name": "removeCollectionAdminCross",588 "outputs": [],589 "stateMutability": "nonpayable",590 "type": "function"591 },592 {593 "inputs": [],594 "name": "removeCollectionSponsor",595 "outputs": [],596 "stateMutability": "nonpayable",597 "type": "function"598 },599 {600 "inputs": [601 {602 "components": [603 { "internalType": "address", "name": "eth", "type": "address" },604 { "internalType": "uint256", "name": "sub", "type": "uint256" }605 ],606 "internalType": "struct EthCrossAccount",607 "name": "user",608 "type": "tuple"609 }610 ],611 "name": "removeFromCollectionAllowListCross",612 "outputs": [],613 "stateMutability": "nonpayable",614 "type": "function"615 },616 {617 "inputs": [618 { "internalType": "address", "name": "from", "type": "address" },619 { "internalType": "address", "name": "to", "type": "address" },620 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }621 ],622 "name": "safeTransferFrom",623 "outputs": [],624 "stateMutability": "nonpayable",625 "type": "function"626 },627 {628 "inputs": [629 { "internalType": "address", "name": "from", "type": "address" },630 { "internalType": "address", "name": "to", "type": "address" },631 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },632 { "internalType": "bytes", "name": "data", "type": "bytes" }633 ],634 "name": "safeTransferFrom",635 "outputs": [],636 "stateMutability": "nonpayable",637 "type": "function"638 },639 {640 "inputs": [641 { "internalType": "address", "name": "operator", "type": "address" },642 { "internalType": "bool", "name": "approved", "type": "bool" }643 ],644 "name": "setApprovalForAll",645 "outputs": [],646 "stateMutability": "nonpayable",647 "type": "function"648 },649 {650 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],651 "name": "setCollectionAccess",652 "outputs": [],653 "stateMutability": "nonpayable",654 "type": "function"655 },656 {657 "inputs": [658 {659 "internalType": "enum CollectionLimits",660 "name": "limit",661 "type": "uint8"662 },663 { "internalType": "bool", "name": "status", "type": "bool" },664 { "internalType": "uint256", "name": "value", "type": "uint256" }665 ],666 "name": "setCollectionLimit",667 "outputs": [],668 "stateMutability": "nonpayable",669 "type": "function"670 },671 {672 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],673 "name": "setCollectionMintMode",674 "outputs": [],675 "stateMutability": "nonpayable",676 "type": "function"677 },678 {679 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],680 "name": "setCollectionNesting",681 "outputs": [],682 "stateMutability": "nonpayable",683 "type": "function"684 },685 {686 "inputs": [687 { "internalType": "bool", "name": "enable", "type": "bool" },688 {689 "internalType": "address[]",690 "name": "collections",691 "type": "address[]"692 }693 ],694 "name": "setCollectionNesting",695 "outputs": [],696 "stateMutability": "nonpayable",697 "type": "function"698 },699 {700 "inputs": [701 {702 "components": [703 { "internalType": "string", "name": "key", "type": "string" },704 { "internalType": "bytes", "name": "value", "type": "bytes" }705 ],706 "internalType": "struct Property[]",707 "name": "properties",708 "type": "tuple[]"709 }710 ],711 "name": "setCollectionProperties",712 "outputs": [],713 "stateMutability": "nonpayable",714 "type": "function"715 },716 {717 "inputs": [718 {719 "components": [720 { "internalType": "address", "name": "eth", "type": "address" },721 { "internalType": "uint256", "name": "sub", "type": "uint256" }722 ],723 "internalType": "struct EthCrossAccount",724 "name": "sponsor",725 "type": "tuple"726 }727 ],728 "name": "setCollectionSponsorCross",729 "outputs": [],730 "stateMutability": "nonpayable",731 "type": "function"732 },733 {734 "inputs": [735 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },736 {737 "components": [738 { "internalType": "string", "name": "key", "type": "string" },739 { "internalType": "bytes", "name": "value", "type": "bytes" }740 ],741 "internalType": "struct Property[]",742 "name": "properties",743 "type": "tuple[]"744 }745 ],746 "name": "setProperties",747 "outputs": [],748 "stateMutability": "nonpayable",749 "type": "function"750 },751 {752 "inputs": [753 {754 "components": [755 { "internalType": "string", "name": "field_0", "type": "string" },756 {757 "components": [758 {759 "internalType": "enum EthTokenPermissions",760 "name": "field_0",761 "type": "uint8"762 },763 { "internalType": "bool", "name": "field_1", "type": "bool" }764 ],765 "internalType": "struct Tuple59[]",766 "name": "field_1",767 "type": "tuple[]"768 }769 ],770 "internalType": "struct Tuple61[]",771 "name": "permissions",772 "type": "tuple[]"773 }774 ],775 "name": "setTokenPropertyPermissions",776 "outputs": [],777 "stateMutability": "nonpayable",778 "type": "function"779 },780 {781 "inputs": [782 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }783 ],784 "name": "supportsInterface",785 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],786 "stateMutability": "view",787 "type": "function"788 },789 {790 "inputs": [],791 "name": "symbol",792 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],793 "stateMutability": "view",794 "type": "function"795 },796 {797 "inputs": [798 { "internalType": "uint256", "name": "index", "type": "uint256" }799 ],800 "name": "tokenByIndex",801 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],802 "stateMutability": "view",803 "type": "function"804 },805 {806 "inputs": [807 { "internalType": "address", "name": "owner", "type": "address" },808 { "internalType": "uint256", "name": "index", "type": "uint256" }809 ],810 "name": "tokenOfOwnerByIndex",811 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],812 "stateMutability": "view",813 "type": "function"814 },815 {816 "inputs": [],817 "name": "tokenPropertyPermissions",818 "outputs": [819 {820 "components": [821 { "internalType": "string", "name": "field_0", "type": "string" },822 {823 "components": [824 {825 "internalType": "enum EthTokenPermissions",826 "name": "field_0",827 "type": "uint8"828 },829 { "internalType": "bool", "name": "field_1", "type": "bool" }830 ],831 "internalType": "struct Tuple59[]",832 "name": "field_1",833 "type": "tuple[]"834 }835 ],836 "internalType": "struct Tuple61[]",837 "name": "",838 "type": "tuple[]"839 }840 ],841 "stateMutability": "view",842 "type": "function"843 },844 {845 "inputs": [846 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }847 ],848 "name": "tokenURI",849 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],850 "stateMutability": "view",851 "type": "function"852 },853 {854 "inputs": [],855 "name": "totalSupply",856 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],857 "stateMutability": "view",858 "type": "function"859 },860 {861 "inputs": [862 { "internalType": "address", "name": "to", "type": "address" },863 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }864 ],865 "name": "transfer",866 "outputs": [],867 "stateMutability": "nonpayable",868 "type": "function"869 },870 {871 "inputs": [872 {873 "components": [874 { "internalType": "address", "name": "eth", "type": "address" },875 { "internalType": "uint256", "name": "sub", "type": "uint256" }876 ],877 "internalType": "struct EthCrossAccount",878 "name": "to",879 "type": "tuple"880 },881 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }882 ],883 "name": "transferCross",884 "outputs": [],885 "stateMutability": "nonpayable",886 "type": "function"887 },888 {889 "inputs": [890 { "internalType": "address", "name": "from", "type": "address" },891 { "internalType": "address", "name": "to", "type": "address" },892 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }893 ],894 "name": "transferFrom",895 "outputs": [],896 "stateMutability": "nonpayable",897 "type": "function"898 },899 {900 "inputs": [901 {902 "components": [903 { "internalType": "address", "name": "eth", "type": "address" },904 { "internalType": "uint256", "name": "sub", "type": "uint256" }905 ],906 "internalType": "struct EthCrossAccount",907 "name": "from",908 "type": "tuple"909 },910 {911 "components": [912 { "internalType": "address", "name": "eth", "type": "address" },913 { "internalType": "uint256", "name": "sub", "type": "uint256" }914 ],915 "internalType": "struct EthCrossAccount",916 "name": "to",917 "type": "tuple"918 },919 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }920 ],921 "name": "transferFromCross",922 "outputs": [],923 "stateMutability": "nonpayable",924 "type": "function"925 },926 {927 "inputs": [],928 "name": "uniqueCollectionType",929 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],930 "stateMutability": "view",931 "type": "function"932 }933]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -232,7 +232,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple32[]",
+ "internalType": "struct Tuple34[]",
"name": "",
"type": "tuple[]"
}
@@ -253,11 +253,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple41[]",
-=======
- "internalType": "struct Tuple38[]",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple43[]",
"name": "",
"type": "tuple[]"
}
@@ -278,11 +274,7 @@
"type": "uint256[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple38",
-=======
- "internalType": "struct Tuple35",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple40",
"name": "",
"type": "tuple"
}
@@ -752,20 +744,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple56[]",
-=======
- "internalType": "struct Tuple53[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple58[]",
-=======
- "internalType": "struct Tuple55[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple60[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -835,20 +819,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple56[]",
-=======
- "internalType": "struct Tuple53[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple58[]",
-=======
- "internalType": "struct Tuple55[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple60[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -119,7 +119,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple19[] memory);
+ function collectionLimits() external view returns (Tuple21[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -191,20 +191,12 @@
/// 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
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
/// 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
+ function collectionNestingPermissions() external view returns (Tuple29[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -319,11 +311,7 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple27 {
-=======
-struct Tuple25 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple29 {
CollectionPermissions field_0;
bool field_1;
}
@@ -334,11 +322,7 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple24 {
-=======
-struct Tuple22 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple26 {
bool field_0;
uint256[] field_1;
}
@@ -366,7 +350,7 @@
}
/// @dev anonymous struct
-struct Tuple19 {
+struct Tuple21 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,20 +30,12 @@
/// @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
+ function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
/// @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
+ function tokenPropertyPermissions() external view returns (Tuple53[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -105,23 +97,13 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple52 {
+struct Tuple53 {
string field_0;
- Tuple50[] field_1;
+ Tuple51[] field_1;
}
/// @dev anonymous struct
-struct Tuple50 {
-=======
-struct Tuple49 {
- string field_0;
- Tuple47[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple47 {
->>>>>>> 9e929f90... chore: generate stubs & types
+struct Tuple51 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -233,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple30[] memory);
+ function collectionLimits() external view returns (Tuple31[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -305,20 +287,12 @@
/// 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
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
/// 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
+ function collectionNestingPermissions() external view returns (Tuple39[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -433,11 +407,7 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple38 {
-=======
-struct Tuple35 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple39 {
CollectionPermissions field_0;
bool field_1;
}
@@ -448,16 +418,11 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple35 {
-=======
-struct Tuple32 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple36 {
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.
@@ -481,22 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple31 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
-}
-
-/// @dev anonymous struct
-struct Tuple27 {
- address field_0;
- uint256 field_1;
}
-=======
->>>>>>> 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
@@ -30,20 +30,12 @@
/// @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
+ function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
/// @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
+ function tokenPropertyPermissions() external view returns (Tuple52[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -105,23 +97,13 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple51 {
+struct Tuple52 {
string field_0;
- Tuple49[] field_1;
+ Tuple50[] field_1;
}
/// @dev anonymous struct
-struct Tuple49 {
-=======
-struct Tuple48 {
- string field_0;
- Tuple46[] field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple46 {
->>>>>>> 9e929f90... chore: generate stubs & types
+struct Tuple50 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -233,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple29[] memory);
+ function collectionLimits() external view returns (Tuple30[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -305,20 +287,12 @@
/// 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
+ 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()
-<<<<<<< HEAD
- function collectionNestingPermissions() external view returns (Tuple37[] memory);
-=======
- function collectionNestingPermissions() external view returns (Tuple34[] memory);
->>>>>>> 09f69700... chore: generate stubs
+ function collectionNestingPermissions() external view returns (Tuple38[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -433,11 +407,7 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple37 {
-=======
-struct Tuple34 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple38 {
CollectionPermissions field_0;
bool field_1;
}
@@ -448,16 +418,11 @@
}
/// @dev anonymous struct
-<<<<<<< HEAD
-struct Tuple34 {
-=======
-struct Tuple31 {
->>>>>>> 09f69700... chore: generate stubs
+struct Tuple35 {
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.
@@ -481,22 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple30 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
-}
-
-/// @dev anonymous struct
-struct Tuple26 {
- address field_0;
- uint256 field_1;
}
-=======
->>>>>>> 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