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.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 {147 "components": [148 { "internalType": "address", "name": "eth", "type": "address" },149 { "internalType": "uint256", "name": "sub", "type": "uint256" }150 ],151 "internalType": "struct CrossAccount",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 CrossAccount",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 CrossAccount",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 CrossAccount[]",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 CollectionLimitField",247 "name": "field",248 "type": "uint8"249 },250 {251 "components": [252 { "internalType": "bool", "name": "status", "type": "bool" },253 { "internalType": "uint256", "name": "value", "type": "uint256" }254 ],255 "internalType": "struct OptionUint",256 "name": "value",257 "type": "tuple"258 }259 ],260 "internalType": "struct CollectionLimit[]",261 "name": "",262 "type": "tuple[]"263 }264 ],265 "stateMutability": "view",266 "type": "function"267 },268 {269 "inputs": [],270 "name": "collectionNestingPermissions",271 "outputs": [272 {273 "components": [274 {275 "internalType": "enum CollectionPermissions",276 "name": "field_0",277 "type": "uint8"278 },279 { "internalType": "bool", "name": "field_1", "type": "bool" }280 ],281 "internalType": "struct Tuple48[]",282 "name": "",283 "type": "tuple[]"284 }285 ],286 "stateMutability": "view",287 "type": "function"288 },289 {290 "inputs": [],291 "name": "collectionNestingRestrictedCollectionIds",292 "outputs": [293 {294 "components": [295 { "internalType": "bool", "name": "field_0", "type": "bool" },296 {297 "internalType": "uint256[]",298 "name": "field_1",299 "type": "uint256[]"300 }301 ],302 "internalType": "struct Tuple45",303 "name": "",304 "type": "tuple"305 }306 ],307 "stateMutability": "view",308 "type": "function"309 },310 {311 "inputs": [],312 "name": "collectionOwner",313 "outputs": [314 {315 "components": [316 { "internalType": "address", "name": "eth", "type": "address" },317 { "internalType": "uint256", "name": "sub", "type": "uint256" }318 ],319 "internalType": "struct CrossAccount",320 "name": "",321 "type": "tuple"322 }323 ],324 "stateMutability": "view",325 "type": "function"326 },327 {328 "inputs": [329 { "internalType": "string[]", "name": "keys", "type": "string[]" }330 ],331 "name": "collectionProperties",332 "outputs": [333 {334 "components": [335 { "internalType": "string", "name": "key", "type": "string" },336 { "internalType": "bytes", "name": "value", "type": "bytes" }337 ],338 "internalType": "struct Property[]",339 "name": "",340 "type": "tuple[]"341 }342 ],343 "stateMutability": "view",344 "type": "function"345 },346 {347 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],348 "name": "collectionProperty",349 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],350 "stateMutability": "view",351 "type": "function"352 },353 {354 "inputs": [],355 "name": "collectionSponsor",356 "outputs": [357 {358 "components": [359 { "internalType": "address", "name": "eth", "type": "address" },360 { "internalType": "uint256", "name": "sub", "type": "uint256" }361 ],362 "internalType": "struct CrossAccount",363 "name": "",364 "type": "tuple"365 }366 ],367 "stateMutability": "view",368 "type": "function"369 },370 {371 "inputs": [],372 "name": "confirmCollectionSponsorship",373 "outputs": [],374 "stateMutability": "nonpayable",375 "type": "function"376 },377 {378 "inputs": [],379 "name": "contractAddress",380 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],381 "stateMutability": "view",382 "type": "function"383 },384 {385 "inputs": [386 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }387 ],388 "name": "crossOwnerOf",389 "outputs": [390 {391 "components": [392 { "internalType": "address", "name": "eth", "type": "address" },393 { "internalType": "uint256", "name": "sub", "type": "uint256" }394 ],395 "internalType": "struct CrossAccount",396 "name": "",397 "type": "tuple"398 }399 ],400 "stateMutability": "view",401 "type": "function"402 },403 {404 "inputs": [405 { "internalType": "string[]", "name": "keys", "type": "string[]" }406 ],407 "name": "deleteCollectionProperties",408 "outputs": [],409 "stateMutability": "nonpayable",410 "type": "function"411 },412 {413 "inputs": [414 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },415 { "internalType": "string[]", "name": "keys", "type": "string[]" }416 ],417 "name": "deleteProperties",418 "outputs": [],419 "stateMutability": "nonpayable",420 "type": "function"421 },422 {423 "inputs": [],424 "name": "description",425 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],426 "stateMutability": "view",427 "type": "function"428 },429 {430 "inputs": [],431 "name": "finishMinting",432 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],433 "stateMutability": "nonpayable",434 "type": "function"435 },436 {437 "inputs": [438 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }439 ],440 "name": "getApproved",441 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],442 "stateMutability": "view",443 "type": "function"444 },445 {446 "inputs": [],447 "name": "hasCollectionPendingSponsor",448 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],449 "stateMutability": "view",450 "type": "function"451 },452 {453 "inputs": [454 { "internalType": "address", "name": "owner", "type": "address" },455 { "internalType": "address", "name": "operator", "type": "address" }456 ],457 "name": "isApprovedForAll",458 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],459 "stateMutability": "view",460 "type": "function"461 },462 {463 "inputs": [464 {465 "components": [466 { "internalType": "address", "name": "eth", "type": "address" },467 { "internalType": "uint256", "name": "sub", "type": "uint256" }468 ],469 "internalType": "struct CrossAccount",470 "name": "user",471 "type": "tuple"472 }473 ],474 "name": "isOwnerOrAdminCross",475 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],476 "stateMutability": "view",477 "type": "function"478 },479 {480 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],481 "name": "mint",482 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],483 "stateMutability": "nonpayable",484 "type": "function"485 },486 {487 "inputs": [488 {489 "components": [490 { "internalType": "address", "name": "eth", "type": "address" },491 { "internalType": "uint256", "name": "sub", "type": "uint256" }492 ],493 "internalType": "struct CrossAccount",494 "name": "to",495 "type": "tuple"496 },497 {498 "components": [499 { "internalType": "string", "name": "key", "type": "string" },500 { "internalType": "bytes", "name": "value", "type": "bytes" }501 ],502 "internalType": "struct Property[]",503 "name": "properties",504 "type": "tuple[]"505 }506 ],507 "name": "mintCross",508 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],509 "stateMutability": "nonpayable",510 "type": "function"511 },512 {513 "inputs": [514 { "internalType": "address", "name": "to", "type": "address" },515 { "internalType": "string", "name": "tokenUri", "type": "string" }516 ],517 "name": "mintWithTokenURI",518 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],519 "stateMutability": "nonpayable",520 "type": "function"521 },522 {523 "inputs": [],524 "name": "mintingFinished",525 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],526 "stateMutability": "view",527 "type": "function"528 },529 {530 "inputs": [],531 "name": "name",532 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],533 "stateMutability": "view",534 "type": "function"535 },536 {537 "inputs": [],538 "name": "nextTokenId",539 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],540 "stateMutability": "view",541 "type": "function"542 },543 {544 "inputs": [545 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }546 ],547 "name": "ownerOf",548 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],549 "stateMutability": "view",550 "type": "function"551 },552 {553 "inputs": [554 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },555 { "internalType": "string[]", "name": "keys", "type": "string[]" }556 ],557 "name": "properties",558 "outputs": [559 {560 "components": [561 { "internalType": "string", "name": "key", "type": "string" },562 { "internalType": "bytes", "name": "value", "type": "bytes" }563 ],564 "internalType": "struct Property[]",565 "name": "",566 "type": "tuple[]"567 }568 ],569 "stateMutability": "view",570 "type": "function"571 },572 {573 "inputs": [574 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },575 { "internalType": "string", "name": "key", "type": "string" }576 ],577 "name": "property",578 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],579 "stateMutability": "view",580 "type": "function"581 },582 {583 "inputs": [584 {585 "components": [586 { "internalType": "address", "name": "eth", "type": "address" },587 { "internalType": "uint256", "name": "sub", "type": "uint256" }588 ],589 "internalType": "struct CrossAccount",590 "name": "admin",591 "type": "tuple"592 }593 ],594 "name": "removeCollectionAdminCross",595 "outputs": [],596 "stateMutability": "nonpayable",597 "type": "function"598 },599 {600 "inputs": [],601 "name": "removeCollectionSponsor",602 "outputs": [],603 "stateMutability": "nonpayable",604 "type": "function"605 },606 {607 "inputs": [608 {609 "components": [610 { "internalType": "address", "name": "eth", "type": "address" },611 { "internalType": "uint256", "name": "sub", "type": "uint256" }612 ],613 "internalType": "struct CrossAccount",614 "name": "user",615 "type": "tuple"616 }617 ],618 "name": "removeFromCollectionAllowListCross",619 "outputs": [],620 "stateMutability": "nonpayable",621 "type": "function"622 },623 {624 "inputs": [625 { "internalType": "address", "name": "from", "type": "address" },626 { "internalType": "address", "name": "to", "type": "address" },627 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }628 ],629 "name": "safeTransferFrom",630 "outputs": [],631 "stateMutability": "nonpayable",632 "type": "function"633 },634 {635 "inputs": [636 { "internalType": "address", "name": "from", "type": "address" },637 { "internalType": "address", "name": "to", "type": "address" },638 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },639 { "internalType": "bytes", "name": "data", "type": "bytes" }640 ],641 "name": "safeTransferFrom",642 "outputs": [],643 "stateMutability": "nonpayable",644 "type": "function"645 },646 {647 "inputs": [648 { "internalType": "address", "name": "operator", "type": "address" },649 { "internalType": "bool", "name": "approved", "type": "bool" }650 ],651 "name": "setApprovalForAll",652 "outputs": [],653 "stateMutability": "nonpayable",654 "type": "function"655 },656 {657 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],658 "name": "setCollectionAccess",659 "outputs": [],660 "stateMutability": "nonpayable",661 "type": "function"662 },663 {664 "inputs": [665 {666 "components": [667 {668 "internalType": "enum CollectionLimitField",669 "name": "field",670 "type": "uint8"671 },672 {673 "components": [674 { "internalType": "bool", "name": "status", "type": "bool" },675 { "internalType": "uint256", "name": "value", "type": "uint256" }676 ],677 "internalType": "struct OptionUint",678 "name": "value",679 "type": "tuple"680 }681 ],682 "internalType": "struct CollectionLimit",683 "name": "limit",684 "type": "tuple"685 }686 ],687 "name": "setCollectionLimit",688 "outputs": [],689 "stateMutability": "nonpayable",690 "type": "function"691 },692 {693 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],694 "name": "setCollectionMintMode",695 "outputs": [],696 "stateMutability": "nonpayable",697 "type": "function"698 },699 {700 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],701 "name": "setCollectionNesting",702 "outputs": [],703 "stateMutability": "nonpayable",704 "type": "function"705 },706 {707 "inputs": [708 { "internalType": "bool", "name": "enable", "type": "bool" },709 {710 "internalType": "address[]",711 "name": "collections",712 "type": "address[]"713 }714 ],715 "name": "setCollectionNesting",716 "outputs": [],717 "stateMutability": "nonpayable",718 "type": "function"719 },720 {721 "inputs": [722 {723 "components": [724 { "internalType": "string", "name": "key", "type": "string" },725 { "internalType": "bytes", "name": "value", "type": "bytes" }726 ],727 "internalType": "struct Property[]",728 "name": "properties",729 "type": "tuple[]"730 }731 ],732 "name": "setCollectionProperties",733 "outputs": [],734 "stateMutability": "nonpayable",735 "type": "function"736 },737 {738 "inputs": [739 {740 "components": [741 { "internalType": "address", "name": "eth", "type": "address" },742 { "internalType": "uint256", "name": "sub", "type": "uint256" }743 ],744 "internalType": "struct CrossAccount",745 "name": "sponsor",746 "type": "tuple"747 }748 ],749 "name": "setCollectionSponsorCross",750 "outputs": [],751 "stateMutability": "nonpayable",752 "type": "function"753 },754 {755 "inputs": [756 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },757 {758 "components": [759 { "internalType": "string", "name": "key", "type": "string" },760 { "internalType": "bytes", "name": "value", "type": "bytes" }761 ],762 "internalType": "struct Property[]",763 "name": "properties",764 "type": "tuple[]"765 }766 ],767 "name": "setProperties",768 "outputs": [],769 "stateMutability": "nonpayable",770 "type": "function"771 },772 {773 "inputs": [774 {775 "components": [776 { "internalType": "string", "name": "key", "type": "string" },777 {778 "components": [779 {780 "internalType": "enum TokenPermissionField",781 "name": "code",782 "type": "uint8"783 },784 { "internalType": "bool", "name": "value", "type": "bool" }785 ],786 "internalType": "struct PropertyPermission[]",787 "name": "permissions",788 "type": "tuple[]"789 }790 ],791 "internalType": "struct TokenPropertyPermission[]",792 "name": "permissions",793 "type": "tuple[]"794 }795 ],796 "name": "setTokenPropertyPermissions",797 "outputs": [],798 "stateMutability": "nonpayable",799 "type": "function"800 },801 {802 "inputs": [803 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }804 ],805 "name": "supportsInterface",806 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],807 "stateMutability": "view",808 "type": "function"809 },810 {811 "inputs": [],812 "name": "symbol",813 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],814 "stateMutability": "view",815 "type": "function"816 },817 {818 "inputs": [819 { "internalType": "uint256", "name": "index", "type": "uint256" }820 ],821 "name": "tokenByIndex",822 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],823 "stateMutability": "view",824 "type": "function"825 },826 {827 "inputs": [828 { "internalType": "address", "name": "owner", "type": "address" },829 { "internalType": "uint256", "name": "index", "type": "uint256" }830 ],831 "name": "tokenOfOwnerByIndex",832 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],833 "stateMutability": "view",834 "type": "function"835 },836 {837 "inputs": [],838 "name": "tokenPropertyPermissions",839 "outputs": [840 {841 "components": [842 { "internalType": "string", "name": "key", "type": "string" },843 {844 "components": [845 {846 "internalType": "enum TokenPermissionField",847 "name": "code",848 "type": "uint8"849 },850 { "internalType": "bool", "name": "value", "type": "bool" }851 ],852 "internalType": "struct PropertyPermission[]",853 "name": "permissions",854 "type": "tuple[]"855 }856 ],857 "internalType": "struct TokenPropertyPermission[]",858 "name": "",859 "type": "tuple[]"860 }861 ],862 "stateMutability": "view",863 "type": "function"864 },865 {866 "inputs": [867 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }868 ],869 "name": "tokenURI",870 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],871 "stateMutability": "view",872 "type": "function"873 },874 {875 "inputs": [],876 "name": "totalSupply",877 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],878 "stateMutability": "view",879 "type": "function"880 },881 {882 "inputs": [883 { "internalType": "address", "name": "to", "type": "address" },884 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }885 ],886 "name": "transfer",887 "outputs": [],888 "stateMutability": "nonpayable",889 "type": "function"890 },891 {892 "inputs": [893 {894 "components": [895 { "internalType": "address", "name": "eth", "type": "address" },896 { "internalType": "uint256", "name": "sub", "type": "uint256" }897 ],898 "internalType": "struct CrossAccount",899 "name": "to",900 "type": "tuple"901 },902 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }903 ],904 "name": "transferCross",905 "outputs": [],906 "stateMutability": "nonpayable",907 "type": "function"908 },909 {910 "inputs": [911 { "internalType": "address", "name": "from", "type": "address" },912 { "internalType": "address", "name": "to", "type": "address" },913 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }914 ],915 "name": "transferFrom",916 "outputs": [],917 "stateMutability": "nonpayable",918 "type": "function"919 },920 {921 "inputs": [922 {923 "components": [924 { "internalType": "address", "name": "eth", "type": "address" },925 { "internalType": "uint256", "name": "sub", "type": "uint256" }926 ],927 "internalType": "struct CrossAccount",928 "name": "from",929 "type": "tuple"930 },931 {932 "components": [933 { "internalType": "address", "name": "eth", "type": "address" },934 { "internalType": "uint256", "name": "sub", "type": "uint256" }935 ],936 "internalType": "struct CrossAccount",937 "name": "to",938 "type": "tuple"939 },940 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }941 ],942 "name": "transferFromCross",943 "outputs": [],944 "stateMutability": "nonpayable",945 "type": "function"946 },947 {948 "inputs": [],949 "name": "uniqueCollectionType",950 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],951 "stateMutability": "view",952 "type": "function"953 }954]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -254,13 +254,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 Tuple47[]",
+ "internalType": "struct CollectionNestingPermission[]",
"name": "",
"type": "tuple[]"
}
@@ -274,14 +274,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 Tuple44",
+ "internalType": "struct CollectionNesting",
"name": "",
"type": "tuple"
}
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;