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.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! ERC-20 standart support implementation.1819extern crate alloc;20use core::char::{REPLACEMENT_CHARACTER, decode_utf16};21use core::convert::TryInto;22use evm_coder::{23 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,24 weight,25};26use up_data_structs::CollectionMode;27use pallet_common::erc::{CommonEvmHandler, PrecompileResult};28use sp_std::vec::Vec;29use pallet_evm::{account::CrossAccountId, PrecompileHandle};30use pallet_evm_coder_substrate::{call, dispatch_to_evm};31use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};32use pallet_common::{CollectionHandle, erc::CollectionCall};3334use crate::{35 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,36 weights::WeightInfo,37};3839#[derive(ToLog)]40pub enum ERC20Events {41 Transfer {42 #[indexed]43 from: address,44 #[indexed]45 to: address,46 value: uint256,47 },48 Approval {49 #[indexed]50 owner: address,51 #[indexed]52 spender: address,53 value: uint256,54 },55}5657#[solidity_interface(name = ERC20, events(ERC20Events))]58impl<T: Config> FungibleHandle<T> {59 fn name(&self) -> Result<string> {60 Ok(decode_utf16(self.name.iter().copied())61 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))62 .collect::<string>())63 }64 fn symbol(&self) -> Result<string> {65 Ok(string::from_utf8_lossy(&self.token_prefix).into())66 }67 fn total_supply(&self) -> Result<uint256> {68 self.consume_store_reads(1)?;69 Ok(<TotalSupply<T>>::get(self.id).into())70 }7172 fn decimals(&self) -> Result<uint8> {73 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {74 *decimals75 } else {76 unreachable!()77 })78 }79 fn balance_of(&self, owner: address) -> Result<uint256> {80 self.consume_store_reads(1)?;81 let owner = T::CrossAccountId::from_eth(owner);82 let balance = <Balance<T>>::get((self.id, owner));83 Ok(balance.into())84 }85 #[weight(<SelfWeightOf<T>>::transfer())]86 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {87 let caller = T::CrossAccountId::from_eth(caller);88 let to = T::CrossAccountId::from_eth(to);89 let amount = amount.try_into().map_err(|_| "amount overflow")?;90 let budget = self91 .recorder92 .weight_calls_budget(<StructureWeight<T>>::find_parent());9394 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;95 Ok(true)96 }9798 #[weight(<SelfWeightOf<T>>::transfer_from())]99 fn transfer_from(100 &mut self,101 caller: caller,102 from: address,103 to: address,104 amount: uint256,105 ) -> Result<bool> {106 let caller = T::CrossAccountId::from_eth(caller);107 let from = T::CrossAccountId::from_eth(from);108 let to = T::CrossAccountId::from_eth(to);109 let amount = amount.try_into().map_err(|_| "amount overflow")?;110 let budget = self111 .recorder112 .weight_calls_budget(<StructureWeight<T>>::find_parent());113114 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)115 .map_err(dispatch_to_evm::<T>)?;116 Ok(true)117 }118 #[weight(<SelfWeightOf<T>>::approve())]119 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {120 let caller = T::CrossAccountId::from_eth(caller);121 let spender = T::CrossAccountId::from_eth(spender);122 let amount = amount.try_into().map_err(|_| "amount overflow")?;123124 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)125 .map_err(dispatch_to_evm::<T>)?;126 Ok(true)127 }128 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {129 self.consume_store_reads(1)?;130 let owner = T::CrossAccountId::from_eth(owner);131 let spender = T::CrossAccountId::from_eth(spender);132133 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())134 }135}136137#[solidity_interface(name = ERC20Mintable)]138impl<T: Config> FungibleHandle<T> {139 /// Mint tokens for `to` account.140 /// @param to account that will receive minted tokens141 /// @param amount amount of tokens to mint142 #[weight(<SelfWeightOf<T>>::create_item())]143 fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {144 let caller = T::CrossAccountId::from_eth(caller);145 let to = T::CrossAccountId::from_eth(to);146 let amount = amount.try_into().map_err(|_| "amount overflow")?;147 let budget = self148 .recorder149 .weight_calls_budget(<StructureWeight<T>>::find_parent());150 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)151 .map_err(dispatch_to_evm::<T>)?;152 Ok(true)153 }154}155156#[solidity_interface(name = ERC20UniqueExtensions)]157impl<T: Config> FungibleHandle<T>158where159 T::AccountId: From<[u8; 32]>,160{161 #[weight(<SelfWeightOf<T>>::approve())]162 fn approve_cross(163 &mut self,164 caller: caller,165 spender: EthCrossAccount,166 amount: uint256,167 ) -> Result<bool> {168 let caller = T::CrossAccountId::from_eth(caller);169 let spender = spender.into_sub_cross_account::<T>()?;170 let amount = amount.try_into().map_err(|_| "amount overflow")?;171172 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)173 .map_err(dispatch_to_evm::<T>)?;174 Ok(true)175 }176177 /// Burn tokens from account178 /// @dev Function that burns an `amount` of the tokens of a given account,179 /// deducting from the sender's allowance for said account.180 /// @param from The account whose tokens will be burnt.181 /// @param amount The amount that will be burnt.182 #[solidity(hide)]183 #[weight(<SelfWeightOf<T>>::burn_from())]184 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {185 let caller = T::CrossAccountId::from_eth(caller);186 let from = T::CrossAccountId::from_eth(from);187 let amount = amount.try_into().map_err(|_| "amount overflow")?;188 let budget = self189 .recorder190 .weight_calls_budget(<StructureWeight<T>>::find_parent());191192 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)193 .map_err(dispatch_to_evm::<T>)?;194 Ok(true)195 }196197 /// Burn tokens from account198 /// @dev Function that burns an `amount` of the tokens of a given account,199 /// deducting from the sender's allowance for said account.200 /// @param from The account whose tokens will be burnt.201 /// @param amount The amount that will be burnt.202 #[weight(<SelfWeightOf<T>>::burn_from())]203 fn burn_from_cross(204 &mut self,205 caller: caller,206 from: EthCrossAccount,207 amount: uint256,208 ) -> Result<bool> {209 let caller = T::CrossAccountId::from_eth(caller);210 let from = from.into_sub_cross_account::<T>()?;211 let amount = amount.try_into().map_err(|_| "amount overflow")?;212 let budget = self213 .recorder214 .weight_calls_budget(<StructureWeight<T>>::find_parent());215216 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)217 .map_err(dispatch_to_evm::<T>)?;218 Ok(true)219 }220221 /// Mint tokens for multiple accounts.222 /// @param amounts array of pairs of account address and amount223 #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]224 fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {225 let caller = T::CrossAccountId::from_eth(caller);226 let budget = self227 .recorder228 .weight_calls_budget(<StructureWeight<T>>::find_parent());229 let amounts = amounts230 .into_iter()231 .map(|(to, amount)| {232 Ok((233 T::CrossAccountId::from_eth(to),234 amount.try_into().map_err(|_| "amount overflow")?,235 ))236 })237 .collect::<Result<_>>()?;238239 <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)240 .map_err(dispatch_to_evm::<T>)?;241 Ok(true)242 }243244 #[weight(<SelfWeightOf<T>>::transfer())]245 fn transfer_cross(246 &mut self,247 caller: caller,248 to: EthCrossAccount,249 amount: uint256,250 ) -> Result<bool> {251 let caller = T::CrossAccountId::from_eth(caller);252 let to = to.into_sub_cross_account::<T>()?;253 let amount = amount.try_into().map_err(|_| "amount overflow")?;254 let budget = self255 .recorder256 .weight_calls_budget(<StructureWeight<T>>::find_parent());257258 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;259 Ok(true)260 }261262 #[weight(<SelfWeightOf<T>>::transfer_from())]263 fn transfer_from_cross(264 &mut self,265 caller: caller,266 from: EthCrossAccount,267 to: EthCrossAccount,268 amount: uint256,269 ) -> Result<bool> {270 let caller = T::CrossAccountId::from_eth(caller);271 let from = from.into_sub_cross_account::<T>()?;272 let to = to.into_sub_cross_account::<T>()?;273 let amount = amount.try_into().map_err(|_| "amount overflow")?;274 let budget = self275 .recorder276 .weight_calls_budget(<StructureWeight<T>>::find_parent());277278 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)279 .map_err(dispatch_to_evm::<T>)?;280 Ok(true)281 }282}283284#[solidity_interface(285 name = UniqueFungible,286 is(287 ERC20,288 ERC20Mintable,289 ERC20UniqueExtensions,290 Collection(via(common_mut returns CollectionHandle<T>)),291 )292)]293impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}294295generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);296generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);297298impl<T: Config> CommonEvmHandler for FungibleHandle<T>299where300 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,301{302 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");303304 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {305 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)306 }307}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! ERC-20 standart support implementation.1819extern crate alloc;20use core::char::{REPLACEMENT_CHARACTER, decode_utf16};21use core::convert::TryInto;22use evm_coder::{23 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,24 weight,25};26use up_data_structs::CollectionMode;27use pallet_common::erc::{CommonEvmHandler, PrecompileResult};28use sp_std::vec::Vec;29use pallet_evm::{account::CrossAccountId, PrecompileHandle};30use pallet_evm_coder_substrate::{call, dispatch_to_evm};31use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};32use pallet_common::{CollectionHandle, erc::CollectionCall};3334use crate::{35 Allowance, Balance, Config, FungibleHandle, Pallet, SelfWeightOf, TotalSupply,36 weights::WeightInfo,37};3839#[derive(ToLog)]40pub enum ERC20Events {41 Transfer {42 #[indexed]43 from: address,44 #[indexed]45 to: address,46 value: uint256,47 },48 Approval {49 #[indexed]50 owner: address,51 #[indexed]52 spender: address,53 value: uint256,54 },55}5657#[solidity_interface(name = ERC20, events(ERC20Events))]58impl<T: Config> FungibleHandle<T> {59 fn name(&self) -> Result<string> {60 Ok(decode_utf16(self.name.iter().copied())61 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))62 .collect::<string>())63 }64 fn symbol(&self) -> Result<string> {65 Ok(string::from_utf8_lossy(&self.token_prefix).into())66 }67 fn total_supply(&self) -> Result<uint256> {68 self.consume_store_reads(1)?;69 Ok(<TotalSupply<T>>::get(self.id).into())70 }7172 fn decimals(&self) -> Result<uint8> {73 Ok(if let CollectionMode::Fungible(decimals) = &self.mode {74 *decimals75 } else {76 unreachable!()77 })78 }79 fn balance_of(&self, owner: address) -> Result<uint256> {80 self.consume_store_reads(1)?;81 let owner = T::CrossAccountId::from_eth(owner);82 let balance = <Balance<T>>::get((self.id, owner));83 Ok(balance.into())84 }85 #[weight(<SelfWeightOf<T>>::transfer())]86 fn transfer(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {87 let caller = T::CrossAccountId::from_eth(caller);88 let to = T::CrossAccountId::from_eth(to);89 let amount = amount.try_into().map_err(|_| "amount overflow")?;90 let budget = self91 .recorder92 .weight_calls_budget(<StructureWeight<T>>::find_parent());9394 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;95 Ok(true)96 }9798 #[weight(<SelfWeightOf<T>>::transfer_from())]99 fn transfer_from(100 &mut self,101 caller: caller,102 from: address,103 to: address,104 amount: uint256,105 ) -> Result<bool> {106 let caller = T::CrossAccountId::from_eth(caller);107 let from = T::CrossAccountId::from_eth(from);108 let to = T::CrossAccountId::from_eth(to);109 let amount = amount.try_into().map_err(|_| "amount overflow")?;110 let budget = self111 .recorder112 .weight_calls_budget(<StructureWeight<T>>::find_parent());113114 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)115 .map_err(dispatch_to_evm::<T>)?;116 Ok(true)117 }118 #[weight(<SelfWeightOf<T>>::approve())]119 fn approve(&mut self, caller: caller, spender: address, amount: uint256) -> Result<bool> {120 let caller = T::CrossAccountId::from_eth(caller);121 let spender = T::CrossAccountId::from_eth(spender);122 let amount = amount.try_into().map_err(|_| "amount overflow")?;123124 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)125 .map_err(dispatch_to_evm::<T>)?;126 Ok(true)127 }128 fn allowance(&self, owner: address, spender: address) -> Result<uint256> {129 self.consume_store_reads(1)?;130 let owner = T::CrossAccountId::from_eth(owner);131 let spender = T::CrossAccountId::from_eth(spender);132133 Ok(<Allowance<T>>::get((self.id, owner, spender)).into())134 }135}136137#[solidity_interface(name = ERC20Mintable)]138impl<T: Config> FungibleHandle<T> {139 /// Mint tokens for `to` account.140 /// @param to account that will receive minted tokens141 /// @param amount amount of tokens to mint142 #[weight(<SelfWeightOf<T>>::create_item())]143 fn mint(&mut self, caller: caller, to: address, amount: uint256) -> Result<bool> {144 let caller = T::CrossAccountId::from_eth(caller);145 let to = T::CrossAccountId::from_eth(to);146 let amount = amount.try_into().map_err(|_| "amount overflow")?;147 let budget = self148 .recorder149 .weight_calls_budget(<StructureWeight<T>>::find_parent());150 <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)151 .map_err(dispatch_to_evm::<T>)?;152 Ok(true)153 }154}155156#[solidity_interface(name = ERC20UniqueExtensions)]157impl<T: Config> FungibleHandle<T>158where159 T::AccountId: From<[u8; 32]>,160{161 /// @notice A description for the collection.162 fn description(&self) -> Result<string> {163 Ok(decode_utf16(self.description.iter().copied())164 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))165 .collect::<string>())166 }167168 #[weight(<SelfWeightOf<T>>::approve())]169 fn approve_cross(170 &mut self,171 caller: caller,172 spender: EthCrossAccount,173 amount: uint256,174 ) -> Result<bool> {175 let caller = T::CrossAccountId::from_eth(caller);176 let spender = spender.into_sub_cross_account::<T>()?;177 let amount = amount.try_into().map_err(|_| "amount overflow")?;178179 <Pallet<T>>::set_allowance(self, &caller, &spender, amount)180 .map_err(dispatch_to_evm::<T>)?;181 Ok(true)182 }183184 /// Burn tokens from account185 /// @dev Function that burns an `amount` of the tokens of a given account,186 /// deducting from the sender's allowance for said account.187 /// @param from The account whose tokens will be burnt.188 /// @param amount The amount that will be burnt.189 #[solidity(hide)]190 #[weight(<SelfWeightOf<T>>::burn_from())]191 fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {192 let caller = T::CrossAccountId::from_eth(caller);193 let from = T::CrossAccountId::from_eth(from);194 let amount = amount.try_into().map_err(|_| "amount overflow")?;195 let budget = self196 .recorder197 .weight_calls_budget(<StructureWeight<T>>::find_parent());198199 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)200 .map_err(dispatch_to_evm::<T>)?;201 Ok(true)202 }203204 /// Burn tokens from account205 /// @dev Function that burns an `amount` of the tokens of a given account,206 /// deducting from the sender's allowance for said account.207 /// @param from The account whose tokens will be burnt.208 /// @param amount The amount that will be burnt.209 #[weight(<SelfWeightOf<T>>::burn_from())]210 fn burn_from_cross(211 &mut self,212 caller: caller,213 from: EthCrossAccount,214 amount: uint256,215 ) -> Result<bool> {216 let caller = T::CrossAccountId::from_eth(caller);217 let from = from.into_sub_cross_account::<T>()?;218 let amount = amount.try_into().map_err(|_| "amount overflow")?;219 let budget = self220 .recorder221 .weight_calls_budget(<StructureWeight<T>>::find_parent());222223 <Pallet<T>>::burn_from(self, &caller, &from, amount, &budget)224 .map_err(dispatch_to_evm::<T>)?;225 Ok(true)226 }227228 /// Mint tokens for multiple accounts.229 /// @param amounts array of pairs of account address and amount230 #[weight(<SelfWeightOf<T>>::create_multiple_items_ex(amounts.len() as u32))]231 fn mint_bulk(&mut self, caller: caller, amounts: Vec<(address, uint256)>) -> Result<bool> {232 let caller = T::CrossAccountId::from_eth(caller);233 let budget = self234 .recorder235 .weight_calls_budget(<StructureWeight<T>>::find_parent());236 let amounts = amounts237 .into_iter()238 .map(|(to, amount)| {239 Ok((240 T::CrossAccountId::from_eth(to),241 amount.try_into().map_err(|_| "amount overflow")?,242 ))243 })244 .collect::<Result<_>>()?;245246 <Pallet<T>>::create_multiple_items(&self, &caller, amounts, &budget)247 .map_err(dispatch_to_evm::<T>)?;248 Ok(true)249 }250251 #[weight(<SelfWeightOf<T>>::transfer())]252 fn transfer_cross(253 &mut self,254 caller: caller,255 to: EthCrossAccount,256 amount: uint256,257 ) -> Result<bool> {258 let caller = T::CrossAccountId::from_eth(caller);259 let to = to.into_sub_cross_account::<T>()?;260 let amount = amount.try_into().map_err(|_| "amount overflow")?;261 let budget = self262 .recorder263 .weight_calls_budget(<StructureWeight<T>>::find_parent());264265 <Pallet<T>>::transfer(self, &caller, &to, amount, &budget).map_err(|_| "transfer error")?;266 Ok(true)267 }268269 #[weight(<SelfWeightOf<T>>::transfer_from())]270 fn transfer_from_cross(271 &mut self,272 caller: caller,273 from: EthCrossAccount,274 to: EthCrossAccount,275 amount: uint256,276 ) -> Result<bool> {277 let caller = T::CrossAccountId::from_eth(caller);278 let from = from.into_sub_cross_account::<T>()?;279 let to = to.into_sub_cross_account::<T>()?;280 let amount = amount.try_into().map_err(|_| "amount overflow")?;281 let budget = self282 .recorder283 .weight_calls_budget(<StructureWeight<T>>::find_parent());284285 <Pallet<T>>::transfer_from(self, &caller, &from, &to, amount, &budget)286 .map_err(dispatch_to_evm::<T>)?;287 Ok(true)288 }289}290291#[solidity_interface(292 name = UniqueFungible,293 is(294 ERC20,295 ERC20Mintable,296 ERC20UniqueExtensions,297 Collection(via(common_mut returns CollectionHandle<T>)),298 )299)]300impl<T: Config> FungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}301302generate_stubgen!(gen_impl, UniqueFungibleCall<()>, true);303generate_stubgen!(gen_iface, UniqueFungibleCall<()>, false);304305impl<T: Config> CommonEvmHandler for FungibleHandle<T>306where307 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,308{309 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueFungible.raw");310311 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {312 call::<T, UniqueFungibleCall<T>, _, _>(handle, self)313 }314}pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -87,11 +87,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple16[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple16[](0);
+ return new Property[](0);
}
// /// Set the sponsor of the collection.
@@ -425,20 +425,23 @@
uint256 sub;
}
-/// @dev anonymous struct
-struct Tuple16 {
- string field_0;
- bytes field_1;
-}
-
/// @dev Property struct
struct Property {
string key;
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
+/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
contract ERC20UniqueExtensions is Dummy, ERC165 {
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
/// @dev EVM selector for this function is: 0x0ecd0ab0,
/// or in textual repr: approveCross((address,uint256),uint256)
function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.10] - 2022-11-18
+
+### Added
+
+- The functions `description`, `crossOwnerOf`, `tokenProperties` to `ERC721UniqueExtensions` interface.
+
## [0.1.9] - 2022-11-14
### Changed
pallets/nonfungible/src/erc.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -37,7 +37,7 @@
use sp_std::vec::Vec;
use pallet_common::{
erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},
- CollectionHandle, CollectionPropertyPermissions,
+ CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::call;
@@ -278,7 +278,7 @@
#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]
impl<T: Config> NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
@@ -686,7 +686,7 @@
#[solidity_interface(name = ERC721UniqueExtensions)]
impl<T: Config> NonfungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
fn name(&self) -> Result<string> {
@@ -700,6 +700,56 @@
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
+ /// @notice A description for the collection.
+ fn description(&self) -> Result<string> {
+ Ok(decode_utf16(self.description.iter().copied())
+ .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+ .collect::<string>())
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ Self::token_owner(&self, token_id.try_into()?)
+ .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .ok_or(Error::Revert("key too large".into()))
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ fn token_properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<PropertyStruct>> {
+ let keys = keys
+ .into_iter()
+ .map(|key| {
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Self as CommonCollectionOperations<T>>::token_properties(
+ &self,
+ token_id.try_into()?,
+ if keys.is_empty() { None } else { Some(keys) },
+ )
+ .into_iter()
+ .map(|p| {
+ let key = string::from_utf8(p.key.to_vec())
+ .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
+ let value = bytes(p.value.to_vec());
+ Ok(PropertyStruct { key, value })
+ })
+ .collect::<Result<Vec<_>>>()
+ }
+
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized
pallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterbothbinary blob — no preview
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -188,11 +188,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple23[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple23[](0);
+ return new Property[](0);
}
// /// Set the sponsor of the collection.
@@ -253,10 +253,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple26 memory) {
+ function collectionSponsor() public view returns (Tuple30 memory) {
require(false, stub_error);
dummy;
- return Tuple26(0x0000000000000000000000000000000000000000, 0);
+ return Tuple30(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,17 +527,11 @@
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple30 {
address field_0;
uint256 field_1;
}
-/// @dev anonymous struct
-struct Tuple23 {
- string field_0;
- bytes field_1;
-}
-
/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
/// @dev See https://eips.ethereum.org/EIPS/eip-721
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -682,7 +676,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x0e9fc611
+/// @dev the ERC-165 identifier for this interface is 0xb8f094a0
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -702,6 +696,42 @@
return "";
}
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ require(false, stub_error);
+ tokenId;
+ dummy;
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0xefc26c69,
+ /// or in textual repr: tokenProperties(uint256,string[])
+ function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {
+ require(false, stub_error);
+ tokenId;
+ keys;
+ dummy;
+ return new Property[](0);
+ }
+
/// @notice Set or reaffirm the approved address for an NFT
/// @dev The zero address indicates there is no approved address.
/// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized
@@ -825,7 +855,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple11[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple15[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -836,7 +866,7 @@
}
/// @dev anonymous struct
-struct Tuple11 {
+struct Tuple15 {
uint256 field_0;
string field_1;
}
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.2.9] - 2022-11-18
+
+### Added
+
+- The functions `description`, `crossOwnerOf`, `tokenProperties` to `ERC721UniqueExtensions` interface.
+
## [0.2.8] - 2022-11-14
### Changed
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -33,6 +33,7 @@
use pallet_common::{
CollectionHandle, CollectionPropertyPermissions,
erc::{CommonEvmHandler, CollectionCall, static_property::key},
+ CommonCollectionOperations,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm};
@@ -273,7 +274,7 @@
#[solidity_interface(name = ERC721Metadata)]
impl<T: Config> RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev real implementation of this function lies in `ERC721UniqueExtensions`
@@ -713,7 +714,7 @@
#[solidity_interface(name = ERC721UniqueExtensions)]
impl<T: Config> RefungibleHandle<T>
where
- T::AccountId: From<[u8; 32]>,
+ T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,
{
/// @notice A descriptive name for a collection of NFTs in this contract
fn name(&self) -> Result<string> {
@@ -727,6 +728,55 @@
Ok(string::from_utf8_lossy(&self.token_prefix).into())
}
+ /// @notice A description for the collection.
+ fn description(&self) -> Result<string> {
+ Ok(decode_utf16(self.description.iter().copied())
+ .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
+ .collect::<string>())
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {
+ Self::token_owner(&self, token_id.try_into()?)
+ .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))
+ .ok_or(Error::Revert("key too large".into()))
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ fn token_properties(
+ &self,
+ token_id: uint256,
+ keys: Vec<string>,
+ ) -> Result<Vec<PropertyStruct>> {
+ let keys = keys
+ .into_iter()
+ .map(|key| {
+ <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| Error::Revert("key too large".into()))
+ })
+ .collect::<Result<Vec<_>>>()?;
+
+ <Self as CommonCollectionOperations<T>>::token_properties(
+ &self,
+ token_id.try_into()?,
+ if keys.is_empty() { None } else { Some(keys) },
+ )
+ .into_iter()
+ .map(|p| {
+ let key = string::from_utf8(p.key.to_vec())
+ .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;
+ let value = bytes(p.value.to_vec());
+ Ok(PropertyStruct { key, value })
+ })
+ .collect::<Result<Vec<_>>>()
+ }
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid RFT.
pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -188,11 +188,11 @@
/// @return Vector of properties key/value pairs.
/// @dev EVM selector for this function is: 0x285fb8e6,
/// or in textual repr: collectionProperties(string[])
- function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
+ function collectionProperties(string[] memory keys) public view returns (Property[] memory) {
require(false, stub_error);
keys;
dummy;
- return new Tuple22[](0);
+ return new Property[](0);
}
// /// Set the sponsor of the collection.
@@ -253,10 +253,10 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x6ec0a9f1,
/// or in textual repr: collectionSponsor()
- function collectionSponsor() public view returns (Tuple25 memory) {
+ function collectionSponsor() public view returns (Tuple29 memory) {
require(false, stub_error);
dummy;
- return Tuple25(0x0000000000000000000000000000000000000000, 0);
+ return Tuple29(0x0000000000000000000000000000000000000000, 0);
}
/// Set limits for the collection.
@@ -527,17 +527,11 @@
}
/// @dev anonymous struct
-struct Tuple25 {
+struct Tuple29 {
address field_0;
uint256 field_1;
}
-/// @dev anonymous struct
-struct Tuple22 {
- string field_0;
- bytes field_1;
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5b5e139f
contract ERC721Metadata is Dummy, ERC165 {
// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -680,7 +674,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xab243667
+/// @dev the ERC-165 identifier for this interface is 0x1d4b64d6
contract ERC721UniqueExtensions is Dummy, ERC165 {
/// @notice A descriptive name for a collection of NFTs in this contract
/// @dev EVM selector for this function is: 0x06fdde03,
@@ -700,6 +694,42 @@
return "";
}
+ /// @notice A description for the collection.
+ /// @dev EVM selector for this function is: 0x7284e416,
+ /// or in textual repr: description()
+ function description() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ /// Returns the owner (in cross format) of the token.
+ ///
+ /// @param tokenId Id for the token.
+ /// @dev EVM selector for this function is: 0x2b29dace,
+ /// or in textual repr: crossOwnerOf(uint256)
+ function crossOwnerOf(uint256 tokenId) public view returns (EthCrossAccount memory) {
+ require(false, stub_error);
+ tokenId;
+ dummy;
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
+ }
+
+ /// Returns the token properties.
+ ///
+ /// @param tokenId Id for the token.
+ /// @param keys Properties keys. Empty keys for all propertyes.
+ /// @return Vector of properties key/value pairs.
+ /// @dev EVM selector for this function is: 0xefc26c69,
+ /// or in textual repr: tokenProperties(uint256,string[])
+ function tokenProperties(uint256 tokenId, string[] memory keys) public view returns (Property[] memory) {
+ require(false, stub_error);
+ tokenId;
+ keys;
+ dummy;
+ return new Property[](0);
+ }
+
/// @notice Transfer ownership of an RFT
/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`
/// is the zero address. Throws if `tokenId` is not a valid RFT.
@@ -813,7 +843,7 @@
// /// @param tokens array of pairs of token ID and token URI for minted tokens
// /// @dev EVM selector for this function is: 0x36543006,
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
- // function mintBulkWithTokenURI(address to, Tuple10[] memory tokens) public returns (bool) {
+ // function mintBulkWithTokenURI(address to, Tuple14[] memory tokens) public returns (bool) {
// require(false, stub_error);
// to;
// tokens;
@@ -835,7 +865,7 @@
}
/// @dev anonymous struct
-struct Tuple10 {
+struct Tuple14 {
uint256 field_0;
string field_1;
}
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/unique/src/eth/stubs/CollectionHelpers.rawdiffbeforeafterbothbinary blob — no preview
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -216,10 +216,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple16[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
@@ -283,6 +283,13 @@
},
{
"inputs": [],
+ "name": "description",
+ "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "hasCollectionPendingSponsor",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "view",
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -246,10 +246,10 @@
"outputs": [
{
"components": [
- { "internalType": "string", "name": "field_0", "type": "string" },
- { "internalType": "bytes", "name": "field_1", "type": "bytes" }
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
],
- "internalType": "struct Tuple23[]",
+ "internalType": "struct Property[]",
"name": "",
"type": "tuple[]"
}
@@ -273,7 +273,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple26",
+ "internalType": "struct Tuple30",
"name": "",
"type": "tuple"
}
@@ -297,6 +297,25 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+ ],
+ "name": "crossOwnerOf",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "",
+ "type": "tuple"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "string[]", "name": "keys", "type": "string[]" }
],
"name": "deleteCollectionProperties",
@@ -316,6 +335,13 @@
},
{
"inputs": [],
+ "name": "description",
+ "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
"name": "finishMinting",
"outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "nonpayable",
@@ -641,6 +667,26 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
+ { "internalType": "string[]", "name": "keys", "type": "string[]" }
+ ],
+ "name": "tokenProperties",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "",
+ "type": "tuple[]"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "uint256", "name": "tokenId", "type": "uint256" }
],
"name": "tokenURI",
tests/src/eth/abi/reFungible.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, {