difftreelog
Merge pull request #728 from UniqueNetwork/feature/newCallMethods
in: master
Added new call functions
31 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/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -178,7 +178,7 @@
///
/// @param keys Properties keys. Empty keys for all propertyes.
/// @return Vector of properties key/value pairs.
- fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<(string, bytes)>> {
+ fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {
let keys = keys
.into_iter()
.map(|key| {
@@ -200,7 +200,7 @@
let key =
string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;
let value = bytes(p.value.to_vec());
- Ok((key, value))
+ Ok(PropertyStruct { key, value })
})
.collect::<Result<Vec<_>>>()?;
Ok(properties)
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,12 +4,22 @@
<!-- bureaucrate goes here -->
+## [0.1.8] - 2022-11-18
+
+### Added
+
+- The function `description` to `ERC20UniqueExtensions` interface.
+
## [0.1.7] - 2022-11-14
### Changed
- Added `transfer_cross` in eth functions.
+### Changed
+
+- Use named structure `EthCrossAccount` in eth functions.
+
## [0.1.6] - 2022-11-02
### Changed
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -158,6 +158,13 @@
where
T::AccountId: From<[u8; 32]>,
{
+ /// @notice A description for the collection.
+ fn description(&self) -> Result<string> {
+ Ok(decode_utf16(self.description.iter().copied())
+ .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+ .collect::<string>())
+ }
+
#[weight(<SelfWeightOf<T>>::approve())]
fn approve_cross(
&mut self,
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -87,11 +87,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 (Tuple16[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple16[](0);
+ return new Property[](0);
}
// /// Set the sponsor of the collection.
@@ -425,20 +425,23 @@
uint256 sub;
}
-/// @dev anonymous struct
-struct Tuple16 {
- string field_0;
- bytes field_1;
-}
-
/// @dev Property struct
struct Property {
string key;
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,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.10] - 2022-11-18
+
+### Added
+
+- The functions `description`, `crossOwnerOf`, `tokenProperties` to `ERC721UniqueExtensions` interface.
+
## [0.1.9] - 2022-11-14
### Changed
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -37,7 +37,7 @@
use sp_std::vec::Vec;
use pallet_common::{
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- CollectionHandle, CollectionPropertyPermissions,
+ CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -278,7 +278,7 @@
#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
impl<T: Config> NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
@@ -686,7 +686,7 @@
#[solidity_interface(name = ERC721UniqueExtensions)]
impl<T: Config> NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
fn name(&self) -> Result<string> {
@@ -700,6 +700,56 @@
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
+ /// @notice A description for the collection.
+ fn description(&self) -> Result<string> {
+ Ok(decode_utf16(self.description.iter().copied())
+ .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+ .collect::<string>())
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ Self::token_owner(&self, token_id.try_into()?)
+ .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .ok_or(Error::Revert("key too large".into()))
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ fn token_properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<PropertyStruct>> {
+ let keys = keys
+ .into_iter()
+ .map(|key| {
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Self as CommonCollectionOperations<T>>::token_properties(
+ &self,
+ token_id.try_into()?,
+ if keys.is_empty() { None } else { Some(keys) },
+ )
+ .into_iter()
+ .map(|p| {
+ 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(PropertyStruct { key, value })
+ })
+ .collect::<Result<Vec<_>>>()
+ }
+
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -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 (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple23[](0);
+ return new Property[](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,17 +527,11 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple30 {
address field_0;
uint256 field_1;
}
-/// @dev anonymous struct
-struct Tuple23 {
- string field_0;
- bytes field_1;
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -682,7 +676,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,
@@ -702,6 +696,42 @@
return "";
}
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ require(false, stub_error);
+ tokenId;
+ dummy;
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @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 (Property[] memory) {
+ require(false, stub_error);
+ tokenId;
+ keys;
+ dummy;
+ return new Property[](0);
+ }
+
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized
@@ -825,7 +855,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;
@@ -836,7 +866,7 @@
}
/// @dev anonymous struct
-struct Tuple11 {
+struct Tuple15 {
uint256 field_0;
string field_1;
}
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.2.9] - 2022-11-18
+
+### Added
+
+- The functions `description`, `crossOwnerOf`, `tokenProperties` to `ERC721UniqueExtensions` interface.
+
## [0.2.8] - 2022-11-14
### Changed
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,6 +33,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
+ CommonCollectionOperations,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -273,7 +274,7 @@
#[solidity_interface(name = ERC721Metadata)]
impl<T: Config> RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
@@ -713,7 +714,7 @@
#[solidity_interface(name = ERC721UniqueExtensions)]
impl<T: Config> RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
fn name(&self) -> Result<string> {
@@ -727,6 +728,55 @@
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
+ /// @notice A description for the collection.
+ fn description(&self) -> Result<string> {
+ Ok(decode_utf16(self.description.iter().copied())
+ .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+ .collect::<string>())
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ Self::token_owner(&self, token_id.try_into()?)
+ .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .ok_or(Error::Revert("key too large".into()))
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ fn token_properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<PropertyStruct>> {
+ let keys = keys
+ .into_iter()
+ .map(|key| {
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Self as CommonCollectionOperations<T>>::token_properties(
+ &self,
+ token_id.try_into()?,
+ if keys.is_empty() { None } else { Some(keys) },
+ )
+ .into_iter()
+ .map(|p| {
+ 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(PropertyStruct { key, value })
+ })
+ .collect::<Result<Vec<_>>>()
+ }
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid RFT.
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -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 (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple22[](0);
+ return new Property[](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,17 +527,11 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple29 {
address field_0;
uint256 field_1;
}
-/// @dev anonymous struct
-struct Tuple22 {
- string field_0;
- bytes field_1;
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -680,7 +674,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,
@@ -700,6 +694,42 @@
return "";
}
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ require(false, stub_error);
+ tokenId;
+ dummy;
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @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 (Property[] memory) {
+ require(false, stub_error);
+ tokenId;
+ keys;
+ dummy;
+ return new Property[](0);
+ }
+
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid RFT.
@@ -813,7 +843,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;
@@ -835,7 +865,7 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple14 {
uint256 field_0;
string field_1;
}
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -216,10 +216,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 Tuple16[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
@@ -283,6 +283,13 @@
},
{
"inputs": [],
+ "name": "description",
+ "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "hasCollectionPendingSponsor",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "view",
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -246,10 +246,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 Tuple23[]",
+ "internalType": "struct Property[]",
"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"
}
@@ -297,6 +297,25 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+ ],
+ "name": "crossOwnerOf",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "",
+ "type": "tuple"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "string[]", "name": "keys", "type": "string[]" }
],
"name": "deleteCollectionProperties",
@@ -316,6 +335,13 @@
},
{
"inputs": [],
+ "name": "description",
+ "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "finishMinting",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "nonpayable",
@@ -641,6 +667,26 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "tokenProperties",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "",
+ "type": "tuple[]"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
"name": "tokenURI",
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct EthCrossAccount",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct EthCrossAccount",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 { "internalType": "address", "name": "user", "type": "address" }120 ],121 "name": "allowed",122 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],123 "stateMutability": "view",124 "type": "function"125 },126 {127 "inputs": [128 { "internalType": "address", "name": "approved", "type": "address" },129 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }130 ],131 "name": "approve",132 "outputs": [],133 "stateMutability": "nonpayable",134 "type": "function"135 },136 {137 "inputs": [138 { "internalType": "address", "name": "owner", "type": "address" }139 ],140 "name": "balanceOf",141 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],142 "stateMutability": "view",143 "type": "function"144 },145 {146 "inputs": [147 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }148 ],149 "name": "burn",150 "outputs": [],151 "stateMutability": "nonpayable",152 "type": "function"153 },154 {155 "inputs": [156 {157 "components": [158 { "internalType": "address", "name": "eth", "type": "address" },159 { "internalType": "uint256", "name": "sub", "type": "uint256" }160 ],161 "internalType": "struct EthCrossAccount",162 "name": "from",163 "type": "tuple"164 },165 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }166 ],167 "name": "burnFromCross",168 "outputs": [],169 "stateMutability": "nonpayable",170 "type": "function"171 },172 {173 "inputs": [174 {175 "components": [176 { "internalType": "address", "name": "eth", "type": "address" },177 { "internalType": "uint256", "name": "sub", "type": "uint256" }178 ],179 "internalType": "struct EthCrossAccount",180 "name": "newOwner",181 "type": "tuple"182 }183 ],184 "name": "changeCollectionOwnerCross",185 "outputs": [],186 "stateMutability": "nonpayable",187 "type": "function"188 },189 {190 "inputs": [],191 "name": "collectionAdmins",192 "outputs": [193 {194 "components": [195 { "internalType": "address", "name": "eth", "type": "address" },196 { "internalType": "uint256", "name": "sub", "type": "uint256" }197 ],198 "internalType": "struct EthCrossAccount[]",199 "name": "",200 "type": "tuple[]"201 }202 ],203 "stateMutability": "view",204 "type": "function"205 },206 {207 "inputs": [],208 "name": "collectionOwner",209 "outputs": [210 {211 "components": [212 { "internalType": "address", "name": "eth", "type": "address" },213 { "internalType": "uint256", "name": "sub", "type": "uint256" }214 ],215 "internalType": "struct EthCrossAccount",216 "name": "",217 "type": "tuple"218 }219 ],220 "stateMutability": "view",221 "type": "function"222 },223 {224 "inputs": [225 { "internalType": "string[]", "name": "keys", "type": "string[]" }226 ],227 "name": "collectionProperties",228 "outputs": [229 {230 "components": [231 { "internalType": "string", "name": "field_0", "type": "string" },232 { "internalType": "bytes", "name": "field_1", "type": "bytes" }233 ],234 "internalType": "struct Tuple22[]",235 "name": "",236 "type": "tuple[]"237 }238 ],239 "stateMutability": "view",240 "type": "function"241 },242 {243 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],244 "name": "collectionProperty",245 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],246 "stateMutability": "view",247 "type": "function"248 },249 {250 "inputs": [],251 "name": "collectionSponsor",252 "outputs": [253 {254 "components": [255 { "internalType": "address", "name": "field_0", "type": "address" },256 { "internalType": "uint256", "name": "field_1", "type": "uint256" }257 ],258 "internalType": "struct Tuple25",259 "name": "",260 "type": "tuple"261 }262 ],263 "stateMutability": "view",264 "type": "function"265 },266 {267 "inputs": [],268 "name": "confirmCollectionSponsorship",269 "outputs": [],270 "stateMutability": "nonpayable",271 "type": "function"272 },273 {274 "inputs": [],275 "name": "contractAddress",276 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],277 "stateMutability": "view",278 "type": "function"279 },280 {281 "inputs": [282 { "internalType": "string[]", "name": "keys", "type": "string[]" }283 ],284 "name": "deleteCollectionProperties",285 "outputs": [],286 "stateMutability": "nonpayable",287 "type": "function"288 },289 {290 "inputs": [291 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },292 { "internalType": "string[]", "name": "keys", "type": "string[]" }293 ],294 "name": "deleteProperties",295 "outputs": [],296 "stateMutability": "nonpayable",297 "type": "function"298 },299 {300 "inputs": [],301 "name": "finishMinting",302 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],303 "stateMutability": "nonpayable",304 "type": "function"305 },306 {307 "inputs": [308 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }309 ],310 "name": "getApproved",311 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],312 "stateMutability": "view",313 "type": "function"314 },315 {316 "inputs": [],317 "name": "hasCollectionPendingSponsor",318 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],319 "stateMutability": "view",320 "type": "function"321 },322 {323 "inputs": [324 { "internalType": "address", "name": "owner", "type": "address" },325 { "internalType": "address", "name": "operator", "type": "address" }326 ],327 "name": "isApprovedForAll",328 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],329 "stateMutability": "view",330 "type": "function"331 },332 {333 "inputs": [334 {335 "components": [336 { "internalType": "address", "name": "eth", "type": "address" },337 { "internalType": "uint256", "name": "sub", "type": "uint256" }338 ],339 "internalType": "struct EthCrossAccount",340 "name": "user",341 "type": "tuple"342 }343 ],344 "name": "isOwnerOrAdminCross",345 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],346 "stateMutability": "view",347 "type": "function"348 },349 {350 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],351 "name": "mint",352 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],353 "stateMutability": "nonpayable",354 "type": "function"355 },356 {357 "inputs": [358 { "internalType": "address", "name": "to", "type": "address" },359 { "internalType": "string", "name": "tokenUri", "type": "string" }360 ],361 "name": "mintWithTokenURI",362 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],363 "stateMutability": "nonpayable",364 "type": "function"365 },366 {367 "inputs": [],368 "name": "mintingFinished",369 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],370 "stateMutability": "view",371 "type": "function"372 },373 {374 "inputs": [],375 "name": "name",376 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],377 "stateMutability": "view",378 "type": "function"379 },380 {381 "inputs": [],382 "name": "nextTokenId",383 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],384 "stateMutability": "view",385 "type": "function"386 },387 {388 "inputs": [389 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }390 ],391 "name": "ownerOf",392 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],393 "stateMutability": "view",394 "type": "function"395 },396 {397 "inputs": [398 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },399 { "internalType": "string", "name": "key", "type": "string" }400 ],401 "name": "property",402 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],403 "stateMutability": "view",404 "type": "function"405 },406 {407 "inputs": [408 {409 "components": [410 { "internalType": "address", "name": "eth", "type": "address" },411 { "internalType": "uint256", "name": "sub", "type": "uint256" }412 ],413 "internalType": "struct EthCrossAccount",414 "name": "admin",415 "type": "tuple"416 }417 ],418 "name": "removeCollectionAdminCross",419 "outputs": [],420 "stateMutability": "nonpayable",421 "type": "function"422 },423 {424 "inputs": [],425 "name": "removeCollectionSponsor",426 "outputs": [],427 "stateMutability": "nonpayable",428 "type": "function"429 },430 {431 "inputs": [432 {433 "components": [434 { "internalType": "address", "name": "eth", "type": "address" },435 { "internalType": "uint256", "name": "sub", "type": "uint256" }436 ],437 "internalType": "struct EthCrossAccount",438 "name": "user",439 "type": "tuple"440 }441 ],442 "name": "removeFromCollectionAllowListCross",443 "outputs": [],444 "stateMutability": "nonpayable",445 "type": "function"446 },447 {448 "inputs": [449 { "internalType": "address", "name": "from", "type": "address" },450 { "internalType": "address", "name": "to", "type": "address" },451 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }452 ],453 "name": "safeTransferFrom",454 "outputs": [],455 "stateMutability": "nonpayable",456 "type": "function"457 },458 {459 "inputs": [460 { "internalType": "address", "name": "from", "type": "address" },461 { "internalType": "address", "name": "to", "type": "address" },462 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },463 { "internalType": "bytes", "name": "data", "type": "bytes" }464 ],465 "name": "safeTransferFromWithData",466 "outputs": [],467 "stateMutability": "nonpayable",468 "type": "function"469 },470 {471 "inputs": [472 { "internalType": "address", "name": "operator", "type": "address" },473 { "internalType": "bool", "name": "approved", "type": "bool" }474 ],475 "name": "setApprovalForAll",476 "outputs": [],477 "stateMutability": "nonpayable",478 "type": "function"479 },480 {481 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],482 "name": "setCollectionAccess",483 "outputs": [],484 "stateMutability": "nonpayable",485 "type": "function"486 },487 {488 "inputs": [489 { "internalType": "string", "name": "limit", "type": "string" },490 { "internalType": "uint256", "name": "value", "type": "uint256" }491 ],492 "name": "setCollectionLimit",493 "outputs": [],494 "stateMutability": "nonpayable",495 "type": "function"496 },497 {498 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],499 "name": "setCollectionMintMode",500 "outputs": [],501 "stateMutability": "nonpayable",502 "type": "function"503 },504 {505 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],506 "name": "setCollectionNesting",507 "outputs": [],508 "stateMutability": "nonpayable",509 "type": "function"510 },511 {512 "inputs": [513 { "internalType": "bool", "name": "enable", "type": "bool" },514 {515 "internalType": "address[]",516 "name": "collections",517 "type": "address[]"518 }519 ],520 "name": "setCollectionNesting",521 "outputs": [],522 "stateMutability": "nonpayable",523 "type": "function"524 },525 {526 "inputs": [527 {528 "components": [529 { "internalType": "string", "name": "key", "type": "string" },530 { "internalType": "bytes", "name": "value", "type": "bytes" }531 ],532 "internalType": "struct Property[]",533 "name": "properties",534 "type": "tuple[]"535 }536 ],537 "name": "setCollectionProperties",538 "outputs": [],539 "stateMutability": "nonpayable",540 "type": "function"541 },542 {543 "inputs": [544 {545 "components": [546 { "internalType": "address", "name": "eth", "type": "address" },547 { "internalType": "uint256", "name": "sub", "type": "uint256" }548 ],549 "internalType": "struct EthCrossAccount",550 "name": "sponsor",551 "type": "tuple"552 }553 ],554 "name": "setCollectionSponsorCross",555 "outputs": [],556 "stateMutability": "nonpayable",557 "type": "function"558 },559 {560 "inputs": [561 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },562 {563 "components": [564 { "internalType": "string", "name": "key", "type": "string" },565 { "internalType": "bytes", "name": "value", "type": "bytes" }566 ],567 "internalType": "struct Property[]",568 "name": "properties",569 "type": "tuple[]"570 }571 ],572 "name": "setProperties",573 "outputs": [],574 "stateMutability": "nonpayable",575 "type": "function"576 },577 {578 "inputs": [579 { "internalType": "string", "name": "key", "type": "string" },580 { "internalType": "bool", "name": "isMutable", "type": "bool" },581 { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },582 { "internalType": "bool", "name": "tokenOwner", "type": "bool" }583 ],584 "name": "setTokenPropertyPermission",585 "outputs": [],586 "stateMutability": "nonpayable",587 "type": "function"588 },589 {590 "inputs": [591 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }592 ],593 "name": "supportsInterface",594 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],595 "stateMutability": "view",596 "type": "function"597 },598 {599 "inputs": [],600 "name": "symbol",601 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],602 "stateMutability": "view",603 "type": "function"604 },605 {606 "inputs": [607 { "internalType": "uint256", "name": "index", "type": "uint256" }608 ],609 "name": "tokenByIndex",610 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],611 "stateMutability": "view",612 "type": "function"613 },614 {615 "inputs": [616 { "internalType": "uint256", "name": "token", "type": "uint256" }617 ],618 "name": "tokenContractAddress",619 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],620 "stateMutability": "view",621 "type": "function"622 },623 {624 "inputs": [625 { "internalType": "address", "name": "owner", "type": "address" },626 { "internalType": "uint256", "name": "index", "type": "uint256" }627 ],628 "name": "tokenOfOwnerByIndex",629 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],630 "stateMutability": "view",631 "type": "function"632 },633 {634 "inputs": [635 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }636 ],637 "name": "tokenURI",638 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],639 "stateMutability": "view",640 "type": "function"641 },642 {643 "inputs": [],644 "name": "totalSupply",645 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],646 "stateMutability": "view",647 "type": "function"648 },649 {650 "inputs": [651 { "internalType": "address", "name": "to", "type": "address" },652 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }653 ],654 "name": "transfer",655 "outputs": [],656 "stateMutability": "nonpayable",657 "type": "function"658 },659 {660 "inputs": [661 {662 "components": [663 { "internalType": "address", "name": "eth", "type": "address" },664 { "internalType": "uint256", "name": "sub", "type": "uint256" }665 ],666 "internalType": "struct EthCrossAccount",667 "name": "to",668 "type": "tuple"669 },670 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }671 ],672 "name": "transferCross",673 "outputs": [],674 "stateMutability": "nonpayable",675 "type": "function"676 },677 {678 "inputs": [679 { "internalType": "address", "name": "from", "type": "address" },680 { "internalType": "address", "name": "to", "type": "address" },681 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }682 ],683 "name": "transferFrom",684 "outputs": [],685 "stateMutability": "nonpayable",686 "type": "function"687 },688 {689 "inputs": [690 {691 "components": [692 { "internalType": "address", "name": "eth", "type": "address" },693 { "internalType": "uint256", "name": "sub", "type": "uint256" }694 ],695 "internalType": "struct EthCrossAccount",696 "name": "from",697 "type": "tuple"698 },699 {700 "components": [701 { "internalType": "address", "name": "eth", "type": "address" },702 { "internalType": "uint256", "name": "sub", "type": "uint256" }703 ],704 "internalType": "struct EthCrossAccount",705 "name": "to",706 "type": "tuple"707 },708 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }709 ],710 "name": "transferFromCross",711 "outputs": [],712 "stateMutability": "nonpayable",713 "type": "function"714 },715 {716 "inputs": [],717 "name": "uniqueCollectionType",718 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],719 "stateMutability": "view",720 "type": "function"721 }722]1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "owner",9 "type": "address"10 },11 {12 "indexed": true,13 "internalType": "address",14 "name": "approved",15 "type": "address"16 },17 {18 "indexed": true,19 "internalType": "uint256",20 "name": "tokenId",21 "type": "uint256"22 }23 ],24 "name": "Approval",25 "type": "event"26 },27 {28 "anonymous": false,29 "inputs": [30 {31 "indexed": true,32 "internalType": "address",33 "name": "owner",34 "type": "address"35 },36 {37 "indexed": true,38 "internalType": "address",39 "name": "operator",40 "type": "address"41 },42 {43 "indexed": false,44 "internalType": "bool",45 "name": "approved",46 "type": "bool"47 }48 ],49 "name": "ApprovalForAll",50 "type": "event"51 },52 {53 "anonymous": false,54 "inputs": [],55 "name": "MintingFinished",56 "type": "event"57 },58 {59 "anonymous": false,60 "inputs": [61 {62 "indexed": true,63 "internalType": "address",64 "name": "from",65 "type": "address"66 },67 {68 "indexed": true,69 "internalType": "address",70 "name": "to",71 "type": "address"72 },73 {74 "indexed": true,75 "internalType": "uint256",76 "name": "tokenId",77 "type": "uint256"78 }79 ],80 "name": "Transfer",81 "type": "event"82 },83 {84 "inputs": [85 {86 "components": [87 { "internalType": "address", "name": "eth", "type": "address" },88 { "internalType": "uint256", "name": "sub", "type": "uint256" }89 ],90 "internalType": "struct EthCrossAccount",91 "name": "newAdmin",92 "type": "tuple"93 }94 ],95 "name": "addCollectionAdminCross",96 "outputs": [],97 "stateMutability": "nonpayable",98 "type": "function"99 },100 {101 "inputs": [102 {103 "components": [104 { "internalType": "address", "name": "eth", "type": "address" },105 { "internalType": "uint256", "name": "sub", "type": "uint256" }106 ],107 "internalType": "struct EthCrossAccount",108 "name": "user",109 "type": "tuple"110 }111 ],112 "name": "addToCollectionAllowListCross",113 "outputs": [],114 "stateMutability": "nonpayable",115 "type": "function"116 },117 {118 "inputs": [119 { "internalType": "address", "name": "user", "type": "address" }120 ],121 "name": "allowed",122 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],123 "stateMutability": "view",124 "type": "function"125 },126 {127 "inputs": [128 { "internalType": "address", "name": "approved", "type": "address" },129 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }130 ],131 "name": "approve",132 "outputs": [],133 "stateMutability": "nonpayable",134 "type": "function"135 },136 {137 "inputs": [138 { "internalType": "address", "name": "owner", "type": "address" }139 ],140 "name": "balanceOf",141 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],142 "stateMutability": "view",143 "type": "function"144 },145 {146 "inputs": [147 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }148 ],149 "name": "burn",150 "outputs": [],151 "stateMutability": "nonpayable",152 "type": "function"153 },154 {155 "inputs": [156 {157 "components": [158 { "internalType": "address", "name": "eth", "type": "address" },159 { "internalType": "uint256", "name": "sub", "type": "uint256" }160 ],161 "internalType": "struct EthCrossAccount",162 "name": "from",163 "type": "tuple"164 },165 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }166 ],167 "name": "burnFromCross",168 "outputs": [],169 "stateMutability": "nonpayable",170 "type": "function"171 },172 {173 "inputs": [174 {175 "components": [176 { "internalType": "address", "name": "eth", "type": "address" },177 { "internalType": "uint256", "name": "sub", "type": "uint256" }178 ],179 "internalType": "struct EthCrossAccount",180 "name": "newOwner",181 "type": "tuple"182 }183 ],184 "name": "changeCollectionOwnerCross",185 "outputs": [],186 "stateMutability": "nonpayable",187 "type": "function"188 },189 {190 "inputs": [],191 "name": "collectionAdmins",192 "outputs": [193 {194 "components": [195 { "internalType": "address", "name": "eth", "type": "address" },196 { "internalType": "uint256", "name": "sub", "type": "uint256" }197 ],198 "internalType": "struct EthCrossAccount[]",199 "name": "",200 "type": "tuple[]"201 }202 ],203 "stateMutability": "view",204 "type": "function"205 },206 {207 "inputs": [],208 "name": "collectionOwner",209 "outputs": [210 {211 "components": [212 { "internalType": "address", "name": "eth", "type": "address" },213 { "internalType": "uint256", "name": "sub", "type": "uint256" }214 ],215 "internalType": "struct EthCrossAccount",216 "name": "",217 "type": "tuple"218 }219 ],220 "stateMutability": "view",221 "type": "function"222 },223 {224 "inputs": [225 { "internalType": "string[]", "name": "keys", "type": "string[]" }226 ],227 "name": "collectionProperties",228 "outputs": [229 {230 "components": [231 { "internalType": "string", "name": "key", "type": "string" },232 { "internalType": "bytes", "name": "value", "type": "bytes" }233 ],234 "internalType": "struct Property[]",235 "name": "",236 "type": "tuple[]"237 }238 ],239 "stateMutability": "view",240 "type": "function"241 },242 {243 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],244 "name": "collectionProperty",245 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],246 "stateMutability": "view",247 "type": "function"248 },249 {250 "inputs": [],251 "name": "collectionSponsor",252 "outputs": [253 {254 "components": [255 { "internalType": "address", "name": "field_0", "type": "address" },256 { "internalType": "uint256", "name": "field_1", "type": "uint256" }257 ],258 "internalType": "struct Tuple29",259 "name": "",260 "type": "tuple"261 }262 ],263 "stateMutability": "view",264 "type": "function"265 },266 {267 "inputs": [],268 "name": "confirmCollectionSponsorship",269 "outputs": [],270 "stateMutability": "nonpayable",271 "type": "function"272 },273 {274 "inputs": [],275 "name": "contractAddress",276 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],277 "stateMutability": "view",278 "type": "function"279 },280 {281 "inputs": [282 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }283 ],284 "name": "crossOwnerOf",285 "outputs": [286 {287 "components": [288 { "internalType": "address", "name": "eth", "type": "address" },289 { "internalType": "uint256", "name": "sub", "type": "uint256" }290 ],291 "internalType": "struct EthCrossAccount",292 "name": "",293 "type": "tuple"294 }295 ],296 "stateMutability": "view",297 "type": "function"298 },299 {300 "inputs": [301 { "internalType": "string[]", "name": "keys", "type": "string[]" }302 ],303 "name": "deleteCollectionProperties",304 "outputs": [],305 "stateMutability": "nonpayable",306 "type": "function"307 },308 {309 "inputs": [310 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },311 { "internalType": "string[]", "name": "keys", "type": "string[]" }312 ],313 "name": "deleteProperties",314 "outputs": [],315 "stateMutability": "nonpayable",316 "type": "function"317 },318 {319 "inputs": [],320 "name": "description",321 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],322 "stateMutability": "view",323 "type": "function"324 },325 {326 "inputs": [],327 "name": "finishMinting",328 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],329 "stateMutability": "nonpayable",330 "type": "function"331 },332 {333 "inputs": [334 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }335 ],336 "name": "getApproved",337 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],338 "stateMutability": "view",339 "type": "function"340 },341 {342 "inputs": [],343 "name": "hasCollectionPendingSponsor",344 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],345 "stateMutability": "view",346 "type": "function"347 },348 {349 "inputs": [350 { "internalType": "address", "name": "owner", "type": "address" },351 { "internalType": "address", "name": "operator", "type": "address" }352 ],353 "name": "isApprovedForAll",354 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],355 "stateMutability": "view",356 "type": "function"357 },358 {359 "inputs": [360 {361 "components": [362 { "internalType": "address", "name": "eth", "type": "address" },363 { "internalType": "uint256", "name": "sub", "type": "uint256" }364 ],365 "internalType": "struct EthCrossAccount",366 "name": "user",367 "type": "tuple"368 }369 ],370 "name": "isOwnerOrAdminCross",371 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],372 "stateMutability": "view",373 "type": "function"374 },375 {376 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],377 "name": "mint",378 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],379 "stateMutability": "nonpayable",380 "type": "function"381 },382 {383 "inputs": [384 { "internalType": "address", "name": "to", "type": "address" },385 { "internalType": "string", "name": "tokenUri", "type": "string" }386 ],387 "name": "mintWithTokenURI",388 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],389 "stateMutability": "nonpayable",390 "type": "function"391 },392 {393 "inputs": [],394 "name": "mintingFinished",395 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],396 "stateMutability": "view",397 "type": "function"398 },399 {400 "inputs": [],401 "name": "name",402 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],403 "stateMutability": "view",404 "type": "function"405 },406 {407 "inputs": [],408 "name": "nextTokenId",409 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],410 "stateMutability": "view",411 "type": "function"412 },413 {414 "inputs": [415 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }416 ],417 "name": "ownerOf",418 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],419 "stateMutability": "view",420 "type": "function"421 },422 {423 "inputs": [424 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },425 { "internalType": "string", "name": "key", "type": "string" }426 ],427 "name": "property",428 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],429 "stateMutability": "view",430 "type": "function"431 },432 {433 "inputs": [434 {435 "components": [436 { "internalType": "address", "name": "eth", "type": "address" },437 { "internalType": "uint256", "name": "sub", "type": "uint256" }438 ],439 "internalType": "struct EthCrossAccount",440 "name": "admin",441 "type": "tuple"442 }443 ],444 "name": "removeCollectionAdminCross",445 "outputs": [],446 "stateMutability": "nonpayable",447 "type": "function"448 },449 {450 "inputs": [],451 "name": "removeCollectionSponsor",452 "outputs": [],453 "stateMutability": "nonpayable",454 "type": "function"455 },456 {457 "inputs": [458 {459 "components": [460 { "internalType": "address", "name": "eth", "type": "address" },461 { "internalType": "uint256", "name": "sub", "type": "uint256" }462 ],463 "internalType": "struct EthCrossAccount",464 "name": "user",465 "type": "tuple"466 }467 ],468 "name": "removeFromCollectionAllowListCross",469 "outputs": [],470 "stateMutability": "nonpayable",471 "type": "function"472 },473 {474 "inputs": [475 { "internalType": "address", "name": "from", "type": "address" },476 { "internalType": "address", "name": "to", "type": "address" },477 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }478 ],479 "name": "safeTransferFrom",480 "outputs": [],481 "stateMutability": "nonpayable",482 "type": "function"483 },484 {485 "inputs": [486 { "internalType": "address", "name": "from", "type": "address" },487 { "internalType": "address", "name": "to", "type": "address" },488 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },489 { "internalType": "bytes", "name": "data", "type": "bytes" }490 ],491 "name": "safeTransferFromWithData",492 "outputs": [],493 "stateMutability": "nonpayable",494 "type": "function"495 },496 {497 "inputs": [498 { "internalType": "address", "name": "operator", "type": "address" },499 { "internalType": "bool", "name": "approved", "type": "bool" }500 ],501 "name": "setApprovalForAll",502 "outputs": [],503 "stateMutability": "nonpayable",504 "type": "function"505 },506 {507 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],508 "name": "setCollectionAccess",509 "outputs": [],510 "stateMutability": "nonpayable",511 "type": "function"512 },513 {514 "inputs": [515 { "internalType": "string", "name": "limit", "type": "string" },516 { "internalType": "uint256", "name": "value", "type": "uint256" }517 ],518 "name": "setCollectionLimit",519 "outputs": [],520 "stateMutability": "nonpayable",521 "type": "function"522 },523 {524 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],525 "name": "setCollectionMintMode",526 "outputs": [],527 "stateMutability": "nonpayable",528 "type": "function"529 },530 {531 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],532 "name": "setCollectionNesting",533 "outputs": [],534 "stateMutability": "nonpayable",535 "type": "function"536 },537 {538 "inputs": [539 { "internalType": "bool", "name": "enable", "type": "bool" },540 {541 "internalType": "address[]",542 "name": "collections",543 "type": "address[]"544 }545 ],546 "name": "setCollectionNesting",547 "outputs": [],548 "stateMutability": "nonpayable",549 "type": "function"550 },551 {552 "inputs": [553 {554 "components": [555 { "internalType": "string", "name": "key", "type": "string" },556 { "internalType": "bytes", "name": "value", "type": "bytes" }557 ],558 "internalType": "struct Property[]",559 "name": "properties",560 "type": "tuple[]"561 }562 ],563 "name": "setCollectionProperties",564 "outputs": [],565 "stateMutability": "nonpayable",566 "type": "function"567 },568 {569 "inputs": [570 {571 "components": [572 { "internalType": "address", "name": "eth", "type": "address" },573 { "internalType": "uint256", "name": "sub", "type": "uint256" }574 ],575 "internalType": "struct EthCrossAccount",576 "name": "sponsor",577 "type": "tuple"578 }579 ],580 "name": "setCollectionSponsorCross",581 "outputs": [],582 "stateMutability": "nonpayable",583 "type": "function"584 },585 {586 "inputs": [587 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },588 {589 "components": [590 { "internalType": "string", "name": "key", "type": "string" },591 { "internalType": "bytes", "name": "value", "type": "bytes" }592 ],593 "internalType": "struct Property[]",594 "name": "properties",595 "type": "tuple[]"596 }597 ],598 "name": "setProperties",599 "outputs": [],600 "stateMutability": "nonpayable",601 "type": "function"602 },603 {604 "inputs": [605 { "internalType": "string", "name": "key", "type": "string" },606 { "internalType": "bool", "name": "isMutable", "type": "bool" },607 { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },608 { "internalType": "bool", "name": "tokenOwner", "type": "bool" }609 ],610 "name": "setTokenPropertyPermission",611 "outputs": [],612 "stateMutability": "nonpayable",613 "type": "function"614 },615 {616 "inputs": [617 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }618 ],619 "name": "supportsInterface",620 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],621 "stateMutability": "view",622 "type": "function"623 },624 {625 "inputs": [],626 "name": "symbol",627 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],628 "stateMutability": "view",629 "type": "function"630 },631 {632 "inputs": [633 { "internalType": "uint256", "name": "index", "type": "uint256" }634 ],635 "name": "tokenByIndex",636 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],637 "stateMutability": "view",638 "type": "function"639 },640 {641 "inputs": [642 { "internalType": "uint256", "name": "token", "type": "uint256" }643 ],644 "name": "tokenContractAddress",645 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],646 "stateMutability": "view",647 "type": "function"648 },649 {650 "inputs": [651 { "internalType": "address", "name": "owner", "type": "address" },652 { "internalType": "uint256", "name": "index", "type": "uint256" }653 ],654 "name": "tokenOfOwnerByIndex",655 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],656 "stateMutability": "view",657 "type": "function"658 },659 {660 "inputs": [661 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },662 { "internalType": "string[]", "name": "keys", "type": "string[]" }663 ],664 "name": "tokenProperties",665 "outputs": [666 {667 "components": [668 { "internalType": "string", "name": "key", "type": "string" },669 { "internalType": "bytes", "name": "value", "type": "bytes" }670 ],671 "internalType": "struct Property[]",672 "name": "",673 "type": "tuple[]"674 }675 ],676 "stateMutability": "view",677 "type": "function"678 },679 {680 "inputs": [681 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }682 ],683 "name": "tokenURI",684 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],685 "stateMutability": "view",686 "type": "function"687 },688 {689 "inputs": [],690 "name": "totalSupply",691 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],692 "stateMutability": "view",693 "type": "function"694 },695 {696 "inputs": [697 { "internalType": "address", "name": "to", "type": "address" },698 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }699 ],700 "name": "transfer",701 "outputs": [],702 "stateMutability": "nonpayable",703 "type": "function"704 },705 {706 "inputs": [707 {708 "components": [709 { "internalType": "address", "name": "eth", "type": "address" },710 { "internalType": "uint256", "name": "sub", "type": "uint256" }711 ],712 "internalType": "struct EthCrossAccount",713 "name": "to",714 "type": "tuple"715 },716 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }717 ],718 "name": "transferCross",719 "outputs": [],720 "stateMutability": "nonpayable",721 "type": "function"722 },723 {724 "inputs": [725 { "internalType": "address", "name": "from", "type": "address" },726 { "internalType": "address", "name": "to", "type": "address" },727 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }728 ],729 "name": "transferFrom",730 "outputs": [],731 "stateMutability": "nonpayable",732 "type": "function"733 },734 {735 "inputs": [736 {737 "components": [738 { "internalType": "address", "name": "eth", "type": "address" },739 { "internalType": "uint256", "name": "sub", "type": "uint256" }740 ],741 "internalType": "struct EthCrossAccount",742 "name": "from",743 "type": "tuple"744 },745 {746 "components": [747 { "internalType": "address", "name": "eth", "type": "address" },748 { "internalType": "uint256", "name": "sub", "type": "uint256" }749 ],750 "internalType": "struct EthCrossAccount",751 "name": "to",752 "type": "tuple"753 },754 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }755 ],756 "name": "transferFromCross",757 "outputs": [],758 "stateMutability": "nonpayable",759 "type": "function"760 },761 {762 "inputs": [],763 "name": "uniqueCollectionType",764 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],765 "stateMutability": "view",766 "type": "function"767 }768]tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -60,7 +60,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 (Tuple16[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Property[] memory);
// /// Set the sponsor of the collection.
// ///
@@ -276,12 +276,6 @@
struct EthCrossAccount {
address eth;
uint256 sub;
-}
-
-/// @dev anonymous struct
-struct Tuple16 {
- string field_0;
- bytes field_1;
}
/// @dev Property struct
@@ -290,8 +284,13 @@
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,
+ /// or in textual repr: description()
+ function description() external view returns (string memory);
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.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 (Tuple23[] memory);
+ function collectionProperties(string[] memory keys) external view returns (Property[] 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 (Tuple26 memory);
+ function collectionSponsor() external view returns (Tuple27 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,15 +346,9 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple27 {
address field_0;
uint256 field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple23 {
- string field_0;
- bytes field_1;
}
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
@@ -452,7 +446,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
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,
@@ -464,6 +458,27 @@
/// or in textual repr: symbol()
function symbol() external view returns (string memory);
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() external view returns (string memory);
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @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 (Property[] memory);
+
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized
@@ -546,12 +561,12 @@
// /// @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) external returns (bool);
+ // function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
}
/// @dev anonymous struct
-struct Tuple11 {
+struct Tuple13 {
uint256 field_0;
string field_1;
}
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 (Property[] 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 (Tuple26 memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -346,15 +346,9 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple26 {
address field_0;
uint256 field_1;
-}
-
-/// @dev anonymous struct
-struct Tuple22 {
- string field_0;
- bytes field_1;
}
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -450,7 +444,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,
@@ -462,6 +456,27 @@
/// or in textual repr: symbol()
function symbol() external view returns (string memory);
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() external view returns (string memory);
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) external view returns (EthCrossAccount memory);
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @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 (Property[] memory);
+
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid RFT.
@@ -539,7 +554,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
///
@@ -550,7 +565,7 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple12 {
uint256 field_0;
string field_1;
}
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, '0x0e9fc611', true, true);
+ await checkInterface(helper, '0xb8f094a0', true, true);
});
itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {
tests/src/eth/createFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -36,9 +36,11 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, 'absolutely anything', 'ENVY');
+ const description = 'absolutely anything';
+
+ const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, description, 'ENVY');
- const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, true);
+ const collection = helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);
await collection.methods.setCollectionSponsor(sponsor).send();
let data = (await helper.rft.getData(collectionId))!;
@@ -57,8 +59,9 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, 'absolutely anything', 'ENVY');
-
+ const description = 'absolutely anything';
+ const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, description, 'ENVY');
+
const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
await collection.methods.setCollectionSponsorCross(sponsorCross).send();
@@ -73,6 +76,7 @@
data = (await helper.rft.getData(collectionId))!;
expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+ expect(await collection.methods.description().call()).to.deep.equal(description);
});
itEth('Set limits', async ({helper}) => {
tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -28,7 +28,7 @@
});
});
- itEth('Create collection with properties', async ({helper}) => {
+ itEth('Create collection with properties & get desctription', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const name = 'CollectionEVM';
@@ -37,7 +37,8 @@
const baseUri = 'BaseURI';
const {collectionId, collectionAddress, events} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, name, description, prefix, baseUri);
-
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');
+
expect(events).to.be.deep.equal([
{
address: '0x6C4E9fE1AE37a41E93CEE429e8E1881aBdcbb54F',
@@ -56,7 +57,9 @@
expect(data.description).to.be.eq(description);
expect(data.raw.tokenPrefix).to.be.eq(prefix);
expect(data.raw.mode).to.be.eq('NFT');
-
+
+ expect(await contract.methods.description().call()).to.deep.equal(description);
+
const options = await collection.getOptions();
expect(options.tokenPropertyPermissions).to.be.deep.equal([
{
@@ -92,11 +95,12 @@
expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
});
- itEth('[cross] Set sponsorship', async ({helper}) => {
+ itEth('[cross] Set sponsorship & get description', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const ss58Format = helper.chain.getChainProperties().ss58Format;
- const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+ const description = 'absolutely anything';
+ const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', description, 'ROC');
const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
@@ -112,6 +116,8 @@
data = (await helper.nft.getData(collectionId))!;
expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+
+ expect(await sponsorCollection.methods.description().call()).to.deep.equal(description);
});
itEth('Set limits', async ({helper}) => {
tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -53,7 +53,7 @@
- itEth('Create collection with properties', async ({helper}) => {
+ itEth('Create collection with properties & get description', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const name = 'CollectionEVM';
@@ -61,7 +61,8 @@
const prefix = 'token prefix';
const baseUri = 'BaseURI';
- const {collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, name, description, prefix, baseUri);
+ const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, name, description, prefix, baseUri);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');
const collection = helper.rft.getCollectionObject(collectionId);
const data = (await collection.getData())!;
@@ -71,6 +72,8 @@
expect(data.raw.tokenPrefix).to.be.eq(prefix);
expect(data.raw.mode).to.be.eq('ReFungible');
+ expect(await contract.methods.description().call()).to.deep.equal(description);
+
const options = await collection.getOptions();
expect(options.tokenPropertyPermissions).to.be.deep.equal([
{
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,6 +17,7 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
import {Contract} from 'web3-eth-contract';
+import exp from 'constants';
describe('NFT: Information getting', () => {
@@ -149,7 +150,7 @@
});
});
- itEth('Can perform mint()', async ({helper}) => {
+ itEth('Can perform mint() & get crossOwner()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
@@ -166,7 +167,8 @@
expect(event.returnValues.to).to.be.equal(receiver);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
-
+ console.log(await contract.methods.crossOwnerOf(tokenId).call());
+ expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
// TODO: this wont work right now, need release 919000 first
// await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -117,7 +117,7 @@
});
});
- itEth('Can perform mint()', async ({helper}) => {
+ itEth('Can perform mint() & crossOwnerOf()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const receiver = helper.eth.createAccount();
const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Minty', '6', '6', '');
@@ -132,6 +132,7 @@
const tokenId = event.returnValues.tokenId;
expect(tokenId).to.be.equal('1');
+ expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
});
tests/src/eth/tokenProperties.test.tsdiffbeforeafterboth--- a/tests/src/eth/tokenProperties.test.ts
+++ b/tests/src/eth/tokenProperties.test.ts
@@ -14,10 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-import {itEth, usingEthPlaygrounds, expect} from './util';
+import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
-import {ITokenPropertyPermission} from '../util/playgrounds/types';
+import {ITokenPropertyPermission, TCollectionMode} from '../util/playgrounds/types';
import {Pallets} from '../util';
+import {UniqueNFTCollection, UniqueRFTCollection} from '../util/playgrounds/unique';
describe('EVM token properties', () => {
let donor: IKeyringPair;
@@ -95,7 +96,7 @@
expect(value).to.equal('testValue');
});
- itEth('Can be multiple set for NFT ', async({helper}) => {
+ async function checkProps(helper: EthUniqueHelper, mode: TCollectionMode) {
const caller = await helper.eth.createAccountWithBalance(donor);
const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
@@ -103,56 +104,44 @@
collectionAdmin: true,
mutable: true}}; });
- const collection = await helper.nft.mintCollection(alice, {
+ const collection = await helper[mode].mintCollection(alice, {
tokenPrefix: 'ethp',
tokenPropertyPermissions: permissions,
- });
+ }) as UniqueNFTCollection | UniqueRFTCollection;
const token = await collection.mintToken(alice);
const valuesBefore = await token.getProperties(properties.map(p => p.key));
expect(valuesBefore).to.be.deep.equal([]);
+
await collection.addAdmin(alice, {Ethereum: caller});
-
+
const address = helper.ethAddress.fromCollectionId(collection.collectionId);
- const contract = helper.ethNativeContract.collection(address, 'nft', caller);
+ const contract = helper.ethNativeContract.collection(address, mode, caller);
+
+ expect(await contract.methods.tokenProperties(token.tokenId, []).call()).to.be.deep.equal([]);
await contract.methods.setProperties(token.tokenId, properties).send({from: caller});
const values = await token.getProperties(properties.map(p => p.key));
expect(values).to.be.deep.equal(properties.map(p => { return {key: p.key, value: p.value.toString()}; }));
- });
-
- itEth.ifWithPallets('Can be multiple set for RFT ', [Pallets.ReFungible], async({helper}) => {
- const caller = await helper.eth.createAccountWithBalance(donor);
- const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
- const permissions: ITokenPropertyPermission[] = properties.map(p => { return {key: p.key, permission: {tokenOwner: true,
- collectionAdmin: true,
- mutable: true}}; });
-
- const collection = await helper.rft.mintCollection(alice, {
- tokenPrefix: 'ethp',
- tokenPropertyPermissions: permissions,
- });
-
- const token = await collection.mintToken(alice);
-
- const valuesBefore = await token.getProperties(properties.map(p => p.key));
- expect(valuesBefore).to.be.deep.equal([]);
+ expect(await contract.methods.tokenProperties(token.tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
- await collection.addAdmin(alice, {Ethereum: caller});
-
- const address = helper.ethAddress.fromCollectionId(collection.collectionId);
- const contract = helper.ethNativeContract.collection(address, 'rft', caller);
-
- await contract.methods.setProperties(token.tokenId, properties).send({from: caller});
-
- const values = await token.getProperties(properties.map(p => p.key));
- expect(values).to.be.deep.equal(properties.map(p => { return {key: p.key, value: p.value.toString()}; }));
+ expect(await contract.methods.tokenProperties(token.tokenId, [properties[0].key]).call())
+ .to.be.like([helper.ethProperty.property(properties[0].key, properties[0].value.toString())]);
+ }
+
+ itEth('Can be multiple set/read for NFT ', async({helper}) => {
+ await checkProps(helper, 'nft');
+ });
+
+ itEth.ifWithPallets('Can be multiple set/read for RFT ', [Pallets.ReFungible], async({helper}) => {
+ await checkProps(helper, 'rft');
});
-
+
itEth('Can be deleted', async({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
const collection = await helper.nft.mintCollection(alice, {