difftreelog
genetate evm stubs & fix abiWriter for struct
in: master
13 files changed
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -184,8 +184,7 @@
impl AbiWrite for Property {
fn abi_write(&self, writer: &mut AbiWriter) {
- self.key.abi_write(writer);
- self.value.abi_write(writer);
+ (&self.key, &self.value).abi_write(writer);
}
}
crates/evm-coder/src/abi/traits.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/traits.rs
+++ b/crates/evm-coder/src/abi/traits.rs
@@ -49,3 +49,9 @@
Ok(writer.into())
}
}
+
+impl<T: AbiWrite> AbiWrite for &T {
+ fn abi_write(&self, writer: &mut AbiWriter) {
+ T::abi_write(self, writer);
+ }
+}
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -437,7 +437,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
+/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -725,7 +725,7 @@
&self,
token_id: uint256,
keys: Vec<string>,
- ) -> Result<Vec<(string, bytes)>> {
+ ) -> Result<Vec<PropertyStruct>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -745,7 +745,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok((key, value))
+ Ok(PropertyStruct { key, value })
})
.collect::<Result<Vec<_>>>()
}
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 0x91a97a6822contract 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(32 string memory key,33 bool isMutable,34 bool collectionAdmin,35 bool tokenOwner36 ) public {37 require(false, stub_error);38 key;39 isMutable;40 collectionAdmin;41 tokenOwner;42 dummy = 0;43 }4445 // /// @notice Set token property value.46 // /// @dev Throws error if `msg.sender` has no permission to edit the property.47 // /// @param tokenId ID of the token.48 // /// @param key Property key.49 // /// @param value Property value.50 // /// @dev EVM selector for this function is: 0x1752d67b,51 // /// or in textual repr: setProperty(uint256,string,bytes)52 // function setProperty(uint256 tokenId, string memory key, bytes memory value) public {53 // require(false, stub_error);54 // tokenId;55 // key;56 // value;57 // dummy = 0;58 // }5960 /// @notice Set token properties value.61 /// @dev Throws error if `msg.sender` has no permission to edit the property.62 /// @param tokenId ID of the token.63 /// @param properties settable properties64 /// @dev EVM selector for this function is: 0x14ed3a6e,65 /// or in textual repr: setProperties(uint256,(string,bytes)[])66 function setProperties(uint256 tokenId, Property[] memory properties) public {67 require(false, stub_error);68 tokenId;69 properties;70 dummy = 0;71 }7273 // /// @notice Delete token property value.74 // /// @dev Throws error if `msg.sender` has no permission to edit the property.75 // /// @param tokenId ID of the token.76 // /// @param key Property key.77 // /// @dev EVM selector for this function is: 0x066111d1,78 // /// or in textual repr: deleteProperty(uint256,string)79 // function deleteProperty(uint256 tokenId, string memory key) public {80 // require(false, stub_error);81 // tokenId;82 // key;83 // dummy = 0;84 // }8586 /// @notice Delete token properties value.87 /// @dev Throws error if `msg.sender` has no permission to edit the property.88 /// @param tokenId ID of the token.89 /// @param keys Properties key.90 /// @dev EVM selector for this function is: 0xc472d371,91 /// or in textual repr: deleteProperties(uint256,string[])92 function deleteProperties(uint256 tokenId, string[] memory keys) public {93 require(false, stub_error);94 tokenId;95 keys;96 dummy = 0;97 }9899 /// @notice Get token property value.100 /// @dev Throws error if key not found101 /// @param tokenId ID of the token.102 /// @param key Property key.103 /// @return Property value bytes104 /// @dev EVM selector for this function is: 0x7228c327,105 /// or in textual repr: property(uint256,string)106 function property(uint256 tokenId, string memory key) public view returns (bytes memory) {107 require(false, stub_error);108 tokenId;109 key;110 dummy;111 return hex"";112 }113}114115/// @dev Property struct116struct Property {117 string key;118 bytes value;119}120121/// @title A contract that allows you to work with collections.122/// @dev the ERC-165 identifier for this interface is 0x8b91d192123contract Collection is Dummy, ERC165 {124 // /// Set collection property.125 // ///126 // /// @param key Property key.127 // /// @param value Propery value.128 // /// @dev EVM selector for this function is: 0x2f073f66,129 // /// or in textual repr: setCollectionProperty(string,bytes)130 // function setCollectionProperty(string memory key, bytes memory value) public {131 // require(false, stub_error);132 // key;133 // value;134 // dummy = 0;135 // }136137 /// Set collection properties.138 ///139 /// @param properties Vector of properties key/value pair.140 /// @dev EVM selector for this function is: 0x50b26b2a,141 /// or in textual repr: setCollectionProperties((string,bytes)[])142 function setCollectionProperties(Property[] memory properties) public {143 require(false, stub_error);144 properties;145 dummy = 0;146 }147148 // /// Delete collection property.149 // ///150 // /// @param key Property key.151 // /// @dev EVM selector for this function is: 0x7b7debce,152 // /// or in textual repr: deleteCollectionProperty(string)153 // function deleteCollectionProperty(string memory key) public {154 // require(false, stub_error);155 // key;156 // dummy = 0;157 // }158159 /// Delete collection properties.160 ///161 /// @param keys Properties keys.162 /// @dev EVM selector for this function is: 0xee206ee3,163 /// or in textual repr: deleteCollectionProperties(string[])164 function deleteCollectionProperties(string[] memory keys) public {165 require(false, stub_error);166 keys;167 dummy = 0;168 }169170 /// Get collection property.171 ///172 /// @dev Throws error if key not found.173 ///174 /// @param key Property key.175 /// @return bytes The property corresponding to the key.176 /// @dev EVM selector for this function is: 0xcf24fd6d,177 /// or in textual repr: collectionProperty(string)178 function collectionProperty(string memory key) public view returns (bytes memory) {179 require(false, stub_error);180 key;181 dummy;182 return hex"";183 }184185 /// Get collection properties.186 ///187 /// @param keys Properties keys. Empty keys for all propertyes.188 /// @return Vector of properties key/value pairs.189 /// @dev EVM selector for this function is: 0x285fb8e6,190 /// or in textual repr: collectionProperties(string[])191 function collectionProperties(string[] memory keys) public view returns (Tuple23[] memory) {192 require(false, stub_error);193 keys;194 dummy;195 return new Tuple23[](0);196 }197198 // /// Set the sponsor of the collection.199 // ///200 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.201 // ///202 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.203 // /// @dev EVM selector for this function is: 0x7623402e,204 // /// or in textual repr: setCollectionSponsor(address)205 // function setCollectionSponsor(address sponsor) public {206 // require(false, stub_error);207 // sponsor;208 // dummy = 0;209 // }210211 /// Set the sponsor of the collection.212 ///213 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.214 ///215 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.216 /// @dev EVM selector for this function is: 0x84a1d5a8,217 /// or in textual repr: setCollectionSponsorCross((address,uint256))218 function setCollectionSponsorCross(EthCrossAccount memory sponsor) public {219 require(false, stub_error);220 sponsor;221 dummy = 0;222 }223224 /// Whether there is a pending sponsor.225 /// @dev EVM selector for this function is: 0x058ac185,226 /// or in textual repr: hasCollectionPendingSponsor()227 function hasCollectionPendingSponsor() public view returns (bool) {228 require(false, stub_error);229 dummy;230 return false;231 }232233 /// Collection sponsorship confirmation.234 ///235 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.236 /// @dev EVM selector for this function is: 0x3c50e97a,237 /// or in textual repr: confirmCollectionSponsorship()238 function confirmCollectionSponsorship() public {239 require(false, stub_error);240 dummy = 0;241 }242243 /// Remove collection sponsor.244 /// @dev EVM selector for this function is: 0x6e0326a3,245 /// or in textual repr: removeCollectionSponsor()246 function removeCollectionSponsor() public {247 require(false, stub_error);248 dummy = 0;249 }250251 /// Get current sponsor.252 ///253 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.254 /// @dev EVM selector for this function is: 0x6ec0a9f1,255 /// or in textual repr: collectionSponsor()256 function collectionSponsor() public view returns (Tuple26 memory) {257 require(false, stub_error);258 dummy;259 return Tuple26(0x0000000000000000000000000000000000000000, 0);260 }261262 /// Set limits for the collection.263 /// @dev Throws error if limit not found.264 /// @param limit Name of the limit. Valid names:265 /// "accountTokenOwnershipLimit",266 /// "sponsoredDataSize",267 /// "sponsoredDataRateLimit",268 /// "tokenLimit",269 /// "sponsorTransferTimeout",270 /// "sponsorApproveTimeout"271 /// "ownerCanTransfer",272 /// "ownerCanDestroy",273 /// "transfersEnabled"274 /// @param value Value of the limit.275 /// @dev EVM selector for this function is: 0x4ad890a8,276 /// or in textual repr: setCollectionLimit(string,uint256)277 function setCollectionLimit(string memory limit, uint256 value) public {278 require(false, stub_error);279 limit;280 value;281 dummy = 0;282 }283284 /// Get contract address.285 /// @dev EVM selector for this function is: 0xf6b4dfb4,286 /// or in textual repr: contractAddress()287 function contractAddress() public view returns (address) {288 require(false, stub_error);289 dummy;290 return 0x0000000000000000000000000000000000000000;291 }292293 /// Add collection admin.294 /// @param newAdmin Cross account administrator address.295 /// @dev EVM selector for this function is: 0x859aa7d6,296 /// or in textual repr: addCollectionAdminCross((address,uint256))297 function addCollectionAdminCross(EthCrossAccount memory newAdmin) public {298 require(false, stub_error);299 newAdmin;300 dummy = 0;301 }302303 /// Remove collection admin.304 /// @param admin Cross account administrator address.305 /// @dev EVM selector for this function is: 0x6c0cd173,306 /// or in textual repr: removeCollectionAdminCross((address,uint256))307 function removeCollectionAdminCross(EthCrossAccount memory admin) public {308 require(false, stub_error);309 admin;310 dummy = 0;311 }312313 // /// Add collection admin.314 // /// @param newAdmin Address of the added administrator.315 // /// @dev EVM selector for this function is: 0x92e462c7,316 // /// or in textual repr: addCollectionAdmin(address)317 // function addCollectionAdmin(address newAdmin) public {318 // require(false, stub_error);319 // newAdmin;320 // dummy = 0;321 // }322323 // /// Remove collection admin.324 // ///325 // /// @param admin Address of the removed administrator.326 // /// @dev EVM selector for this function is: 0xfafd7b42,327 // /// or in textual repr: removeCollectionAdmin(address)328 // function removeCollectionAdmin(address admin) public {329 // require(false, stub_error);330 // admin;331 // dummy = 0;332 // }333334 /// Toggle accessibility of collection nesting.335 ///336 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'337 /// @dev EVM selector for this function is: 0x112d4586,338 /// or in textual repr: setCollectionNesting(bool)339 function setCollectionNesting(bool enable) public {340 require(false, stub_error);341 enable;342 dummy = 0;343 }344345 /// Toggle accessibility of collection nesting.346 ///347 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'348 /// @param collections Addresses of collections that will be available for nesting.349 /// @dev EVM selector for this function is: 0x64872396,350 /// or in textual repr: setCollectionNesting(bool,address[])351 function setCollectionNesting(bool enable, address[] memory collections) public {352 require(false, stub_error);353 enable;354 collections;355 dummy = 0;356 }357358 /// Set the collection access method.359 /// @param mode Access mode360 /// 0 for Normal361 /// 1 for AllowList362 /// @dev EVM selector for this function is: 0x41835d4c,363 /// or in textual repr: setCollectionAccess(uint8)364 function setCollectionAccess(uint8 mode) public {365 require(false, stub_error);366 mode;367 dummy = 0;368 }369370 /// Checks that user allowed to operate with collection.371 ///372 /// @param user User address to check.373 /// @dev EVM selector for this function is: 0xd63a8e11,374 /// or in textual repr: allowed(address)375 function allowed(address user) public view returns (bool) {376 require(false, stub_error);377 user;378 dummy;379 return false;380 }381382 // /// Add the user to the allowed list.383 // ///384 // /// @param user Address of a trusted user.385 // /// @dev EVM selector for this function is: 0x67844fe6,386 // /// or in textual repr: addToCollectionAllowList(address)387 // function addToCollectionAllowList(address user) public {388 // require(false, stub_error);389 // user;390 // dummy = 0;391 // }392393 /// Add user to allowed list.394 ///395 /// @param user User cross account address.396 /// @dev EVM selector for this function is: 0xa0184a3a,397 /// or in textual repr: addToCollectionAllowListCross((address,uint256))398 function addToCollectionAllowListCross(EthCrossAccount memory user) public {399 require(false, stub_error);400 user;401 dummy = 0;402 }403404 // /// Remove the user from the allowed list.405 // ///406 // /// @param user Address of a removed user.407 // /// @dev EVM selector for this function is: 0x85c51acb,408 // /// or in textual repr: removeFromCollectionAllowList(address)409 // function removeFromCollectionAllowList(address user) public {410 // require(false, stub_error);411 // user;412 // dummy = 0;413 // }414415 /// Remove user from allowed list.416 ///417 /// @param user User cross account address.418 /// @dev EVM selector for this function is: 0x09ba452a,419 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))420 function removeFromCollectionAllowListCross(EthCrossAccount memory user) public {421 require(false, stub_error);422 user;423 dummy = 0;424 }425426 /// Switch permission for minting.427 ///428 /// @param mode Enable if "true".429 /// @dev EVM selector for this function is: 0x00018e84,430 /// or in textual repr: setCollectionMintMode(bool)431 function setCollectionMintMode(bool mode) public {432 require(false, stub_error);433 mode;434 dummy = 0;435 }436437 // /// Check that account is the owner or admin of the collection438 // ///439 // /// @param user account to verify440 // /// @return "true" if account is the owner or admin441 // /// @dev EVM selector for this function is: 0x9811b0c7,442 // /// or in textual repr: isOwnerOrAdmin(address)443 // function isOwnerOrAdmin(address user) public view returns (bool) {444 // require(false, stub_error);445 // user;446 // dummy;447 // return false;448 // }449450 /// Check that account is the owner or admin of the collection451 ///452 /// @param user User cross account to verify453 /// @return "true" if account is the owner or admin454 /// @dev EVM selector for this function is: 0x3e75a905,455 /// or in textual repr: isOwnerOrAdminCross((address,uint256))456 function isOwnerOrAdminCross(EthCrossAccount memory user) public view returns (bool) {457 require(false, stub_error);458 user;459 dummy;460 return false;461 }462463 /// Returns collection type464 ///465 /// @return `Fungible` or `NFT` or `ReFungible`466 /// @dev EVM selector for this function is: 0xd34b55b8,467 /// or in textual repr: uniqueCollectionType()468 function uniqueCollectionType() public view returns (string memory) {469 require(false, stub_error);470 dummy;471 return "";472 }473474 /// Get collection owner.475 ///476 /// @return Tuble with sponsor address and his substrate mirror.477 /// If address is canonical then substrate mirror is zero and vice versa.478 /// @dev EVM selector for this function is: 0xdf727d3b,479 /// or in textual repr: collectionOwner()480 function collectionOwner() public view returns (EthCrossAccount memory) {481 require(false, stub_error);482 dummy;483 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);484 }485486 // /// Changes collection owner to another account487 // ///488 // /// @dev Owner can be changed only by current owner489 // /// @param newOwner new owner account490 // /// @dev EVM selector for this function is: 0x4f53e226,491 // /// or in textual repr: changeCollectionOwner(address)492 // function changeCollectionOwner(address newOwner) public {493 // require(false, stub_error);494 // newOwner;495 // dummy = 0;496 // }497498 /// Get collection administrators499 ///500 /// @return Vector of tuples with admins address and his substrate mirror.501 /// If address is canonical then substrate mirror is zero and vice versa.502 /// @dev EVM selector for this function is: 0x5813216b,503 /// or in textual repr: collectionAdmins()504 function collectionAdmins() public view returns (EthCrossAccount[] memory) {505 require(false, stub_error);506 dummy;507 return new EthCrossAccount[](0);508 }509510 /// Changes collection owner to another account511 ///512 /// @dev Owner can be changed only by current owner513 /// @param newOwner new owner cross account514 /// @dev EVM selector for this function is: 0x6496c497,515 /// or in textual repr: changeCollectionOwnerCross((address,uint256))516 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {517 require(false, stub_error);518 newOwner;519 dummy = 0;520 }521}522523/// @dev Cross account struct524struct EthCrossAccount {525 address eth;526 uint256 sub;527}528529/// @dev anonymous struct530struct Tuple26 {531 address field_0;532 uint256 field_1;533}534535/// @dev anonymous struct536struct Tuple23 {537 string field_0;538 bytes field_1;539}540541/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension542/// @dev See https://eips.ethereum.org/EIPS/eip-721543/// @dev the ERC-165 identifier for this interface is 0x5b5e139f544contract ERC721Metadata is Dummy, ERC165 {545 // /// @notice A descriptive name for a collection of NFTs in this contract546 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`547 // /// @dev EVM selector for this function is: 0x06fdde03,548 // /// or in textual repr: name()549 // function name() public view returns (string memory) {550 // require(false, stub_error);551 // dummy;552 // return "";553 // }554555 // /// @notice An abbreviated name for NFTs in this contract556 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`557 // /// @dev EVM selector for this function is: 0x95d89b41,558 // /// or in textual repr: symbol()559 // function symbol() public view returns (string memory) {560 // require(false, stub_error);561 // dummy;562 // return "";563 // }564565 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.566 ///567 /// @dev If the token has a `url` property and it is not empty, it is returned.568 /// 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`.569 /// If the collection property `baseURI` is empty or absent, return "" (empty string)570 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix571 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).572 ///573 /// @return token's const_metadata574 /// @dev EVM selector for this function is: 0xc87b56dd,575 /// or in textual repr: tokenURI(uint256)576 function tokenURI(uint256 tokenId) public view returns (string memory) {577 require(false, stub_error);578 tokenId;579 dummy;580 return "";581 }582}583584/// @title ERC721 Token that can be irreversibly burned (destroyed).585/// @dev the ERC-165 identifier for this interface is 0x42966c68586contract ERC721Burnable is Dummy, ERC165 {587 /// @notice Burns a specific ERC721 token.588 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized589 /// operator of the current owner.590 /// @param tokenId The NFT to approve591 /// @dev EVM selector for this function is: 0x42966c68,592 /// or in textual repr: burn(uint256)593 function burn(uint256 tokenId) public {594 require(false, stub_error);595 tokenId;596 dummy = 0;597 }598}599600/// @dev inlined interface601contract ERC721UniqueMintableEvents {602 event MintingFinished();603}604605/// @title ERC721 minting logic.606/// @dev the ERC-165 identifier for this interface is 0x476ff149607contract ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {608 /// @dev EVM selector for this function is: 0x05d2035b,609 /// or in textual repr: mintingFinished()610 function mintingFinished() public view returns (bool) {611 require(false, stub_error);612 dummy;613 return false;614 }615616 /// @notice Function to mint token.617 /// @param to The new owner618 /// @return uint256 The id of the newly minted token619 /// @dev EVM selector for this function is: 0x6a627842,620 /// or in textual repr: mint(address)621 function mint(address to) public returns (uint256) {622 require(false, stub_error);623 to;624 dummy = 0;625 return 0;626 }627628 // /// @notice Function to mint token.629 // /// @dev `tokenId` should be obtained with `nextTokenId` method,630 // /// unlike standard, you can't specify it manually631 // /// @param to The new owner632 // /// @param tokenId ID of the minted NFT633 // /// @dev EVM selector for this function is: 0x40c10f19,634 // /// or in textual repr: mint(address,uint256)635 // function mint(address to, uint256 tokenId) public returns (bool) {636 // require(false, stub_error);637 // to;638 // tokenId;639 // dummy = 0;640 // return false;641 // }642643 /// @notice Function to mint token with the given tokenUri.644 /// @param to The new owner645 /// @param tokenUri Token URI that would be stored in the NFT properties646 /// @return uint256 The id of the newly minted token647 /// @dev EVM selector for this function is: 0x45c17782,648 /// or in textual repr: mintWithTokenURI(address,string)649 function mintWithTokenURI(address to, string memory tokenUri) public returns (uint256) {650 require(false, stub_error);651 to;652 tokenUri;653 dummy = 0;654 return 0;655 }656657 // /// @notice Function to mint token with the given tokenUri.658 // /// @dev `tokenId` should be obtained with `nextTokenId` method,659 // /// unlike standard, you can't specify it manually660 // /// @param to The new owner661 // /// @param tokenId ID of the minted NFT662 // /// @param tokenUri Token URI that would be stored in the NFT properties663 // /// @dev EVM selector for this function is: 0x50bb4e7f,664 // /// or in textual repr: mintWithTokenURI(address,uint256,string)665 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) public returns (bool) {666 // require(false, stub_error);667 // to;668 // tokenId;669 // tokenUri;670 // dummy = 0;671 // return false;672 // }673674 /// @dev Not implemented675 /// @dev EVM selector for this function is: 0x7d64bcb4,676 /// or in textual repr: finishMinting()677 function finishMinting() public returns (bool) {678 require(false, stub_error);679 dummy = 0;680 return false;681 }682}683684/// @title Unique extensions for ERC721.685/// @dev the ERC-165 identifier for this interface is 0x0e9fc611686contract ERC721UniqueExtensions is Dummy, ERC165 {687 /// @notice A descriptive name for a collection of NFTs in this contract688 /// @dev EVM selector for this function is: 0x06fdde03,689 /// or in textual repr: name()690 function name() public view returns (string memory) {691 require(false, stub_error);692 dummy;693 return "";694 }695696 /// @notice An abbreviated name for NFTs in this contract697 /// @dev EVM selector for this function is: 0x95d89b41,698 /// or in textual repr: symbol()699 function symbol() public view returns (string memory) {700 require(false, stub_error);701 dummy;702 return "";703 }704705 /// @notice A description for the collection.706 /// @dev EVM selector for this function is: 0x7284e416,707 /// or in textual repr: description()708 function description() public view returns (string memory) {709 require(false, stub_error);710 dummy;711 return "";712 }713714 /// Returns the owner (in cross format) of the token.715 ///716 /// @param tokenId Id for the token.717 /// @dev EVM selector for this function is: 0x2b29dace,718 /// or in textual repr: crossOwnerOf(uint256)719 function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {720 require(false, stub_error);721 tokenId;722 dummy;723 return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);724 }725726 /// Returns the token properties.727 ///728 /// @param tokenId Id for the token.729 /// @param keys Properties keys. Empty keys for all propertyes.730 /// @return Vector of properties key/value pairs.731 /// @dev EVM selector for this function is: 0xefc26c69,732 /// or in textual repr: tokenProperties(uint256,string[])733 function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Tuple8[] memory) {734 require(false, stub_error);735 tokenId;736 keys;737 dummy;738 return new Tuple8[](0);739 }740741 /// @notice Set or reaffirm the approved address for an NFT742 /// @dev The zero address indicates there is no approved address.743 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized744 /// operator of the current owner.745 /// @param approved The new substrate address approved NFT controller746 /// @param tokenId The NFT to approve747 /// @dev EVM selector for this function is: 0x0ecd0ab0,748 /// or in textual repr: approveCross((address,uint256),uint256)749 function approveCross(EthCrossAccount memory approved, uint256 tokenId) public {750 require(false, stub_error);751 approved;752 tokenId;753 dummy = 0;754 }755756 /// @notice Transfer ownership of an NFT757 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`758 /// is the zero address. Throws if `tokenId` is not a valid NFT.759 /// @param to The new owner760 /// @param tokenId The NFT to transfer761 /// @dev EVM selector for this function is: 0xa9059cbb,762 /// or in textual repr: transfer(address,uint256)763 function transfer(address to, uint256 tokenId) public {764 require(false, stub_error);765 to;766 tokenId;767 dummy = 0;768 }769770 /// @notice Transfer ownership of an NFT771 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`772 /// is the zero address. Throws if `tokenId` is not a valid NFT.773 /// @param to The new owner774 /// @param tokenId The NFT to transfer775 /// @dev EVM selector for this function is: 0x2ada85ff,776 /// or in textual repr: transferCross((address,uint256),uint256)777 function transferCross(EthCrossAccount memory to, uint256 tokenId) public {778 require(false, stub_error);779 to;780 tokenId;781 dummy = 0;782 }783784 /// @notice Transfer ownership of an NFT from cross account address to cross account address785 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`786 /// is the zero address. Throws if `tokenId` is not a valid NFT.787 /// @param from Cross acccount address of current owner788 /// @param to Cross acccount address of new owner789 /// @param tokenId The NFT to transfer790 /// @dev EVM selector for this function is: 0xd5cf430b,791 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)792 function transferFromCross(793 EthCrossAccount memory from,794 EthCrossAccount memory to,795 uint256 tokenId796 ) public {797 require(false, stub_error);798 from;799 to;800 tokenId;801 dummy = 0;802 }803804 // /// @notice Burns a specific ERC721 token.805 // /// @dev Throws unless `msg.sender` is the current owner or an authorized806 // /// operator for this NFT. Throws if `from` is not the current owner. Throws807 // /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.808 // /// @param from The current owner of the NFT809 // /// @param tokenId The NFT to transfer810 // /// @dev EVM selector for this function is: 0x79cc6790,811 // /// or in textual repr: burnFrom(address,uint256)812 // function burnFrom(address from, uint256 tokenId) public {813 // require(false, stub_error);814 // from;815 // tokenId;816 // dummy = 0;817 // }818819 /// @notice Burns a specific ERC721 token.820 /// @dev Throws unless `msg.sender` is the current owner or an authorized821 /// operator for this NFT. Throws if `from` is not the current owner. Throws822 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.823 /// @param from The current owner of the NFT824 /// @param tokenId The NFT to transfer825 /// @dev EVM selector for this function is: 0xbb2f5a58,826 /// or in textual repr: burnFromCross((address,uint256),uint256)827 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) public {828 require(false, stub_error);829 from;830 tokenId;831 dummy = 0;832 }833834 /// @notice Returns next free NFT ID.835 /// @dev EVM selector for this function is: 0x75794a3c,836 /// or in textual repr: nextTokenId()837 function nextTokenId() public view returns (uint256) {838 require(false, stub_error);839 dummy;840 return 0;841 }842 // /// @notice Function to mint multiple tokens.843 // /// @dev `tokenIds` should be an array of consecutive numbers and first number844 // /// should be obtained with `nextTokenId` method845 // /// @param to The new owner846 // /// @param tokenIds IDs of the minted NFTs847 // /// @dev EVM selector for this function is: 0x44a9945e,848 // /// or in textual repr: mintBulk(address,uint256[])849 // function mintBulk(address to, uint256[] memory tokenIds) public returns (bool) {850 // require(false, stub_error);851 // to;852 // tokenIds;853 // dummy = 0;854 // return false;855 // }856857 // /// @notice Function to mint multiple tokens with the given tokenUris.858 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive859 // /// numbers and first number should be obtained with `nextTokenId` method860 // /// @param to The new owner861 // /// @param tokens array of pairs of token ID and token URI for minted tokens862 // /// @dev EVM selector for this function is: 0x36543006,863 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])864 // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {865 // require(false, stub_error);866 // to;867 // tokens;868 // dummy = 0;869 // return false;870 // }871872}873874/// @dev anonymous struct875struct Tuple11 {876 uint256 field_0;877 string field_1;878}879880/// @dev anonymous struct881struct Tuple8 {882 string field_0;883 bytes field_1;884}885886/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension887/// @dev See https://eips.ethereum.org/EIPS/eip-721888/// @dev the ERC-165 identifier for this interface is 0x780e9d63889contract ERC721Enumerable is Dummy, ERC165 {890 /// @notice Enumerate valid NFTs891 /// @param index A counter less than `totalSupply()`892 /// @return The token identifier for the `index`th NFT,893 /// (sort order not specified)894 /// @dev EVM selector for this function is: 0x4f6ccce7,895 /// or in textual repr: tokenByIndex(uint256)896 function tokenByIndex(uint256 index) public view returns (uint256) {897 require(false, stub_error);898 index;899 dummy;900 return 0;901 }902903 /// @dev Not implemented904 /// @dev EVM selector for this function is: 0x2f745c59,905 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)906 function tokenOfOwnerByIndex(address owner, uint256 index) public view returns (uint256) {907 require(false, stub_error);908 owner;909 index;910 dummy;911 return 0;912 }913914 /// @notice Count NFTs tracked by this contract915 /// @return A count of valid NFTs tracked by this contract, where each one of916 /// them has an assigned and queryable owner not equal to the zero address917 /// @dev EVM selector for this function is: 0x18160ddd,918 /// or in textual repr: totalSupply()919 function totalSupply() public view returns (uint256) {920 require(false, stub_error);921 dummy;922 return 0;923 }924}925926/// @dev inlined interface927contract ERC721Events {928 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);929 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);930 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);931}932933/// @title ERC-721 Non-Fungible Token Standard934/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md935/// @dev the ERC-165 identifier for this interface is 0x80ac58cd936contract ERC721 is Dummy, ERC165, ERC721Events {937 /// @notice Count all NFTs assigned to an owner938 /// @dev NFTs assigned to the zero address are considered invalid, and this939 /// function throws for queries about the zero address.940 /// @param owner An address for whom to query the balance941 /// @return The number of NFTs owned by `owner`, possibly zero942 /// @dev EVM selector for this function is: 0x70a08231,943 /// or in textual repr: balanceOf(address)944 function balanceOf(address owner) public view returns (uint256) {945 require(false, stub_error);946 owner;947 dummy;948 return 0;949 }950951 /// @notice Find the owner of an NFT952 /// @dev NFTs assigned to zero address are considered invalid, and queries953 /// about them do throw.954 /// @param tokenId The identifier for an NFT955 /// @return The address of the owner of the NFT956 /// @dev EVM selector for this function is: 0x6352211e,957 /// or in textual repr: ownerOf(uint256)958 function ownerOf(uint256 tokenId) public view returns (address) {959 require(false, stub_error);960 tokenId;961 dummy;962 return 0x0000000000000000000000000000000000000000;963 }964965 /// @dev Not implemented966 /// @dev EVM selector for this function is: 0xb88d4fde,967 /// or in textual repr: safeTransferFrom(address,address,uint256,bytes)968 function safeTransferFrom(969 address from,970 address to,971 uint256 tokenId,972 bytes memory data973 ) public {974 require(false, stub_error);975 from;976 to;977 tokenId;978 data;979 dummy = 0;980 }981982 /// @dev Not implemented983 /// @dev EVM selector for this function is: 0x42842e0e,984 /// or in textual repr: safeTransferFrom(address,address,uint256)985 function safeTransferFrom(986 address from,987 address to,988 uint256 tokenId989 ) public {990 require(false, stub_error);991 from;992 to;993 tokenId;994 dummy = 0;995 }996997 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE998 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE999 /// THEY MAY BE PERMANENTLY LOST1000 /// @dev Throws unless `msg.sender` is the current owner or an authorized1001 /// operator for this NFT. Throws if `from` is not the current owner. Throws1002 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.1003 /// @param from The current owner of the NFT1004 /// @param to The new owner1005 /// @param tokenId The NFT to transfer1006 /// @dev EVM selector for this function is: 0x23b872dd,1007 /// or in textual repr: transferFrom(address,address,uint256)1008 function transferFrom(1009 address from,1010 address to,1011 uint256 tokenId1012 ) public {1013 require(false, stub_error);1014 from;1015 to;1016 tokenId;1017 dummy = 0;1018 }10191020 /// @notice Set or reaffirm the approved address for an NFT1021 /// @dev The zero address indicates there is no approved address.1022 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized1023 /// operator of the current owner.1024 /// @param approved The new approved NFT controller1025 /// @param tokenId The NFT to approve1026 /// @dev EVM selector for this function is: 0x095ea7b3,1027 /// or in textual repr: approve(address,uint256)1028 function approve(address approved, uint256 tokenId) public {1029 require(false, stub_error);1030 approved;1031 tokenId;1032 dummy = 0;1033 }10341035 /// @dev Not implemented1036 /// @dev EVM selector for this function is: 0xa22cb465,1037 /// or in textual repr: setApprovalForAll(address,bool)1038 function setApprovalForAll(address operator, bool approved) public {1039 require(false, stub_error);1040 operator;1041 approved;1042 dummy = 0;1043 }10441045 /// @dev Not implemented1046 /// @dev EVM selector for this function is: 0x081812fc,1047 /// or in textual repr: getApproved(uint256)1048 function getApproved(uint256 tokenId) public view returns (address) {1049 require(false, stub_error);1050 tokenId;1051 dummy;1052 return 0x0000000000000000000000000000000000000000;1053 }10541055 /// @dev Not implemented1056 /// @dev EVM selector for this function is: 0xe985e9c5,1057 /// or in textual repr: isApprovedForAll(address,address)1058 function isApprovedForAll(address owner, address operator) public view returns (address) {1059 require(false, stub_error);1060 owner;1061 operator;1062 dummy;1063 return 0x0000000000000000000000000000000000000000;1064 }1065}10661067contract UniqueNFT is1068 Dummy,1069 ERC165,1070 ERC721,1071 ERC721Enumerable,1072 ERC721UniqueExtensions,1073 ERC721UniqueMintable,1074 ERC721Burnable,1075 ERC721Metadata,1076 Collection,1077 TokenProperties1078{}pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -753,7 +753,7 @@
&self,
token_id: uint256,
keys: Vec<string>,
- ) -> Result<Vec<(string, bytes)>> {
+ ) -> Result<Vec<PropertyStruct>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -773,7 +773,7 @@
let key = string::from_utf8(p.key.to_vec())
.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok((key, value))
+ Ok(PropertyStruct { key, value })
})
.collect::<Result<Vec<_>>>()
}
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -188,11 +188,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple26[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple22[](0);
+ return new Tuple26[](0);
}
// /// Set the sponsor of the collection.
@@ -253,10 +253,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple25 memory) {
+ function collectionSponsor() public view returns (Tuple29 memory) {
require(false, stub_error);
dummy;
- return Tuple25(0x0000000000000000000000000000000000000000, 0);
+ return Tuple29(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,13 +527,13 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple29 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple22 {
+struct Tuple26 {
string field_0;
bytes field_1;
}
@@ -680,7 +680,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xab243667
+/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -728,12 +728,12 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Tuple8[] memory) {
+ function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
tokenId;
keys;
dummy;
- return new Tuple8[](0);
+ return new Property[](0);
}
/// @notice Transfer ownership of an RFT
@@ -849,7 +849,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -871,15 +871,9 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple14 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple8 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -249,7 +249,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple23[]",
+ "internalType": "struct Tuple27[]",
"name": "",
"type": "tuple[]"
}
@@ -273,7 +273,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple26",
+ "internalType": "struct Tuple30",
"name": "",
"type": "tuple"
}
@@ -674,10 +674,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -231,7 +231,7 @@
{ "internalType": "string", "name": "field_0", "type": "string" },
{ "internalType": "bytes", "name": "field_1", "type": "bytes" }
],
- "internalType": "struct Tuple22[]",
+ "internalType": "struct Tuple26[]",
"name": "",
"type": "tuple[]"
}
@@ -255,7 +255,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple25",
+ "internalType": "struct Tuple29",
"name": "",
"type": "tuple"
}
@@ -665,10 +665,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -290,7 +290,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
+/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
interface ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -45,7 +45,7 @@
/// @param properties settable properties
/// @dev EVM selector for this function is: 0x14ed3a6e,
/// or in textual repr: setProperties(uint256,(string,bytes)[])
- function setProperties(uint256 tokenId, Tuple21[] memory properties) external;
+ function setProperties(uint256 tokenId, Property[] memory properties) external;
// /// @notice Delete token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -95,7 +95,7 @@
/// @param properties Vector of properties key/value pair.
/// @dev EVM selector for this function is: 0x50b26b2a,
/// or in textual repr: setCollectionProperties((string,bytes)[])
- function setCollectionProperties(Tuple21[] memory properties) external;
+ function setCollectionProperties(Property[] memory properties) external;
// /// Delete collection property.
// ///
@@ -127,7 +127,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple25[] memory);
// /// Set the sponsor of the collection.
// ///
@@ -169,7 +169,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple24 memory);
+ function collectionSponsor() external view returns (Tuple28 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,13 +346,13 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple28 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple21 {
+struct Tuple25 {
string field_0;
bytes field_1;
}
@@ -452,7 +452,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x244543ee
+/// @dev the ERC-165 identifier for this interface is 0xb8f094a0
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -483,7 +483,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Tuple7[] memory);
+ function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
@@ -567,20 +567,14 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple13 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple7 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -127,7 +127,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Tuple24[] memory);
// /// Set the sponsor of the collection.
// ///
@@ -169,7 +169,7 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() external view returns (Tuple25 memory);
+ function collectionSponsor() external view returns (Tuple27 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,13 +346,13 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple27 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple22 {
+struct Tuple24 {
string field_0;
bytes field_1;
}
@@ -450,7 +450,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xab243667
+/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6
interface ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -481,7 +481,7 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0xefc26c69,
/// or in textual repr: tokenProperties(uint256,string[])
- function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Tuple7[] memory);
+ function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Property[] memory);
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
@@ -560,7 +560,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
/// Returns EVM address for refungible token
///
@@ -571,15 +571,9 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple12 {
uint256 field_0;
string field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple7 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -117,7 +117,7 @@
});
itEth('ERC721UniqueExtensions support', async ({helper}) => {
- await checkInterface(helper, '0x922a115f', true, true);
+ await checkInterface(helper, '0xb8f094a0', true, true);
});
itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {