--- a/pallets/common/src/eth.rs +++ b/pallets/common/src/eth.rs @@ -18,7 +18,10 @@ use alloc::format; use sp_std::{vec, vec::Vec}; -use evm_coder::{AbiCoder, types::Address}; +use evm_coder::{ + AbiCoder, + types::{Address, String}, +}; pub use pallet_evm::{Config, account::CrossAccountId}; use sp_core::{H160, U256}; use up_data_structs::CollectionId; @@ -390,6 +393,16 @@ } } +/// Data for creation token with uri. +#[derive(Debug, AbiCoder)] +pub struct TokenUri { + /// Id of new token. + pub id: U256, + + /// Uri of new token. + pub uri: String, +} + /// Nested collections. #[derive(Debug, Default, AbiCoder)] pub struct CollectionNesting { --- a/pallets/fungible/src/erc.rs +++ b/pallets/fungible/src/erc.rs @@ -6,7 +6,7 @@ // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Unique Network is distributed in the hope that it will be useful, +// Unique Network is disaddress: tod in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. @@ -19,6 +19,7 @@ extern crate alloc; use core::char::{REPLACEMENT_CHARACTER, decode_utf16}; use core::convert::TryInto; +use evm_coder::AbiCoder; use evm_coder::{ abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight, @@ -57,6 +58,12 @@ }, } +#[derive(AbiCoder, Debug)] +pub struct AmountForAddress { + to: Address, + amount: U256, +} + #[solidity_interface(name = ERC20, events(ERC20Events), expect_selector = 0x942e8b22)] impl FungibleHandle { fn name(&self) -> Result { @@ -264,14 +271,14 @@ /// Mint tokens for multiple accounts. /// @param amounts array of pairs of account address and amount #[weight(>::create_multiple_items_ex(amounts.len() as u32))] - fn mint_bulk(&mut self, caller: Caller, amounts: Vec<(Address, U256)>) -> Result { + fn mint_bulk(&mut self, caller: Caller, amounts: Vec) -> Result { let caller = T::CrossAccountId::from_eth(caller); let budget = self .recorder .weight_calls_budget(>::find_parent()); let amounts = amounts .into_iter() - .map(|(to, amount)| { + .map(|AmountForAddress { to, amount }| { Ok(( T::CrossAccountId::from_eth(to), amount.try_into().map_err(|_| "amount overflow")?, --- a/pallets/fungible/src/stubs/UniqueFungible.sol +++ b/pallets/fungible/src/stubs/UniqueFungible.sol @@ -590,7 +590,7 @@ /// @param amounts array of pairs of account address and amount /// @dev EVM selector for this function is: 0x1acf2d55, /// or in textual repr: mintBulk((address,uint256)[]) - function mintBulk(Tuple11[] memory amounts) public returns (bool) { + function mintBulk(AmountForAddress[] memory amounts) public returns (bool) { require(false, stub_error); amounts; dummy = 0; @@ -632,10 +632,9 @@ } } -/// @dev anonymous struct -struct Tuple11 { - address field_0; - uint256 field_1; +struct AmountForAddress { + address to; + uint256 amount; } /// @dev the ERC-165 identifier for this interface is 0x40c10f19 --- a/pallets/nonfungible/src/erc.rs +++ b/pallets/nonfungible/src/erc.rs @@ -38,7 +38,7 @@ use pallet_common::{ CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations, erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key}, - eth, + eth::{self, TokenUri}, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::call; @@ -948,7 +948,7 @@ &mut self, caller: Caller, to: Address, - tokens: Vec<(U256, String)>, + tokens: Vec, ) -> Result { let key = key::url(); let caller = T::CrossAccountId::from_eth(caller); @@ -961,7 +961,7 @@ .weight_calls_budget(>::find_parent()); let mut data = Vec::with_capacity(tokens.len()); - for (id, token_uri) in tokens { + for TokenUri { id, uri } in tokens { let id: u32 = id.try_into().map_err(|_| "token id overflow")?; if id != expected_index { return Err("item id should be next".into()); @@ -972,7 +972,7 @@ properties .try_push(Property { key: key.clone(), - value: token_uri + value: uri .into_bytes() .try_into() .map_err(|_| "token uri is too long")?, --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -949,7 +949,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, Tuple15[] memory tokens) public returns (bool) { + // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) { // require(false, stub_error); // to; // tokens; @@ -981,10 +981,12 @@ } } -/// @dev anonymous struct -struct Tuple15 { - uint256 field_0; - string field_1; +/// Data for creation token with uri. +struct TokenUri { + /// Id of new token. + uint256 id; + /// Uri of new token. + string uri; } /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension --- a/pallets/refungible/src/erc.rs +++ b/pallets/refungible/src/erc.rs @@ -34,7 +34,7 @@ CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations, Error as CommonError, erc::{CommonEvmHandler, CollectionCall, static_property::key}, - eth, + eth::{self, TokenUri}, }; use pallet_evm::{account::CrossAccountId, PrecompileHandle}; use pallet_evm_coder_substrate::{call, dispatch_to_evm}; @@ -999,7 +999,7 @@ &mut self, caller: Caller, to: Address, - tokens: Vec<(U256, String)>, + tokens: Vec, ) -> Result { let key = key::url(); let caller = T::CrossAccountId::from_eth(caller); @@ -1017,7 +1017,7 @@ .collect::>() .try_into() .unwrap(); - for (id, token_uri) in tokens { + for TokenUri { id, uri } in tokens { let id: u32 = id.try_into().map_err(|_| "token id overflow")?; if id != expected_index { return Err("item id should be next".into()); @@ -1028,7 +1028,7 @@ properties .try_push(Property { key: key.clone(), - value: token_uri + value: uri .into_bytes() .try_into() .map_err(|_| "token uri is too long")?, --- a/pallets/refungible/src/stubs/UniqueRefungible.sol +++ b/pallets/refungible/src/stubs/UniqueRefungible.sol @@ -938,7 +938,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, Tuple14[] memory tokens) public returns (bool) { + // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) public returns (bool) { // require(false, stub_error); // to; // tokens; @@ -982,10 +982,12 @@ } } -/// @dev anonymous struct -struct Tuple14 { - uint256 field_0; - string field_1; +/// Data for creation token with uri. +struct TokenUri { + /// Id of new token. + uint256 id; + /// Uri of new token. + string uri; } /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension --- a/tests/src/eth/abi/fungible.json +++ b/tests/src/eth/abi/fungible.json @@ -434,10 +434,10 @@ "inputs": [ { "components": [ - { "internalType": "address", "name": "field_0", "type": "address" }, - { "internalType": "uint256", "name": "field_1", "type": "uint256" } + { "internalType": "address", "name": "to", "type": "address" }, + { "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "internalType": "struct Tuple11[]", + "internalType": "struct AmountForAddress[]", "name": "amounts", "type": "tuple[]" } --- a/tests/src/eth/api/UniqueFungible.sol +++ b/tests/src/eth/api/UniqueFungible.sol @@ -398,7 +398,7 @@ /// @param amounts array of pairs of account address and amount /// @dev EVM selector for this function is: 0x1acf2d55, /// or in textual repr: mintBulk((address,uint256)[]) - function mintBulk(Tuple11[] memory amounts) external returns (bool); + function mintBulk(AmountForAddress[] memory amounts) external returns (bool); /// @dev EVM selector for this function is: 0x2ada85ff, /// or in textual repr: transferCross((address,uint256),uint256) @@ -418,10 +418,9 @@ function collectionHelperAddress() external view returns (address); } -/// @dev anonymous struct -struct Tuple11 { - address field_0; - uint256 field_1; +struct AmountForAddress { + address to; + uint256 amount; } /// @dev the ERC-165 identifier for this interface is 0x40c10f19 --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -644,7 +644,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, Tuple13[] memory tokens) external returns (bool); + // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool); /// @notice Function to mint a token. /// @param to The new owner crossAccountId @@ -660,10 +660,12 @@ function collectionHelperAddress() external view returns (address); } -/// @dev anonymous struct -struct Tuple13 { - uint256 field_0; - string field_1; +/// Data for creation token with uri. +struct TokenUri { + /// Id of new token. + uint256 id; + /// Uri of new token. + string uri; } /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension --- a/tests/src/eth/api/UniqueRefungible.sol +++ b/tests/src/eth/api/UniqueRefungible.sol @@ -638,7 +638,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, Tuple12[] memory tokens) external returns (bool); + // function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external returns (bool); /// @notice Function to mint a token. /// @param to The new owner crossAccountId @@ -661,10 +661,12 @@ function collectionHelperAddress() external view returns (address); } -/// @dev anonymous struct -struct Tuple12 { - uint256 field_0; - string field_1; +/// Data for creation token with uri. +struct TokenUri { + /// Id of new token. + uint256 id; + /// Uri of new token. + string uri; } /// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension --- a/tests/src/eth/proxy/UniqueNFTProxy.sol +++ b/tests/src/eth/proxy/UniqueNFTProxy.sol @@ -168,7 +168,7 @@ return proxied.mintBulk(to, tokenIds); } - function mintBulkWithTokenURI(address to, Tuple6[] memory tokens) + function mintBulkWithTokenURI(address to, TokenUri[] memory tokens) external override returns (bool)