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.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7contract Dummy {8 uint8 dummy;9 string stub_error = "this contract is implemented in native";10}1112contract ERC165 is Dummy {13 function supportsInterface(bytes4 interfaceID) external view returns (bool) {14 require(false, stub_error);15 interfaceID;16 return true;17 }18}1920/// @title A contract that allows to set and delete token properties and change token property permissions.21/// @dev the ERC-165 identifier for this interface is 0xde0695c222contract TokenProperties is Dummy, ERC165 {23 // /// @notice Set permissions for token property.24 // /// @dev Throws error if `msg.sender` is not admin or owner of the collection.25 // /// @param key Property key.26 // /// @param isMutable Permission to mutate property.27 // /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.28 // /// @param tokenOwner Permission to mutate property by token owner if property is mutable.29 // /// @dev EVM selector for this function is: 0x222d97fa,30 // /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)31 // function setTokenPropertyPermission(string memory key, bool isMutable, bool collectionAdmin, bool tokenOwner) public {32 // require(false, stub_error);33 // key;34 // isMutable;35 // collectionAdmin;36 // tokenOwner;37 // dummy = 0;38 // }3940 /// @notice Set permissions for token property.41 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.42 /// @param permissions Permissions for keys.43 /// @dev EVM selector for this function is: 0xbd92983a,44 /// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])45 function setTokenPropertyPermissions(Tuple61[] memory permissions) public {46 require(false, stub_error);47 permissions;48 dummy = 0;49 }5051 /// @notice Get permissions for token properties.52 /// @dev EVM selector for this function is: 0xf23d7790,53 /// or in textual repr: tokenPropertyPermissions()54 function tokenPropertyPermissions() public view returns (Tuple61[] memory) {55 require(false, stub_error);56 dummy;57 return new Tuple61[](0);58 }5960 // /// @notice Set token property value.61 // /// @dev Throws error if `msg.sender` has no permission to edit the property.62 // /// @param tokenId ID of the token.63 // /// @param key Property key.64 // /// @param value Property value.65 // /// @dev EVM selector for this function is: 0x1752d67b,66 // /// or in textual repr: setProperty(uint256,string,bytes)67 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {68 // require(false, stub_error);69 // tokenId;70 // key;71 // value;72 // dummy = 0;73 // }7475 /// @notice Set token properties value.76 /// @dev Throws error if `msg.sender` has no permission to edit the property.77 /// @param tokenId ID of the token.78 /// @param properties settable properties79 /// @dev EVM selector for this function is: 0x14ed3a6e,80 /// or in textual repr: setProperties(uint256,(string,bytes)[])81 function setProperties(uint256 tokenId, Property[] memory properties) public {82 require(false, stub_error);83 tokenId;84 properties;85 dummy = 0;86 }8788 // /// @notice Delete token property value.89 // /// @dev Throws error if `msg.sender` has no permission to edit the property.90 // /// @param tokenId ID of the token.91 // /// @param key Property key.92 // /// @dev EVM selector for this function is: 0x066111d1,93 // /// or in textual repr: deleteProperty(uint256,string)94 // function deleteProperty(uint256 tokenId, string memory key) public {95 // require(false, stub_error);96 // tokenId;97 // key;98 // dummy = 0;99 // }100101 /// @notice Delete token properties value.102 /// @dev Throws error if `msg.sender` has no permission to edit the property.103 /// @param tokenId ID of the token.104 /// @param keys Properties key.105 /// @dev EVM selector for this function is: 0xc472d371,106 /// or in textual repr: deleteProperties(uint256,string[])107 function deleteProperties(uint256 tokenId, string[] memory keys) public {108 require(false, stub_error);109 tokenId;110 keys;111 dummy = 0;112 }113114 /// @notice Get token property value.115 /// @dev Throws error if key not found116 /// @param tokenId ID of the token.117 /// @param key Property key.118 /// @return Property value bytes119 /// @dev EVM selector for this function is: 0x7228c327,120 /// or in textual repr: property(uint256,string)121 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {122 require(false, stub_error);123 tokenId;124 key;125 dummy;126 return hex"";127 }128}129130/// @dev Property struct131struct Property {132 string key;133 bytes value;134}135136/// @dev Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.137enum EthTokenPermissions {138 /// @dev Permission to change the property and property permission. See [`up_data_structs::PropertyPermission::mutable`]139 Mutable,140 /// @dev Change permission for the collection administrator. See [`up_data_structs::PropertyPermission::token_owner`]141 TokenOwner,142 /// @dev Permission to change the property for the owner of the token. See [`up_data_structs::PropertyPermission::collection_admin`]143 CollectionAdmin144}145146/// @dev anonymous struct147struct Tuple61 {148 string field_0;149 Tuple59[] field_1;150}151152/// @dev anonymous struct153struct Tuple59 {154 EthTokenPermissions field_0;155 bool field_1;156}157158/// @title A contract that allows you to work with collections.159/// @dev the ERC-165 identifier for this interface is 0x81172a75160contract Collection is Dummy, ERC165 {161 // /// Set collection property.162 // ///163 // /// @param key Property key.164 // /// @param value Propery value.165 // /// @dev EVM selector for this function is: 0x2f073f66,166 // /// or in textual repr: setCollectionProperty(string,bytes)167 // function setCollectionProperty(string memory key, bytes memory value) public {168 // require(false, stub_error);169 // key;170 // value;171 // dummy = 0;172 // }173174 /// Set collection properties.175 ///176 /// @param properties Vector of properties key/value pair.177 /// @dev EVM selector for this function is: 0x50b26b2a,178 /// or in textual repr: setCollectionProperties((string,bytes)[])179 function setCollectionProperties(Property[] memory properties) public {180 require(false, stub_error);181 properties;182 dummy = 0;183 }184185 // /// Delete collection property.186 // ///187 // /// @param key Property key.188 // /// @dev EVM selector for this function is: 0x7b7debce,189 // /// or in textual repr: deleteCollectionProperty(string)190 // function deleteCollectionProperty(string memory key) public {191 // require(false, stub_error);192 // key;193 // dummy = 0;194 // }195196 /// Delete collection properties.197 ///198 /// @param keys Properties keys.199 /// @dev EVM selector for this function is: 0xee206ee3,200 /// or in textual repr: deleteCollectionProperties(string[])201 function deleteCollectionProperties(string[] memory keys) public {202 require(false, stub_error);203 keys;204 dummy = 0;205 }206207 /// Get collection property.208 ///209 /// @dev Throws error if key not found.210 ///211 /// @param key Property key.212 /// @return bytes The property corresponding to the key.213 /// @dev EVM selector for this function is: 0xcf24fd6d,214 /// or in textual repr: collectionProperty(string)215 function collectionProperty(string memory key) public view returns (bytes memory) {216 require(false, stub_error);217 key;218 dummy;219 return hex"";220 }221222 /// Get collection properties.223 ///224 /// @param keys Properties keys. Empty keys for all propertyes.225 /// @return Vector of properties key/value pairs.226 /// @dev EVM selector for this function is: 0x285fb8e6,227 /// or in textual repr: collectionProperties(string[])228 function collectionProperties(string[] memory keys) public view returns (Property[] memory) {229 require(false, stub_error);230 keys;231 dummy;232 return new Property[](0);233 }234235 // /// Set the sponsor of the collection.236 // ///237 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.238 // ///239 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.240 // /// @dev EVM selector for this function is: 0x7623402e,241 // /// or in textual repr: setCollectionSponsor(address)242 // function setCollectionSponsor(address sponsor) public {243 // require(false, stub_error);244 // sponsor;245 // dummy = 0;246 // }247248 /// Set the sponsor of the collection.249 ///250 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.251 ///252 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.253 /// @dev EVM selector for this function is: 0x84a1d5a8,254 /// or in textual repr: setCollectionSponsorCross((address,uint256))255 function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {256 require(false, stub_error);257 sponsor;258 dummy = 0;259 }260261 /// Whether there is a pending sponsor.262 /// @dev EVM selector for this function is: 0x058ac185,263 /// or in textual repr: hasCollectionPendingSponsor()264 function hasCollectionPendingSponsor() public view returns (bool) {265 require(false, stub_error);266 dummy;267 return false;268 }269270 /// Collection sponsorship confirmation.271 ///272 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.273 /// @dev EVM selector for this function is: 0x3c50e97a,274 /// or in textual repr: confirmCollectionSponsorship()275 function confirmCollectionSponsorship() public {276 require(false, stub_error);277 dummy = 0;278 }279280 /// Remove collection sponsor.281 /// @dev EVM selector for this function is: 0x6e0326a3,282 /// or in textual repr: removeCollectionSponsor()283 function removeCollectionSponsor() public {284 require(false, stub_error);285 dummy = 0;286 }287288 /// Get current sponsor.289 ///290 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.291 /// @dev EVM selector for this function is: 0x6ec0a9f1,292 /// or in textual repr: collectionSponsor()293 function collectionSponsor() public view returns (EthCrossAccount memory) {294 require(false, stub_error);295 dummy;296 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);297 }298299 /// Get current collection limits.300 ///301 /// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:302 /// "accountTokenOwnershipLimit",303 /// "sponsoredDataSize",304 /// "sponsoredDataRateLimit",305 /// "tokenLimit",306 /// "sponsorTransferTimeout",307 /// "sponsorApproveTimeout"308 /// "ownerCanTransfer",309 /// "ownerCanDestroy",310 /// "transfersEnabled"311 /// Return `false` if a limit not set.312 /// @dev EVM selector for this function is: 0xf63bc572,313 /// or in textual repr: collectionLimits()314 function collectionLimits() public view returns (Tuple35[] memory) {315 require(false, stub_error);316 dummy;317 return new Tuple35[](0);318 }319320 /// Set limits for the collection.321 /// @dev Throws error if limit not found.322 /// @param limit Name of the limit. Valid names:323 /// "accountTokenOwnershipLimit",324 /// "sponsoredDataSize",325 /// "sponsoredDataRateLimit",326 /// "tokenLimit",327 /// "sponsorTransferTimeout",328 /// "sponsorApproveTimeout"329 /// "ownerCanTransfer",330 /// "ownerCanDestroy",331 /// "transfersEnabled"332 /// @param status enable\disable limit. Works only with `true`.333 /// @param value Value of the limit.334 /// @dev EVM selector for this function is: 0x88150bd0,335 /// or in textual repr: setCollectionLimit(uint8,bool,uint256)336 function setCollectionLimit(337 CollectionLimits limit,338 bool status,339 uint256 value340 ) public {341 require(false, stub_error);342 limit;343 status;344 value;345 dummy = 0;346 }347348 /// Get contract address.349 /// @dev EVM selector for this function is: 0xf6b4dfb4,350 /// or in textual repr: contractAddress()351 function contractAddress() public view returns (address) {352 require(false, stub_error);353 dummy;354 return 0x0000000000000000000000000000000000000000;355 }356357 /// Add collection admin.358 /// @param newAdmin Cross account administrator address.359 /// @dev EVM selector for this function is: 0x859aa7d6,360 /// or in textual repr: addCollectionAdminCross((address,uint256))361 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {362 require(false, stub_error);363 newAdmin;364 dummy = 0;365 }366367 /// Remove collection admin.368 /// @param admin Cross account administrator address.369 /// @dev EVM selector for this function is: 0x6c0cd173,370 /// or in textual repr: removeCollectionAdminCross((address,uint256))371 function removeCollectionAdminCross(EthCrossAccount memory admin) public {372 require(false, stub_error);373 admin;374 dummy = 0;375 }376377 // /// Add collection admin.378 // /// @param newAdmin Address of the added administrator.379 // /// @dev EVM selector for this function is: 0x92e462c7,380 // /// or in textual repr: addCollectionAdmin(address)381 // function addCollectionAdmin(address newAdmin) public {382 // require(false, stub_error);383 // newAdmin;384 // dummy = 0;385 // }386387 // /// Remove collection admin.388 // ///389 // /// @param admin Address of the removed administrator.390 // /// @dev EVM selector for this function is: 0xfafd7b42,391 // /// or in textual repr: removeCollectionAdmin(address)392 // function removeCollectionAdmin(address admin) public {393 // require(false, stub_error);394 // admin;395 // dummy = 0;396 // }397398 /// Toggle accessibility of collection nesting.399 ///400 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'401 /// @dev EVM selector for this function is: 0x112d4586,402 /// or in textual repr: setCollectionNesting(bool)403 function setCollectionNesting(bool enable) public {404 require(false, stub_error);405 enable;406 dummy = 0;407 }408409 /// Toggle accessibility of collection nesting.410 ///411 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'412 /// @param collections Addresses of collections that will be available for nesting.413 /// @dev EVM selector for this function is: 0x64872396,414 /// or in textual repr: setCollectionNesting(bool,address[])415 function setCollectionNesting(bool enable, address[] memory collections) public {416 require(false, stub_error);417 enable;418 collections;419 dummy = 0;420 }421422 /// Returns nesting for a collection423 /// @dev EVM selector for this function is: 0x22d25bfe,424 /// or in textual repr: collectionNestingRestrictedCollectionIds()425 function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {426 require(false, stub_error);427 dummy;428 return Tuple41(false, new uint256[](0));429 }430431 /// Returns permissions for a collection432 /// @dev EVM selector for this function is: 0x5b2eaf4b,433 /// or in textual repr: collectionNestingPermissions()434 function collectionNestingPermissions() public view returns (Tuple44[] memory) {435 require(false, stub_error);436 dummy;437 return new Tuple44[](0);438 }439440 /// Set the collection access method.441 /// @param mode Access mode442 /// 0 for Normal443 /// 1 for AllowList444 /// @dev EVM selector for this function is: 0x41835d4c,445 /// or in textual repr: setCollectionAccess(uint8)446 function setCollectionAccess(uint8 mode) public {447 require(false, stub_error);448 mode;449 dummy = 0;450 }451452 /// Checks that user allowed to operate with collection.453 ///454 /// @param user User address to check.455 /// @dev EVM selector for this function is: 0x91b6df49,456 /// or in textual repr: allowlistedCross((address,uint256))457 function allowlistedCross(EthCrossAccount memory user) public view returns (bool) {458 require(false, stub_error);459 user;460 dummy;461 return false;462 }463464 // /// Add the user to the allowed list.465 // ///466 // /// @param user Address of a trusted user.467 // /// @dev EVM selector for this function is: 0x67844fe6,468 // /// or in textual repr: addToCollectionAllowList(address)469 // function addToCollectionAllowList(address user) public {470 // require(false, stub_error);471 // user;472 // dummy = 0;473 // }474475 /// Add user to allowed list.476 ///477 /// @param user User cross account address.478 /// @dev EVM selector for this function is: 0xa0184a3a,479 /// or in textual repr: addToCollectionAllowListCross((address,uint256))480 function addToCollectionAllowListCross(EthCrossAccount memory user) public {481 require(false, stub_error);482 user;483 dummy = 0;484 }485486 // /// Remove the user from the allowed list.487 // ///488 // /// @param user Address of a removed user.489 // /// @dev EVM selector for this function is: 0x85c51acb,490 // /// or in textual repr: removeFromCollectionAllowList(address)491 // function removeFromCollectionAllowList(address user) public {492 // require(false, stub_error);493 // user;494 // dummy = 0;495 // }496497 /// Remove user from allowed list.498 ///499 /// @param user User cross account address.500 /// @dev EVM selector for this function is: 0x09ba452a,501 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))502 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {503 require(false, stub_error);504 user;505 dummy = 0;506 }507508 /// Switch permission for minting.509 ///510 /// @param mode Enable if "true".511 /// @dev EVM selector for this function is: 0x00018e84,512 /// or in textual repr: setCollectionMintMode(bool)513 function setCollectionMintMode(bool mode) public {514 require(false, stub_error);515 mode;516 dummy = 0;517 }518519 // /// Check that account is the owner or admin of the collection520 // ///521 // /// @param user account to verify522 // /// @return "true" if account is the owner or admin523 // /// @dev EVM selector for this function is: 0x9811b0c7,524 // /// or in textual repr: isOwnerOrAdmin(address)525 // function isOwnerOrAdmin(address user) public view returns (bool) {526 // require(false, stub_error);527 // user;528 // dummy;529 // return false;530 // }531532 /// Check that account is the owner or admin of the collection533 ///534 /// @param user User cross account to verify535 /// @return "true" if account is the owner or admin536 /// @dev EVM selector for this function is: 0x3e75a905,537 /// or in textual repr: isOwnerOrAdminCross((address,uint256))538 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {539 require(false, stub_error);540 user;541 dummy;542 return false;543 }544545 /// Returns collection type546 ///547 /// @return `Fungible` or `NFT` or `ReFungible`548 /// @dev EVM selector for this function is: 0xd34b55b8,549 /// or in textual repr: uniqueCollectionType()550 function uniqueCollectionType() public view returns (string memory) {551 require(false, stub_error);552 dummy;553 return "";554 }555556 /// Get collection owner.557 ///558 /// @return Tuble with sponsor address and his substrate mirror.559 /// If address is canonical then substrate mirror is zero and vice versa.560 /// @dev EVM selector for this function is: 0xdf727d3b,561 /// or in textual repr: collectionOwner()562 function collectionOwner() public view returns (EthCrossAccount memory) {563 require(false, stub_error);564 dummy;565 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);566 }567568 // /// Changes collection owner to another account569 // ///570 // /// @dev Owner can be changed only by current owner571 // /// @param newOwner new owner account572 // /// @dev EVM selector for this function is: 0x4f53e226,573 // /// or in textual repr: changeCollectionOwner(address)574 // function changeCollectionOwner(address newOwner) public {575 // require(false, stub_error);576 // newOwner;577 // dummy = 0;578 // }579580 /// Get collection administrators581 ///582 /// @return Vector of tuples with admins address and his substrate mirror.583 /// If address is canonical then substrate mirror is zero and vice versa.584 /// @dev EVM selector for this function is: 0x5813216b,585 /// or in textual repr: collectionAdmins()586 function collectionAdmins() public view returns (EthCrossAccount[] memory) {587 require(false, stub_error);588 dummy;589 return new EthCrossAccount[](0);590 }591592 /// Changes collection owner to another account593 ///594 /// @dev Owner can be changed only by current owner595 /// @param newOwner new owner cross account596 /// @dev EVM selector for this function is: 0x6496c497,597 /// or in textual repr: changeCollectionOwnerCross((address,uint256))598 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {599 require(false, stub_error);600 newOwner;601 dummy = 0;602 }603}604605/// @dev Cross account struct606struct EthCrossAccount {607 address eth;608 uint256 sub;609}610611enum CollectionPermissions {612 CollectionAdmin,613 TokenOwner614}615616/// @dev anonymous struct617struct Tuple44 {618 CollectionPermissions field_0;619 bool field_1;620}621622/// @dev anonymous struct623struct Tuple41 {624 bool field_0;625 uint256[] field_1;626}627628/// @dev [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.629enum CollectionLimits {630 /// @dev How many tokens can a user have on one account.631 AccountTokenOwnership,632 /// @dev How many bytes of data are available for sponsorship.633 SponsoredDataSize,634 /// @dev In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]635 SponsoredDataRateLimit,636 /// @dev How many tokens can be mined into this collection.637 TokenLimit,638 /// @dev Timeouts for transfer sponsoring.639 SponsorTransferTimeout,640 /// @dev Timeout for sponsoring an approval in passed blocks.641 SponsorApproveTimeout,642 /// @dev Whether the collection owner of the collection can send tokens (which belong to other users).643 OwnerCanTransfer,644 /// @dev Can the collection owner burn other people's tokens.645 OwnerCanDestroy,646 /// @dev Is it possible to send tokens from this collection between users.647 TransferEnabled648}649650/// @dev anonymous struct651struct Tuple35 {652 CollectionLimits field_0;653 bool field_1;654 uint256 field_2;655}656657/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension658/// @dev See https://eips.ethereum.org/EIPS/eip-721659/// @dev the ERC-165 identifier for this interface is 0x5b5e139f660contract ERC721Metadata is Dummy, ERC165 {661 // /// @notice A descriptive name for a collection of NFTs in this contract662 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`663 // /// @dev EVM selector for this function is: 0x06fdde03,664 // /// or in textual repr: name()665 // function name() public view returns (string memory) {666 // require(false, stub_error);667 // dummy;668 // return "";669 // }670671 // /// @notice An abbreviated name for NFTs in this contract672 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`673 // /// @dev EVM selector for this function is: 0x95d89b41,674 // /// or in textual repr: symbol()675 // function symbol() public view returns (string memory) {676 // require(false, stub_error);677 // dummy;678 // return "";679 // }680681 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.682 ///683 /// @dev If the token has a `url` property and it is not empty, it is returned.684 /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.685 /// If the collection property `baseURI` is empty or absent, return "" (empty string)686 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix687 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).688 ///689 /// @return token's const_metadata690 /// @dev EVM selector for this function is: 0xc87b56dd,691 /// or in textual repr: tokenURI(uint256)692 function tokenURI(uint256 tokenId) public view returns (string memory) {693 require(false, stub_error);694 tokenId;695 dummy;696 return "";697 }698}699700/// @title ERC721 Token that can be irreversibly burned (destroyed).701/// @dev the ERC-165 identifier for this interface is 0x42966c68702contract ERC721Burnable is Dummy, ERC165 {703 /// @notice Burns a specific ERC721 token.704 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized705 /// operator of the current owner.706 /// @param tokenId The NFT to approve707 /// @dev EVM selector for this function is: 0x42966c68,708 /// or in textual repr: burn(uint256)709 function burn(uint256 tokenId) public {710 require(false, stub_error);711 tokenId;712 dummy = 0;713 }714}715716/// @dev inlined interface717contract ERC721UniqueMintableEvents {718 event MintingFinished();719}720721/// @title ERC721 minting logic.722/// @dev the ERC-165 identifier for this interface is 0x476ff149723contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {724 /// @dev EVM selector for this function is: 0x05d2035b,725 /// or in textual repr: mintingFinished()726 function mintingFinished() public view returns (bool) {727 require(false, stub_error);728 dummy;729 return false;730 }731732 /// @notice Function to mint a token.733 /// @param to The new owner734 /// @return uint256 The id of the newly minted token735 /// @dev EVM selector for this function is: 0x6a627842,736 /// or in textual repr: mint(address)737 function mint(address to) public returns (uint256) {738 require(false, stub_error);739 to;740 dummy = 0;741 return 0;742 }743744 // /// @notice Function to mint a token.745 // /// @dev `tokenId` should be obtained with `nextTokenId` method,746 // /// unlike standard, you can't specify it manually747 // /// @param to The new owner748 // /// @param tokenId ID of the minted NFT749 // /// @dev EVM selector for this function is: 0x40c10f19,750 // /// or in textual repr: mint(address,uint256)751 // function mint(address to, uint256 tokenId) public returns (bool) {752 // require(false, stub_error);753 // to;754 // tokenId;755 // dummy = 0;756 // return false;757 // }758759 /// @notice Function to mint token with the given tokenUri.760 /// @param to The new owner761 /// @param tokenUri Token URI that would be stored in the NFT properties762 /// @return uint256 The id of the newly minted token763 /// @dev EVM selector for this function is: 0x45c17782,764 /// or in textual repr: mintWithTokenURI(address,string)765 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {766 require(false, stub_error);767 to;768 tokenUri;769 dummy = 0;770 return 0;771 }772773 // /// @notice Function to mint token with the given tokenUri.774 // /// @dev `tokenId` should be obtained with `nextTokenId` method,775 // /// unlike standard, you can't specify it manually776 // /// @param to The new owner777 // /// @param tokenId ID of the minted NFT778 // /// @param tokenUri Token URI that would be stored in the NFT properties779 // /// @dev EVM selector for this function is: 0x50bb4e7f,780 // /// or in textual repr: mintWithTokenURI(address,uint256,string)781 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {782 // require(false, stub_error);783 // to;784 // tokenId;785 // tokenUri;786 // dummy = 0;787 // return false;788 // }789790 /// @dev Not implemented791 /// @dev EVM selector for this function is: 0x7d64bcb4,792 /// or in textual repr: finishMinting()793 function finishMinting() public returns (bool) {794 require(false, stub_error);795 dummy = 0;796 return false;797 }798}799800/// @title Unique extensions for ERC721.801/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4802contract ERC721UniqueExtensions is Dummy, ERC165 {803 /// @notice A descriptive name for a collection of NFTs in this contract804 /// @dev EVM selector for this function is: 0x06fdde03,805 /// or in textual repr: name()806 function name() public view returns (string memory) {807 require(false, stub_error);808 dummy;809 return "";810 }811812 /// @notice An abbreviated name for NFTs in this contract813 /// @dev EVM selector for this function is: 0x95d89b41,814 /// or in textual repr: symbol()815 function symbol() public view returns (string memory) {816 require(false, stub_error);817 dummy;818 return "";819 }820821 /// @notice A description for the collection.822 /// @dev EVM selector for this function is: 0x7284e416,823 /// or in textual repr: description()824 function description() public view returns (string memory) {825 require(false, stub_error);826 dummy;827 return "";828 }829830 /// Returns the owner (in cross format) of the token.831 ///832 /// @param tokenId Id for the token.833 /// @dev EVM selector for this function is: 0x2b29dace,834 /// or in textual repr: crossOwnerOf(uint256)835 function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {836 require(false, stub_error);837 tokenId;838 dummy;839 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);840 }841842 /// Returns the token properties.843 ///844 /// @param tokenId Id for the token.845 /// @param keys Properties keys. Empty keys for all propertyes.846 /// @return Vector of properties key/value pairs.847 /// @dev EVM selector for this function is: 0xe07ede7e,848 /// or in textual repr: properties(uint256,string[])849 function properties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {850 require(false, stub_error);851 tokenId;852 keys;853 dummy;854 return new Property[](0);855 }856857 /// @notice Set or reaffirm the approved address for an NFT858 /// @dev The zero address indicates there is no approved address.859 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized860 /// operator of the current owner.861 /// @param approved The new substrate address approved NFT controller862 /// @param tokenId The NFT to approve863 /// @dev EVM selector for this function is: 0x0ecd0ab0,864 /// or in textual repr: approveCross((address,uint256),uint256)865 function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {866 require(false, stub_error);867 approved;868 tokenId;869 dummy = 0;870 }871872 /// @notice Transfer ownership of an NFT873 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`874 /// is the zero address. Throws if `tokenId` is not a valid NFT.875 /// @param to The new owner876 /// @param tokenId The NFT to transfer877 /// @dev EVM selector for this function is: 0xa9059cbb,878 /// or in textual repr: transfer(address,uint256)879 function transfer(address to, uint256 tokenId) public {880 require(false, stub_error);881 to;882 tokenId;883 dummy = 0;884 }885886 /// @notice Transfer ownership of an NFT887 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`888 /// is the zero address. Throws if `tokenId` is not a valid NFT.889 /// @param to The new owner890 /// @param tokenId The NFT to transfer891 /// @dev EVM selector for this function is: 0x2ada85ff,892 /// or in textual repr: transferCross((address,uint256),uint256)893 function transferCross(EthCrossAccount memory to, uint256 tokenId) public {894 require(false, stub_error);895 to;896 tokenId;897 dummy = 0;898 }899900 /// @notice Transfer ownership of an NFT from cross account address to cross account address901 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`902 /// is the zero address. Throws if `tokenId` is not a valid NFT.903 /// @param from Cross acccount address of current owner904 /// @param to Cross acccount address of new owner905 /// @param tokenId The NFT to transfer906 /// @dev EVM selector for this function is: 0xd5cf430b,907 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)908 function transferFromCross(909 EthCrossAccount memory from,910 EthCrossAccount memory to,911 uint256 tokenId912 ) public {913 require(false, stub_error);914 from;915 to;916 tokenId;917 dummy = 0;918 }919920 // /// @notice Burns a specific ERC721 token.921 // /// @dev Throws unless `msg.sender` is the current owner or an authorized922 // /// operator for this NFT. Throws if `from` is not the current owner. Throws923 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.924 // /// @param from The current owner of the NFT925 // /// @param tokenId The NFT to transfer926 // /// @dev EVM selector for this function is: 0x79cc6790,927 // /// or in textual repr: burnFrom(address,uint256)928 // function burnFrom(address from, uint256 tokenId) public {929 // require(false, stub_error);930 // from;931 // tokenId;932 // dummy = 0;933 // }934935 /// @notice Burns a specific ERC721 token.936 /// @dev Throws unless `msg.sender` is the current owner or an authorized937 /// operator for this NFT. Throws if `from` is not the current owner. Throws938 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.939 /// @param from The current owner of the NFT940 /// @param tokenId The NFT to transfer941 /// @dev EVM selector for this function is: 0xbb2f5a58,942 /// or in textual repr: burnFromCross((address,uint256),uint256)943 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {944 require(false, stub_error);945 from;946 tokenId;947 dummy = 0;948 }949950 /// @notice Returns next free NFT ID.951 /// @dev EVM selector for this function is: 0x75794a3c,952 /// or in textual repr: nextTokenId()953 function nextTokenId() public view returns (uint256) {954 require(false, stub_error);955 dummy;956 return 0;957 }958959 // /// @notice Function to mint multiple tokens.960 // /// @dev `tokenIds` should be an array of consecutive numbers and first number961 // /// should be obtained with `nextTokenId` method962 // /// @param to The new owner963 // /// @param tokenIds IDs of the minted NFTs964 // /// @dev EVM selector for this function is: 0x44a9945e,965 // /// or in textual repr: mintBulk(address,uint256[])966 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {967 // require(false, stub_error);968 // to;969 // tokenIds;970 // dummy = 0;971 // return false;972 // }973974 // /// @notice Function to mint multiple tokens with the given tokenUris.975 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive976 // /// numbers and first number should be obtained with `nextTokenId` method977 // /// @param to The new owner978 // /// @param tokens array of pairs of token ID and token URI for minted tokens979 // /// @dev EVM selector for this function is: 0x36543006,980 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])981 // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {982 // require(false, stub_error);983 // to;984 // tokens;985 // dummy = 0;986 // return false;987 // }988989 /// @notice Function to mint a token.990 /// @param to The new owner crossAccountId991 /// @param properties Properties of minted token992 /// @return uint256 The id of the newly minted token993 /// @dev EVM selector for this function is: 0xb904db03,994 /// or in textual repr: mintCross((address,uint256),(string,bytes)[])995 function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {996 require(false, stub_error);997 to;998 properties;999 dummy = 0;1000 return 0;1001 }1002}10031004/// @dev anonymous struct1005struct Tuple15 {1006 uint256 field_0;1007 string field_1;1008}10091010/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension1011/// @dev See https://eips.ethereum.org/EIPS/eip-7211012/// @dev the ERC-165 identifier for this interface is 0x780e9d631013contract ERC721Enumerable is Dummy, ERC165 {1014 /// @notice Enumerate valid NFTs1015 /// @param index A counter less than `totalSupply()`1016 /// @return The token identifier for the `index`th NFT,1017 /// (sort order not specified)1018 /// @dev EVM selector for this function is: 0x4f6ccce7,1019 /// or in textual repr: tokenByIndex(uint256)1020 function tokenByIndex(uint256 index) public view returns (uint256) {1021 require(false, stub_error);1022 index;1023 dummy;1024 return 0;1025 }10261027 /// @dev Not implemented1028 /// @dev EVM selector for this function is: 0x2f745c59,1029 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)1030 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {1031 require(false, stub_error);1032 owner;1033 index;1034 dummy;1035 return 0;1036 }10371038 /// @notice Count NFTs tracked by this contract1039 /// @return A count of valid NFTs tracked by this contract, where each one of1040 /// them has an assigned and queryable owner not equal to the zero address1041 /// @dev EVM selector for this function is: 0x18160ddd,1042 /// or in textual repr: totalSupply()1043 function totalSupply() public view returns (uint256) {1044 require(false, stub_error);1045 dummy;1046 return 0;1047 }1048}10491050/// @dev inlined interface1051contract ERC721Events {1052 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);1053 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);1054 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);1055}10561057/// @title ERC-721 Non-Fungible Token Standard1058/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md1059/// @dev the ERC-165 identifier for this interface is 0x983a942b1060contract ERC721 is Dummy, ERC165, ERC721Events {1061 /// @notice Count all NFTs assigned to an owner1062 /// @dev NFTs assigned to the zero address are considered invalid, and this1063 /// function throws for queries about the zero address.1064 /// @param owner An address for whom to query the balance1065 /// @return The number of NFTs owned by `owner`, possibly zero1066 /// @dev EVM selector for this function is: 0x70a08231,1067 /// or in textual repr: balanceOf(address)1068 function balanceOf(address owner) public view returns (uint256) {1069 require(false, stub_error);1070 owner;1071 dummy;1072 return 0;1073 }10741075 /// @notice Find the owner of an NFT1076 /// @dev NFTs assigned to zero address are considered invalid, and queries1077 /// about them do throw.1078 /// @param tokenId The identifier for an NFT1079 /// @return The address of the owner of the NFT1080 /// @dev EVM selector for this function is: 0x6352211e,1081 /// or in textual repr: ownerOf(uint256)1082 function ownerOf(uint256 tokenId) public view returns (address) {1083 require(false, stub_error);1084 tokenId;1085 dummy;1086 return 0x0000000000000000000000000000000000000000;1087 }10881089 /// @dev Not implemented1090 /// @dev EVM selector for this function is: 0xb88d4fde,1091 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)1092 function safeTransferFrom(1093 address from,1094 address to,1095 uint256 tokenId,1096 bytes memory data1097 ) public {1098 require(false, stub_error);1099 from;1100 to;1101 tokenId;1102 data;1103 dummy = 0;1104 }11051106 /// @dev Not implemented1107 /// @dev EVM selector for this function is: 0x42842e0e,1108 /// or in textual repr: safeTransferFrom(address,address,uint256)1109 function safeTransferFrom(1110 address from,1111 address to,1112 uint256 tokenId1113 ) public {1114 require(false, stub_error);1115 from;1116 to;1117 tokenId;1118 dummy = 0;1119 }11201121 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE1122 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE1123 /// THEY MAY BE PERMANENTLY LOST1124 /// @dev Throws unless `msg.sender` is the current owner or an authorized1125 /// operator for this NFT. Throws if `from` is not the current owner. Throws1126 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1127 /// @param from The current owner of the NFT1128 /// @param to The new owner1129 /// @param tokenId The NFT to transfer1130 /// @dev EVM selector for this function is: 0x23b872dd,1131 /// or in textual repr: transferFrom(address,address,uint256)1132 function transferFrom(1133 address from,1134 address to,1135 uint256 tokenId1136 ) public {1137 require(false, stub_error);1138 from;1139 to;1140 tokenId;1141 dummy = 0;1142 }11431144 /// @notice Set or reaffirm the approved address for an NFT1145 /// @dev The zero address indicates there is no approved address.1146 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1147 /// operator of the current owner.1148 /// @param approved The new approved NFT controller1149 /// @param tokenId The NFT to approve1150 /// @dev EVM selector for this function is: 0x095ea7b3,1151 /// or in textual repr: approve(address,uint256)1152 function approve(address approved, uint256 tokenId) public {1153 require(false, stub_error);1154 approved;1155 tokenId;1156 dummy = 0;1157 }11581159 /// @notice Sets or unsets the approval of a given operator.1160 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.1161 /// @param operator Operator1162 /// @param approved Should operator status be granted or revoked?1163 /// @dev EVM selector for this function is: 0xa22cb465,1164 /// or in textual repr: setApprovalForAll(address,bool)1165 function setApprovalForAll(address operator, bool approved) public {1166 require(false, stub_error);1167 operator;1168 approved;1169 dummy = 0;1170 }11711172 /// @dev Not implemented1173 /// @dev EVM selector for this function is: 0x081812fc,1174 /// or in textual repr: getApproved(uint256)1175 function getApproved(uint256 tokenId) public view returns (address) {1176 require(false, stub_error);1177 tokenId;1178 dummy;1179 return 0x0000000000000000000000000000000000000000;1180 }11811182 /// @notice Tells whether the given `owner` approves the `operator`.1183 /// @dev EVM selector for this function is: 0xe985e9c5,1184 /// or in textual repr: isApprovedForAll(address,address)1185 function isApprovedForAll(address owner, address operator) public view returns (bool) {1186 require(false, stub_error);1187 owner;1188 operator;1189 dummy;1190 return false;1191 }11921193 /// @notice Returns collection helper contract address1194 /// @dev EVM selector for this function is: 0x1896cce6,1195 /// or in textual repr: collectionHelperAddress()1196 function collectionHelperAddress() public view returns (address) {1197 require(false, stub_error);1198 dummy;1199 return 0x0000000000000000000000000000000000000000;1200 }1201}12021203contract UniqueNFT is1204 Dummy,1205 ERC165,1206 ERC721,1207 ERC721Enumerable,1208 ERC721UniqueExtensions,1209 ERC721UniqueMintable,1210 ERC721Burnable,1211 ERC721Metadata,1212 Collection,1213 TokenProperties1214{}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.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -250,7 +250,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple33[]",
+ "internalType": "struct Tuple35[]",
"name": "",
"type": "tuple[]"
}
@@ -271,11 +271,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple42[]",
-=======
- "internalType": "struct Tuple39[]",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple44[]",
"name": "",
"type": "tuple[]"
}
@@ -296,11 +292,7 @@
"type": "uint256[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple39",
-=======
- "internalType": "struct Tuple36",
->>>>>>> 09f69700... chore: generate stubs
+ "internalType": "struct Tuple41",
"name": "",
"type": "tuple"
}
@@ -770,20 +762,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple57[]",
-=======
- "internalType": "struct Tuple54[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple59[]",
-=======
- "internalType": "struct Tuple56[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple61[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -844,20 +828,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
-<<<<<<< HEAD
- "internalType": "struct Tuple57[]",
-=======
- "internalType": "struct Tuple54[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
-<<<<<<< HEAD
- "internalType": "struct Tuple59[]",
-=======
- "internalType": "struct Tuple56[]",
->>>>>>> 9e929f90... chore: generate stubs & types
+ "internalType": "struct Tuple61[]",
"name": "",
"type": "tuple[]"
}
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