difftreelog
refactor remove last anonimous structs
in: master
14 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -34,9 +34,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
- eth::{
- CollectionPermissions as EvmPermissions, CollectionLimitField as EvmCollectionLimits, self,
- },
+ eth::{CollectionLimitField as EvmCollectionLimits, self},
weights::WeightInfo,
};
@@ -490,10 +488,10 @@
/// Returns nesting for a collection
#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]
- fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {
+ fn collection_nesting_restricted_ids(&self) -> Result<eth::CollectionNesting> {
let nesting = self.collection.permissions.nesting();
- Ok((
+ Ok(eth::CollectionNesting::new(
nesting.token_owner,
nesting
.restricted
@@ -504,11 +502,17 @@
}
/// Returns permissions for a collection
- fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {
+ fn collection_nesting_permissions(&self) -> Result<Vec<eth::CollectionNestingPermission>> {
let nesting = self.collection.permissions.nesting();
Ok(vec![
- (EvmPermissions::CollectionAdmin, nesting.collection_admin),
- (EvmPermissions::TokenOwner, nesting.token_owner),
+ eth::CollectionNestingPermission::new(
+ eth::CollectionPermissionField::CollectionAdmin,
+ nesting.collection_admin,
+ ),
+ eth::CollectionNestingPermission::new(
+ eth::CollectionPermissionField::TokenOwner,
+ nesting.token_owner,
+ ),
])
}
/// Set the collection access method.
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -306,7 +306,7 @@
/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
#[derive(Default, Debug, Clone, Copy, AbiCoder)]
#[repr(u8)]
-pub enum CollectionPermissions {
+pub enum CollectionPermissionField {
/// Owner of token can nest tokens under it.
#[default]
TokenOwner,
@@ -431,3 +431,31 @@
Ok(perms)
}
}
+
+/// Nested collections.
+#[derive(Debug, Default, AbiCoder)]
+pub struct CollectionNesting {
+ token_owner: bool,
+ ids: Vec<uint256>,
+}
+
+impl CollectionNesting {
+ /// Create [`CollectionNesting`].
+ pub fn new(token_owner: bool, ids: Vec<uint256>) -> Self {
+ Self { token_owner, ids }
+ }
+}
+
+/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+#[derive(Debug, Default, AbiCoder)]
+pub struct CollectionNestingPermission {
+ field: CollectionPermissionField,
+ value: bool,
+}
+
+impl CollectionNestingPermission {
+ /// Create [`CollectionNestingPermission`].
+ pub fn new(field: CollectionPermissionField, value: bool) -> Self {
+ Self { field, value }
+ }
+}
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
@@ -257,19 +257,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple33 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {
require(false, stub_error);
dummy;
- return Tuple33(false, new uint256[](0));
+ return CollectionNesting(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple36[] memory) {
+ function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {
require(false, stub_error);
dummy;
- return new Tuple36[](0);
+ return new CollectionNestingPermission[](0);
}
/// Set the collection access method.
@@ -443,24 +443,24 @@
uint256 sub;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
+}
+
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple36 {
- CollectionPermissions field_0;
- bool field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple33 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -469,6 +469,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;
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
@@ -401,19 +401,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple45 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {
require(false, stub_error);
dummy;
- return Tuple45(false, new uint256[](0));
+ return CollectionNesting(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple48[] memory) {
+ function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {
require(false, stub_error);
dummy;
- return new Tuple48[](0);
+ return new CollectionNestingPermission[](0);
}
/// Set the collection access method.
@@ -587,24 +587,24 @@
uint256 sub;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
+}
+
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple48 {
- CollectionPermissions field_0;
- bool field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple45 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -613,6 +613,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;
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
@@ -401,19 +401,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple44 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (CollectionNesting memory) {
require(false, stub_error);
dummy;
- return Tuple44(false, new uint256[](0));
+ return CollectionNesting(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple47[] memory) {
+ function collectionNestingPermissions() public view returns (CollectionNestingPermission[] memory) {
require(false, stub_error);
dummy;
- return new Tuple47[](0);
+ return new CollectionNestingPermission[](0);
}
/// Set the collection access method.
@@ -587,24 +587,24 @@
uint256 sub;
}
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
+}
+
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple47 {
- CollectionPermissions field_0;
- bool field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple44 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -613,6 +613,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -242,13 +242,13 @@
{
"components": [
{
- "internalType": "enum CollectionPermissions",
- "name": "field_0",
+ "internalType": "enum CollectionPermissionField",
+ "name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple36[]",
+ "internalType": "struct CollectionNestingPermission[]",
"name": "",
"type": "tuple[]"
}
@@ -262,14 +262,10 @@
"outputs": [
{
"components": [
- { "internalType": "bool", "name": "field_0", "type": "bool" },
- {
- "internalType": "uint256[]",
- "name": "field_1",
- "type": "uint256[]"
- }
+ { "internalType": "bool", "name": "token_owner", "type": "bool" },
+ { "internalType": "uint256[]", "name": "ids", "type": "uint256[]" }
],
- "internalType": "struct Tuple33",
+ "internalType": "struct CollectionNesting",
"name": "",
"type": "tuple"
}
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -272,13 +272,13 @@
{
"components": [
{
- "internalType": "enum CollectionPermissions",
- "name": "field_0",
+ "internalType": "enum CollectionPermissionField",
+ "name": "field",
"type": "uint8"
},
- { "internalType": "bool", "name": "field_1", "type": "bool" }
+ { "internalType": "bool", "name": "value", "type": "bool" }
],
- "internalType": "struct Tuple48[]",
+ "internalType": "struct CollectionNestingPermission[]",
"name": "",
"type": "tuple[]"
}
@@ -292,14 +292,10 @@
"outputs": [
{
"components": [
- { "internalType": "bool", "name": "field_0", "type": "bool" },
- {
- "internalType": "uint256[]",
- "name": "field_1",
- "type": "uint256[]"
- }
+ { "internalType": "bool", "name": "token_owner", "type": "bool" },
+ { "internalType": "uint256[]", "name": "ids", "type": "uint256[]" }
],
- "internalType": "struct Tuple45",
+ "internalType": "struct CollectionNesting",
"name": "",
"type": "tuple"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct CrossAccount",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 CrossAccount",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 CrossAccount",125 "name": "user",126 "type": "tuple"127 }128 ],129 "name": "allowlistedCross",130 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],131 "stateMutability": "view",132 "type": "function"133 },134 {135 "inputs": [136 { "internalType": "address", "name": "approved", "type": "address" },137 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }138 ],139 "name": "approve",140 "outputs": [],141 "stateMutability": "nonpayable",142 "type": "function"143 },144 {145 "inputs": [146 { "internalType": "address", "name": "owner", "type": "address" }147 ],148 "name": "balanceOf",149 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],150 "stateMutability": "view",151 "type": "function"152 },153 {154 "inputs": [155 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }156 ],157 "name": "burn",158 "outputs": [],159 "stateMutability": "nonpayable",160 "type": "function"161 },162 {163 "inputs": [164 {165 "components": [166 { "internalType": "address", "name": "eth", "type": "address" },167 { "internalType": "uint256", "name": "sub", "type": "uint256" }168 ],169 "internalType": "struct CrossAccount",170 "name": "from",171 "type": "tuple"172 },173 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }174 ],175 "name": "burnFromCross",176 "outputs": [],177 "stateMutability": "nonpayable",178 "type": "function"179 },180 {181 "inputs": [182 {183 "components": [184 { "internalType": "address", "name": "eth", "type": "address" },185 { "internalType": "uint256", "name": "sub", "type": "uint256" }186 ],187 "internalType": "struct CrossAccount",188 "name": "newOwner",189 "type": "tuple"190 }191 ],192 "name": "changeCollectionOwnerCross",193 "outputs": [],194 "stateMutability": "nonpayable",195 "type": "function"196 },197 {198 "inputs": [],199 "name": "collectionAdmins",200 "outputs": [201 {202 "components": [203 { "internalType": "address", "name": "eth", "type": "address" },204 { "internalType": "uint256", "name": "sub", "type": "uint256" }205 ],206 "internalType": "struct CrossAccount[]",207 "name": "",208 "type": "tuple[]"209 }210 ],211 "stateMutability": "view",212 "type": "function"213 },214 {215 "inputs": [],216 "name": "collectionHelperAddress",217 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],218 "stateMutability": "view",219 "type": "function"220 },221 {222 "inputs": [],223 "name": "collectionLimits",224 "outputs": [225 {226 "components": [227 {228 "internalType": "enum CollectionLimitField",229 "name": "field",230 "type": "uint8"231 },232 {233 "components": [234 { "internalType": "bool", "name": "status", "type": "bool" },235 { "internalType": "uint256", "name": "value", "type": "uint256" }236 ],237 "internalType": "struct OptionUint",238 "name": "value",239 "type": "tuple"240 }241 ],242 "internalType": "struct CollectionLimit[]",243 "name": "",244 "type": "tuple[]"245 }246 ],247 "stateMutability": "view",248 "type": "function"249 },250 {251 "inputs": [],252 "name": "collectionNestingPermissions",253 "outputs": [254 {255 "components": [256 {257 "internalType": "enum CollectionPermissions",258 "name": "field_0",259 "type": "uint8"260 },261 { "internalType": "bool", "name": "field_1", "type": "bool" }262 ],263 "internalType": "struct Tuple47[]",264 "name": "",265 "type": "tuple[]"266 }267 ],268 "stateMutability": "view",269 "type": "function"270 },271 {272 "inputs": [],273 "name": "collectionNestingRestrictedCollectionIds",274 "outputs": [275 {276 "components": [277 { "internalType": "bool", "name": "field_0", "type": "bool" },278 {279 "internalType": "uint256[]",280 "name": "field_1",281 "type": "uint256[]"282 }283 ],284 "internalType": "struct Tuple44",285 "name": "",286 "type": "tuple"287 }288 ],289 "stateMutability": "view",290 "type": "function"291 },292 {293 "inputs": [],294 "name": "collectionOwner",295 "outputs": [296 {297 "components": [298 { "internalType": "address", "name": "eth", "type": "address" },299 { "internalType": "uint256", "name": "sub", "type": "uint256" }300 ],301 "internalType": "struct CrossAccount",302 "name": "",303 "type": "tuple"304 }305 ],306 "stateMutability": "view",307 "type": "function"308 },309 {310 "inputs": [311 { "internalType": "string[]", "name": "keys", "type": "string[]" }312 ],313 "name": "collectionProperties",314 "outputs": [315 {316 "components": [317 { "internalType": "string", "name": "key", "type": "string" },318 { "internalType": "bytes", "name": "value", "type": "bytes" }319 ],320 "internalType": "struct Property[]",321 "name": "",322 "type": "tuple[]"323 }324 ],325 "stateMutability": "view",326 "type": "function"327 },328 {329 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],330 "name": "collectionProperty",331 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],332 "stateMutability": "view",333 "type": "function"334 },335 {336 "inputs": [],337 "name": "collectionSponsor",338 "outputs": [339 {340 "components": [341 { "internalType": "address", "name": "eth", "type": "address" },342 { "internalType": "uint256", "name": "sub", "type": "uint256" }343 ],344 "internalType": "struct CrossAccount",345 "name": "",346 "type": "tuple"347 }348 ],349 "stateMutability": "view",350 "type": "function"351 },352 {353 "inputs": [],354 "name": "confirmCollectionSponsorship",355 "outputs": [],356 "stateMutability": "nonpayable",357 "type": "function"358 },359 {360 "inputs": [],361 "name": "contractAddress",362 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],363 "stateMutability": "view",364 "type": "function"365 },366 {367 "inputs": [368 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }369 ],370 "name": "crossOwnerOf",371 "outputs": [372 {373 "components": [374 { "internalType": "address", "name": "eth", "type": "address" },375 { "internalType": "uint256", "name": "sub", "type": "uint256" }376 ],377 "internalType": "struct CrossAccount",378 "name": "",379 "type": "tuple"380 }381 ],382 "stateMutability": "view",383 "type": "function"384 },385 {386 "inputs": [387 { "internalType": "string[]", "name": "keys", "type": "string[]" }388 ],389 "name": "deleteCollectionProperties",390 "outputs": [],391 "stateMutability": "nonpayable",392 "type": "function"393 },394 {395 "inputs": [396 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },397 { "internalType": "string[]", "name": "keys", "type": "string[]" }398 ],399 "name": "deleteProperties",400 "outputs": [],401 "stateMutability": "nonpayable",402 "type": "function"403 },404 {405 "inputs": [],406 "name": "description",407 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],408 "stateMutability": "view",409 "type": "function"410 },411 {412 "inputs": [],413 "name": "finishMinting",414 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],415 "stateMutability": "nonpayable",416 "type": "function"417 },418 {419 "inputs": [420 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }421 ],422 "name": "getApproved",423 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],424 "stateMutability": "view",425 "type": "function"426 },427 {428 "inputs": [],429 "name": "hasCollectionPendingSponsor",430 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],431 "stateMutability": "view",432 "type": "function"433 },434 {435 "inputs": [436 { "internalType": "address", "name": "owner", "type": "address" },437 { "internalType": "address", "name": "operator", "type": "address" }438 ],439 "name": "isApprovedForAll",440 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],441 "stateMutability": "view",442 "type": "function"443 },444 {445 "inputs": [446 {447 "components": [448 { "internalType": "address", "name": "eth", "type": "address" },449 { "internalType": "uint256", "name": "sub", "type": "uint256" }450 ],451 "internalType": "struct CrossAccount",452 "name": "user",453 "type": "tuple"454 }455 ],456 "name": "isOwnerOrAdminCross",457 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],458 "stateMutability": "view",459 "type": "function"460 },461 {462 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],463 "name": "mint",464 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],465 "stateMutability": "nonpayable",466 "type": "function"467 },468 {469 "inputs": [470 {471 "components": [472 { "internalType": "address", "name": "eth", "type": "address" },473 { "internalType": "uint256", "name": "sub", "type": "uint256" }474 ],475 "internalType": "struct CrossAccount",476 "name": "to",477 "type": "tuple"478 },479 {480 "components": [481 { "internalType": "string", "name": "key", "type": "string" },482 { "internalType": "bytes", "name": "value", "type": "bytes" }483 ],484 "internalType": "struct Property[]",485 "name": "properties",486 "type": "tuple[]"487 }488 ],489 "name": "mintCross",490 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],491 "stateMutability": "nonpayable",492 "type": "function"493 },494 {495 "inputs": [496 { "internalType": "address", "name": "to", "type": "address" },497 { "internalType": "string", "name": "tokenUri", "type": "string" }498 ],499 "name": "mintWithTokenURI",500 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],501 "stateMutability": "nonpayable",502 "type": "function"503 },504 {505 "inputs": [],506 "name": "mintingFinished",507 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],508 "stateMutability": "view",509 "type": "function"510 },511 {512 "inputs": [],513 "name": "name",514 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],515 "stateMutability": "view",516 "type": "function"517 },518 {519 "inputs": [],520 "name": "nextTokenId",521 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],522 "stateMutability": "view",523 "type": "function"524 },525 {526 "inputs": [527 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }528 ],529 "name": "ownerOf",530 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],531 "stateMutability": "view",532 "type": "function"533 },534 {535 "inputs": [536 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },537 { "internalType": "string[]", "name": "keys", "type": "string[]" }538 ],539 "name": "properties",540 "outputs": [541 {542 "components": [543 { "internalType": "string", "name": "key", "type": "string" },544 { "internalType": "bytes", "name": "value", "type": "bytes" }545 ],546 "internalType": "struct Property[]",547 "name": "",548 "type": "tuple[]"549 }550 ],551 "stateMutability": "view",552 "type": "function"553 },554 {555 "inputs": [556 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },557 { "internalType": "string", "name": "key", "type": "string" }558 ],559 "name": "property",560 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],561 "stateMutability": "view",562 "type": "function"563 },564 {565 "inputs": [566 {567 "components": [568 { "internalType": "address", "name": "eth", "type": "address" },569 { "internalType": "uint256", "name": "sub", "type": "uint256" }570 ],571 "internalType": "struct CrossAccount",572 "name": "admin",573 "type": "tuple"574 }575 ],576 "name": "removeCollectionAdminCross",577 "outputs": [],578 "stateMutability": "nonpayable",579 "type": "function"580 },581 {582 "inputs": [],583 "name": "removeCollectionSponsor",584 "outputs": [],585 "stateMutability": "nonpayable",586 "type": "function"587 },588 {589 "inputs": [590 {591 "components": [592 { "internalType": "address", "name": "eth", "type": "address" },593 { "internalType": "uint256", "name": "sub", "type": "uint256" }594 ],595 "internalType": "struct CrossAccount",596 "name": "user",597 "type": "tuple"598 }599 ],600 "name": "removeFromCollectionAllowListCross",601 "outputs": [],602 "stateMutability": "nonpayable",603 "type": "function"604 },605 {606 "inputs": [607 { "internalType": "address", "name": "from", "type": "address" },608 { "internalType": "address", "name": "to", "type": "address" },609 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }610 ],611 "name": "safeTransferFrom",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 { "internalType": "bytes", "name": "data", "type": "bytes" }622 ],623 "name": "safeTransferFromWithData",624 "outputs": [],625 "stateMutability": "nonpayable",626 "type": "function"627 },628 {629 "inputs": [630 { "internalType": "address", "name": "operator", "type": "address" },631 { "internalType": "bool", "name": "approved", "type": "bool" }632 ],633 "name": "setApprovalForAll",634 "outputs": [],635 "stateMutability": "nonpayable",636 "type": "function"637 },638 {639 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],640 "name": "setCollectionAccess",641 "outputs": [],642 "stateMutability": "nonpayable",643 "type": "function"644 },645 {646 "inputs": [647 {648 "components": [649 {650 "internalType": "enum CollectionLimitField",651 "name": "field",652 "type": "uint8"653 },654 {655 "components": [656 { "internalType": "bool", "name": "status", "type": "bool" },657 { "internalType": "uint256", "name": "value", "type": "uint256" }658 ],659 "internalType": "struct OptionUint",660 "name": "value",661 "type": "tuple"662 }663 ],664 "internalType": "struct CollectionLimit",665 "name": "limit",666 "type": "tuple"667 }668 ],669 "name": "setCollectionLimit",670 "outputs": [],671 "stateMutability": "nonpayable",672 "type": "function"673 },674 {675 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],676 "name": "setCollectionMintMode",677 "outputs": [],678 "stateMutability": "nonpayable",679 "type": "function"680 },681 {682 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],683 "name": "setCollectionNesting",684 "outputs": [],685 "stateMutability": "nonpayable",686 "type": "function"687 },688 {689 "inputs": [690 { "internalType": "bool", "name": "enable", "type": "bool" },691 {692 "internalType": "address[]",693 "name": "collections",694 "type": "address[]"695 }696 ],697 "name": "setCollectionNesting",698 "outputs": [],699 "stateMutability": "nonpayable",700 "type": "function"701 },702 {703 "inputs": [704 {705 "components": [706 { "internalType": "string", "name": "key", "type": "string" },707 { "internalType": "bytes", "name": "value", "type": "bytes" }708 ],709 "internalType": "struct Property[]",710 "name": "properties",711 "type": "tuple[]"712 }713 ],714 "name": "setCollectionProperties",715 "outputs": [],716 "stateMutability": "nonpayable",717 "type": "function"718 },719 {720 "inputs": [721 {722 "components": [723 { "internalType": "address", "name": "eth", "type": "address" },724 { "internalType": "uint256", "name": "sub", "type": "uint256" }725 ],726 "internalType": "struct CrossAccount",727 "name": "sponsor",728 "type": "tuple"729 }730 ],731 "name": "setCollectionSponsorCross",732 "outputs": [],733 "stateMutability": "nonpayable",734 "type": "function"735 },736 {737 "inputs": [738 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },739 {740 "components": [741 { "internalType": "string", "name": "key", "type": "string" },742 { "internalType": "bytes", "name": "value", "type": "bytes" }743 ],744 "internalType": "struct Property[]",745 "name": "properties",746 "type": "tuple[]"747 }748 ],749 "name": "setProperties",750 "outputs": [],751 "stateMutability": "nonpayable",752 "type": "function"753 },754 {755 "inputs": [756 {757 "components": [758 { "internalType": "string", "name": "key", "type": "string" },759 {760 "components": [761 {762 "internalType": "enum TokenPermissionField",763 "name": "code",764 "type": "uint8"765 },766 { "internalType": "bool", "name": "value", "type": "bool" }767 ],768 "internalType": "struct PropertyPermission[]",769 "name": "permissions",770 "type": "tuple[]"771 }772 ],773 "internalType": "struct TokenPropertyPermission[]",774 "name": "permissions",775 "type": "tuple[]"776 }777 ],778 "name": "setTokenPropertyPermissions",779 "outputs": [],780 "stateMutability": "nonpayable",781 "type": "function"782 },783 {784 "inputs": [785 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }786 ],787 "name": "supportsInterface",788 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],789 "stateMutability": "view",790 "type": "function"791 },792 {793 "inputs": [],794 "name": "symbol",795 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],796 "stateMutability": "view",797 "type": "function"798 },799 {800 "inputs": [801 { "internalType": "uint256", "name": "index", "type": "uint256" }802 ],803 "name": "tokenByIndex",804 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],805 "stateMutability": "view",806 "type": "function"807 },808 {809 "inputs": [810 { "internalType": "uint256", "name": "token", "type": "uint256" }811 ],812 "name": "tokenContractAddress",813 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],814 "stateMutability": "view",815 "type": "function"816 },817 {818 "inputs": [819 { "internalType": "address", "name": "owner", "type": "address" },820 { "internalType": "uint256", "name": "index", "type": "uint256" }821 ],822 "name": "tokenOfOwnerByIndex",823 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],824 "stateMutability": "view",825 "type": "function"826 },827 {828 "inputs": [],829 "name": "tokenPropertyPermissions",830 "outputs": [831 {832 "components": [833 { "internalType": "string", "name": "key", "type": "string" },834 {835 "components": [836 {837 "internalType": "enum TokenPermissionField",838 "name": "code",839 "type": "uint8"840 },841 { "internalType": "bool", "name": "value", "type": "bool" }842 ],843 "internalType": "struct PropertyPermission[]",844 "name": "permissions",845 "type": "tuple[]"846 }847 ],848 "internalType": "struct TokenPropertyPermission[]",849 "name": "",850 "type": "tuple[]"851 }852 ],853 "stateMutability": "view",854 "type": "function"855 },856 {857 "inputs": [858 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }859 ],860 "name": "tokenURI",861 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],862 "stateMutability": "view",863 "type": "function"864 },865 {866 "inputs": [],867 "name": "totalSupply",868 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],869 "stateMutability": "view",870 "type": "function"871 },872 {873 "inputs": [874 { "internalType": "address", "name": "to", "type": "address" },875 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }876 ],877 "name": "transfer",878 "outputs": [],879 "stateMutability": "nonpayable",880 "type": "function"881 },882 {883 "inputs": [884 {885 "components": [886 { "internalType": "address", "name": "eth", "type": "address" },887 { "internalType": "uint256", "name": "sub", "type": "uint256" }888 ],889 "internalType": "struct CrossAccount",890 "name": "to",891 "type": "tuple"892 },893 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }894 ],895 "name": "transferCross",896 "outputs": [],897 "stateMutability": "nonpayable",898 "type": "function"899 },900 {901 "inputs": [902 { "internalType": "address", "name": "from", "type": "address" },903 { "internalType": "address", "name": "to", "type": "address" },904 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }905 ],906 "name": "transferFrom",907 "outputs": [],908 "stateMutability": "nonpayable",909 "type": "function"910 },911 {912 "inputs": [913 {914 "components": [915 { "internalType": "address", "name": "eth", "type": "address" },916 { "internalType": "uint256", "name": "sub", "type": "uint256" }917 ],918 "internalType": "struct CrossAccount",919 "name": "from",920 "type": "tuple"921 },922 {923 "components": [924 { "internalType": "address", "name": "eth", "type": "address" },925 { "internalType": "uint256", "name": "sub", "type": "uint256" }926 ],927 "internalType": "struct CrossAccount",928 "name": "to",929 "type": "tuple"930 },931 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }932 ],933 "name": "transferFromCross",934 "outputs": [],935 "stateMutability": "nonpayable",936 "type": "function"937 },938 {939 "inputs": [],940 "name": "uniqueCollectionType",941 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],942 "stateMutability": "view",943 "type": "function"944 }945]tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -166,12 +166,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple28 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple31[] memory);
+ function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -285,24 +285,24 @@
uint256 sub;
}
-/// @dev anonymous struct
-struct Tuple31 {
- CollectionPermissions field_0;
- bool field_1;
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
}
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple28 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -311,6 +311,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -268,12 +268,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple38 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple41[] memory);
+ function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -387,24 +387,24 @@
uint256 sub;
}
-/// @dev anonymous struct
-struct Tuple41 {
- CollectionPermissions field_0;
- bool field_1;
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
}
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple38 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -413,6 +413,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -268,12 +268,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple37 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (CollectionNesting memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple40[] memory);
+ function collectionNestingPermissions() external view returns (CollectionNestingPermission[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -387,24 +387,24 @@
uint256 sub;
}
-/// @dev anonymous struct
-struct Tuple40 {
- CollectionPermissions field_0;
- bool field_1;
+/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) field.
+struct CollectionNestingPermission {
+ CollectionPermissionField field;
+ bool value;
}
/// @dev Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
-enum CollectionPermissions {
+enum CollectionPermissionField {
/// @dev Owner of token can nest tokens under it.
TokenOwner,
/// @dev Admin of token collection can nest tokens under token.
CollectionAdmin
}
-/// @dev anonymous struct
-struct Tuple37 {
- bool field_0;
- uint256[] field_1;
+/// @dev Nested collections.
+struct CollectionNesting {
+ bool token_owner;
+ uint256[] ids;
}
/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) field representation for EVM.
@@ -413,6 +413,7 @@
OptionUint value;
}
+/// @dev Ethereum representation of Optional value with uint256.
struct OptionUint {
bool status;
uint256 value;