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.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.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 (Tuple23[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Tuple27[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple23[](0);
+ return new Tuple27[](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 (Tuple26 memory) {
+ function collectionSponsor() public view returns (Tuple30 memory) {
require(false, stub_error);
dummy;
- return Tuple26(0x0000000000000000000000000000000000000000, 0);
+ return Tuple30(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,13 +527,13 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple30 {
address field_0;
uint256 field_1;
}
/// @dev anonymous struct
-struct Tuple23 {
+struct Tuple27 {
string field_0;
bytes field_1;
}
@@ -682,7 +682,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e9fc611
+/// @dev the ERC-165 identifier for this interface is 0xb8f094a0
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,
@@ -730,12 +730,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 Set or reaffirm the approved address for an NFT
@@ -861,7 +861,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, Tuple11[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -872,15 +872,9 @@
}
/// @dev anonymous struct
-struct Tuple11 {
+struct Tuple15 {
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
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.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @title A contract that allows to set and delete token properties and change token property permissions.16/// @dev the ERC-165 identifier for this interface is 0x91a97a6817interface TokenProperties is Dummy, ERC165 {18 /// @notice Set permissions for token property.19 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.20 /// @param key Property key.21 /// @param isMutable Permission to mutate property.22 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.23 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.24 /// @dev EVM selector for this function is: 0x222d97fa,25 /// or in textual repr: setTokenPropertyPermission(string,bool,bool,bool)26 function setTokenPropertyPermission(27 string memory key,28 bool isMutable,29 bool collectionAdmin,30 bool tokenOwner31 ) external;3233 // /// @notice Set token property value.34 // /// @dev Throws error if `msg.sender` has no permission to edit the property.35 // /// @param tokenId ID of the token.36 // /// @param key Property key.37 // /// @param value Property value.38 // /// @dev EVM selector for this function is: 0x1752d67b,39 // /// or in textual repr: setProperty(uint256,string,bytes)40 // function setProperty(uint256 tokenId, string memory key, bytes memory value) external;4142 /// @notice Set token properties value.43 /// @dev Throws error if `msg.sender` has no permission to edit the property.44 /// @param tokenId ID of the token.45 /// @param properties settable properties46 /// @dev EVM selector for this function is: 0x14ed3a6e,47 /// or in textual repr: setProperties(uint256,(string,bytes)[])48 function setProperties(uint256 tokenId, Property[] memory properties) external;4950 // /// @notice Delete token property value.51 // /// @dev Throws error if `msg.sender` has no permission to edit the property.52 // /// @param tokenId ID of the token.53 // /// @param key Property key.54 // /// @dev EVM selector for this function is: 0x066111d1,55 // /// or in textual repr: deleteProperty(uint256,string)56 // function deleteProperty(uint256 tokenId, string memory key) external;5758 /// @notice Delete token properties value.59 /// @dev Throws error if `msg.sender` has no permission to edit the property.60 /// @param tokenId ID of the token.61 /// @param keys Properties key.62 /// @dev EVM selector for this function is: 0xc472d371,63 /// or in textual repr: deleteProperties(uint256,string[])64 function deleteProperties(uint256 tokenId, string[] memory keys) external;6566 /// @notice Get token property value.67 /// @dev Throws error if key not found68 /// @param tokenId ID of the token.69 /// @param key Property key.70 /// @return Property value bytes71 /// @dev EVM selector for this function is: 0x7228c327,72 /// or in textual repr: property(uint256,string)73 function property(uint256 tokenId, string memory key) external view returns (bytes memory);74}7576/// @dev Property struct77struct Property {78 string key;79 bytes value;80}8182/// @title A contract that allows you to work with collections.83/// @dev the ERC-165 identifier for this interface is 0x8b91d19284interface Collection is Dummy, ERC165 {85 // /// Set collection property.86 // ///87 // /// @param key Property key.88 // /// @param value Propery value.89 // /// @dev EVM selector for this function is: 0x2f073f66,90 // /// or in textual repr: setCollectionProperty(string,bytes)91 // function setCollectionProperty(string memory key, bytes memory value) external;9293 /// Set collection properties.94 ///95 /// @param properties Vector of properties key/value pair.96 /// @dev EVM selector for this function is: 0x50b26b2a,97 /// or in textual repr: setCollectionProperties((string,bytes)[])98 function setCollectionProperties(Property[] memory properties) external;99100 // /// Delete collection property.101 // ///102 // /// @param key Property key.103 // /// @dev EVM selector for this function is: 0x7b7debce,104 // /// or in textual repr: deleteCollectionProperty(string)105 // function deleteCollectionProperty(string memory key) external;106107 /// Delete collection properties.108 ///109 /// @param keys Properties keys.110 /// @dev EVM selector for this function is: 0xee206ee3,111 /// or in textual repr: deleteCollectionProperties(string[])112 function deleteCollectionProperties(string[] memory keys) external;113114 /// Get collection property.115 ///116 /// @dev Throws error if key not found.117 ///118 /// @param key Property key.119 /// @return bytes The property corresponding to the key.120 /// @dev EVM selector for this function is: 0xcf24fd6d,121 /// or in textual repr: collectionProperty(string)122 function collectionProperty(string memory key) external view returns (bytes memory);123124 /// Get collection properties.125 ///126 /// @param keys Properties keys. Empty keys for all propertyes.127 /// @return Vector of properties key/value pairs.128 /// @dev EVM selector for this function is: 0x285fb8e6,129 /// or in textual repr: collectionProperties(string[])130 function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);131132 // /// Set the sponsor of the collection.133 // ///134 // /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.135 // ///136 // /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.137 // /// @dev EVM selector for this function is: 0x7623402e,138 // /// or in textual repr: setCollectionSponsor(address)139 // function setCollectionSponsor(address sponsor) external;140141 /// Set the sponsor of the collection.142 ///143 /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.144 ///145 /// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.146 /// @dev EVM selector for this function is: 0x84a1d5a8,147 /// or in textual repr: setCollectionSponsorCross((address,uint256))148 function setCollectionSponsorCross(EthCrossAccount memory sponsor) external;149150 /// Whether there is a pending sponsor.151 /// @dev EVM selector for this function is: 0x058ac185,152 /// or in textual repr: hasCollectionPendingSponsor()153 function hasCollectionPendingSponsor() external view returns (bool);154155 /// Collection sponsorship confirmation.156 ///157 /// @dev After setting the sponsor for the collection, it must be confirmed with this function.158 /// @dev EVM selector for this function is: 0x3c50e97a,159 /// or in textual repr: confirmCollectionSponsorship()160 function confirmCollectionSponsorship() external;161162 /// Remove collection sponsor.163 /// @dev EVM selector for this function is: 0x6e0326a3,164 /// or in textual repr: removeCollectionSponsor()165 function removeCollectionSponsor() external;166167 /// Get current sponsor.168 ///169 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.170 /// @dev EVM selector for this function is: 0x6ec0a9f1,171 /// or in textual repr: collectionSponsor()172 function collectionSponsor() external view returns (Tuple25 memory);173174 /// Set limits for the collection.175 /// @dev Throws error if limit not found.176 /// @param limit Name of the limit. Valid names:177 /// "accountTokenOwnershipLimit",178 /// "sponsoredDataSize",179 /// "sponsoredDataRateLimit",180 /// "tokenLimit",181 /// "sponsorTransferTimeout",182 /// "sponsorApproveTimeout"183 /// "ownerCanTransfer",184 /// "ownerCanDestroy",185 /// "transfersEnabled"186 /// @param value Value of the limit.187 /// @dev EVM selector for this function is: 0x4ad890a8,188 /// or in textual repr: setCollectionLimit(string,uint256)189 function setCollectionLimit(string memory limit, uint256 value) external;190191 /// Get contract address.192 /// @dev EVM selector for this function is: 0xf6b4dfb4,193 /// or in textual repr: contractAddress()194 function contractAddress() external view returns (address);195196 /// Add collection admin.197 /// @param newAdmin Cross account administrator address.198 /// @dev EVM selector for this function is: 0x859aa7d6,199 /// or in textual repr: addCollectionAdminCross((address,uint256))200 function addCollectionAdminCross(EthCrossAccount memory newAdmin) external;201202 /// Remove collection admin.203 /// @param admin Cross account administrator address.204 /// @dev EVM selector for this function is: 0x6c0cd173,205 /// or in textual repr: removeCollectionAdminCross((address,uint256))206 function removeCollectionAdminCross(EthCrossAccount memory admin) external;207208 // /// Add collection admin.209 // /// @param newAdmin Address of the added administrator.210 // /// @dev EVM selector for this function is: 0x92e462c7,211 // /// or in textual repr: addCollectionAdmin(address)212 // function addCollectionAdmin(address newAdmin) external;213214 // /// Remove collection admin.215 // ///216 // /// @param admin Address of the removed administrator.217 // /// @dev EVM selector for this function is: 0xfafd7b42,218 // /// or in textual repr: removeCollectionAdmin(address)219 // function removeCollectionAdmin(address admin) external;220221 /// Toggle accessibility of collection nesting.222 ///223 /// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'224 /// @dev EVM selector for this function is: 0x112d4586,225 /// or in textual repr: setCollectionNesting(bool)226 function setCollectionNesting(bool enable) external;227228 /// Toggle accessibility of collection nesting.229 ///230 /// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'231 /// @param collections Addresses of collections that will be available for nesting.232 /// @dev EVM selector for this function is: 0x64872396,233 /// or in textual repr: setCollectionNesting(bool,address[])234 function setCollectionNesting(bool enable, address[] memory collections) external;235236 /// Set the collection access method.237 /// @param mode Access mode238 /// 0 for Normal239 /// 1 for AllowList240 /// @dev EVM selector for this function is: 0x41835d4c,241 /// or in textual repr: setCollectionAccess(uint8)242 function setCollectionAccess(uint8 mode) external;243244 /// Checks that user allowed to operate with collection.245 ///246 /// @param user User address to check.247 /// @dev EVM selector for this function is: 0xd63a8e11,248 /// or in textual repr: allowed(address)249 function allowed(address user) external view returns (bool);250251 // /// Add the user to the allowed list.252 // ///253 // /// @param user Address of a trusted user.254 // /// @dev EVM selector for this function is: 0x67844fe6,255 // /// or in textual repr: addToCollectionAllowList(address)256 // function addToCollectionAllowList(address user) external;257258 /// Add user to allowed list.259 ///260 /// @param user User cross account address.261 /// @dev EVM selector for this function is: 0xa0184a3a,262 /// or in textual repr: addToCollectionAllowListCross((address,uint256))263 function addToCollectionAllowListCross(EthCrossAccount memory user) external;264265 // /// Remove the user from the allowed list.266 // ///267 // /// @param user Address of a removed user.268 // /// @dev EVM selector for this function is: 0x85c51acb,269 // /// or in textual repr: removeFromCollectionAllowList(address)270 // function removeFromCollectionAllowList(address user) external;271272 /// Remove user from allowed list.273 ///274 /// @param user User cross account address.275 /// @dev EVM selector for this function is: 0x09ba452a,276 /// or in textual repr: removeFromCollectionAllowListCross((address,uint256))277 function removeFromCollectionAllowListCross(EthCrossAccount memory user) external;278279 /// Switch permission for minting.280 ///281 /// @param mode Enable if "true".282 /// @dev EVM selector for this function is: 0x00018e84,283 /// or in textual repr: setCollectionMintMode(bool)284 function setCollectionMintMode(bool mode) external;285286 // /// Check that account is the owner or admin of the collection287 // ///288 // /// @param user account to verify289 // /// @return "true" if account is the owner or admin290 // /// @dev EVM selector for this function is: 0x9811b0c7,291 // /// or in textual repr: isOwnerOrAdmin(address)292 // function isOwnerOrAdmin(address user) external view returns (bool);293294 /// Check that account is the owner or admin of the collection295 ///296 /// @param user User cross account to verify297 /// @return "true" if account is the owner or admin298 /// @dev EVM selector for this function is: 0x3e75a905,299 /// or in textual repr: isOwnerOrAdminCross((address,uint256))300 function isOwnerOrAdminCross(EthCrossAccount memory user) external view returns (bool);301302 /// Returns collection type303 ///304 /// @return `Fungible` or `NFT` or `ReFungible`305 /// @dev EVM selector for this function is: 0xd34b55b8,306 /// or in textual repr: uniqueCollectionType()307 function uniqueCollectionType() external view returns (string memory);308309 /// Get collection owner.310 ///311 /// @return Tuble with sponsor address and his substrate mirror.312 /// If address is canonical then substrate mirror is zero and vice versa.313 /// @dev EVM selector for this function is: 0xdf727d3b,314 /// or in textual repr: collectionOwner()315 function collectionOwner() external view returns (EthCrossAccount memory);316317 // /// Changes collection owner to another account318 // ///319 // /// @dev Owner can be changed only by current owner320 // /// @param newOwner new owner account321 // /// @dev EVM selector for this function is: 0x4f53e226,322 // /// or in textual repr: changeCollectionOwner(address)323 // function changeCollectionOwner(address newOwner) external;324325 /// Get collection administrators326 ///327 /// @return Vector of tuples with admins address and his substrate mirror.328 /// If address is canonical then substrate mirror is zero and vice versa.329 /// @dev EVM selector for this function is: 0x5813216b,330 /// or in textual repr: collectionAdmins()331 function collectionAdmins() external view returns (EthCrossAccount[] memory);332333 /// Changes collection owner to another account334 ///335 /// @dev Owner can be changed only by current owner336 /// @param newOwner new owner cross account337 /// @dev EVM selector for this function is: 0x6496c497,338 /// or in textual repr: changeCollectionOwnerCross((address,uint256))339 function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;340}341342/// @dev Cross account struct343struct EthCrossAccount {344 address eth;345 uint256 sub;346}347348/// @dev anonymous struct349struct Tuple25 {350 address field_0;351 uint256 field_1;352}353354/// @dev anonymous struct355struct Tuple22 {356 string field_0;357 bytes field_1;358}359360/// @dev the ERC-165 identifier for this interface is 0x5b5e139f361interface ERC721Metadata is Dummy, ERC165 {362 // /// @notice A descriptive name for a collection of NFTs in this contract363 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`364 // /// @dev EVM selector for this function is: 0x06fdde03,365 // /// or in textual repr: name()366 // function name() external view returns (string memory);367368 // /// @notice An abbreviated name for NFTs in this contract369 // /// @dev real implementation of this function lies in `ERC721UniqueExtensions`370 // /// @dev EVM selector for this function is: 0x95d89b41,371 // /// or in textual repr: symbol()372 // function symbol() external view returns (string memory);373374 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.375 ///376 /// @dev If the token has a `url` property and it is not empty, it is returned.377 /// 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`.378 /// If the collection property `baseURI` is empty or absent, return "" (empty string)379 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix380 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).381 ///382 /// @return token's const_metadata383 /// @dev EVM selector for this function is: 0xc87b56dd,384 /// or in textual repr: tokenURI(uint256)385 function tokenURI(uint256 tokenId) external view returns (string memory);386}387388/// @title ERC721 Token that can be irreversibly burned (destroyed).389/// @dev the ERC-165 identifier for this interface is 0x42966c68390interface ERC721Burnable is Dummy, ERC165 {391 /// @notice Burns a specific ERC721 token.392 /// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized393 /// operator of the current owner.394 /// @param tokenId The RFT to approve395 /// @dev EVM selector for this function is: 0x42966c68,396 /// or in textual repr: burn(uint256)397 function burn(uint256 tokenId) external;398}399400/// @dev inlined interface401interface ERC721UniqueMintableEvents {402 event MintingFinished();403}404405/// @title ERC721 minting logic.406/// @dev the ERC-165 identifier for this interface is 0x476ff149407interface ERC721UniqueMintable is Dummy, ERC165, ERC721UniqueMintableEvents {408 /// @dev EVM selector for this function is: 0x05d2035b,409 /// or in textual repr: mintingFinished()410 function mintingFinished() external view returns (bool);411412 /// @notice Function to mint token.413 /// @param to The new owner414 /// @return uint256 The id of the newly minted token415 /// @dev EVM selector for this function is: 0x6a627842,416 /// or in textual repr: mint(address)417 function mint(address to) external returns (uint256);418419 // /// @notice Function to mint token.420 // /// @dev `tokenId` should be obtained with `nextTokenId` method,421 // /// unlike standard, you can't specify it manually422 // /// @param to The new owner423 // /// @param tokenId ID of the minted RFT424 // /// @dev EVM selector for this function is: 0x40c10f19,425 // /// or in textual repr: mint(address,uint256)426 // function mint(address to, uint256 tokenId) external returns (bool);427428 /// @notice Function to mint token with the given tokenUri.429 /// @param to The new owner430 /// @param tokenUri Token URI that would be stored in the NFT properties431 /// @return uint256 The id of the newly minted token432 /// @dev EVM selector for this function is: 0x45c17782,433 /// or in textual repr: mintWithTokenURI(address,string)434 function mintWithTokenURI(address to, string memory tokenUri) external returns (uint256);435436 // /// @notice Function to mint token with the given tokenUri.437 // /// @dev `tokenId` should be obtained with `nextTokenId` method,438 // /// unlike standard, you can't specify it manually439 // /// @param to The new owner440 // /// @param tokenId ID of the minted RFT441 // /// @param tokenUri Token URI that would be stored in the RFT properties442 // /// @dev EVM selector for this function is: 0x50bb4e7f,443 // /// or in textual repr: mintWithTokenURI(address,uint256,string)444 // function mintWithTokenURI(address to, uint256 tokenId, string memory tokenUri) external returns (bool);445446 /// @dev Not implemented447 /// @dev EVM selector for this function is: 0x7d64bcb4,448 /// or in textual repr: finishMinting()449 function finishMinting() external returns (bool);450}451452/// @title Unique extensions for ERC721.453/// @dev the ERC-165 identifier for this interface is 0xab243667454interface ERC721UniqueExtensions is Dummy, ERC165 {455 /// @notice A descriptive name for a collection of NFTs in this contract456 /// @dev EVM selector for this function is: 0x06fdde03,457 /// or in textual repr: name()458 function name() external view returns (string memory);459460 /// @notice An abbreviated name for NFTs in this contract461 /// @dev EVM selector for this function is: 0x95d89b41,462 /// or in textual repr: symbol()463 function symbol() external view returns (string memory);464465 /// @notice A description for the collection.466 /// @dev EVM selector for this function is: 0x7284e416,467 /// or in textual repr: description()468 function description() external view returns (string memory);469470 /// Returns the owner (in cross format) of the token.471 ///472 /// @param tokenId Id for the token.473 /// @dev EVM selector for this function is: 0x2b29dace,474 /// or in textual repr: crossOwnerOf(uint256)475 function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);476477 /// Returns the token properties.478 ///479 /// @param tokenId Id for the token.480 /// @param keys Properties keys. Empty keys for all propertyes.481 /// @return Vector of properties key/value pairs.482 /// @dev EVM selector for this function is: 0xefc26c69,483 /// or in textual repr: tokenProperties(uint256,string[])484 function tokenProperties(uint256 tokenId, string[] memory keys) external view returns (Tuple7[] memory);485486 /// @notice Transfer ownership of an RFT487 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`488 /// is the zero address. Throws if `tokenId` is not a valid RFT.489 /// Throws if RFT pieces have multiple owners.490 /// @param to The new owner491 /// @param tokenId The RFT to transfer492 /// @dev EVM selector for this function is: 0xa9059cbb,493 /// or in textual repr: transfer(address,uint256)494 function transfer(address to, uint256 tokenId) external;495496 /// @notice Transfer ownership of an RFT497 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`498 /// is the zero address. Throws if `tokenId` is not a valid RFT.499 /// Throws if RFT pieces have multiple owners.500 /// @param to The new owner501 /// @param tokenId The RFT to transfer502 /// @dev EVM selector for this function is: 0x2ada85ff,503 /// or in textual repr: transferCross((address,uint256),uint256)504 function transferCross(EthCrossAccount memory to, uint256 tokenId) external;505506 /// @notice Transfer ownership of an RFT507 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`508 /// is the zero address. Throws if `tokenId` is not a valid RFT.509 /// Throws if RFT pieces have multiple owners.510 /// @param to The new owner511 /// @param tokenId The RFT to transfer512 /// @dev EVM selector for this function is: 0xd5cf430b,513 /// or in textual repr: transferFromCross((address,uint256),(address,uint256),uint256)514 function transferFromCross(515 EthCrossAccount memory from,516 EthCrossAccount memory to,517 uint256 tokenId518 ) external;519520 // /// @notice Burns a specific ERC721 token.521 // /// @dev Throws unless `msg.sender` is the current owner or an authorized522 // /// operator for this RFT. Throws if `from` is not the current owner. Throws523 // /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.524 // /// Throws if RFT pieces have multiple owners.525 // /// @param from The current owner of the RFT526 // /// @param tokenId The RFT to transfer527 // /// @dev EVM selector for this function is: 0x79cc6790,528 // /// or in textual repr: burnFrom(address,uint256)529 // function burnFrom(address from, uint256 tokenId) external;530531 /// @notice Burns a specific ERC721 token.532 /// @dev Throws unless `msg.sender` is the current owner or an authorized533 /// operator for this RFT. Throws if `from` is not the current owner. Throws534 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.535 /// Throws if RFT pieces have multiple owners.536 /// @param from The current owner of the RFT537 /// @param tokenId The RFT to transfer538 /// @dev EVM selector for this function is: 0xbb2f5a58,539 /// or in textual repr: burnFromCross((address,uint256),uint256)540 function burnFromCross(EthCrossAccount memory from, uint256 tokenId) external;541542 /// @notice Returns next free RFT ID.543 /// @dev EVM selector for this function is: 0x75794a3c,544 /// or in textual repr: nextTokenId()545 function nextTokenId() external view returns (uint256);546547 // /// @notice Function to mint multiple tokens.548 // /// @dev `tokenIds` should be an array of consecutive numbers and first number549 // /// should be obtained with `nextTokenId` method550 // /// @param to The new owner551 // /// @param tokenIds IDs of the minted RFTs552 // /// @dev EVM selector for this function is: 0x44a9945e,553 // /// or in textual repr: mintBulk(address,uint256[])554 // function mintBulk(address to, uint256[] memory tokenIds) external returns (bool);555556 // /// @notice Function to mint multiple tokens with the given tokenUris.557 // /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive558 // /// numbers and first number should be obtained with `nextTokenId` method559 // /// @param to The new owner560 // /// @param tokens array of pairs of token ID and token URI for minted tokens561 // /// @dev EVM selector for this function is: 0x36543006,562 // /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])563 // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) external returns (bool);564565 /// Returns EVM address for refungible token566 ///567 /// @param token ID of the token568 /// @dev EVM selector for this function is: 0xab76fac6,569 /// or in textual repr: tokenContractAddress(uint256)570 function tokenContractAddress(uint256 token) external view returns (address);571}572573/// @dev anonymous struct574struct Tuple10 {575 uint256 field_0;576 string field_1;577}578579/// @dev anonymous struct580struct Tuple7 {581 string field_0;582 bytes field_1;583}584585/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension586/// @dev See https://eips.ethereum.org/EIPS/eip-721587/// @dev the ERC-165 identifier for this interface is 0x780e9d63588interface ERC721Enumerable is Dummy, ERC165 {589 /// @notice Enumerate valid RFTs590 /// @param index A counter less than `totalSupply()`591 /// @return The token identifier for the `index`th NFT,592 /// (sort order not specified)593 /// @dev EVM selector for this function is: 0x4f6ccce7,594 /// or in textual repr: tokenByIndex(uint256)595 function tokenByIndex(uint256 index) external view returns (uint256);596597 /// Not implemented598 /// @dev EVM selector for this function is: 0x2f745c59,599 /// or in textual repr: tokenOfOwnerByIndex(address,uint256)600 function tokenOfOwnerByIndex(address owner, uint256 index) external view returns (uint256);601602 /// @notice Count RFTs tracked by this contract603 /// @return A count of valid RFTs tracked by this contract, where each one of604 /// them has an assigned and queryable owner not equal to the zero address605 /// @dev EVM selector for this function is: 0x18160ddd,606 /// or in textual repr: totalSupply()607 function totalSupply() external view returns (uint256);608}609610/// @dev inlined interface611interface ERC721Events {612 event Transfer(address indexed from, address indexed to, uint256 indexed tokenId);613 event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId);614 event ApprovalForAll(address indexed owner, address indexed operator, bool approved);615}616617/// @title ERC-721 Non-Fungible Token Standard618/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md619/// @dev the ERC-165 identifier for this interface is 0x58800161620interface ERC721 is Dummy, ERC165, ERC721Events {621 /// @notice Count all RFTs assigned to an owner622 /// @dev RFTs assigned to the zero address are considered invalid, and this623 /// function throws for queries about the zero address.624 /// @param owner An address for whom to query the balance625 /// @return The number of RFTs owned by `owner`, possibly zero626 /// @dev EVM selector for this function is: 0x70a08231,627 /// or in textual repr: balanceOf(address)628 function balanceOf(address owner) external view returns (uint256);629630 /// @notice Find the owner of an RFT631 /// @dev RFTs assigned to zero address are considered invalid, and queries632 /// about them do throw.633 /// Returns special 0xffffffffffffffffffffffffffffffffffffffff address for634 /// the tokens that are partially owned.635 /// @param tokenId The identifier for an RFT636 /// @return The address of the owner of the RFT637 /// @dev EVM selector for this function is: 0x6352211e,638 /// or in textual repr: ownerOf(uint256)639 function ownerOf(uint256 tokenId) external view returns (address);640641 /// @dev Not implemented642 /// @dev EVM selector for this function is: 0x60a11672,643 /// or in textual repr: safeTransferFromWithData(address,address,uint256,bytes)644 function safeTransferFromWithData(645 address from,646 address to,647 uint256 tokenId,648 bytes memory data649 ) external;650651 /// @dev Not implemented652 /// @dev EVM selector for this function is: 0x42842e0e,653 /// or in textual repr: safeTransferFrom(address,address,uint256)654 function safeTransferFrom(655 address from,656 address to,657 uint256 tokenId658 ) external;659660 /// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE661 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE662 /// THEY MAY BE PERMANENTLY LOST663 /// @dev Throws unless `msg.sender` is the current owner or an authorized664 /// operator for this RFT. Throws if `from` is not the current owner. Throws665 /// if `to` is the zero address. Throws if `tokenId` is not a valid RFT.666 /// Throws if RFT pieces have multiple owners.667 /// @param from The current owner of the NFT668 /// @param to The new owner669 /// @param tokenId The NFT to transfer670 /// @dev EVM selector for this function is: 0x23b872dd,671 /// or in textual repr: transferFrom(address,address,uint256)672 function transferFrom(673 address from,674 address to,675 uint256 tokenId676 ) external;677678 /// @dev Not implemented679 /// @dev EVM selector for this function is: 0x095ea7b3,680 /// or in textual repr: approve(address,uint256)681 function approve(address approved, uint256 tokenId) external;682683 /// @dev Not implemented684 /// @dev EVM selector for this function is: 0xa22cb465,685 /// or in textual repr: setApprovalForAll(address,bool)686 function setApprovalForAll(address operator, bool approved) external;687688 /// @dev Not implemented689 /// @dev EVM selector for this function is: 0x081812fc,690 /// or in textual repr: getApproved(uint256)691 function getApproved(uint256 tokenId) external view returns (address);692693 /// @dev Not implemented694 /// @dev EVM selector for this function is: 0xe985e9c5,695 /// or in textual repr: isApprovedForAll(address,address)696 function isApprovedForAll(address owner, address operator) external view returns (address);697}698699interface UniqueRefungible is700 Dummy,701 ERC165,702 ERC721,703 ERC721Enumerable,704 ERC721UniqueExtensions,705 ERC721UniqueMintable,706 ERC721Burnable,707 ERC721Metadata,708 Collection,709 TokenProperties710{}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}) => {