From f8de52dc63cdf678077ac7530abf367876d624fd Mon Sep 17 00:00:00 2001 From: Grigoriy Simonov Date: Wed, 12 Oct 2022 18:05:15 +0000 Subject: [PATCH] chore: code review requests --- --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -34,15 +34,14 @@ use sp_std::vec::Vec; use pallet_common::{ erc::{ - CommonEvmHandler, PrecompileResult, CollectionCall, - static_property::{key, value as property_value}, + CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key, + static_property::value, }, CollectionHandle, CollectionPropertyPermissions, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::call; use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _}; -use alloc::string::ToString; use crate::{ AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted, @@ -226,37 +225,44 @@ /// @return token's const_metadata #[solidity(rename_selector = "tokenURI")] fn token_uri(&self, token_id: uint256) -> Result { + if !self.supports_metadata() { + return Ok("".into()); + } + let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?; - if let Ok(url) = get_token_property(self, token_id_u32, &key::url()) { - if !url.is_empty() { - return Ok(url); + match get_token_property(self, token_id_u32, &key::url()).as_deref() { + Err(_) | Ok("") => (), + Ok(url) => { + return Ok(url.into()); } - } else if !self.supports_metadata() { - return Err("tokenURI not set".into()); - } + }; - if let Some(base_uri) = + let base_uri = pallet_common::Pallet::::get_collection_property(self.id, &key::base_uri()) - { - if !base_uri.is_empty() { - let base_uri = string::from_utf8(base_uri.into_inner()).map_err(|e| { + .map(BoundedVec::into_inner) + .map(string::from_utf8) + .transpose() + .map_err(|e| { Error::Revert(alloc::format!( "Can not convert value \"baseURI\" to string with error \"{}\"", e )) })?; - if let Ok(suffix) = get_token_property(self, token_id_u32, &key::suffix()) { - if !suffix.is_empty() { - return Ok(base_uri + suffix.as_str()); - } - } - return Ok(base_uri); + let base_uri = match base_uri.as_deref() { + None | Some("") => { + return Ok("".into()); } - } + Some(base_uri) => base_uri.into(), + }; - Ok("".into()) + Ok( + match get_token_property(self, token_id_u32, &key::suffix()).as_deref() { + Err(_) | Ok("") => base_uri, + Ok(suffix) => base_uri + suffix, + }, + ) } } @@ -706,17 +712,29 @@ } } +impl NonfungibleHandle { + pub fn supports_metadata(&self) -> bool { + if let Some(erc721_metadata) = + pallet_common::Pallet::::get_collection_property(self.id, &key::erc721_metadata()) + { + *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED + } else { + false + } + } +} + #[solidity_interface( name = UniqueNFT, is( ERC721, - ERC721Metadata(if(this.supports_metadata())), ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection(via(common_mut returns CollectionHandle)), TokenProperties, + ERC721Metadata(if(this.supports_metadata())), ) )] impl NonfungibleHandle where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {} --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -297,18 +297,6 @@ } } -impl NonfungibleHandle { - pub fn supports_metadata(&self) -> bool { - if let Some(erc721_metadata) = - pallet_common::Pallet::::get_collection_property(self.id, &key::erc721_metadata()) - { - *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED - } else { - false - } - } -} - impl WithRecorder for NonfungibleHandle { fn recorder(&self) -> &SubstrateRecorder { self.0.recorder() --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -17,6 +17,47 @@ } } +/// @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 +contract ERC721Metadata is Dummy, ERC165 { + /// @notice A descriptive name for a collection of NFTs in this contract + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @notice An abbreviated name for NFTs in this contract + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. + /// + /// @dev If the token has a `url` property and it is not empty, it is returned. + /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. + /// If the collection property `baseURI` is empty or absent, return "" (empty string) + /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix + /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). + /// + /// @return token's const_metadata + /// @dev EVM selector for this function is: 0xc87b56dd, + /// or in textual repr: tokenURI(uint256) + function tokenURI(uint256 tokenId) public view returns (string memory) { + require(false, stub_error); + tokenId; + dummy; + return ""; + } +} + /// @title A contract that allows to set and delete token properties and change token property permissions. /// @dev the ERC-165 identifier for this interface is 0x41369377 contract TokenProperties is Dummy, ERC165 { @@ -177,10 +218,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 (Tuple17 memory) { + function collectionSponsor() public view returns (Tuple15 memory) { require(false, stub_error); dummy; - return Tuple17(0x0000000000000000000000000000000000000000, 0); + return Tuple15(0x0000000000000000000000000000000000000000, 0); } /// Set limits for the collection. @@ -359,10 +400,10 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() - function collectionOwner() public view returns (Tuple17 memory) { + function collectionOwner() public view returns (Tuple15 memory) { require(false, stub_error); dummy; - return Tuple17(0x0000000000000000000000000000000000000000, 0); + return Tuple15(0x0000000000000000000000000000000000000000, 0); } /// Changes collection owner to another account @@ -379,7 +420,7 @@ } /// @dev anonymous struct -struct Tuple17 { +struct Tuple15 { address field_0; uint256 field_1; } @@ -525,7 +566,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, Tuple8[] memory tokens) public returns (bool) { + function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { require(false, stub_error); to; tokens; @@ -535,7 +576,7 @@ } /// @dev anonymous struct -struct Tuple8 { +struct Tuple6 { uint256 field_0; string field_1; } @@ -577,48 +618,7 @@ require(false, stub_error); dummy; return 0; - } -} - -/// @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 -contract ERC721Metadata is Dummy, ERC165 { - /// @notice A descriptive name for a collection of NFTs in this contract - /// @dev EVM selector for this function is: 0x06fdde03, - /// or in textual repr: name() - function name() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; - } - - /// @notice An abbreviated name for NFTs in this contract - /// @dev EVM selector for this function is: 0x95d89b41, - /// or in textual repr: symbol() - function symbol() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; } - - /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. - /// - /// @dev If the token has a `url` property and it is not empty, it is returned. - /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. - /// If the collection property `baseURI` is empty or absent, return "" (empty string) - /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix - /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). - /// - /// @return token's const_metadata - /// @dev EVM selector for this function is: 0xc87b56dd, - /// or in textual repr: tokenURI(uint256) - function tokenURI(uint256 tokenId) public view returns (string memory) { - require(false, stub_error); - tokenId; - dummy; - return ""; - } } /// @dev inlined interface @@ -766,11 +766,11 @@ Dummy, ERC165, ERC721, - ERC721Metadata, ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection, - TokenProperties + TokenProperties, + ERC721Metadata {} --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -21,19 +21,15 @@ extern crate alloc; -use alloc::string::ToString; use core::{ char::{REPLACEMENT_CHARACTER, decode_utf16}, convert::TryInto, }; use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight}; -use frame_support::BoundedBTreeMap; +use frame_support::{BoundedBTreeMap, BoundedVec}; use pallet_common::{ CollectionHandle, CollectionPropertyPermissions, - erc::{ - CommonEvmHandler, CollectionCall, - static_property::{key, value as property_value}, - }, + erc::{CommonEvmHandler, CollectionCall, static_property::key, static_property::value}, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::{call, dispatch_to_evm}; @@ -222,37 +218,44 @@ /// @return token's const_metadata #[solidity(rename_selector = "tokenURI")] fn token_uri(&self, token_id: uint256) -> Result { + if !self.supports_metadata() { + return Ok("".into()); + } + let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?; - if let Ok(url) = get_token_property(self, token_id_u32, &key::url()) { - if !url.is_empty() { - return Ok(url); + match get_token_property(self, token_id_u32, &key::url()).as_deref() { + Err(_) | Ok("") => (), + Ok(url) => { + return Ok(url.into()); } - } else if !self.supports_metadata() { - return Err("tokenURI not set".into()); - } + }; - if let Some(base_uri) = + let base_uri = pallet_common::Pallet::::get_collection_property(self.id, &key::base_uri()) - { - if !base_uri.is_empty() { - let base_uri = string::from_utf8(base_uri.into_inner()).map_err(|e| { + .map(BoundedVec::into_inner) + .map(string::from_utf8) + .transpose() + .map_err(|e| { Error::Revert(alloc::format!( "Can not convert value \"baseURI\" to string with error \"{}\"", e )) })?; - if let Ok(suffix) = get_token_property(self, token_id_u32, &key::suffix()) { - if !suffix.is_empty() { - return Ok(base_uri + suffix.as_str()); - } - } - return Ok(base_uri); + let base_uri = match base_uri.as_deref() { + None | Some("") => { + return Ok("".into()); } - } + Some(base_uri) => base_uri.into(), + }; - Ok("".into()) + Ok( + match get_token_property(self, token_id_u32, &key::suffix()).as_deref() { + Err(_) | Ok("") => base_uri, + Ok(suffix) => base_uri + suffix, + }, + ) } } @@ -765,17 +768,29 @@ } } +impl RefungibleHandle { + pub fn supports_metadata(&self) -> bool { + if let Some(erc721_metadata) = + pallet_common::Pallet::::get_collection_property(self.id, &key::erc721_metadata()) + { + *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED + } else { + false + } + } +} + #[solidity_interface( name = UniqueRefungible, is( ERC721, - ERC721Metadata(if(this.supports_metadata())), ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection(via(common_mut returns CollectionHandle)), TokenProperties, + ERC721Metadata(if(this.supports_metadata())), ) )] impl RefungibleHandle where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {} --- a/pallets/refungible/src/lib.rs +++ b/pallets/refungible/src/lib.rs @@ -304,18 +304,6 @@ } } -impl RefungibleHandle { - pub fn supports_metadata(&self) -> bool { - if let Some(erc721_metadata) = - pallet_common::Pallet::::get_collection_property(self.id, &key::erc721_metadata()) - { - *erc721_metadata.into_inner() == *value::ERC721_METADATA_SUPPORTED - } else { - false - } - } -} - impl Deref for RefungibleHandle { type Target = pallet_common::CollectionHandle; --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -17,6 +17,45 @@ } } +/// @dev the ERC-165 identifier for this interface is 0x5b5e139f +contract ERC721Metadata is Dummy, ERC165 { + /// @notice A descriptive name for a collection of RFTs in this contract + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @notice An abbreviated name for RFTs in this contract + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() public view returns (string memory) { + require(false, stub_error); + dummy; + return ""; + } + + /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. + /// + /// @dev If the token has a `url` property and it is not empty, it is returned. + /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. + /// If the collection property `baseURI` is empty or absent, return "" (empty string) + /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix + /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). + /// + /// @return token's const_metadata + /// @dev EVM selector for this function is: 0xc87b56dd, + /// or in textual repr: tokenURI(uint256) + function tokenURI(uint256 tokenId) public view returns (string memory) { + require(false, stub_error); + tokenId; + dummy; + return ""; + } +} + /// @title A contract that allows to set and delete token properties and change token property permissions. /// @dev the ERC-165 identifier for this interface is 0x41369377 contract TokenProperties is Dummy, ERC165 { @@ -177,10 +216,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 (Tuple17 memory) { + function collectionSponsor() public view returns (Tuple15 memory) { require(false, stub_error); dummy; - return Tuple17(0x0000000000000000000000000000000000000000, 0); + return Tuple15(0x0000000000000000000000000000000000000000, 0); } /// Set limits for the collection. @@ -359,10 +398,10 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() - function collectionOwner() public view returns (Tuple17 memory) { + function collectionOwner() public view returns (Tuple15 memory) { require(false, stub_error); dummy; - return Tuple17(0x0000000000000000000000000000000000000000, 0); + return Tuple15(0x0000000000000000000000000000000000000000, 0); } /// Changes collection owner to another account @@ -379,7 +418,7 @@ } /// @dev anonymous struct -struct Tuple17 { +struct Tuple15 { address field_0; uint256 field_1; } @@ -527,7 +566,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, Tuple8[] memory tokens) public returns (bool) { + function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) public returns (bool) { require(false, stub_error); to; tokens; @@ -549,7 +588,7 @@ } /// @dev anonymous struct -struct Tuple8 { +struct Tuple6 { uint256 field_0; string field_1; } @@ -591,45 +630,6 @@ require(false, stub_error); dummy; return 0; - } -} - -/// @dev the ERC-165 identifier for this interface is 0x5b5e139f -contract ERC721Metadata is Dummy, ERC165 { - /// @notice A descriptive name for a collection of RFTs in this contract - /// @dev EVM selector for this function is: 0x06fdde03, - /// or in textual repr: name() - function name() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; - } - - /// @notice An abbreviated name for RFTs in this contract - /// @dev EVM selector for this function is: 0x95d89b41, - /// or in textual repr: symbol() - function symbol() public view returns (string memory) { - require(false, stub_error); - dummy; - return ""; - } - - /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. - /// - /// @dev If the token has a `url` property and it is not empty, it is returned. - /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. - /// If the collection property `baseURI` is empty or absent, return "" (empty string) - /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix - /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). - /// - /// @return token's const_metadata - /// @dev EVM selector for this function is: 0xc87b56dd, - /// or in textual repr: tokenURI(uint256) - function tokenURI(uint256 tokenId) public view returns (string memory) { - require(false, stub_error); - tokenId; - dummy; - return ""; } } @@ -776,11 +776,11 @@ Dummy, ERC165, ERC721, - ERC721Metadata, ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection, - TokenProperties + TokenProperties, + ERC721Metadata {} --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -336,27 +336,6 @@ } #[weight(>::create_collection())] - #[deprecated(note = "mathod was renamed to `create_rft_collection`, prefer it instead")] - fn create_refungible_collection( - &mut self, - caller: caller, - value: value, - name: string, - description: string, - token_prefix: string, - ) -> Result
{ - create_refungible_collection_internal::( - caller, - value, - name, - description, - token_prefix, - Default::default(), - false, - ) - } - - #[weight(>::create_collection())] #[solidity(rename_selector = "createERC721MetadataCompatibleRFTCollection")] fn create_refungible_collection_with_properties( &mut self, --- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol +++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol @@ -23,7 +23,7 @@ } /// @title Contract, which allows users to operate with collections -/// @dev the ERC-165 identifier for this interface is 0x95eb98f4 +/// @dev the ERC-165 identifier for this interface is 0xd14d1221 contract CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents { /// Create an NFT collection /// @param name Name of the collection @@ -85,21 +85,6 @@ /// @dev EVM selector for this function is: 0xab173450, /// or in textual repr: createRFTCollection(string,string,string) function createRFTCollection( - string memory name, - string memory description, - string memory tokenPrefix - ) public payable returns (address) { - require(false, stub_error); - name; - description; - tokenPrefix; - dummy = 0; - return 0x0000000000000000000000000000000000000000; - } - - /// @dev EVM selector for this function is: 0x44a68ad5, - /// or in textual repr: createRefungibleCollection(string,string,string) - function createRefungibleCollection( string memory name, string memory description, string memory tokenPrefix --- a/tests/src/eth/api/CollectionHelpers.sol +++ b/tests/src/eth/api/CollectionHelpers.sol @@ -18,7 +18,7 @@ } /// @title Contract, which allows users to operate with collections -/// @dev the ERC-165 identifier for this interface is 0x95eb98f4 +/// @dev the ERC-165 identifier for this interface is 0xd14d1221 interface CollectionHelpers is Dummy, ERC165, CollectionHelpersEvents { /// Create an NFT collection /// @param name Name of the collection @@ -58,14 +58,6 @@ /// @dev EVM selector for this function is: 0xab173450, /// or in textual repr: createRFTCollection(string,string,string) function createRFTCollection( - string memory name, - string memory description, - string memory tokenPrefix - ) external payable returns (address); - - /// @dev EVM selector for this function is: 0x44a68ad5, - /// or in textual repr: createRefungibleCollection(string,string,string) - function createRefungibleCollection( string memory name, string memory description, string memory tokenPrefix --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -12,6 +12,34 @@ function supportsInterface(bytes4 interfaceID) external view returns (bool); } +/// @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 +interface ERC721Metadata is Dummy, ERC165 { + /// @notice A descriptive name for a collection of NFTs in this contract + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() external view returns (string memory); + + /// @notice An abbreviated name for NFTs in this contract + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() external view returns (string memory); + + /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. + /// + /// @dev If the token has a `url` property and it is not empty, it is returned. + /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. + /// If the collection property `baseURI` is empty or absent, return "" (empty string) + /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix + /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). + /// + /// @return token's const_metadata + /// @dev EVM selector for this function is: 0xc87b56dd, + /// or in textual repr: tokenURI(uint256) + function tokenURI(uint256 tokenId) external view returns (string memory); +} + /// @title A contract that allows to set and delete token properties and change token property permissions. /// @dev the ERC-165 identifier for this interface is 0x41369377 interface TokenProperties is Dummy, ERC165 { @@ -120,7 +148,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 (Tuple17 memory); + function collectionSponsor() external view returns (Tuple15 memory); /// Set limits for the collection. /// @dev Throws error if limit not found. @@ -237,7 +265,7 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() - function collectionOwner() external view returns (Tuple17 memory); + function collectionOwner() external view returns (Tuple15 memory); /// Changes collection owner to another account /// @@ -249,7 +277,7 @@ } /// @dev anonymous struct -struct Tuple17 { +struct Tuple15 { address field_0; uint256 field_1; } @@ -350,11 +378,11 @@ /// @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, Tuple8[] memory tokens) external returns (bool); + function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); } /// @dev anonymous struct -struct Tuple8 { +struct Tuple6 { uint256 field_0; string field_1; } @@ -383,35 +411,7 @@ /// or in textual repr: totalSupply() function totalSupply() external view returns (uint256); } - -/// @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 -interface ERC721Metadata is Dummy, ERC165 { - /// @notice A descriptive name for a collection of NFTs in this contract - /// @dev EVM selector for this function is: 0x06fdde03, - /// or in textual repr: name() - function name() external view returns (string memory); - /// @notice An abbreviated name for NFTs in this contract - /// @dev EVM selector for this function is: 0x95d89b41, - /// or in textual repr: symbol() - function symbol() external view returns (string memory); - - /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. - /// - /// @dev If the token has a `url` property and it is not empty, it is returned. - /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. - /// If the collection property `baseURI` is empty or absent, return "" (empty string) - /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix - /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). - /// - /// @return token's const_metadata - /// @dev EVM selector for this function is: 0xc87b56dd, - /// or in textual repr: tokenURI(uint256) - function tokenURI(uint256 tokenId) external view returns (string memory); -} - /// @dev inlined interface interface ERC721Events { event Transfer(address indexed from, address indexed to, uint256 indexed tokenId); @@ -507,11 +507,11 @@ Dummy, ERC165, ERC721, - ERC721Metadata, ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection, - TokenProperties + TokenProperties, + ERC721Metadata {} --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -12,6 +12,32 @@ function supportsInterface(bytes4 interfaceID) external view returns (bool); } +/// @dev the ERC-165 identifier for this interface is 0x5b5e139f +interface ERC721Metadata is Dummy, ERC165 { + /// @notice A descriptive name for a collection of RFTs in this contract + /// @dev EVM selector for this function is: 0x06fdde03, + /// or in textual repr: name() + function name() external view returns (string memory); + + /// @notice An abbreviated name for RFTs in this contract + /// @dev EVM selector for this function is: 0x95d89b41, + /// or in textual repr: symbol() + function symbol() external view returns (string memory); + + /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. + /// + /// @dev If the token has a `url` property and it is not empty, it is returned. + /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. + /// If the collection property `baseURI` is empty or absent, return "" (empty string) + /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix + /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). + /// + /// @return token's const_metadata + /// @dev EVM selector for this function is: 0xc87b56dd, + /// or in textual repr: tokenURI(uint256) + function tokenURI(uint256 tokenId) external view returns (string memory); +} + /// @title A contract that allows to set and delete token properties and change token property permissions. /// @dev the ERC-165 identifier for this interface is 0x41369377 interface TokenProperties is Dummy, ERC165 { @@ -120,7 +146,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 (Tuple17 memory); + function collectionSponsor() external view returns (Tuple15 memory); /// Set limits for the collection. /// @dev Throws error if limit not found. @@ -237,7 +263,7 @@ /// If address is canonical then substrate mirror is zero and vice versa. /// @dev EVM selector for this function is: 0xdf727d3b, /// or in textual repr: collectionOwner() - function collectionOwner() external view returns (Tuple17 memory); + function collectionOwner() external view returns (Tuple15 memory); /// Changes collection owner to another account /// @@ -249,7 +275,7 @@ } /// @dev anonymous struct -struct Tuple17 { +struct Tuple15 { address field_0; uint256 field_1; } @@ -352,7 +378,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, Tuple8[] memory tokens) external returns (bool); + function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) external returns (bool); /// Returns EVM address for refungible token /// @@ -363,7 +389,7 @@ } /// @dev anonymous struct -struct Tuple8 { +struct Tuple6 { uint256 field_0; string field_1; } @@ -393,32 +419,6 @@ function totalSupply() external view returns (uint256); } -/// @dev the ERC-165 identifier for this interface is 0x5b5e139f -interface ERC721Metadata is Dummy, ERC165 { - /// @notice A descriptive name for a collection of RFTs in this contract - /// @dev EVM selector for this function is: 0x06fdde03, - /// or in textual repr: name() - function name() external view returns (string memory); - - /// @notice An abbreviated name for RFTs in this contract - /// @dev EVM selector for this function is: 0x95d89b41, - /// or in textual repr: symbol() - function symbol() external view returns (string memory); - - /// @notice A distinct Uniform Resource Identifier (URI) for a given asset. - /// - /// @dev If the token has a `url` property and it is not empty, it is returned. - /// Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`. - /// If the collection property `baseURI` is empty or absent, return "" (empty string) - /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix - /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings). - /// - /// @return token's const_metadata - /// @dev EVM selector for this function is: 0xc87b56dd, - /// or in textual repr: tokenURI(uint256) - function tokenURI(uint256 tokenId) external view returns (string memory); -} - /// @dev inlined interface interface ERC721Events { event Transfer(address indexed from, address indexed to, uint256 indexed tokenId); @@ -512,11 +512,11 @@ Dummy, ERC165, ERC721, - ERC721Metadata, ERC721Enumerable, ERC721UniqueExtensions, ERC721Mintable, ERC721Burnable, Collection, - TokenProperties + TokenProperties, + ERC721Metadata {} --- a/tests/src/eth/collectionHelpersAbi.json +++ b/tests/src/eth/collectionHelpersAbi.json @@ -84,17 +84,6 @@ }, { "inputs": [ - { "internalType": "string", "name": "name", "type": "string" }, - { "internalType": "string", "name": "description", "type": "string" }, - { "internalType": "string", "name": "tokenPrefix", "type": "string" } - ], - "name": "createRefungibleCollection", - "outputs": [{ "internalType": "address", "name": "", "type": "address" }], - "stateMutability": "payable", - "type": "function" - }, - { - "inputs": [ { "internalType": "address", "name": "collectionAddress", --- a/tests/src/eth/collectionProperties.test.ts +++ b/tests/src/eth/collectionProperties.test.ts @@ -1,5 +1,6 @@ import {itEth, usingEthPlaygrounds, expect} from './util/playgrounds'; import {IKeyringPair} from '@polkadot/types/types'; +import {Pallets} from '../util/playgrounds'; describe('EVM collection properties', () => { let donor: IKeyringPair; @@ -80,7 +81,7 @@ expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false; }); - itEth('ERC721Metadata property can be set for RFT collection', async({helper}) => { + itEth.ifWithPallets('ERC721Metadata property can be set for RFT collection', [Pallets.ReFungible], async({helper}) => { const caller = await helper.eth.createAccountWithBalance(donor); const collection = await helper.rft.mintCollection(donor, {name: 'col', description: 'descr', tokenPrefix: 'COL'}); --- a/tests/src/eth/nonFungible.test.ts +++ b/tests/src/eth/nonFungible.test.ts @@ -79,11 +79,11 @@ }); }); - async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> { + async function setup(helper: EthUniqueHelper, baseUri: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> { const owner = await helper.eth.createAccountWithBalance(donor); const receiver = helper.eth.createAccount(); - const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix); + const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', baseUri); const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner); const nextTokenId = await contract.methods.nextTokenId().call(); --- a/tests/src/eth/nonFungibleAbi.json +++ b/tests/src/eth/nonFungibleAbi.json @@ -154,7 +154,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple17", + "internalType": "struct Tuple15", "name": "", "type": "tuple" } @@ -178,7 +178,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple17", + "internalType": "struct Tuple15", "name": "", "type": "tuple" } @@ -287,7 +287,7 @@ { "internalType": "uint256", "name": "field_0", "type": "uint256" }, { "internalType": "string", "name": "field_1", "type": "string" } ], - "internalType": "struct Tuple8[]", + "internalType": "struct Tuple6[]", "name": "tokens", "type": "tuple[]" } --- a/tests/src/eth/reFungibleAbi.json +++ b/tests/src/eth/reFungibleAbi.json @@ -154,7 +154,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple17", + "internalType": "struct Tuple15", "name": "", "type": "tuple" } @@ -178,7 +178,7 @@ { "internalType": "address", "name": "field_0", "type": "address" }, { "internalType": "uint256", "name": "field_1", "type": "uint256" } ], - "internalType": "struct Tuple17", + "internalType": "struct Tuple15", "name": "", "type": "tuple" } @@ -287,7 +287,7 @@ { "internalType": "uint256", "name": "field_0", "type": "uint256" }, { "internalType": "string", "name": "field_1", "type": "string" } ], - "internalType": "struct Tuple8[]", + "internalType": "struct Tuple6[]", "name": "tokens", "type": "tuple[]" } --- a/tests/src/eth/reFungibleToken.test.ts +++ b/tests/src/eth/reFungibleToken.test.ts @@ -76,11 +76,11 @@ }); }); - async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> { + async function setup(helper: EthUniqueHelper, baseUri: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> { const owner = await helper.eth.createAccountWithBalance(donor); const receiver = helper.eth.createAccount(); - const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Mint collection', 'a', 'b', tokenPrefix); + const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Mint collection', 'a', 'b', baseUri); const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', owner); const nextTokenId = await contract.methods.nextTokenId().call(); -- gitstuff