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.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 {139 "components": [140 { "internalType": "address", "name": "eth", "type": "address" },141 { "internalType": "uint256", "name": "sub", "type": "uint256" }142 ],143 "internalType": "struct EthCrossAccount",144 "name": "approved",145 "type": "tuple"146 },147 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }148 ],149 "name": "approveCross",150 "outputs": [],151 "stateMutability": "nonpayable",152 "type": "function"153 },154 {155 "inputs": [156 { "internalType": "address", "name": "owner", "type": "address" }157 ],158 "name": "balanceOf",159 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],160 "stateMutability": "view",161 "type": "function"162 },163 {164 "inputs": [165 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }166 ],167 "name": "burn",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": "from",181 "type": "tuple"182 },183 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }184 ],185 "name": "burnFromCross",186 "outputs": [],187 "stateMutability": "nonpayable",188 "type": "function"189 },190 {191 "inputs": [192 {193 "components": [194 { "internalType": "address", "name": "eth", "type": "address" },195 { "internalType": "uint256", "name": "sub", "type": "uint256" }196 ],197 "internalType": "struct EthCrossAccount",198 "name": "newOwner",199 "type": "tuple"200 }201 ],202 "name": "changeCollectionOwnerCross",203 "outputs": [],204 "stateMutability": "nonpayable",205 "type": "function"206 },207 {208 "inputs": [],209 "name": "collectionAdmins",210 "outputs": [211 {212 "components": [213 { "internalType": "address", "name": "eth", "type": "address" },214 { "internalType": "uint256", "name": "sub", "type": "uint256" }215 ],216 "internalType": "struct EthCrossAccount[]",217 "name": "",218 "type": "tuple[]"219 }220 ],221 "stateMutability": "view",222 "type": "function"223 },224 {225 "inputs": [],226 "name": "collectionOwner",227 "outputs": [228 {229 "components": [230 { "internalType": "address", "name": "eth", "type": "address" },231 { "internalType": "uint256", "name": "sub", "type": "uint256" }232 ],233 "internalType": "struct EthCrossAccount",234 "name": "",235 "type": "tuple"236 }237 ],238 "stateMutability": "view",239 "type": "function"240 },241 {242 "inputs": [243 { "internalType": "string[]", "name": "keys", "type": "string[]" }244 ],245 "name": "collectionProperties",246 "outputs": [247 {248 "components": [249 { "internalType": "string", "name": "field_0", "type": "string" },250 { "internalType": "bytes", "name": "field_1", "type": "bytes" }251 ],252 "internalType": "struct Tuple23[]",253 "name": "",254 "type": "tuple[]"255 }256 ],257 "stateMutability": "view",258 "type": "function"259 },260 {261 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],262 "name": "collectionProperty",263 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],264 "stateMutability": "view",265 "type": "function"266 },267 {268 "inputs": [],269 "name": "collectionSponsor",270 "outputs": [271 {272 "components": [273 { "internalType": "address", "name": "field_0", "type": "address" },274 { "internalType": "uint256", "name": "field_1", "type": "uint256" }275 ],276 "internalType": "struct Tuple26",277 "name": "",278 "type": "tuple"279 }280 ],281 "stateMutability": "view",282 "type": "function"283 },284 {285 "inputs": [],286 "name": "confirmCollectionSponsorship",287 "outputs": [],288 "stateMutability": "nonpayable",289 "type": "function"290 },291 {292 "inputs": [],293 "name": "contractAddress",294 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],295 "stateMutability": "view",296 "type": "function"297 },298 {299 "inputs": [300 { "internalType": "string[]", "name": "keys", "type": "string[]" }301 ],302 "name": "deleteCollectionProperties",303 "outputs": [],304 "stateMutability": "nonpayable",305 "type": "function"306 },307 {308 "inputs": [309 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },310 { "internalType": "string[]", "name": "keys", "type": "string[]" }311 ],312 "name": "deleteProperties",313 "outputs": [],314 "stateMutability": "nonpayable",315 "type": "function"316 },317 {318 "inputs": [],319 "name": "finishMinting",320 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],321 "stateMutability": "nonpayable",322 "type": "function"323 },324 {325 "inputs": [326 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }327 ],328 "name": "getApproved",329 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],330 "stateMutability": "view",331 "type": "function"332 },333 {334 "inputs": [],335 "name": "hasCollectionPendingSponsor",336 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],337 "stateMutability": "view",338 "type": "function"339 },340 {341 "inputs": [342 { "internalType": "address", "name": "owner", "type": "address" },343 { "internalType": "address", "name": "operator", "type": "address" }344 ],345 "name": "isApprovedForAll",346 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],347 "stateMutability": "view",348 "type": "function"349 },350 {351 "inputs": [352 {353 "components": [354 { "internalType": "address", "name": "eth", "type": "address" },355 { "internalType": "uint256", "name": "sub", "type": "uint256" }356 ],357 "internalType": "struct EthCrossAccount",358 "name": "user",359 "type": "tuple"360 }361 ],362 "name": "isOwnerOrAdminCross",363 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],364 "stateMutability": "view",365 "type": "function"366 },367 {368 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],369 "name": "mint",370 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],371 "stateMutability": "nonpayable",372 "type": "function"373 },374 {375 "inputs": [376 { "internalType": "address", "name": "to", "type": "address" },377 { "internalType": "string", "name": "tokenUri", "type": "string" }378 ],379 "name": "mintWithTokenURI",380 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],381 "stateMutability": "nonpayable",382 "type": "function"383 },384 {385 "inputs": [],386 "name": "mintingFinished",387 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],388 "stateMutability": "view",389 "type": "function"390 },391 {392 "inputs": [],393 "name": "name",394 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],395 "stateMutability": "view",396 "type": "function"397 },398 {399 "inputs": [],400 "name": "nextTokenId",401 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],402 "stateMutability": "view",403 "type": "function"404 },405 {406 "inputs": [407 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }408 ],409 "name": "ownerOf",410 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],411 "stateMutability": "view",412 "type": "function"413 },414 {415 "inputs": [416 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },417 { "internalType": "string", "name": "key", "type": "string" }418 ],419 "name": "property",420 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],421 "stateMutability": "view",422 "type": "function"423 },424 {425 "inputs": [426 {427 "components": [428 { "internalType": "address", "name": "eth", "type": "address" },429 { "internalType": "uint256", "name": "sub", "type": "uint256" }430 ],431 "internalType": "struct EthCrossAccount",432 "name": "admin",433 "type": "tuple"434 }435 ],436 "name": "removeCollectionAdminCross",437 "outputs": [],438 "stateMutability": "nonpayable",439 "type": "function"440 },441 {442 "inputs": [],443 "name": "removeCollectionSponsor",444 "outputs": [],445 "stateMutability": "nonpayable",446 "type": "function"447 },448 {449 "inputs": [450 {451 "components": [452 { "internalType": "address", "name": "eth", "type": "address" },453 { "internalType": "uint256", "name": "sub", "type": "uint256" }454 ],455 "internalType": "struct EthCrossAccount",456 "name": "user",457 "type": "tuple"458 }459 ],460 "name": "removeFromCollectionAllowListCross",461 "outputs": [],462 "stateMutability": "nonpayable",463 "type": "function"464 },465 {466 "inputs": [467 { "internalType": "address", "name": "from", "type": "address" },468 { "internalType": "address", "name": "to", "type": "address" },469 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }470 ],471 "name": "safeTransferFrom",472 "outputs": [],473 "stateMutability": "nonpayable",474 "type": "function"475 },476 {477 "inputs": [478 { "internalType": "address", "name": "from", "type": "address" },479 { "internalType": "address", "name": "to", "type": "address" },480 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },481 { "internalType": "bytes", "name": "data", "type": "bytes" }482 ],483 "name": "safeTransferFrom",484 "outputs": [],485 "stateMutability": "nonpayable",486 "type": "function"487 },488 {489 "inputs": [490 { "internalType": "address", "name": "operator", "type": "address" },491 { "internalType": "bool", "name": "approved", "type": "bool" }492 ],493 "name": "setApprovalForAll",494 "outputs": [],495 "stateMutability": "nonpayable",496 "type": "function"497 },498 {499 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],500 "name": "setCollectionAccess",501 "outputs": [],502 "stateMutability": "nonpayable",503 "type": "function"504 },505 {506 "inputs": [507 { "internalType": "string", "name": "limit", "type": "string" },508 { "internalType": "uint256", "name": "value", "type": "uint256" }509 ],510 "name": "setCollectionLimit",511 "outputs": [],512 "stateMutability": "nonpayable",513 "type": "function"514 },515 {516 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],517 "name": "setCollectionMintMode",518 "outputs": [],519 "stateMutability": "nonpayable",520 "type": "function"521 },522 {523 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],524 "name": "setCollectionNesting",525 "outputs": [],526 "stateMutability": "nonpayable",527 "type": "function"528 },529 {530 "inputs": [531 { "internalType": "bool", "name": "enable", "type": "bool" },532 {533 "internalType": "address[]",534 "name": "collections",535 "type": "address[]"536 }537 ],538 "name": "setCollectionNesting",539 "outputs": [],540 "stateMutability": "nonpayable",541 "type": "function"542 },543 {544 "inputs": [545 {546 "components": [547 { "internalType": "string", "name": "key", "type": "string" },548 { "internalType": "bytes", "name": "value", "type": "bytes" }549 ],550 "internalType": "struct Property[]",551 "name": "properties",552 "type": "tuple[]"553 }554 ],555 "name": "setCollectionProperties",556 "outputs": [],557 "stateMutability": "nonpayable",558 "type": "function"559 },560 {561 "inputs": [562 {563 "components": [564 { "internalType": "address", "name": "eth", "type": "address" },565 { "internalType": "uint256", "name": "sub", "type": "uint256" }566 ],567 "internalType": "struct EthCrossAccount",568 "name": "sponsor",569 "type": "tuple"570 }571 ],572 "name": "setCollectionSponsorCross",573 "outputs": [],574 "stateMutability": "nonpayable",575 "type": "function"576 },577 {578 "inputs": [579 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },580 {581 "components": [582 { "internalType": "string", "name": "key", "type": "string" },583 { "internalType": "bytes", "name": "value", "type": "bytes" }584 ],585 "internalType": "struct Property[]",586 "name": "properties",587 "type": "tuple[]"588 }589 ],590 "name": "setProperties",591 "outputs": [],592 "stateMutability": "nonpayable",593 "type": "function"594 },595 {596 "inputs": [597 { "internalType": "string", "name": "key", "type": "string" },598 { "internalType": "bool", "name": "isMutable", "type": "bool" },599 { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },600 { "internalType": "bool", "name": "tokenOwner", "type": "bool" }601 ],602 "name": "setTokenPropertyPermission",603 "outputs": [],604 "stateMutability": "nonpayable",605 "type": "function"606 },607 {608 "inputs": [609 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }610 ],611 "name": "supportsInterface",612 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],613 "stateMutability": "view",614 "type": "function"615 },616 {617 "inputs": [],618 "name": "symbol",619 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],620 "stateMutability": "view",621 "type": "function"622 },623 {624 "inputs": [625 { "internalType": "uint256", "name": "index", "type": "uint256" }626 ],627 "name": "tokenByIndex",628 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],629 "stateMutability": "view",630 "type": "function"631 },632 {633 "inputs": [634 { "internalType": "address", "name": "owner", "type": "address" },635 { "internalType": "uint256", "name": "index", "type": "uint256" }636 ],637 "name": "tokenOfOwnerByIndex",638 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],639 "stateMutability": "view",640 "type": "function"641 },642 {643 "inputs": [644 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }645 ],646 "name": "tokenURI",647 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],648 "stateMutability": "view",649 "type": "function"650 },651 {652 "inputs": [],653 "name": "totalSupply",654 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],655 "stateMutability": "view",656 "type": "function"657 },658 {659 "inputs": [660 { "internalType": "address", "name": "to", "type": "address" },661 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }662 ],663 "name": "transfer",664 "outputs": [],665 "stateMutability": "nonpayable",666 "type": "function"667 },668 {669 "inputs": [670 {671 "components": [672 { "internalType": "address", "name": "eth", "type": "address" },673 { "internalType": "uint256", "name": "sub", "type": "uint256" }674 ],675 "internalType": "struct EthCrossAccount",676 "name": "to",677 "type": "tuple"678 },679 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }680 ],681 "name": "transferCross",682 "outputs": [],683 "stateMutability": "nonpayable",684 "type": "function"685 },686 {687 "inputs": [688 { "internalType": "address", "name": "from", "type": "address" },689 { "internalType": "address", "name": "to", "type": "address" },690 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }691 ],692 "name": "transferFrom",693 "outputs": [],694 "stateMutability": "nonpayable",695 "type": "function"696 },697 {698 "inputs": [699 {700 "components": [701 { "internalType": "address", "name": "eth", "type": "address" },702 { "internalType": "uint256", "name": "sub", "type": "uint256" }703 ],704 "internalType": "struct EthCrossAccount",705 "name": "from",706 "type": "tuple"707 },708 {709 "components": [710 { "internalType": "address", "name": "eth", "type": "address" },711 { "internalType": "uint256", "name": "sub", "type": "uint256" }712 ],713 "internalType": "struct EthCrossAccount",714 "name": "to",715 "type": "tuple"716 },717 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }718 ],719 "name": "transferFromCross",720 "outputs": [],721 "stateMutability": "nonpayable",722 "type": "function"723 },724 {725 "inputs": [],726 "name": "uniqueCollectionType",727 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],728 "stateMutability": "view",729 "type": "function"730 }731]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 {139 "components": [140 { "internalType": "address", "name": "eth", "type": "address" },141 { "internalType": "uint256", "name": "sub", "type": "uint256" }142 ],143 "internalType": "struct EthCrossAccount",144 "name": "approved",145 "type": "tuple"146 },147 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }148 ],149 "name": "approveCross",150 "outputs": [],151 "stateMutability": "nonpayable",152 "type": "function"153 },154 {155 "inputs": [156 { "internalType": "address", "name": "owner", "type": "address" }157 ],158 "name": "balanceOf",159 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],160 "stateMutability": "view",161 "type": "function"162 },163 {164 "inputs": [165 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }166 ],167 "name": "burn",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": "from",181 "type": "tuple"182 },183 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }184 ],185 "name": "burnFromCross",186 "outputs": [],187 "stateMutability": "nonpayable",188 "type": "function"189 },190 {191 "inputs": [192 {193 "components": [194 { "internalType": "address", "name": "eth", "type": "address" },195 { "internalType": "uint256", "name": "sub", "type": "uint256" }196 ],197 "internalType": "struct EthCrossAccount",198 "name": "newOwner",199 "type": "tuple"200 }201 ],202 "name": "changeCollectionOwnerCross",203 "outputs": [],204 "stateMutability": "nonpayable",205 "type": "function"206 },207 {208 "inputs": [],209 "name": "collectionAdmins",210 "outputs": [211 {212 "components": [213 { "internalType": "address", "name": "eth", "type": "address" },214 { "internalType": "uint256", "name": "sub", "type": "uint256" }215 ],216 "internalType": "struct EthCrossAccount[]",217 "name": "",218 "type": "tuple[]"219 }220 ],221 "stateMutability": "view",222 "type": "function"223 },224 {225 "inputs": [],226 "name": "collectionOwner",227 "outputs": [228 {229 "components": [230 { "internalType": "address", "name": "eth", "type": "address" },231 { "internalType": "uint256", "name": "sub", "type": "uint256" }232 ],233 "internalType": "struct EthCrossAccount",234 "name": "",235 "type": "tuple"236 }237 ],238 "stateMutability": "view",239 "type": "function"240 },241 {242 "inputs": [243 { "internalType": "string[]", "name": "keys", "type": "string[]" }244 ],245 "name": "collectionProperties",246 "outputs": [247 {248 "components": [249 { "internalType": "string", "name": "key", "type": "string" },250 { "internalType": "bytes", "name": "value", "type": "bytes" }251 ],252 "internalType": "struct Property[]",253 "name": "",254 "type": "tuple[]"255 }256 ],257 "stateMutability": "view",258 "type": "function"259 },260 {261 "inputs": [{ "internalType": "string", "name": "key", "type": "string" }],262 "name": "collectionProperty",263 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],264 "stateMutability": "view",265 "type": "function"266 },267 {268 "inputs": [],269 "name": "collectionSponsor",270 "outputs": [271 {272 "components": [273 { "internalType": "address", "name": "field_0", "type": "address" },274 { "internalType": "uint256", "name": "field_1", "type": "uint256" }275 ],276 "internalType": "struct Tuple30",277 "name": "",278 "type": "tuple"279 }280 ],281 "stateMutability": "view",282 "type": "function"283 },284 {285 "inputs": [],286 "name": "confirmCollectionSponsorship",287 "outputs": [],288 "stateMutability": "nonpayable",289 "type": "function"290 },291 {292 "inputs": [],293 "name": "contractAddress",294 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],295 "stateMutability": "view",296 "type": "function"297 },298 {299 "inputs": [300 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }301 ],302 "name": "crossOwnerOf",303 "outputs": [304 {305 "components": [306 { "internalType": "address", "name": "eth", "type": "address" },307 { "internalType": "uint256", "name": "sub", "type": "uint256" }308 ],309 "internalType": "struct EthCrossAccount",310 "name": "",311 "type": "tuple"312 }313 ],314 "stateMutability": "view",315 "type": "function"316 },317 {318 "inputs": [319 { "internalType": "string[]", "name": "keys", "type": "string[]" }320 ],321 "name": "deleteCollectionProperties",322 "outputs": [],323 "stateMutability": "nonpayable",324 "type": "function"325 },326 {327 "inputs": [328 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },329 { "internalType": "string[]", "name": "keys", "type": "string[]" }330 ],331 "name": "deleteProperties",332 "outputs": [],333 "stateMutability": "nonpayable",334 "type": "function"335 },336 {337 "inputs": [],338 "name": "description",339 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],340 "stateMutability": "view",341 "type": "function"342 },343 {344 "inputs": [],345 "name": "finishMinting",346 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],347 "stateMutability": "nonpayable",348 "type": "function"349 },350 {351 "inputs": [352 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }353 ],354 "name": "getApproved",355 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],356 "stateMutability": "view",357 "type": "function"358 },359 {360 "inputs": [],361 "name": "hasCollectionPendingSponsor",362 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],363 "stateMutability": "view",364 "type": "function"365 },366 {367 "inputs": [368 { "internalType": "address", "name": "owner", "type": "address" },369 { "internalType": "address", "name": "operator", "type": "address" }370 ],371 "name": "isApprovedForAll",372 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],373 "stateMutability": "view",374 "type": "function"375 },376 {377 "inputs": [378 {379 "components": [380 { "internalType": "address", "name": "eth", "type": "address" },381 { "internalType": "uint256", "name": "sub", "type": "uint256" }382 ],383 "internalType": "struct EthCrossAccount",384 "name": "user",385 "type": "tuple"386 }387 ],388 "name": "isOwnerOrAdminCross",389 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],390 "stateMutability": "view",391 "type": "function"392 },393 {394 "inputs": [{ "internalType": "address", "name": "to", "type": "address" }],395 "name": "mint",396 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],397 "stateMutability": "nonpayable",398 "type": "function"399 },400 {401 "inputs": [402 { "internalType": "address", "name": "to", "type": "address" },403 { "internalType": "string", "name": "tokenUri", "type": "string" }404 ],405 "name": "mintWithTokenURI",406 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],407 "stateMutability": "nonpayable",408 "type": "function"409 },410 {411 "inputs": [],412 "name": "mintingFinished",413 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],414 "stateMutability": "view",415 "type": "function"416 },417 {418 "inputs": [],419 "name": "name",420 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],421 "stateMutability": "view",422 "type": "function"423 },424 {425 "inputs": [],426 "name": "nextTokenId",427 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],428 "stateMutability": "view",429 "type": "function"430 },431 {432 "inputs": [433 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }434 ],435 "name": "ownerOf",436 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],437 "stateMutability": "view",438 "type": "function"439 },440 {441 "inputs": [442 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },443 { "internalType": "string", "name": "key", "type": "string" }444 ],445 "name": "property",446 "outputs": [{ "internalType": "bytes", "name": "", "type": "bytes" }],447 "stateMutability": "view",448 "type": "function"449 },450 {451 "inputs": [452 {453 "components": [454 { "internalType": "address", "name": "eth", "type": "address" },455 { "internalType": "uint256", "name": "sub", "type": "uint256" }456 ],457 "internalType": "struct EthCrossAccount",458 "name": "admin",459 "type": "tuple"460 }461 ],462 "name": "removeCollectionAdminCross",463 "outputs": [],464 "stateMutability": "nonpayable",465 "type": "function"466 },467 {468 "inputs": [],469 "name": "removeCollectionSponsor",470 "outputs": [],471 "stateMutability": "nonpayable",472 "type": "function"473 },474 {475 "inputs": [476 {477 "components": [478 { "internalType": "address", "name": "eth", "type": "address" },479 { "internalType": "uint256", "name": "sub", "type": "uint256" }480 ],481 "internalType": "struct EthCrossAccount",482 "name": "user",483 "type": "tuple"484 }485 ],486 "name": "removeFromCollectionAllowListCross",487 "outputs": [],488 "stateMutability": "nonpayable",489 "type": "function"490 },491 {492 "inputs": [493 { "internalType": "address", "name": "from", "type": "address" },494 { "internalType": "address", "name": "to", "type": "address" },495 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }496 ],497 "name": "safeTransferFrom",498 "outputs": [],499 "stateMutability": "nonpayable",500 "type": "function"501 },502 {503 "inputs": [504 { "internalType": "address", "name": "from", "type": "address" },505 { "internalType": "address", "name": "to", "type": "address" },506 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },507 { "internalType": "bytes", "name": "data", "type": "bytes" }508 ],509 "name": "safeTransferFrom",510 "outputs": [],511 "stateMutability": "nonpayable",512 "type": "function"513 },514 {515 "inputs": [516 { "internalType": "address", "name": "operator", "type": "address" },517 { "internalType": "bool", "name": "approved", "type": "bool" }518 ],519 "name": "setApprovalForAll",520 "outputs": [],521 "stateMutability": "nonpayable",522 "type": "function"523 },524 {525 "inputs": [{ "internalType": "uint8", "name": "mode", "type": "uint8" }],526 "name": "setCollectionAccess",527 "outputs": [],528 "stateMutability": "nonpayable",529 "type": "function"530 },531 {532 "inputs": [533 { "internalType": "string", "name": "limit", "type": "string" },534 { "internalType": "uint256", "name": "value", "type": "uint256" }535 ],536 "name": "setCollectionLimit",537 "outputs": [],538 "stateMutability": "nonpayable",539 "type": "function"540 },541 {542 "inputs": [{ "internalType": "bool", "name": "mode", "type": "bool" }],543 "name": "setCollectionMintMode",544 "outputs": [],545 "stateMutability": "nonpayable",546 "type": "function"547 },548 {549 "inputs": [{ "internalType": "bool", "name": "enable", "type": "bool" }],550 "name": "setCollectionNesting",551 "outputs": [],552 "stateMutability": "nonpayable",553 "type": "function"554 },555 {556 "inputs": [557 { "internalType": "bool", "name": "enable", "type": "bool" },558 {559 "internalType": "address[]",560 "name": "collections",561 "type": "address[]"562 }563 ],564 "name": "setCollectionNesting",565 "outputs": [],566 "stateMutability": "nonpayable",567 "type": "function"568 },569 {570 "inputs": [571 {572 "components": [573 { "internalType": "string", "name": "key", "type": "string" },574 { "internalType": "bytes", "name": "value", "type": "bytes" }575 ],576 "internalType": "struct Property[]",577 "name": "properties",578 "type": "tuple[]"579 }580 ],581 "name": "setCollectionProperties",582 "outputs": [],583 "stateMutability": "nonpayable",584 "type": "function"585 },586 {587 "inputs": [588 {589 "components": [590 { "internalType": "address", "name": "eth", "type": "address" },591 { "internalType": "uint256", "name": "sub", "type": "uint256" }592 ],593 "internalType": "struct EthCrossAccount",594 "name": "sponsor",595 "type": "tuple"596 }597 ],598 "name": "setCollectionSponsorCross",599 "outputs": [],600 "stateMutability": "nonpayable",601 "type": "function"602 },603 {604 "inputs": [605 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },606 {607 "components": [608 { "internalType": "string", "name": "key", "type": "string" },609 { "internalType": "bytes", "name": "value", "type": "bytes" }610 ],611 "internalType": "struct Property[]",612 "name": "properties",613 "type": "tuple[]"614 }615 ],616 "name": "setProperties",617 "outputs": [],618 "stateMutability": "nonpayable",619 "type": "function"620 },621 {622 "inputs": [623 { "internalType": "string", "name": "key", "type": "string" },624 { "internalType": "bool", "name": "isMutable", "type": "bool" },625 { "internalType": "bool", "name": "collectionAdmin", "type": "bool" },626 { "internalType": "bool", "name": "tokenOwner", "type": "bool" }627 ],628 "name": "setTokenPropertyPermission",629 "outputs": [],630 "stateMutability": "nonpayable",631 "type": "function"632 },633 {634 "inputs": [635 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }636 ],637 "name": "supportsInterface",638 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],639 "stateMutability": "view",640 "type": "function"641 },642 {643 "inputs": [],644 "name": "symbol",645 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],646 "stateMutability": "view",647 "type": "function"648 },649 {650 "inputs": [651 { "internalType": "uint256", "name": "index", "type": "uint256" }652 ],653 "name": "tokenByIndex",654 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],655 "stateMutability": "view",656 "type": "function"657 },658 {659 "inputs": [660 { "internalType": "address", "name": "owner", "type": "address" },661 { "internalType": "uint256", "name": "index", "type": "uint256" }662 ],663 "name": "tokenOfOwnerByIndex",664 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],665 "stateMutability": "view",666 "type": "function"667 },668 {669 "inputs": [670 { "internalType": "uint256", "name": "tokenId", "type": "uint256" },671 { "internalType": "string[]", "name": "keys", "type": "string[]" }672 ],673 "name": "tokenProperties",674 "outputs": [675 {676 "components": [677 { "internalType": "string", "name": "key", "type": "string" },678 { "internalType": "bytes", "name": "value", "type": "bytes" }679 ],680 "internalType": "struct Property[]",681 "name": "",682 "type": "tuple[]"683 }684 ],685 "stateMutability": "view",686 "type": "function"687 },688 {689 "inputs": [690 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }691 ],692 "name": "tokenURI",693 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],694 "stateMutability": "view",695 "type": "function"696 },697 {698 "inputs": [],699 "name": "totalSupply",700 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],701 "stateMutability": "view",702 "type": "function"703 },704 {705 "inputs": [706 { "internalType": "address", "name": "to", "type": "address" },707 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }708 ],709 "name": "transfer",710 "outputs": [],711 "stateMutability": "nonpayable",712 "type": "function"713 },714 {715 "inputs": [716 {717 "components": [718 { "internalType": "address", "name": "eth", "type": "address" },719 { "internalType": "uint256", "name": "sub", "type": "uint256" }720 ],721 "internalType": "struct EthCrossAccount",722 "name": "to",723 "type": "tuple"724 },725 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }726 ],727 "name": "transferCross",728 "outputs": [],729 "stateMutability": "nonpayable",730 "type": "function"731 },732 {733 "inputs": [734 { "internalType": "address", "name": "from", "type": "address" },735 { "internalType": "address", "name": "to", "type": "address" },736 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }737 ],738 "name": "transferFrom",739 "outputs": [],740 "stateMutability": "nonpayable",741 "type": "function"742 },743 {744 "inputs": [745 {746 "components": [747 { "internalType": "address", "name": "eth", "type": "address" },748 { "internalType": "uint256", "name": "sub", "type": "uint256" }749 ],750 "internalType": "struct EthCrossAccount",751 "name": "from",752 "type": "tuple"753 },754 {755 "components": [756 { "internalType": "address", "name": "eth", "type": "address" },757 { "internalType": "uint256", "name": "sub", "type": "uint256" }758 ],759 "internalType": "struct EthCrossAccount",760 "name": "to",761 "type": "tuple"762 },763 { "internalType": "uint256", "name": "tokenId", "type": "uint256" }764 ],765 "name": "transferFromCross",766 "outputs": [],767 "stateMutability": "nonpayable",768 "type": "function"769 },770 {771 "inputs": [],772 "name": "uniqueCollectionType",773 "outputs": [{ "internalType": "string", "name": "", "type": "string" }],774 "stateMutability": "view",775 "type": "function"776 }777]tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -228,10 +228,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 Tuple22[]",
+ "internalType": "struct Property[]",
"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"
}
@@ -279,6 +279,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",
@@ -298,6 +317,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",
@@ -632,6 +658,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/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, {