difftreelog
Merge pull request #743 from UniqueNetwork/feature/mintCross
in: master
added `mintCross` function for `UniqueExtensoins` interfaces
39 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6085,7 +6085,7 @@
[[package]]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6342,7 +6342,7 @@
[[package]]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
dependencies = [
"ethereum 0.14.0",
"evm-coder",
@@ -6501,7 +6501,7 @@
[[package]]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
dependencies = [
"derivative",
"ethereum 0.14.0",
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -36,7 +36,7 @@
use crate::{
Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,
eth::{
- EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,
+ EthCrossAccount, CollectionPermissions as EvmPermissions,
CollectionLimits as EvmCollectionLimits,
},
weights::WeightInfo,
@@ -289,20 +289,13 @@
/// Get current sponsor.
///
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn collection_sponsor(&self) -> Result<(address, uint256)> {
+ fn collection_sponsor(&self) -> Result<EthCrossAccount> {
let sponsor = match self.collection.sponsorship.sponsor() {
Some(sponsor) => sponsor,
None => return Ok(Default::default()),
};
- let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
- let result: (address, uint256) = if sponsor.is_canonical_substrate() {
- let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);
- (Default::default(), sponsor)
- } else {
- let sponsor = *sponsor.as_eth();
- (sponsor, Default::default())
- };
- Ok(result)
+
+ Ok(EthCrossAccount::from_sub::<T>(&sponsor))
}
/// Get current collection limits.
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
address[0..16] == ETH_COLLECTION_PREFIX
}
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- let slice = from.as_sub().as_ref();
- uint256::from_big_endian(slice)
-}
-
/// Convert `uint256` to `CrossAccountId`.
pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
where
@@ -71,46 +62,6 @@
from.to_big_endian(&mut new_admin_arr);
let account_id = T::AccountId::from(new_admin_arr);
T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
- cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
- T::AccountId: AsRef<[u8; 32]>,
-{
- if cross_account_id.is_canonical_substrate() {
- let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
- (Default::default(), sub)
- } else {
- let eth = *cross_account_id.as_eth();
- (eth, Default::default())
- }
-}
-
-/// Convert tuple `(address, uint256)` to `CrossAccountId`.
-///
-/// If `address` in the tuple has *default* value, then the canonical form is substrate,
-/// if `uint256` has *default* value, then the ethereum form is canonical,
-/// if both values are *default* or *non default*, then this is considered an invalid address and `Error` is returned.
-pub fn convert_tuple_to_cross_account<T: Config>(
- eth_cross_account_id: (address, uint256),
-) -> evm_coder::execution::Result<T::CrossAccountId>
-where
- T::AccountId: From<[u8; 32]>,
-{
- if eth_cross_account_id == Default::default() {
- Err("All fields of cross account is zeroed".into())
- } else if eth_cross_account_id.0 == Default::default() {
- Ok(convert_uint256_to_cross_account::<T>(
- eth_cross_account_id.1,
- ))
- } else if eth_cross_account_id.1 == Default::default() {
- Ok(T::CrossAccountId::from_eth(eth_cross_account_id.0))
- } else {
- Err("All fields of cross account is non zeroed".into())
- }
}
/// Cross account struct
@@ -121,16 +72,14 @@
}
impl EthCrossAccount {
+ /// Converts `CrossAccountId` to `EthCrossAccountId`
pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
where
T: pallet_evm::Config,
T::AccountId: AsRef<[u8; 32]>,
{
if cross_account_id.is_canonical_substrate() {
- Self {
- eth: Default::default(),
- sub: convert_cross_account_to_uint256::<T>(cross_account_id),
- }
+ Self::from_sub::<T>(cross_account_id.as_sub())
} else {
Self {
eth: *cross_account_id.as_eth(),
@@ -138,7 +87,18 @@
}
}
}
-
+ /// Creates `EthCrossAccount` from substrate account
+ pub fn from_sub<T>(account_id: &T::AccountId) -> Self
+ where
+ T: pallet_evm::Config,
+ T::AccountId: AsRef<[u8; 32]>,
+ {
+ Self {
+ eth: Default::default(),
+ sub: uint256::from_big_endian(account_id.as_ref()),
+ }
+ }
+ /// Converts `EthCrossAccount` to `CrossAccountId`
pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
where
T: pallet_evm::Config,
@@ -163,29 +123,41 @@
/// How many tokens can a user have on one account.
#[default]
AccountTokenOwnership,
+
/// How many bytes of data are available for sponsorship.
SponsoredDataSize,
+
/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
SponsoredDataRateLimit,
+
/// How many tokens can be mined into this collection.
TokenLimit,
+
/// Timeouts for transfer sponsoring.
SponsorTransferTimeout,
+
/// Timeout for sponsoring an approval in passed blocks.
SponsorApproveTimeout,
+
/// Whether the collection owner of the collection can send tokens (which belong to other users).
OwnerCanTransfer,
+
/// Can the collection owner burn other people's tokens.
OwnerCanDestroy,
+
/// Is it possible to send tokens from this collection between users.
TransferEnabled,
}
+/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
#[derive(Default, Debug, Clone, Copy, AbiCoder)]
#[repr(u8)]
pub enum CollectionPermissions {
+ /// Owner of token can nest tokens under it.
#[default]
- CollectionAdmin,
TokenOwner,
+
+ /// Admin of token collection can nest tokens under token.
+ CollectionAdmin,
}
/// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
"pallet-evm-coder-substrate/std",
"pallet-evm/std",
"up-sponsorship/std",
+ "pallet-common/std",
]
try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -25,6 +25,7 @@
types::*,
ToLog,
};
+use pallet_common::eth::EthCrossAccount;
use pallet_evm::{
ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
account::CrossAccountId,
@@ -174,11 +175,9 @@
///
/// @param contractAddress The contract for which a sponsor is requested.
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
- let sponsor =
- Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
- Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
- &sponsor,
+ fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
+ Ok(EthCrossAccount::from_sub_cross_account::<T>(
+ &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
))
}
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
/// @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: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) public view returns (Tuple0 memory) {
+ function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
require(false, stub_error);
contractAddress;
dummy;
- return Tuple0(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
}
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
pallets/fungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,6 +4,12 @@
<!-- bureaucrate goes here -->
+## [0.1.9] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC20UniqueExtensions` interface.
+
## [0.1.8] - 2022-11-18
### Added
pallets/fungible/Cargo.tomldiffbeforeafterboth--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
license = "GPLv3"
edition = "2021"
pallets/fungible/src/erc.rsdiffbeforeafterboth--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -174,6 +174,19 @@
.collect::<string>())
}
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+ let caller = T::CrossAccountId::from_eth(caller);
+ let to = to.into_sub_cross_account::<T>()?;
+ let amount = amount.try_into().map_err(|_| "amount overflow")?;
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+ <Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)
+ .map_err(dispatch_to_evm::<T>)?;
+ Ok(true)
+ }
+
#[weight(<SelfWeightOf<T>>::approve())]
fn approve_cross(
&mut self,
pallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -152,10 +152,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 (Tuple8 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple8(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -173,10 +173,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple20[] memory) {
+ function collectionLimits() public view returns (Tuple23[] memory) {
require(false, stub_error);
dummy;
- return new Tuple20[](0);
+ return new Tuple23[](0);
}
/// Set limits for the collection.
@@ -284,19 +284,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 memory) {
require(false, stub_error);
dummy;
- return Tuple26(false, new uint256[](0));
+ return Tuple29(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple29[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple32[] memory) {
require(false, stub_error);
dummy;
- return new Tuple29[](0);
+ return new Tuple32[](0);
}
/// Set the collection access method.
@@ -476,13 +476,13 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple32 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple26 {
+struct Tuple29 {
bool field_0;
uint256[] field_1;
}
@@ -510,7 +510,7 @@
}
/// @dev anonymous struct
-struct Tuple20 {
+struct Tuple23 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
@@ -522,7 +522,7 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
contract ERC20UniqueExtensions is Dummy, ERC165 {
/// @notice A description for the collection.
/// @dev EVM selector for this function is: 0x7284e416,
@@ -533,6 +533,16 @@
return "";
}
+ /// @dev EVM selector for this function is: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
/// @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) {
@@ -577,7 +587,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(Tuple8[] memory amounts) public returns (bool) {
+ function mintBulk(Tuple9[] memory amounts) public returns (bool) {
require(false, stub_error);
amounts;
dummy = 0;
@@ -611,7 +621,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.1.11] - 2022-12-16
+## [0.1.12] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.1.11] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.1.10] - 2022-11-18
### Added
pallets/nonfungible/Cargo.tomldiffbeforeafterboth--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
license = "GPLv3"
edition = "2021"
pallets/nonfungible/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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24 char::{REPLACEMENT_CHARACTER, decode_utf16},25 convert::TryInto,26};27use evm_coder::{28 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,29 types::Property as PropertyStruct, weight,30};31use frame_support::BoundedVec;32use up_data_structs::{33 TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,34 CollectionPropertiesVec,35};36use pallet_evm_coder_substrate::dispatch_to_evm;37use sp_std::{vec::Vec, vec};38use pallet_common::{39 CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,40 erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},41 eth::{EthCrossAccount, EthTokenPermissions},42};43use pallet_evm::{account::CrossAccountId, PrecompileHandle};44use pallet_evm_coder_substrate::call;45use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};46use sp_core::Get;4748use crate::{49 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,50 SelfWeightOf, weights::WeightInfo, TokenProperties,51};5253/// @title A contract that allows to set and delete token properties and change token property permissions.54#[solidity_interface(name = TokenProperties)]55impl<T: Config> NonfungibleHandle<T> {56 /// @notice Set permissions for token property.57 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.58 /// @param key Property key.59 /// @param isMutable Permission to mutate property.60 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.61 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.62 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]63 #[solidity(hide)]64 fn set_token_property_permission(65 &mut self,66 caller: caller,67 key: string,68 is_mutable: bool,69 collection_admin: bool,70 token_owner: bool,71 ) -> Result<()> {72 let caller = T::CrossAccountId::from_eth(caller);73 <Pallet<T>>::set_token_property_permissions(74 self,75 &caller,76 vec![PropertyKeyPermission {77 key: <Vec<u8>>::from(key)78 .try_into()79 .map_err(|_| "too long key")?,80 permission: PropertyPermission {81 mutable: is_mutable,82 collection_admin,83 token_owner,84 },85 }],86 )87 .map_err(dispatch_to_evm::<T>)88 }8990 /// @notice Set permissions for token property.91 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.92 /// @param permissions Permissions for keys.93 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]94 fn set_token_property_permissions(95 &mut self,96 caller: caller,97 permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,98 ) -> Result<()> {99 let caller = T::CrossAccountId::from_eth(caller);100 const PERMISSIONS_FIELDS_COUNT: usize = 3;101102 let mut perms = Vec::new();103104 for (key, pp) in permissions {105 if pp.len() > PERMISSIONS_FIELDS_COUNT {106 return Err(alloc::format!(107 "Actual number of fields {} for {}, which exceeds the maximum value of {}",108 pp.len(),109 stringify!(EthTokenPermissions),110 PERMISSIONS_FIELDS_COUNT111 )112 .as_str()113 .into());114 }115116 let mut token_permission = PropertyPermission::default();117118 for (perm, value) in pp {119 match perm {120 EthTokenPermissions::Mutable => token_permission.mutable = value,121 EthTokenPermissions::TokenOwner => token_permission.token_owner = value,122 EthTokenPermissions::CollectionAdmin => {123 token_permission.collection_admin = value124 }125 }126 }127128 perms.push(PropertyKeyPermission {129 key: key.into_bytes().try_into().map_err(|_| "too long key")?,130 permission: token_permission,131 });132 }133134 <Pallet<T>>::set_token_property_permissions(self, &caller, perms)135 .map_err(dispatch_to_evm::<T>)136 }137138 /// @notice Get permissions for token properties.139 fn token_property_permissions(140 &self,141 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {142 let perms = <Pallet<T>>::token_property_permission(self.id);143 Ok(perms144 .into_iter()145 .map(|(key, pp)| {146 let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");147 let pp = vec![148 (EthTokenPermissions::Mutable, pp.mutable),149 (EthTokenPermissions::TokenOwner, pp.token_owner),150 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),151 ];152 (key, pp)153 })154 .collect())155 }156157 /// @notice Set token property value.158 /// @dev Throws error if `msg.sender` has no permission to edit the property.159 /// @param tokenId ID of the token.160 /// @param key Property key.161 /// @param value Property value.162 #[solidity(hide)]163 #[weight(<SelfWeightOf<T>>::set_token_properties(1))]164 fn set_property(165 &mut self,166 caller: caller,167 token_id: uint256,168 key: string,169 value: bytes,170 ) -> Result<()> {171 let caller = T::CrossAccountId::from_eth(caller);172 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;173 let key = <Vec<u8>>::from(key)174 .try_into()175 .map_err(|_| "key too long")?;176 let value = value.0.try_into().map_err(|_| "value too long")?;177178 let nesting_budget = self179 .recorder180 .weight_calls_budget(<StructureWeight<T>>::find_parent());181182 <Pallet<T>>::set_token_property(183 self,184 &caller,185 TokenId(token_id),186 Property { key, value },187 &nesting_budget,188 )189 .map_err(dispatch_to_evm::<T>)190 }191192 /// @notice Set token properties value.193 /// @dev Throws error if `msg.sender` has no permission to edit the property.194 /// @param tokenId ID of the token.195 /// @param properties settable properties196 #[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]197 fn set_properties(198 &mut self,199 caller: caller,200 token_id: uint256,201 properties: Vec<PropertyStruct>,202 ) -> Result<()> {203 let caller = T::CrossAccountId::from_eth(caller);204 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;205206 let nesting_budget = self207 .recorder208 .weight_calls_budget(<StructureWeight<T>>::find_parent());209210 let properties = properties211 .into_iter()212 .map(|PropertyStruct { key, value }| {213 let key = <Vec<u8>>::from(key)214 .try_into()215 .map_err(|_| "key too large")?;216217 let value = value.0.try_into().map_err(|_| "value too large")?;218219 Ok(Property { key, value })220 })221 .collect::<Result<Vec<_>>>()?;222223 <Pallet<T>>::set_token_properties(224 self,225 &caller,226 TokenId(token_id),227 properties.into_iter(),228 false,229 &nesting_budget,230 )231 .map_err(dispatch_to_evm::<T>)232 }233234 /// @notice Delete token property value.235 /// @dev Throws error if `msg.sender` has no permission to edit the property.236 /// @param tokenId ID of the token.237 /// @param key Property key.238 #[solidity(hide)]239 #[weight(<SelfWeightOf<T>>::delete_token_properties(1))]240 fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {241 let caller = T::CrossAccountId::from_eth(caller);242 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;243 let key = <Vec<u8>>::from(key)244 .try_into()245 .map_err(|_| "key too long")?;246247 let nesting_budget = self248 .recorder249 .weight_calls_budget(<StructureWeight<T>>::find_parent());250251 <Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)252 .map_err(dispatch_to_evm::<T>)253 }254255 /// @notice Delete token properties value.256 /// @dev Throws error if `msg.sender` has no permission to edit the property.257 /// @param tokenId ID of the token.258 /// @param keys Properties key.259 #[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]260 fn delete_properties(261 &mut self,262 token_id: uint256,263 caller: caller,264 keys: Vec<string>,265 ) -> Result<()> {266 let caller = T::CrossAccountId::from_eth(caller);267 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;268 let keys = keys269 .into_iter()270 .map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))271 .collect::<Result<Vec<_>>>()?;272273 let nesting_budget = self274 .recorder275 .weight_calls_budget(<StructureWeight<T>>::find_parent());276277 <Pallet<T>>::delete_token_properties(278 self,279 &caller,280 TokenId(token_id),281 keys.into_iter(),282 &nesting_budget,283 )284 .map_err(dispatch_to_evm::<T>)285 }286287 /// @notice Get token property value.288 /// @dev Throws error if key not found289 /// @param tokenId ID of the token.290 /// @param key Property key.291 /// @return Property value bytes292 fn property(&self, token_id: uint256, key: string) -> Result<bytes> {293 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;294 let key = <Vec<u8>>::from(key)295 .try_into()296 .map_err(|_| "key too long")?;297298 let props = <TokenProperties<T>>::get((self.id, token_id));299 let prop = props.get(&key).ok_or("key not found")?;300301 Ok(prop.to_vec().into())302 }303}304305#[derive(ToLog)]306pub enum ERC721Events {307 /// @dev This emits when ownership of any NFT changes by any mechanism.308 /// This event emits when NFTs are created (`from` == 0) and destroyed309 /// (`to` == 0). Exception: during contract creation, any number of NFTs310 /// may be created and assigned without emitting Transfer. At the time of311 /// any transfer, the approved address for that NFT (if any) is reset to none.312 Transfer {313 #[indexed]314 from: address,315 #[indexed]316 to: address,317 #[indexed]318 token_id: uint256,319 },320 /// @dev This emits when the approved address for an NFT is changed or321 /// reaffirmed. The zero address indicates there is no approved address.322 /// When a Transfer event emits, this also indicates that the approved323 /// address for that NFT (if any) is reset to none.324 Approval {325 #[indexed]326 owner: address,327 #[indexed]328 approved: address,329 #[indexed]330 token_id: uint256,331 },332 /// @dev This emits when an operator is enabled or disabled for an owner.333 /// The operator can manage all NFTs of the owner.334 #[allow(dead_code)]335 ApprovalForAll {336 #[indexed]337 owner: address,338 #[indexed]339 operator: address,340 approved: bool,341 },342}343344#[derive(ToLog)]345pub enum ERC721UniqueMintableEvents {346 #[allow(dead_code)]347 MintingFinished {},348}349350/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension351/// @dev See https://eips.ethereum.org/EIPS/eip-721352#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]353impl<T: Config> NonfungibleHandle<T>354where355 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,356{357 /// @notice A descriptive name for a collection of NFTs in this contract358 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`359 #[solidity(hide, rename_selector = "name")]360 fn name_proxy(&self) -> Result<string> {361 self.name()362 }363364 /// @notice An abbreviated name for NFTs in this contract365 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`366 #[solidity(hide, rename_selector = "symbol")]367 fn symbol_proxy(&self) -> Result<string> {368 self.symbol()369 }370371 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.372 ///373 /// @dev If the token has a `url` property and it is not empty, it is returned.374 /// 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`.375 /// If the collection property `baseURI` is empty or absent, return "" (empty string)376 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix377 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).378 ///379 /// @return token's const_metadata380 #[solidity(rename_selector = "tokenURI")]381 fn token_uri(&self, token_id: uint256) -> Result<string> {382 let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;383384 match get_token_property(self, token_id_u32, &key::url()).as_deref() {385 Err(_) | Ok("") => (),386 Ok(url) => {387 return Ok(url.into());388 }389 };390391 let base_uri =392 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())393 .map(BoundedVec::into_inner)394 .map(string::from_utf8)395 .transpose()396 .map_err(|e| {397 Error::Revert(alloc::format!(398 "Can not convert value \"baseURI\" to string with error \"{}\"",399 e400 ))401 })?;402403 let base_uri = match base_uri.as_deref() {404 None | Some("") => {405 return Ok("".into());406 }407 Some(base_uri) => base_uri.into(),408 };409410 Ok(411 match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {412 Err(_) | Ok("") => base_uri,413 Ok(suffix) => base_uri + suffix,414 },415 )416 }417}418419/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension420/// @dev See https://eips.ethereum.org/EIPS/eip-721421#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]422impl<T: Config> NonfungibleHandle<T> {423 /// @notice Enumerate valid NFTs424 /// @param index A counter less than `totalSupply()`425 /// @return The token identifier for the `index`th NFT,426 /// (sort order not specified)427 fn token_by_index(&self, index: uint256) -> Result<uint256> {428 Ok(index)429 }430431 /// @dev Not implemented432 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {433 // TODO: Not implemetable434 Err("not implemented".into())435 }436437 /// @notice Count NFTs tracked by this contract438 /// @return A count of valid NFTs tracked by this contract, where each one of439 /// them has an assigned and queryable owner not equal to the zero address440 fn total_supply(&self) -> Result<uint256> {441 self.consume_store_reads(1)?;442 Ok(<Pallet<T>>::total_supply(self).into())443 }444}445446/// @title ERC-721 Non-Fungible Token Standard447/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md448#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]449impl<T: Config> NonfungibleHandle<T> {450 /// @notice Count all NFTs assigned to an owner451 /// @dev NFTs assigned to the zero address are considered invalid, and this452 /// function throws for queries about the zero address.453 /// @param owner An address for whom to query the balance454 /// @return The number of NFTs owned by `owner`, possibly zero455 fn balance_of(&self, owner: address) -> Result<uint256> {456 self.consume_store_reads(1)?;457 let owner = T::CrossAccountId::from_eth(owner);458 let balance = <AccountBalance<T>>::get((self.id, owner));459 Ok(balance.into())460 }461 /// @notice Find the owner of an NFT462 /// @dev NFTs assigned to zero address are considered invalid, and queries463 /// about them do throw.464 /// @param tokenId The identifier for an NFT465 /// @return The address of the owner of the NFT466 fn owner_of(&self, token_id: uint256) -> Result<address> {467 self.consume_store_reads(1)?;468 let token: TokenId = token_id.try_into()?;469 Ok(*<TokenData<T>>::get((self.id, token))470 .ok_or("token not found")?471 .owner472 .as_eth())473 }474 /// @dev Not implemented475 #[solidity(rename_selector = "safeTransferFrom")]476 fn safe_transfer_from_with_data(477 &mut self,478 _from: address,479 _to: address,480 _token_id: uint256,481 _data: bytes,482 ) -> Result<void> {483 // TODO: Not implemetable484 Err("not implemented".into())485 }486 /// @dev Not implemented487 fn safe_transfer_from(488 &mut self,489 _from: address,490 _to: address,491 _token_id: uint256,492 ) -> Result<void> {493 // TODO: Not implemetable494 Err("not implemented".into())495 }496497 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE498 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE499 /// THEY MAY BE PERMANENTLY LOST500 /// @dev Throws unless `msg.sender` is the current owner or an authorized501 /// operator for this NFT. Throws if `from` is not the current owner. Throws502 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.503 /// @param from The current owner of the NFT504 /// @param to The new owner505 /// @param tokenId The NFT to transfer506 #[weight(<SelfWeightOf<T>>::transfer_from())]507 fn transfer_from(508 &mut self,509 caller: caller,510 from: address,511 to: address,512 token_id: uint256,513 ) -> Result<void> {514 let caller = T::CrossAccountId::from_eth(caller);515 let from = T::CrossAccountId::from_eth(from);516 let to = T::CrossAccountId::from_eth(to);517 let token = token_id.try_into()?;518 let budget = self519 .recorder520 .weight_calls_budget(<StructureWeight<T>>::find_parent());521522 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)523 .map_err(dispatch_to_evm::<T>)?;524 Ok(())525 }526527 /// @notice Set or reaffirm the approved address for an NFT528 /// @dev The zero address indicates there is no approved address.529 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized530 /// operator of the current owner.531 /// @param approved The new approved NFT controller532 /// @param tokenId The NFT to approve533 #[weight(<SelfWeightOf<T>>::approve())]534 fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {535 let caller = T::CrossAccountId::from_eth(caller);536 let approved = T::CrossAccountId::from_eth(approved);537 let token = token_id.try_into()?;538539 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))540 .map_err(dispatch_to_evm::<T>)?;541 Ok(())542 }543544 /// @notice Sets or unsets the approval of a given operator.545 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.546 /// @param operator Operator547 /// @param approved Should operator status be granted or revoked?548 #[weight(<SelfWeightOf<T>>::set_allowance_for_all())]549 fn set_approval_for_all(550 &mut self,551 caller: caller,552 operator: address,553 approved: bool,554 ) -> Result<void> {555 let caller = T::CrossAccountId::from_eth(caller);556 let operator = T::CrossAccountId::from_eth(operator);557558 <Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)559 .map_err(dispatch_to_evm::<T>)?;560 Ok(())561 }562563 /// @dev Not implemented564 fn get_approved(&self, _token_id: uint256) -> Result<address> {565 // TODO: Not implemetable566 Err("not implemented".into())567 }568569 /// @notice Tells whether the given `owner` approves the `operator`.570 #[weight(<SelfWeightOf<T>>::allowance_for_all())]571 fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {572 let owner = T::CrossAccountId::from_eth(owner);573 let operator = T::CrossAccountId::from_eth(operator);574575 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))576 }577578 /// @notice Returns collection helper contract address579 fn collection_helper_address(&self) -> Result<address> {580 Ok(T::ContractAddress::get())581 }582}583584/// @title ERC721 Token that can be irreversibly burned (destroyed).585#[solidity_interface(name = ERC721Burnable)]586impl<T: Config> NonfungibleHandle<T> {587 /// @notice Burns a specific ERC721 token.588 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized589 /// operator of the current owner.590 /// @param tokenId The NFT to approve591 #[weight(<SelfWeightOf<T>>::burn_item())]592 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {593 let caller = T::CrossAccountId::from_eth(caller);594 let token = token_id.try_into()?;595596 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;597 Ok(())598 }599}600601/// @title ERC721 minting logic.602#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]603impl<T: Config> NonfungibleHandle<T> {604 fn minting_finished(&self) -> Result<bool> {605 Ok(false)606 }607608 /// @notice Function to mint token.609 /// @param to The new owner610 /// @return uint256 The id of the newly minted token611 #[weight(<SelfWeightOf<T>>::create_item())]612 fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {613 let token_id: uint256 = <TokensMinted<T>>::get(self.id)614 .checked_add(1)615 .ok_or("item id overflow")?616 .into();617 self.mint_check_id(caller, to, token_id)?;618 Ok(token_id)619 }620621 /// @notice Function to mint token.622 /// @dev `tokenId` should be obtained with `nextTokenId` method,623 /// unlike standard, you can't specify it manually624 /// @param to The new owner625 /// @param tokenId ID of the minted NFT626 #[solidity(hide, rename_selector = "mint")]627 #[weight(<SelfWeightOf<T>>::create_item())]628 fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {629 let caller = T::CrossAccountId::from_eth(caller);630 let to = T::CrossAccountId::from_eth(to);631 let token_id: u32 = token_id.try_into()?;632 let budget = self633 .recorder634 .weight_calls_budget(<StructureWeight<T>>::find_parent());635636 if <TokensMinted<T>>::get(self.id)637 .checked_add(1)638 .ok_or("item id overflow")?639 != token_id640 {641 return Err("item id should be next".into());642 }643644 <Pallet<T>>::create_item(645 self,646 &caller,647 CreateItemData::<T> {648 properties: BoundedVec::default(),649 owner: to,650 },651 &budget,652 )653 .map_err(dispatch_to_evm::<T>)?;654655 Ok(true)656 }657658 /// @notice Function to mint token with the given tokenUri.659 /// @param to The new owner660 /// @param tokenUri Token URI that would be stored in the NFT properties661 /// @return uint256 The id of the newly minted token662 #[solidity(rename_selector = "mintWithTokenURI")]663 #[weight(<SelfWeightOf<T>>::create_item())]664 fn mint_with_token_uri(665 &mut self,666 caller: caller,667 to: address,668 token_uri: string,669 ) -> Result<uint256> {670 let token_id: uint256 = <TokensMinted<T>>::get(self.id)671 .checked_add(1)672 .ok_or("item id overflow")?673 .into();674 self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;675 Ok(token_id)676 }677678 /// @notice Function to mint token with the given tokenUri.679 /// @dev `tokenId` should be obtained with `nextTokenId` method,680 /// unlike standard, you can't specify it manually681 /// @param to The new owner682 /// @param tokenId ID of the minted NFT683 /// @param tokenUri Token URI that would be stored in the NFT properties684 #[solidity(hide, rename_selector = "mintWithTokenURI")]685 #[weight(<SelfWeightOf<T>>::create_item())]686 fn mint_with_token_uri_check_id(687 &mut self,688 caller: caller,689 to: address,690 token_id: uint256,691 token_uri: string,692 ) -> Result<bool> {693 let key = key::url();694 let permission = get_token_permission::<T>(self.id, &key)?;695 if !permission.collection_admin {696 return Err("Operation is not allowed".into());697 }698699 let caller = T::CrossAccountId::from_eth(caller);700 let to = T::CrossAccountId::from_eth(to);701 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;702 let budget = self703 .recorder704 .weight_calls_budget(<StructureWeight<T>>::find_parent());705706 if <TokensMinted<T>>::get(self.id)707 .checked_add(1)708 .ok_or("item id overflow")?709 != token_id710 {711 return Err("item id should be next".into());712 }713714 let mut properties = CollectionPropertiesVec::default();715 properties716 .try_push(Property {717 key,718 value: token_uri719 .into_bytes()720 .try_into()721 .map_err(|_| "token uri is too long")?,722 })723 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;724725 <Pallet<T>>::create_item(726 self,727 &caller,728 CreateItemData::<T> {729 properties,730 owner: to,731 },732 &budget,733 )734 .map_err(dispatch_to_evm::<T>)?;735 Ok(true)736 }737738 /// @dev Not implemented739 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {740 Err("not implementable".into())741 }742}743744fn get_token_property<T: Config>(745 collection: &CollectionHandle<T>,746 token_id: u32,747 key: &up_data_structs::PropertyKey,748) -> Result<string> {749 collection.consume_store_reads(1)?;750 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))751 .map_err(|_| Error::Revert("Token properties not found".into()))?;752 if let Some(property) = properties.get(key) {753 return Ok(string::from_utf8_lossy(property).into());754 }755756 Err("Property tokenURI not found".into())757}758759fn get_token_permission<T: Config>(760 collection_id: CollectionId,761 key: &PropertyKey,762) -> Result<PropertyPermission> {763 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)764 .map_err(|_| Error::Revert("No permissions for collection".into()))?;765 let a = token_property_permissions766 .get(key)767 .map(Clone::clone)768 .ok_or_else(|| {769 let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();770 Error::Revert(alloc::format!("No permission for key {}", key))771 })?;772 Ok(a)773}774775/// @title Unique extensions for ERC721.776#[solidity_interface(name = ERC721UniqueExtensions)]777impl<T: Config> NonfungibleHandle<T>778where779 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,780{781 /// @notice A descriptive name for a collection of NFTs in this contract782 fn name(&self) -> Result<string> {783 Ok(decode_utf16(self.name.iter().copied())784 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))785 .collect::<string>())786 }787788 /// @notice An abbreviated name for NFTs in this contract789 fn symbol(&self) -> Result<string> {790 Ok(string::from_utf8_lossy(&self.token_prefix).into())791 }792793 /// @notice A description for the collection.794 fn description(&self) -> Result<string> {795 Ok(decode_utf16(self.description.iter().copied())796 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))797 .collect::<string>())798 }799800 /// Returns the owner (in cross format) of the token.801 ///802 /// @param tokenId Id for the token.803 fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {804 Self::token_owner(&self, token_id.try_into()?)805 .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))806 .ok_or(Error::Revert("key too large".into()))807 }808809 /// Returns the token properties.810 ///811 /// @param tokenId Id for the token.812 /// @param keys Properties keys. Empty keys for all propertyes.813 /// @return Vector of properties key/value pairs.814 fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {815 let keys = keys816 .into_iter()817 .map(|key| {818 <Vec<u8>>::from(key)819 .try_into()820 .map_err(|_| Error::Revert("key too large".into()))821 })822 .collect::<Result<Vec<_>>>()?;823824 <Self as CommonCollectionOperations<T>>::token_properties(825 &self,826 token_id.try_into()?,827 if keys.is_empty() { None } else { Some(keys) },828 )829 .into_iter()830 .map(|p| {831 let key = string::from_utf8(p.key.to_vec())832 .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;833 let value = bytes(p.value.to_vec());834 Ok(PropertyStruct { key, value })835 })836 .collect::<Result<Vec<_>>>()837 }838839 /// @notice Set or reaffirm the approved address for an NFT840 /// @dev The zero address indicates there is no approved address.841 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized842 /// operator of the current owner.843 /// @param approved The new substrate address approved NFT controller844 /// @param tokenId The NFT to approve845 #[weight(<SelfWeightOf<T>>::approve())]846 fn approve_cross(847 &mut self,848 caller: caller,849 approved: EthCrossAccount,850 token_id: uint256,851 ) -> Result<void> {852 let caller = T::CrossAccountId::from_eth(caller);853 let approved = approved.into_sub_cross_account::<T>()?;854 let token = token_id.try_into()?;855856 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))857 .map_err(dispatch_to_evm::<T>)?;858 Ok(())859 }860861 /// @notice Transfer ownership of an NFT862 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`863 /// is the zero address. Throws if `tokenId` is not a valid NFT.864 /// @param to The new owner865 /// @param tokenId The NFT to transfer866 #[weight(<SelfWeightOf<T>>::transfer())]867 fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {868 let caller = T::CrossAccountId::from_eth(caller);869 let to = T::CrossAccountId::from_eth(to);870 let token = token_id.try_into()?;871 let budget = self872 .recorder873 .weight_calls_budget(<StructureWeight<T>>::find_parent());874875 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;876 Ok(())877 }878879 /// @notice Transfer ownership of an NFT880 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`881 /// is the zero address. Throws if `tokenId` is not a valid NFT.882 /// @param to The new owner883 /// @param tokenId The NFT to transfer884 #[weight(<SelfWeightOf<T>>::transfer())]885 fn transfer_cross(886 &mut self,887 caller: caller,888 to: EthCrossAccount,889 token_id: uint256,890 ) -> Result<void> {891 let caller = T::CrossAccountId::from_eth(caller);892 let to = to.into_sub_cross_account::<T>()?;893 let token = token_id.try_into()?;894 let budget = self895 .recorder896 .weight_calls_budget(<StructureWeight<T>>::find_parent());897898 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;899 Ok(())900 }901902 /// @notice Transfer ownership of an NFT from cross account address to cross account address903 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`904 /// is the zero address. Throws if `tokenId` is not a valid NFT.905 /// @param from Cross acccount address of current owner906 /// @param to Cross acccount address of new owner907 /// @param tokenId The NFT to transfer908 #[weight(<SelfWeightOf<T>>::transfer())]909 fn transfer_from_cross(910 &mut self,911 caller: caller,912 from: EthCrossAccount,913 to: EthCrossAccount,914 token_id: uint256,915 ) -> Result<void> {916 let caller = T::CrossAccountId::from_eth(caller);917 let from = from.into_sub_cross_account::<T>()?;918 let to = to.into_sub_cross_account::<T>()?;919 let token_id = token_id.try_into()?;920 let budget = self921 .recorder922 .weight_calls_budget(<StructureWeight<T>>::find_parent());923 Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)924 .map_err(dispatch_to_evm::<T>)?;925 Ok(())926 }927928 /// @notice Burns a specific ERC721 token.929 /// @dev Throws unless `msg.sender` is the current owner or an authorized930 /// operator for this NFT. Throws if `from` is not the current owner. Throws931 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.932 /// @param from The current owner of the NFT933 /// @param tokenId The NFT to transfer934 #[solidity(hide)]935 #[weight(<SelfWeightOf<T>>::burn_from())]936 fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {937 let caller = T::CrossAccountId::from_eth(caller);938 let from = T::CrossAccountId::from_eth(from);939 let token = token_id.try_into()?;940 let budget = self941 .recorder942 .weight_calls_budget(<StructureWeight<T>>::find_parent());943944 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)945 .map_err(dispatch_to_evm::<T>)?;946 Ok(())947 }948949 /// @notice Burns a specific ERC721 token.950 /// @dev Throws unless `msg.sender` is the current owner or an authorized951 /// operator for this NFT. Throws if `from` is not the current owner. Throws952 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.953 /// @param from The current owner of the NFT954 /// @param tokenId The NFT to transfer955 #[weight(<SelfWeightOf<T>>::burn_from())]956 fn burn_from_cross(957 &mut self,958 caller: caller,959 from: EthCrossAccount,960 token_id: uint256,961 ) -> Result<void> {962 let caller = T::CrossAccountId::from_eth(caller);963 let from = from.into_sub_cross_account::<T>()?;964 let token = token_id.try_into()?;965 let budget = self966 .recorder967 .weight_calls_budget(<StructureWeight<T>>::find_parent());968969 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)970 .map_err(dispatch_to_evm::<T>)?;971 Ok(())972 }973974 /// @notice Returns next free NFT ID.975 fn next_token_id(&self) -> Result<uint256> {976 self.consume_store_reads(1)?;977 Ok(<TokensMinted<T>>::get(self.id)978 .checked_add(1)979 .ok_or("item id overflow")?980 .into())981 }982983 /// @notice Function to mint multiple tokens.984 /// @dev `tokenIds` should be an array of consecutive numbers and first number985 /// should be obtained with `nextTokenId` method986 /// @param to The new owner987 /// @param tokenIds IDs of the minted NFTs988 #[solidity(hide)]989 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]990 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {991 let caller = T::CrossAccountId::from_eth(caller);992 let to = T::CrossAccountId::from_eth(to);993 let mut expected_index = <TokensMinted<T>>::get(self.id)994 .checked_add(1)995 .ok_or("item id overflow")?;996 let budget = self997 .recorder998 .weight_calls_budget(<StructureWeight<T>>::find_parent());9991000 let total_tokens = token_ids.len();1001 for id in token_ids.into_iter() {1002 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1003 if id != expected_index {1004 return Err("item id should be next".into());1005 }1006 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1007 }1008 let data = (0..total_tokens)1009 .map(|_| CreateItemData::<T> {1010 properties: BoundedVec::default(),1011 owner: to.clone(),1012 })1013 .collect();10141015 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1016 .map_err(dispatch_to_evm::<T>)?;1017 Ok(true)1018 }10191020 /// @notice Function to mint multiple tokens with the given tokenUris.1021 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1022 /// numbers and first number should be obtained with `nextTokenId` method1023 /// @param to The new owner1024 /// @param tokens array of pairs of token ID and token URI for minted tokens1025 #[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1026 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1027 fn mint_bulk_with_token_uri(1028 &mut self,1029 caller: caller,1030 to: address,1031 tokens: Vec<(uint256, string)>,1032 ) -> Result<bool> {1033 let key = key::url();1034 let caller = T::CrossAccountId::from_eth(caller);1035 let to = T::CrossAccountId::from_eth(to);1036 let mut expected_index = <TokensMinted<T>>::get(self.id)1037 .checked_add(1)1038 .ok_or("item id overflow")?;1039 let budget = self1040 .recorder1041 .weight_calls_budget(<StructureWeight<T>>::find_parent());10421043 let mut data = Vec::with_capacity(tokens.len());1044 for (id, token_uri) in tokens {1045 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1046 if id != expected_index {1047 return Err("item id should be next".into());1048 }1049 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10501051 let mut properties = CollectionPropertiesVec::default();1052 properties1053 .try_push(Property {1054 key: key.clone(),1055 value: token_uri1056 .into_bytes()1057 .try_into()1058 .map_err(|_| "token uri is too long")?,1059 })1060 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10611062 data.push(CreateItemData::<T> {1063 properties,1064 owner: to.clone(),1065 });1066 }10671068 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1069 .map_err(dispatch_to_evm::<T>)?;1070 Ok(true)1071 }1072}10731074#[solidity_interface(1075 name = UniqueNFT,1076 is(1077 ERC721,1078 ERC721Enumerable,1079 ERC721UniqueExtensions,1080 ERC721UniqueMintable,1081 ERC721Burnable,1082 ERC721Metadata(if(this.flags.erc721metadata)),1083 Collection(via(common_mut returns CollectionHandle<T>)),1084 TokenProperties,1085 )1086)]1087impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}10881089// Not a tests, but code generators1090generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);1091generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);10921093impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>1094where1095 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1096{1097 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");10981099 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {1100 call::<T, UniqueNFTCall<T>, _, _>(handle, self)1101 }1102}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//! # Nonfungible Pallet EVM API18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Nonfungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.2122extern crate alloc;23use core::{24 char::{REPLACEMENT_CHARACTER, decode_utf16},25 convert::TryInto,26};27use evm_coder::{28 abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,29 types::Property as PropertyStruct, weight,30};31use frame_support::BoundedVec;32use up_data_structs::{33 TokenId, PropertyPermission, PropertyKeyPermission, Property, CollectionId, PropertyKey,34 CollectionPropertiesVec,35};36use pallet_evm_coder_substrate::dispatch_to_evm;37use sp_std::{vec::Vec, vec};38use pallet_common::{39 CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,40 erc::{CommonEvmHandler, PrecompileResult, CollectionCall, static_property::key},41 eth::{EthCrossAccount, EthTokenPermissions},42};43use pallet_evm::{account::CrossAccountId, PrecompileHandle};44use pallet_evm_coder_substrate::call;45use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};46use sp_core::Get;4748use crate::{49 AccountBalance, Config, CreateItemData, NonfungibleHandle, Pallet, TokenData, TokensMinted,50 SelfWeightOf, weights::WeightInfo, TokenProperties,51};5253/// @title A contract that allows to set and delete token properties and change token property permissions.54#[solidity_interface(name = TokenProperties)]55impl<T: Config> NonfungibleHandle<T> {56 /// @notice Set permissions for token property.57 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.58 /// @param key Property key.59 /// @param isMutable Permission to mutate property.60 /// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.61 /// @param tokenOwner Permission to mutate property by token owner if property is mutable.62 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]63 #[solidity(hide)]64 fn set_token_property_permission(65 &mut self,66 caller: caller,67 key: string,68 is_mutable: bool,69 collection_admin: bool,70 token_owner: bool,71 ) -> Result<()> {72 let caller = T::CrossAccountId::from_eth(caller);73 <Pallet<T>>::set_token_property_permissions(74 self,75 &caller,76 vec![PropertyKeyPermission {77 key: <Vec<u8>>::from(key)78 .try_into()79 .map_err(|_| "too long key")?,80 permission: PropertyPermission {81 mutable: is_mutable,82 collection_admin,83 token_owner,84 },85 }],86 )87 .map_err(dispatch_to_evm::<T>)88 }8990 /// @notice Set permissions for token property.91 /// @dev Throws error if `msg.sender` is not admin or owner of the collection.92 /// @param permissions Permissions for keys.93 #[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]94 fn set_token_property_permissions(95 &mut self,96 caller: caller,97 permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,98 ) -> Result<()> {99 let caller = T::CrossAccountId::from_eth(caller);100 const PERMISSIONS_FIELDS_COUNT: usize = 3;101102 let mut perms = Vec::new();103104 for (key, pp) in permissions {105 if pp.len() > PERMISSIONS_FIELDS_COUNT {106 return Err(alloc::format!(107 "Actual number of fields {} for {}, which exceeds the maximum value of {}",108 pp.len(),109 stringify!(EthTokenPermissions),110 PERMISSIONS_FIELDS_COUNT111 )112 .as_str()113 .into());114 }115116 let mut token_permission = PropertyPermission::default();117118 for (perm, value) in pp {119 match perm {120 EthTokenPermissions::Mutable => token_permission.mutable = value,121 EthTokenPermissions::TokenOwner => token_permission.token_owner = value,122 EthTokenPermissions::CollectionAdmin => {123 token_permission.collection_admin = value124 }125 }126 }127128 perms.push(PropertyKeyPermission {129 key: key.into_bytes().try_into().map_err(|_| "too long key")?,130 permission: token_permission,131 });132 }133134 <Pallet<T>>::set_token_property_permissions(self, &caller, perms)135 .map_err(dispatch_to_evm::<T>)136 }137138 /// @notice Get permissions for token properties.139 fn token_property_permissions(140 &self,141 ) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {142 let perms = <Pallet<T>>::token_property_permission(self.id);143 Ok(perms144 .into_iter()145 .map(|(key, pp)| {146 let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");147 let pp = vec![148 (EthTokenPermissions::Mutable, pp.mutable),149 (EthTokenPermissions::TokenOwner, pp.token_owner),150 (EthTokenPermissions::CollectionAdmin, pp.collection_admin),151 ];152 (key, pp)153 })154 .collect())155 }156157 /// @notice Set token property value.158 /// @dev Throws error if `msg.sender` has no permission to edit the property.159 /// @param tokenId ID of the token.160 /// @param key Property key.161 /// @param value Property value.162 #[solidity(hide)]163 #[weight(<SelfWeightOf<T>>::set_token_properties(1))]164 fn set_property(165 &mut self,166 caller: caller,167 token_id: uint256,168 key: string,169 value: bytes,170 ) -> Result<()> {171 let caller = T::CrossAccountId::from_eth(caller);172 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;173 let key = <Vec<u8>>::from(key)174 .try_into()175 .map_err(|_| "key too long")?;176 let value = value.0.try_into().map_err(|_| "value too long")?;177178 let nesting_budget = self179 .recorder180 .weight_calls_budget(<StructureWeight<T>>::find_parent());181182 <Pallet<T>>::set_token_property(183 self,184 &caller,185 TokenId(token_id),186 Property { key, value },187 &nesting_budget,188 )189 .map_err(dispatch_to_evm::<T>)190 }191192 /// @notice Set token properties value.193 /// @dev Throws error if `msg.sender` has no permission to edit the property.194 /// @param tokenId ID of the token.195 /// @param properties settable properties196 #[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]197 fn set_properties(198 &mut self,199 caller: caller,200 token_id: uint256,201 properties: Vec<PropertyStruct>,202 ) -> Result<()> {203 let caller = T::CrossAccountId::from_eth(caller);204 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;205206 let nesting_budget = self207 .recorder208 .weight_calls_budget(<StructureWeight<T>>::find_parent());209210 let properties = properties211 .into_iter()212 .map(|PropertyStruct { key, value }| {213 let key = <Vec<u8>>::from(key)214 .try_into()215 .map_err(|_| "key too large")?;216217 let value = value.0.try_into().map_err(|_| "value too large")?;218219 Ok(Property { key, value })220 })221 .collect::<Result<Vec<_>>>()?;222223 <Pallet<T>>::set_token_properties(224 self,225 &caller,226 TokenId(token_id),227 properties.into_iter(),228 false,229 &nesting_budget,230 )231 .map_err(dispatch_to_evm::<T>)232 }233234 /// @notice Delete token property value.235 /// @dev Throws error if `msg.sender` has no permission to edit the property.236 /// @param tokenId ID of the token.237 /// @param key Property key.238 #[solidity(hide)]239 #[weight(<SelfWeightOf<T>>::delete_token_properties(1))]240 fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {241 let caller = T::CrossAccountId::from_eth(caller);242 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;243 let key = <Vec<u8>>::from(key)244 .try_into()245 .map_err(|_| "key too long")?;246247 let nesting_budget = self248 .recorder249 .weight_calls_budget(<StructureWeight<T>>::find_parent());250251 <Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)252 .map_err(dispatch_to_evm::<T>)253 }254255 /// @notice Delete token properties value.256 /// @dev Throws error if `msg.sender` has no permission to edit the property.257 /// @param tokenId ID of the token.258 /// @param keys Properties key.259 #[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]260 fn delete_properties(261 &mut self,262 token_id: uint256,263 caller: caller,264 keys: Vec<string>,265 ) -> Result<()> {266 let caller = T::CrossAccountId::from_eth(caller);267 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;268 let keys = keys269 .into_iter()270 .map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))271 .collect::<Result<Vec<_>>>()?;272273 let nesting_budget = self274 .recorder275 .weight_calls_budget(<StructureWeight<T>>::find_parent());276277 <Pallet<T>>::delete_token_properties(278 self,279 &caller,280 TokenId(token_id),281 keys.into_iter(),282 &nesting_budget,283 )284 .map_err(dispatch_to_evm::<T>)285 }286287 /// @notice Get token property value.288 /// @dev Throws error if key not found289 /// @param tokenId ID of the token.290 /// @param key Property key.291 /// @return Property value bytes292 fn property(&self, token_id: uint256, key: string) -> Result<bytes> {293 let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;294 let key = <Vec<u8>>::from(key)295 .try_into()296 .map_err(|_| "key too long")?;297298 let props = <TokenProperties<T>>::get((self.id, token_id));299 let prop = props.get(&key).ok_or("key not found")?;300301 Ok(prop.to_vec().into())302 }303}304305#[derive(ToLog)]306pub enum ERC721Events {307 /// @dev This emits when ownership of any NFT changes by any mechanism.308 /// This event emits when NFTs are created (`from` == 0) and destroyed309 /// (`to` == 0). Exception: during contract creation, any number of NFTs310 /// may be created and assigned without emitting Transfer. At the time of311 /// any transfer, the approved address for that NFT (if any) is reset to none.312 Transfer {313 #[indexed]314 from: address,315 #[indexed]316 to: address,317 #[indexed]318 token_id: uint256,319 },320 /// @dev This emits when the approved address for an NFT is changed or321 /// reaffirmed. The zero address indicates there is no approved address.322 /// When a Transfer event emits, this also indicates that the approved323 /// address for that NFT (if any) is reset to none.324 Approval {325 #[indexed]326 owner: address,327 #[indexed]328 approved: address,329 #[indexed]330 token_id: uint256,331 },332 /// @dev This emits when an operator is enabled or disabled for an owner.333 /// The operator can manage all NFTs of the owner.334 #[allow(dead_code)]335 ApprovalForAll {336 #[indexed]337 owner: address,338 #[indexed]339 operator: address,340 approved: bool,341 },342}343344#[derive(ToLog)]345pub enum ERC721UniqueMintableEvents {346 #[allow(dead_code)]347 MintingFinished {},348}349350/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension351/// @dev See https://eips.ethereum.org/EIPS/eip-721352#[solidity_interface(name = ERC721Metadata, expect_selector = 0x5b5e139f)]353impl<T: Config> NonfungibleHandle<T>354where355 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,356{357 /// @notice A descriptive name for a collection of NFTs in this contract358 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`359 #[solidity(hide, rename_selector = "name")]360 fn name_proxy(&self) -> Result<string> {361 self.name()362 }363364 /// @notice An abbreviated name for NFTs in this contract365 /// @dev real implementation of this function lies in `ERC721UniqueExtensions`366 #[solidity(hide, rename_selector = "symbol")]367 fn symbol_proxy(&self) -> Result<string> {368 self.symbol()369 }370371 /// @notice A distinct Uniform Resource Identifier (URI) for a given asset.372 ///373 /// @dev If the token has a `url` property and it is not empty, it is returned.374 /// 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`.375 /// If the collection property `baseURI` is empty or absent, return "" (empty string)376 /// otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix377 /// otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).378 ///379 /// @return token's const_metadata380 #[solidity(rename_selector = "tokenURI")]381 fn token_uri(&self, token_id: uint256) -> Result<string> {382 let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;383384 match get_token_property(self, token_id_u32, &key::url()).as_deref() {385 Err(_) | Ok("") => (),386 Ok(url) => {387 return Ok(url.into());388 }389 };390391 let base_uri =392 pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())393 .map(BoundedVec::into_inner)394 .map(string::from_utf8)395 .transpose()396 .map_err(|e| {397 Error::Revert(alloc::format!(398 "Can not convert value \"baseURI\" to string with error \"{}\"",399 e400 ))401 })?;402403 let base_uri = match base_uri.as_deref() {404 None | Some("") => {405 return Ok("".into());406 }407 Some(base_uri) => base_uri.into(),408 };409410 Ok(411 match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {412 Err(_) | Ok("") => base_uri,413 Ok(suffix) => base_uri + suffix,414 },415 )416 }417}418419/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension420/// @dev See https://eips.ethereum.org/EIPS/eip-721421#[solidity_interface(name = ERC721Enumerable, expect_selector = 0x780e9d63)]422impl<T: Config> NonfungibleHandle<T> {423 /// @notice Enumerate valid NFTs424 /// @param index A counter less than `totalSupply()`425 /// @return The token identifier for the `index`th NFT,426 /// (sort order not specified)427 fn token_by_index(&self, index: uint256) -> Result<uint256> {428 Ok(index)429 }430431 /// @dev Not implemented432 fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {433 // TODO: Not implemetable434 Err("not implemented".into())435 }436437 /// @notice Count NFTs tracked by this contract438 /// @return A count of valid NFTs tracked by this contract, where each one of439 /// them has an assigned and queryable owner not equal to the zero address440 fn total_supply(&self) -> Result<uint256> {441 self.consume_store_reads(1)?;442 Ok(<Pallet<T>>::total_supply(self).into())443 }444}445446/// @title ERC-721 Non-Fungible Token Standard447/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md448#[solidity_interface(name = ERC721, events(ERC721Events), expect_selector = 0x80ac58cd)]449impl<T: Config> NonfungibleHandle<T> {450 /// @notice Count all NFTs assigned to an owner451 /// @dev NFTs assigned to the zero address are considered invalid, and this452 /// function throws for queries about the zero address.453 /// @param owner An address for whom to query the balance454 /// @return The number of NFTs owned by `owner`, possibly zero455 fn balance_of(&self, owner: address) -> Result<uint256> {456 self.consume_store_reads(1)?;457 let owner = T::CrossAccountId::from_eth(owner);458 let balance = <AccountBalance<T>>::get((self.id, owner));459 Ok(balance.into())460 }461 /// @notice Find the owner of an NFT462 /// @dev NFTs assigned to zero address are considered invalid, and queries463 /// about them do throw.464 /// @param tokenId The identifier for an NFT465 /// @return The address of the owner of the NFT466 fn owner_of(&self, token_id: uint256) -> Result<address> {467 self.consume_store_reads(1)?;468 let token: TokenId = token_id.try_into()?;469 Ok(*<TokenData<T>>::get((self.id, token))470 .ok_or("token not found")?471 .owner472 .as_eth())473 }474 /// @dev Not implemented475 #[solidity(rename_selector = "safeTransferFrom")]476 fn safe_transfer_from_with_data(477 &mut self,478 _from: address,479 _to: address,480 _token_id: uint256,481 _data: bytes,482 ) -> Result<void> {483 // TODO: Not implemetable484 Err("not implemented".into())485 }486 /// @dev Not implemented487 fn safe_transfer_from(488 &mut self,489 _from: address,490 _to: address,491 _token_id: uint256,492 ) -> Result<void> {493 // TODO: Not implemetable494 Err("not implemented".into())495 }496497 /// @notice Transfer ownership of an NFT -- THE CALLER IS RESPONSIBLE498 /// TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE499 /// THEY MAY BE PERMANENTLY LOST500 /// @dev Throws unless `msg.sender` is the current owner or an authorized501 /// operator for this NFT. Throws if `from` is not the current owner. Throws502 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.503 /// @param from The current owner of the NFT504 /// @param to The new owner505 /// @param tokenId The NFT to transfer506 #[weight(<SelfWeightOf<T>>::transfer_from())]507 fn transfer_from(508 &mut self,509 caller: caller,510 from: address,511 to: address,512 token_id: uint256,513 ) -> Result<void> {514 let caller = T::CrossAccountId::from_eth(caller);515 let from = T::CrossAccountId::from_eth(from);516 let to = T::CrossAccountId::from_eth(to);517 let token = token_id.try_into()?;518 let budget = self519 .recorder520 .weight_calls_budget(<StructureWeight<T>>::find_parent());521522 <Pallet<T>>::transfer_from(self, &caller, &from, &to, token, &budget)523 .map_err(dispatch_to_evm::<T>)?;524 Ok(())525 }526527 /// @notice Set or reaffirm the approved address for an NFT528 /// @dev The zero address indicates there is no approved address.529 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized530 /// operator of the current owner.531 /// @param approved The new approved NFT controller532 /// @param tokenId The NFT to approve533 #[weight(<SelfWeightOf<T>>::approve())]534 fn approve(&mut self, caller: caller, approved: address, token_id: uint256) -> Result<void> {535 let caller = T::CrossAccountId::from_eth(caller);536 let approved = T::CrossAccountId::from_eth(approved);537 let token = token_id.try_into()?;538539 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))540 .map_err(dispatch_to_evm::<T>)?;541 Ok(())542 }543544 /// @notice Sets or unsets the approval of a given operator.545 /// The `operator` is allowed to transfer all tokens of the `caller` on their behalf.546 /// @param operator Operator547 /// @param approved Should operator status be granted or revoked?548 #[weight(<SelfWeightOf<T>>::set_allowance_for_all())]549 fn set_approval_for_all(550 &mut self,551 caller: caller,552 operator: address,553 approved: bool,554 ) -> Result<void> {555 let caller = T::CrossAccountId::from_eth(caller);556 let operator = T::CrossAccountId::from_eth(operator);557558 <Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)559 .map_err(dispatch_to_evm::<T>)?;560 Ok(())561 }562563 /// @dev Not implemented564 fn get_approved(&self, _token_id: uint256) -> Result<address> {565 // TODO: Not implemetable566 Err("not implemented".into())567 }568569 /// @notice Tells whether the given `owner` approves the `operator`.570 #[weight(<SelfWeightOf<T>>::allowance_for_all())]571 fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {572 let owner = T::CrossAccountId::from_eth(owner);573 let operator = T::CrossAccountId::from_eth(operator);574575 Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))576 }577578 /// @notice Returns collection helper contract address579 fn collection_helper_address(&self) -> Result<address> {580 Ok(T::ContractAddress::get())581 }582}583584/// @title ERC721 Token that can be irreversibly burned (destroyed).585#[solidity_interface(name = ERC721Burnable)]586impl<T: Config> NonfungibleHandle<T> {587 /// @notice Burns a specific ERC721 token.588 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized589 /// operator of the current owner.590 /// @param tokenId The NFT to approve591 #[weight(<SelfWeightOf<T>>::burn_item())]592 fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {593 let caller = T::CrossAccountId::from_eth(caller);594 let token = token_id.try_into()?;595596 <Pallet<T>>::burn(self, &caller, token).map_err(dispatch_to_evm::<T>)?;597 Ok(())598 }599}600601/// @title ERC721 minting logic.602#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]603impl<T: Config> NonfungibleHandle<T> {604 fn minting_finished(&self) -> Result<bool> {605 Ok(false)606 }607608 /// @notice Function to mint a token.609 /// @param to The new owner610 /// @return uint256 The id of the newly minted token611 #[weight(<SelfWeightOf<T>>::create_item())]612 fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {613 let token_id: uint256 = <TokensMinted<T>>::get(self.id)614 .checked_add(1)615 .ok_or("item id overflow")?616 .into();617 self.mint_check_id(caller, to, token_id)?;618 Ok(token_id)619 }620621 /// @notice Function to mint a token.622 /// @dev `tokenId` should be obtained with `nextTokenId` method,623 /// unlike standard, you can't specify it manually624 /// @param to The new owner625 /// @param tokenId ID of the minted NFT626 #[solidity(hide, rename_selector = "mint")]627 #[weight(<SelfWeightOf<T>>::create_item())]628 fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {629 let caller = T::CrossAccountId::from_eth(caller);630 let to = T::CrossAccountId::from_eth(to);631 let token_id: u32 = token_id.try_into()?;632 let budget = self633 .recorder634 .weight_calls_budget(<StructureWeight<T>>::find_parent());635636 if <TokensMinted<T>>::get(self.id)637 .checked_add(1)638 .ok_or("item id overflow")?639 != token_id640 {641 return Err("item id should be next".into());642 }643644 <Pallet<T>>::create_item(645 self,646 &caller,647 CreateItemData::<T> {648 properties: BoundedVec::default(),649 owner: to,650 },651 &budget,652 )653 .map_err(dispatch_to_evm::<T>)?;654655 Ok(true)656 }657658 /// @notice Function to mint token with the given tokenUri.659 /// @param to The new owner660 /// @param tokenUri Token URI that would be stored in the NFT properties661 /// @return uint256 The id of the newly minted token662 #[solidity(rename_selector = "mintWithTokenURI")]663 #[weight(<SelfWeightOf<T>>::create_item())]664 fn mint_with_token_uri(665 &mut self,666 caller: caller,667 to: address,668 token_uri: string,669 ) -> Result<uint256> {670 let token_id: uint256 = <TokensMinted<T>>::get(self.id)671 .checked_add(1)672 .ok_or("item id overflow")?673 .into();674 self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;675 Ok(token_id)676 }677678 /// @notice Function to mint token with the given tokenUri.679 /// @dev `tokenId` should be obtained with `nextTokenId` method,680 /// unlike standard, you can't specify it manually681 /// @param to The new owner682 /// @param tokenId ID of the minted NFT683 /// @param tokenUri Token URI that would be stored in the NFT properties684 #[solidity(hide, rename_selector = "mintWithTokenURI")]685 #[weight(<SelfWeightOf<T>>::create_item())]686 fn mint_with_token_uri_check_id(687 &mut self,688 caller: caller,689 to: address,690 token_id: uint256,691 token_uri: string,692 ) -> Result<bool> {693 let key = key::url();694 let permission = get_token_permission::<T>(self.id, &key)?;695 if !permission.collection_admin {696 return Err("Operation is not allowed".into());697 }698699 let caller = T::CrossAccountId::from_eth(caller);700 let to = T::CrossAccountId::from_eth(to);701 let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;702 let budget = self703 .recorder704 .weight_calls_budget(<StructureWeight<T>>::find_parent());705706 if <TokensMinted<T>>::get(self.id)707 .checked_add(1)708 .ok_or("item id overflow")?709 != token_id710 {711 return Err("item id should be next".into());712 }713714 let mut properties = CollectionPropertiesVec::default();715 properties716 .try_push(Property {717 key,718 value: token_uri719 .into_bytes()720 .try_into()721 .map_err(|_| "token uri is too long")?,722 })723 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;724725 <Pallet<T>>::create_item(726 self,727 &caller,728 CreateItemData::<T> {729 properties,730 owner: to,731 },732 &budget,733 )734 .map_err(dispatch_to_evm::<T>)?;735 Ok(true)736 }737738 /// @dev Not implemented739 fn finish_minting(&mut self, _caller: caller) -> Result<bool> {740 Err("not implementable".into())741 }742}743744fn get_token_property<T: Config>(745 collection: &CollectionHandle<T>,746 token_id: u32,747 key: &up_data_structs::PropertyKey,748) -> Result<string> {749 collection.consume_store_reads(1)?;750 let properties = <TokenProperties<T>>::try_get((collection.id, token_id))751 .map_err(|_| Error::Revert("Token properties not found".into()))?;752 if let Some(property) = properties.get(key) {753 return Ok(string::from_utf8_lossy(property).into());754 }755756 Err("Property tokenURI not found".into())757}758759fn get_token_permission<T: Config>(760 collection_id: CollectionId,761 key: &PropertyKey,762) -> Result<PropertyPermission> {763 let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)764 .map_err(|_| Error::Revert("No permissions for collection".into()))?;765 let a = token_property_permissions766 .get(key)767 .map(Clone::clone)768 .ok_or_else(|| {769 let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();770 Error::Revert(alloc::format!("No permission for key {}", key))771 })?;772 Ok(a)773}774775/// @title Unique extensions for ERC721.776#[solidity_interface(name = ERC721UniqueExtensions)]777impl<T: Config> NonfungibleHandle<T>778where779 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,780{781 /// @notice A descriptive name for a collection of NFTs in this contract782 fn name(&self) -> Result<string> {783 Ok(decode_utf16(self.name.iter().copied())784 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))785 .collect::<string>())786 }787788 /// @notice An abbreviated name for NFTs in this contract789 fn symbol(&self) -> Result<string> {790 Ok(string::from_utf8_lossy(&self.token_prefix).into())791 }792793 /// @notice A description for the collection.794 fn description(&self) -> Result<string> {795 Ok(decode_utf16(self.description.iter().copied())796 .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))797 .collect::<string>())798 }799800 /// Returns the owner (in cross format) of the token.801 ///802 /// @param tokenId Id for the token.803 fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {804 Self::token_owner(&self, token_id.try_into()?)805 .map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))806 .ok_or(Error::Revert("key too large".into()))807 }808809 /// Returns the token properties.810 ///811 /// @param tokenId Id for the token.812 /// @param keys Properties keys. Empty keys for all propertyes.813 /// @return Vector of properties key/value pairs.814 fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {815 let keys = keys816 .into_iter()817 .map(|key| {818 <Vec<u8>>::from(key)819 .try_into()820 .map_err(|_| Error::Revert("key too large".into()))821 })822 .collect::<Result<Vec<_>>>()?;823824 <Self as CommonCollectionOperations<T>>::token_properties(825 &self,826 token_id.try_into()?,827 if keys.is_empty() { None } else { Some(keys) },828 )829 .into_iter()830 .map(|p| {831 let key = string::from_utf8(p.key.to_vec())832 .map_err(|e| Error::Revert(alloc::format!("{}", e)))?;833 let value = bytes(p.value.to_vec());834 Ok(PropertyStruct { key, value })835 })836 .collect::<Result<Vec<_>>>()837 }838839 /// @notice Set or reaffirm the approved address for an NFT840 /// @dev The zero address indicates there is no approved address.841 /// @dev Throws unless `msg.sender` is the current NFT owner, or an authorized842 /// operator of the current owner.843 /// @param approved The new substrate address approved NFT controller844 /// @param tokenId The NFT to approve845 #[weight(<SelfWeightOf<T>>::approve())]846 fn approve_cross(847 &mut self,848 caller: caller,849 approved: EthCrossAccount,850 token_id: uint256,851 ) -> Result<void> {852 let caller = T::CrossAccountId::from_eth(caller);853 let approved = approved.into_sub_cross_account::<T>()?;854 let token = token_id.try_into()?;855856 <Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))857 .map_err(dispatch_to_evm::<T>)?;858 Ok(())859 }860861 /// @notice Transfer ownership of an NFT862 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`863 /// is the zero address. Throws if `tokenId` is not a valid NFT.864 /// @param to The new owner865 /// @param tokenId The NFT to transfer866 #[weight(<SelfWeightOf<T>>::transfer())]867 fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {868 let caller = T::CrossAccountId::from_eth(caller);869 let to = T::CrossAccountId::from_eth(to);870 let token = token_id.try_into()?;871 let budget = self872 .recorder873 .weight_calls_budget(<StructureWeight<T>>::find_parent());874875 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;876 Ok(())877 }878879 /// @notice Transfer ownership of an NFT880 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`881 /// is the zero address. Throws if `tokenId` is not a valid NFT.882 /// @param to The new owner883 /// @param tokenId The NFT to transfer884 #[weight(<SelfWeightOf<T>>::transfer())]885 fn transfer_cross(886 &mut self,887 caller: caller,888 to: EthCrossAccount,889 token_id: uint256,890 ) -> Result<void> {891 let caller = T::CrossAccountId::from_eth(caller);892 let to = to.into_sub_cross_account::<T>()?;893 let token = token_id.try_into()?;894 let budget = self895 .recorder896 .weight_calls_budget(<StructureWeight<T>>::find_parent());897898 <Pallet<T>>::transfer(self, &caller, &to, token, &budget).map_err(dispatch_to_evm::<T>)?;899 Ok(())900 }901902 /// @notice Transfer ownership of an NFT from cross account address to cross account address903 /// @dev Throws unless `msg.sender` is the current owner. Throws if `to`904 /// is the zero address. Throws if `tokenId` is not a valid NFT.905 /// @param from Cross acccount address of current owner906 /// @param to Cross acccount address of new owner907 /// @param tokenId The NFT to transfer908 #[weight(<SelfWeightOf<T>>::transfer())]909 fn transfer_from_cross(910 &mut self,911 caller: caller,912 from: EthCrossAccount,913 to: EthCrossAccount,914 token_id: uint256,915 ) -> Result<void> {916 let caller = T::CrossAccountId::from_eth(caller);917 let from = from.into_sub_cross_account::<T>()?;918 let to = to.into_sub_cross_account::<T>()?;919 let token_id = token_id.try_into()?;920 let budget = self921 .recorder922 .weight_calls_budget(<StructureWeight<T>>::find_parent());923 Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, &budget)924 .map_err(dispatch_to_evm::<T>)?;925 Ok(())926 }927928 /// @notice Burns a specific ERC721 token.929 /// @dev Throws unless `msg.sender` is the current owner or an authorized930 /// operator for this NFT. Throws if `from` is not the current owner. Throws931 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.932 /// @param from The current owner of the NFT933 /// @param tokenId The NFT to transfer934 #[solidity(hide)]935 #[weight(<SelfWeightOf<T>>::burn_from())]936 fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {937 let caller = T::CrossAccountId::from_eth(caller);938 let from = T::CrossAccountId::from_eth(from);939 let token = token_id.try_into()?;940 let budget = self941 .recorder942 .weight_calls_budget(<StructureWeight<T>>::find_parent());943944 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)945 .map_err(dispatch_to_evm::<T>)?;946 Ok(())947 }948949 /// @notice Burns a specific ERC721 token.950 /// @dev Throws unless `msg.sender` is the current owner or an authorized951 /// operator for this NFT. Throws if `from` is not the current owner. Throws952 /// if `to` is the zero address. Throws if `tokenId` is not a valid NFT.953 /// @param from The current owner of the NFT954 /// @param tokenId The NFT to transfer955 #[weight(<SelfWeightOf<T>>::burn_from())]956 fn burn_from_cross(957 &mut self,958 caller: caller,959 from: EthCrossAccount,960 token_id: uint256,961 ) -> Result<void> {962 let caller = T::CrossAccountId::from_eth(caller);963 let from = from.into_sub_cross_account::<T>()?;964 let token = token_id.try_into()?;965 let budget = self966 .recorder967 .weight_calls_budget(<StructureWeight<T>>::find_parent());968969 <Pallet<T>>::burn_from(self, &caller, &from, token, &budget)970 .map_err(dispatch_to_evm::<T>)?;971 Ok(())972 }973974 /// @notice Returns next free NFT ID.975 fn next_token_id(&self) -> Result<uint256> {976 self.consume_store_reads(1)?;977 Ok(<TokensMinted<T>>::get(self.id)978 .checked_add(1)979 .ok_or("item id overflow")?980 .into())981 }982983 /// @notice Function to mint multiple tokens.984 /// @dev `tokenIds` should be an array of consecutive numbers and first number985 /// should be obtained with `nextTokenId` method986 /// @param to The new owner987 /// @param tokenIds IDs of the minted NFTs988 #[solidity(hide)]989 #[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]990 fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {991 let caller = T::CrossAccountId::from_eth(caller);992 let to = T::CrossAccountId::from_eth(to);993 let mut expected_index = <TokensMinted<T>>::get(self.id)994 .checked_add(1)995 .ok_or("item id overflow")?;996 let budget = self997 .recorder998 .weight_calls_budget(<StructureWeight<T>>::find_parent());9991000 let total_tokens = token_ids.len();1001 for id in token_ids.into_iter() {1002 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1003 if id != expected_index {1004 return Err("item id should be next".into());1005 }1006 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1007 }1008 let data = (0..total_tokens)1009 .map(|_| CreateItemData::<T> {1010 properties: BoundedVec::default(),1011 owner: to.clone(),1012 })1013 .collect();10141015 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1016 .map_err(dispatch_to_evm::<T>)?;1017 Ok(true)1018 }10191020 /// @notice Function to mint multiple tokens with the given tokenUris.1021 /// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1022 /// numbers and first number should be obtained with `nextTokenId` method1023 /// @param to The new owner1024 /// @param tokens array of pairs of token ID and token URI for minted tokens1025 #[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1026 #[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1027 fn mint_bulk_with_token_uri(1028 &mut self,1029 caller: caller,1030 to: address,1031 tokens: Vec<(uint256, string)>,1032 ) -> Result<bool> {1033 let key = key::url();1034 let caller = T::CrossAccountId::from_eth(caller);1035 let to = T::CrossAccountId::from_eth(to);1036 let mut expected_index = <TokensMinted<T>>::get(self.id)1037 .checked_add(1)1038 .ok_or("item id overflow")?;1039 let budget = self1040 .recorder1041 .weight_calls_budget(<StructureWeight<T>>::find_parent());10421043 let mut data = Vec::with_capacity(tokens.len());1044 for (id, token_uri) in tokens {1045 let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1046 if id != expected_index {1047 return Err("item id should be next".into());1048 }1049 expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10501051 let mut properties = CollectionPropertiesVec::default();1052 properties1053 .try_push(Property {1054 key: key.clone(),1055 value: token_uri1056 .into_bytes()1057 .try_into()1058 .map_err(|_| "token uri is too long")?,1059 })1060 .map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10611062 data.push(CreateItemData::<T> {1063 properties,1064 owner: to.clone(),1065 });1066 }10671068 <Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1069 .map_err(dispatch_to_evm::<T>)?;1070 Ok(true)1071 }10721073 /// @notice Function to mint a token.1074 /// @param to The new owner crossAccountId1075 /// @param properties Properties of minted token1076 /// @return uint256 The id of the newly minted token1077 #[weight(<SelfWeightOf<T>>::create_item())]1078 fn mint_cross(1079 &mut self,1080 caller: caller,1081 to: EthCrossAccount,1082 properties: Vec<PropertyStruct>,1083 ) -> Result<uint256> {1084 let token_id = <TokensMinted<T>>::get(self.id)1085 .checked_add(1)1086 .ok_or("item id overflow")?;10871088 let to = to.into_sub_cross_account::<T>()?;10891090 let properties = properties1091 .into_iter()1092 .map(|PropertyStruct { key, value }| {1093 let key = <Vec<u8>>::from(key)1094 .try_into()1095 .map_err(|_| "key too large")?;10961097 let value = value.0.try_into().map_err(|_| "value too large")?;10981099 Ok(Property { key, value })1100 })1101 .collect::<Result<Vec<_>>>()?1102 .try_into()1103 .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11041105 let caller = T::CrossAccountId::from_eth(caller);11061107 let budget = self1108 .recorder1109 .weight_calls_budget(<StructureWeight<T>>::find_parent());11101111 <Pallet<T>>::create_item(1112 self,1113 &caller,1114 CreateItemData::<T> {1115 properties,1116 owner: to,1117 },1118 &budget,1119 )1120 .map_err(dispatch_to_evm::<T>)?;11211122 Ok(token_id.into())1123 }1124}11251126#[solidity_interface(1127 name = UniqueNFT,1128 is(1129 ERC721,1130 ERC721Enumerable,1131 ERC721UniqueExtensions,1132 ERC721UniqueMintable,1133 ERC721Burnable,1134 ERC721Metadata(if(this.flags.erc721metadata)),1135 Collection(via(common_mut returns CollectionHandle<T>)),1136 TokenProperties,1137 )1138)]1139impl<T: Config> NonfungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11401141// Not a tests, but code generators1142generate_stubgen!(gen_impl, UniqueNFTCall<()>, true);1143generate_stubgen!(gen_iface, UniqueNFTCall<()>, false);11441145impl<T: Config> CommonEvmHandler for NonfungibleHandle<T>1146where1147 T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1148{1149 const CODE: &'static [u8] = include_bytes!("./stubs/UniqueNFT.raw");11501151 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {1152 call::<T, UniqueNFTCall<T>, _, _>(handle, self)1153 }1154}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
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple59[] memory permissions) public {
+ function setTokenPropertyPermissions(Tuple61[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple59[] memory) {
+ function tokenPropertyPermissions() public view returns (Tuple61[] memory) {
require(false, stub_error);
dummy;
- return new Tuple59[](0);
+ return new Tuple61[](0);
}
// /// @notice Set token property value.
@@ -144,13 +144,13 @@
}
/// @dev anonymous struct
-struct Tuple59 {
+struct Tuple61 {
string field_0;
- Tuple57[] field_1;
+ Tuple59[] field_1;
}
/// @dev anonymous struct
-struct Tuple57 {
+struct Tuple59 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -290,10 +290,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 (Tuple30 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple30(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -311,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple33[] memory) {
+ function collectionLimits() public view returns (Tuple35[] memory) {
require(false, stub_error);
dummy;
- return new Tuple33[](0);
+ return new Tuple35[](0);
}
/// Set limits for the collection.
@@ -422,19 +422,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
require(false, stub_error);
dummy;
- return Tuple39(false, new uint256[](0));
+ return Tuple41(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple42[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple44[] memory) {
require(false, stub_error);
dummy;
- return new Tuple42[](0);
+ return new Tuple44[](0);
}
/// Set the collection access method.
@@ -614,13 +614,13 @@
}
/// @dev anonymous struct
-struct Tuple42 {
+struct Tuple44 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple39 {
+struct Tuple41 {
bool field_0;
uint256[] field_1;
}
@@ -648,18 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple33 {
+struct Tuple35 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple30 {
- address field_0;
- uint256 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
@@ -735,7 +729,7 @@
return false;
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
@@ -747,7 +741,7 @@
return 0;
}
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -804,7 +798,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
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,
@@ -961,6 +955,7 @@
dummy;
return 0;
}
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -991,6 +986,19 @@
// return false;
// }
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
}
/// @dev anonymous struct
pallets/refungible/CHANGELOG.mddiffbeforeafterboth--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,7 +4,7 @@
<!-- bureaucrate goes here -->
-## [0.2.10] - 2022-12-16
+## [0.2.11] - 2022-12-16
### Added
@@ -14,6 +14,12 @@
- Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
+## [0.2.10] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
## [0.2.9] - 2022-11-18
### Added
pallets/refungible/Cargo.tomldiffbeforeafterboth--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
license = "GPLv3"
edition = "2021"
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -165,9 +165,9 @@
fn map_create_data<T: Config>(
data: up_data_structs::CreateItemData,
to: &T::CrossAccountId,
-) -> Result<CreateItemData<T::CrossAccountId>, DispatchError> {
+) -> Result<CreateItemData<T>, DispatchError> {
match data {
- up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData {
+ up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData::<T> {
users: {
let mut out = BTreeMap::new();
out.insert(to.clone(), data.pieces);
@@ -230,7 +230,7 @@
CreateItemExData::RefungibleMultipleOwners(CreateRefungibleExMultipleOwners {
users,
properties,
- }) => vec![CreateItemData { users, properties }],
+ }) => vec![CreateItemData::<T> { users, properties }],
CreateItemExData::RefungibleMultipleItems(r) => r
.into_inner()
.into_iter()
@@ -239,7 +239,7 @@
user,
pieces,
properties,
- }| CreateItemData {
+ }| CreateItemData::<T> {
users: BTreeMap::from([(user, pieces)])
.try_into()
.expect("limit >= 1"),
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
Ok(false)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
Ok(token_id)
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @dev `tokenId` should be obtained with `nextTokenId` method,
/// unlike standard, you can't specify it manually
/// @param to The new owner
@@ -681,7 +681,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData::<T::CrossAccountId> {
+ CreateItemData::<T> {
users,
properties: CollectionPropertiesVec::default(),
},
@@ -767,7 +767,7 @@
<Pallet<T>>::create_item(
self,
&caller,
- CreateItemData::<T::CrossAccountId> { users, properties },
+ CreateItemData::<T> { users, properties },
&budget,
)
.map_err(dispatch_to_evm::<T>)?;
@@ -1048,7 +1048,7 @@
.collect::<BTreeMap<_, _>>()
.try_into()
.unwrap();
- let create_item_data = CreateItemData::<T::CrossAccountId> {
+ let create_item_data = CreateItemData::<T> {
users,
properties: CollectionPropertiesVec::default(),
};
@@ -1108,7 +1108,7 @@
})
.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
- let create_item_data = CreateItemData::<T::CrossAccountId> {
+ let create_item_data = CreateItemData::<T> {
users: users.clone(),
properties,
};
@@ -1120,6 +1120,60 @@
Ok(true)
}
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ #[weight(<SelfWeightOf<T>>::create_item())]
+ fn mint_cross(
+ &mut self,
+ caller: caller,
+ to: EthCrossAccount,
+ properties: Vec<PropertyStruct>,
+ ) -> Result<uint256> {
+ let token_id = <TokensMinted<T>>::get(self.id)
+ .checked_add(1)
+ .ok_or("item id overflow")?;
+
+ let to = to.into_sub_cross_account::<T>()?;
+
+ let properties = properties
+ .into_iter()
+ .map(|PropertyStruct { key, value }| {
+ let key = <Vec<u8>>::from(key)
+ .try_into()
+ .map_err(|_| "key too large")?;
+
+ let value = value.0.try_into().map_err(|_| "value too large")?;
+
+ Ok(Property { key, value })
+ })
+ .collect::<Result<Vec<_>>>()?
+ .try_into()
+ .map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+ let caller = T::CrossAccountId::from_eth(caller);
+
+ let budget = self
+ .recorder
+ .weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+ let users = [(to, 1)]
+ .into_iter()
+ .collect::<BTreeMap<_, _>>()
+ .try_into()
+ .unwrap();
+ <Pallet<T>>::create_item(
+ self,
+ &caller,
+ CreateItemData::<T> { users, properties },
+ &budget,
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(token_id.into())
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -114,6 +114,7 @@
CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+ CreateRefungibleExMultipleOwners,
};
pub use pallet::*;
@@ -124,13 +125,8 @@
pub mod erc_token;
pub mod weights;
-#[derive(Derivative, Clone)]
-pub struct CreateItemData<CrossAccountId> {
- #[derivative(Debug(format_with = "bounded::map_debug"))]
- pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
- #[derivative(Debug(format_with = "bounded::vec_debug"))]
- pub properties: CollectionPropertiesVec,
-}
+pub type CreateItemData<T> =
+ CreateRefungibleExMultipleOwners<<T as pallet_evm::Config>::CrossAccountId>;
pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
/// Token data, stored independently from other data used to describe it
@@ -913,7 +909,7 @@
pub fn create_multiple_items(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: Vec<CreateItemData<T::CrossAccountId>>,
+ data: Vec<CreateItemData<T>>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
if !collection.is_owner_or_admin(sender) {
@@ -1259,7 +1255,7 @@
pub fn create_item(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
- data: CreateItemData<T::CrossAccountId>,
+ data: CreateItemData<T>,
nesting_budget: &dyn Budget,
) -> DispatchResult {
Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
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
@@ -42,7 +42,7 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple58[] memory permissions) public {
+ function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
require(false, stub_error);
permissions;
dummy = 0;
@@ -51,10 +51,10 @@
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() public view returns (Tuple58[] memory) {
+ function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
require(false, stub_error);
dummy;
- return new Tuple58[](0);
+ return new Tuple60[](0);
}
// /// @notice Set token property value.
@@ -144,13 +144,13 @@
}
/// @dev anonymous struct
-struct Tuple58 {
+struct Tuple60 {
string field_0;
- Tuple56[] field_1;
+ Tuple58[] field_1;
}
/// @dev anonymous struct
-struct Tuple56 {
+struct Tuple58 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -290,10 +290,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 (Tuple29 memory) {
+ function collectionSponsor() public view returns (EthCrossAccount memory) {
require(false, stub_error);
dummy;
- return Tuple29(0x0000000000000000000000000000000000000000, 0);
+ return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
}
/// Get current collection limits.
@@ -311,10 +311,10 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() public view returns (Tuple32[] memory) {
+ function collectionLimits() public view returns (Tuple34[] memory) {
require(false, stub_error);
dummy;
- return new Tuple32[](0);
+ return new Tuple34[](0);
}
/// Set limits for the collection.
@@ -422,19 +422,19 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
+ function collectionNestingRestrictedCollectionIds() public view returns (Tuple40 memory) {
require(false, stub_error);
dummy;
- return Tuple38(false, new uint256[](0));
+ return Tuple40(false, new uint256[](0));
}
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() public view returns (Tuple41[] memory) {
+ function collectionNestingPermissions() public view returns (Tuple43[] memory) {
require(false, stub_error);
dummy;
- return new Tuple41[](0);
+ return new Tuple43[](0);
}
/// Set the collection access method.
@@ -614,13 +614,13 @@
}
/// @dev anonymous struct
-struct Tuple41 {
+struct Tuple43 {
CollectionPermissions field_0;
bool field_1;
}
/// @dev anonymous struct
-struct Tuple38 {
+struct Tuple40 {
bool field_0;
uint256[] field_1;
}
@@ -648,18 +648,12 @@
}
/// @dev anonymous struct
-struct Tuple32 {
+struct Tuple34 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple29 {
- address field_0;
- uint256 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
@@ -733,7 +727,7 @@
return false;
}
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +739,7 @@
return 0;
}
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -802,7 +796,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
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,
@@ -979,6 +973,20 @@
// return false;
// }
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+ require(false, stub_error);
+ to;
+ properties;
+ dummy = 0;
+ return 0;
+ }
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple0",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
tests/src/eth/abi/fungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -220,7 +220,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple20[]",
+ "internalType": "struct Tuple23[]",
"name": "",
"type": "tuple[]"
}
@@ -241,7 +241,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple29[]",
+ "internalType": "struct Tuple32[]",
"name": "",
"type": "tuple[]"
}
@@ -262,7 +262,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple26",
+ "internalType": "struct Tuple29",
"name": "",
"type": "tuple"
}
@@ -319,10 +319,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple8",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -408,7 +408,7 @@
{ "internalType": "address", "name": "field_0", "type": "address" },
{ "internalType": "uint256", "name": "field_1", "type": "uint256" }
],
- "internalType": "struct Tuple8[]",
+ "internalType": "struct Tuple9[]",
"name": "amounts",
"type": "tuple[]"
}
@@ -419,6 +419,24 @@
"type": "function"
},
{
+ "inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ { "internalType": "uint256", "name": "amount", "type": "uint256" }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
tests/src/eth/abi/nonFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -250,7 +250,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple33[]",
+ "internalType": "struct Tuple35[]",
"name": "",
"type": "tuple[]"
}
@@ -271,7 +271,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple42[]",
+ "internalType": "struct Tuple44[]",
"name": "",
"type": "tuple[]"
}
@@ -292,7 +292,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple39",
+ "internalType": "struct Tuple41",
"name": "",
"type": "tuple"
}
@@ -349,10 +349,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple30",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -478,6 +478,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
@@ -736,12 +762,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple57[]",
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple59[]",
+ "internalType": "struct Tuple61[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -802,12 +828,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple57[]",
+ "internalType": "struct Tuple59[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple59[]",
+ "internalType": "struct Tuple61[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/abi/reFungible.jsondiffbeforeafterboth--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -232,7 +232,7 @@
{ "internalType": "bool", "name": "field_1", "type": "bool" },
{ "internalType": "uint256", "name": "field_2", "type": "uint256" }
],
- "internalType": "struct Tuple32[]",
+ "internalType": "struct Tuple34[]",
"name": "",
"type": "tuple[]"
}
@@ -253,7 +253,7 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple41[]",
+ "internalType": "struct Tuple43[]",
"name": "",
"type": "tuple[]"
}
@@ -274,7 +274,7 @@
"type": "uint256[]"
}
],
- "internalType": "struct Tuple38",
+ "internalType": "struct Tuple40",
"name": "",
"type": "tuple"
}
@@ -331,10 +331,10 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
],
- "internalType": "struct Tuple29",
+ "internalType": "struct EthCrossAccount",
"name": "",
"type": "tuple"
}
@@ -460,6 +460,32 @@
},
{
"inputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct EthCrossAccount",
+ "name": "to",
+ "type": "tuple"
+ },
+ {
+ "components": [
+ { "internalType": "string", "name": "key", "type": "string" },
+ { "internalType": "bytes", "name": "value", "type": "bytes" }
+ ],
+ "internalType": "struct Property[]",
+ "name": "properties",
+ "type": "tuple[]"
+ }
+ ],
+ "name": "mintCross",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "to", "type": "address" },
{ "internalType": "string", "name": "tokenUri", "type": "string" }
],
@@ -718,12 +744,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple56[]",
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple58[]",
+ "internalType": "struct Tuple60[]",
"name": "permissions",
"type": "tuple[]"
}
@@ -793,12 +819,12 @@
},
{ "internalType": "bool", "name": "field_1", "type": "bool" }
],
- "internalType": "struct Tuple56[]",
+ "internalType": "struct Tuple58[]",
"name": "field_1",
"type": "tuple[]"
}
],
- "internalType": "struct Tuple58[]",
+ "internalType": "struct Tuple60[]",
"name": "",
"type": "tuple[]"
}
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,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: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) external view returns (Tuple0 memory);
+ function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
/// Check tat contract has confirmed sponsor.
///
@@ -171,8 +171,8 @@
function toggleAllowlist(address contractAddress, bool enabled) external;
}
-/// @dev anonymous struct
-struct Tuple0 {
- address field_0;
- uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+ address eth;
+ uint256 sub;
}
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -102,7 +102,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 (Tuple8 memory);
+ function collectionSponsor() external view returns (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -119,7 +119,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple19[] memory);
+ function collectionLimits() external view returns (Tuple21[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -191,12 +191,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple27[] memory);
+ function collectionNestingPermissions() external view returns (Tuple29[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -311,7 +311,7 @@
}
/// @dev anonymous struct
-struct Tuple27 {
+struct Tuple29 {
CollectionPermissions field_0;
bool field_1;
}
@@ -322,7 +322,7 @@
}
/// @dev anonymous struct
-struct Tuple24 {
+struct Tuple26 {
bool field_0;
uint256[] field_1;
}
@@ -350,7 +350,7 @@
}
/// @dev anonymous struct
-struct Tuple19 {
+struct Tuple21 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
@@ -362,13 +362,17 @@
bytes value;
}
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
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: 0x269e6158,
+ /// or in textual repr: mintCross((address,uint256),uint256)
+ function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
/// @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);
@@ -395,7 +399,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(Tuple8[] memory amounts) external returns (bool);
+ function mintBulk(Tuple9[] memory amounts) external returns (bool);
/// @dev EVM selector for this function is: 0x2ada85ff,
/// or in textual repr: transferCross((address,uint256),uint256)
@@ -411,7 +415,7 @@
}
/// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
address field_0;
uint256 field_1;
}
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+ function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+ function tokenPropertyPermissions() external view returns (Tuple53[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
}
/// @dev anonymous struct
-struct Tuple52 {
+struct Tuple53 {
string field_0;
- Tuple50[] field_1;
+ Tuple51[] field_1;
}
/// @dev anonymous struct
-struct Tuple50 {
+struct Tuple51 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -198,7 +198,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 (Tuple27 memory);
+ function collectionSponsor() external view returns (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -215,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple30[] memory);
+ function collectionLimits() external view returns (Tuple31[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple38[] memory);
+ function collectionNestingPermissions() external view returns (Tuple39[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -407,7 +407,7 @@
}
/// @dev anonymous struct
-struct Tuple38 {
+struct Tuple39 {
CollectionPermissions field_0;
bool field_1;
}
@@ -418,7 +418,7 @@
}
/// @dev anonymous struct
-struct Tuple35 {
+struct Tuple36 {
bool field_0;
uint256[] field_1;
}
@@ -446,18 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple30 {
+struct Tuple31 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple27 {
- address field_0;
- uint256 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
@@ -512,14 +506,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -553,7 +547,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
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,
@@ -652,6 +646,7 @@
/// @dev EVM selector for this function is: 0x75794a3c,
/// or in textual repr: nextTokenId()
function nextTokenId() external view returns (uint256);
+
// /// @notice Function to mint multiple tokens.
// /// @dev `tokenIds` should be an array of consecutive numbers and first number
// /// should be obtained with `nextTokenId` method
@@ -670,6 +665,13 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
}
/// @dev anonymous struct
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,12 @@
/// @param permissions Permissions for keys.
/// @dev EVM selector for this function is: 0xbd92983a,
/// or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
- function setTokenPropertyPermissions(Tuple51[] memory permissions) external;
+ function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
/// @notice Get permissions for token properties.
/// @dev EVM selector for this function is: 0xf23d7790,
/// or in textual repr: tokenPropertyPermissions()
- function tokenPropertyPermissions() external view returns (Tuple51[] memory);
+ function tokenPropertyPermissions() external view returns (Tuple52[] memory);
// /// @notice Set token property value.
// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
}
/// @dev anonymous struct
-struct Tuple51 {
+struct Tuple52 {
string field_0;
- Tuple49[] field_1;
+ Tuple50[] field_1;
}
/// @dev anonymous struct
-struct Tuple49 {
+struct Tuple50 {
EthTokenPermissions field_0;
bool field_1;
}
@@ -198,7 +198,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 (EthCrossAccount memory);
/// Get current collection limits.
///
@@ -215,7 +215,7 @@
/// Return `false` if a limit not set.
/// @dev EVM selector for this function is: 0xf63bc572,
/// or in textual repr: collectionLimits()
- function collectionLimits() external view returns (Tuple29[] memory);
+ function collectionLimits() external view returns (Tuple30[] memory);
/// Set limits for the collection.
/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
/// Returns nesting for a collection
/// @dev EVM selector for this function is: 0x22d25bfe,
/// or in textual repr: collectionNestingRestrictedCollectionIds()
- function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory);
+ function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
/// Returns permissions for a collection
/// @dev EVM selector for this function is: 0x5b2eaf4b,
/// or in textual repr: collectionNestingPermissions()
- function collectionNestingPermissions() external view returns (Tuple37[] memory);
+ function collectionNestingPermissions() external view returns (Tuple38[] memory);
/// Set the collection access method.
/// @param mode Access mode
@@ -407,7 +407,7 @@
}
/// @dev anonymous struct
-struct Tuple37 {
+struct Tuple38 {
CollectionPermissions field_0;
bool field_1;
}
@@ -418,7 +418,7 @@
}
/// @dev anonymous struct
-struct Tuple34 {
+struct Tuple35 {
bool field_0;
uint256[] field_1;
}
@@ -446,18 +446,12 @@
}
/// @dev anonymous struct
-struct Tuple29 {
+struct Tuple30 {
CollectionLimits field_0;
bool field_1;
uint256 field_2;
}
-/// @dev anonymous struct
-struct Tuple26 {
- address field_0;
- uint256 field_1;
-}
-
/// @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
@@ -510,14 +504,14 @@
/// or in textual repr: mintingFinished()
function mintingFinished() external view returns (bool);
- /// @notice Function to mint token.
+ /// @notice Function to mint a token.
/// @param to The new owner
/// @return uint256 The id of the newly minted token
/// @dev EVM selector for this function is: 0x6a627842,
/// or in textual repr: mint(address)
function mint(address to) external returns (uint256);
- // /// @notice Function to mint token.
+ // /// @notice Function to mint a token.
// /// @dev `tokenId` should be obtained with `nextTokenId` method,
// /// unlike standard, you can't specify it manually
// /// @param to The new owner
@@ -551,7 +545,7 @@
}
/// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
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,
@@ -663,6 +657,14 @@
// /// or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
+ /// @notice Function to mint a token.
+ /// @param to The new owner crossAccountId
+ /// @param properties Properties of minted token
+ /// @return uint256 The id of the newly minted token
+ /// @dev EVM selector for this function is: 0xb904db03,
+ /// or in textual repr: mintCross((address,uint256),(string,bytes)[])
+ function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+
/// Returns EVM address for refungible token
///
/// @param token ID of the token
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -116,7 +116,7 @@
await checkInterface(helper, '0x780e9d63', true, true);
});
- itEth('ERC721UniqueExtensions support', async ({helper}) => {
+ itEth.skip('ERC721UniqueExtensions support', async ({helper}) => {
await checkInterface(helper, '0xb74c26b7', true, true);
});
tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -106,7 +106,7 @@
await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
const sponsorTuple = await collectionEvm.methods.collectionSponsor().call({from: owner});
- expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
+ expect(sponsorTuple.eth).to.be.eq('0x0000000000000000000000000000000000000000');
}));
[
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -57,7 +57,7 @@
before(async function() {
await usingEthPlaygrounds(async (helper, privateKey) => {
donor = await privateKey({filename: __filename});
- [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);
+ [alice, owner] = await helper.arrange.createAccounts([30n, 20n], donor);
});
});
@@ -78,6 +78,25 @@
expect(event.returnValues.to).to.equal(receiver);
expect(event.returnValues.value).to.equal('100');
});
+
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(owner);
+ const ethOwner = await helper.eth.createAccountWithBalance(donor);
+ const collection = await helper.ft.mintCollection(alice);
+ await collection.addAdmin(alice, {Ethereum: ethOwner});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);
+
+ const result = await contract.methods.mintCross(receiverCross, 100).send();
+
+ const event = result.events.Transfer;
+ expect(event.address).to.equal(collectionAddress);
+ expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.equal(helper.address.substrateToEth(owner.address));
+ expect(event.returnValues.value).to.equal('100');
+ });
itEth('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/nesting/nest.test.tsdiffbeforeafterboth--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -62,9 +62,9 @@
expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, []]);
await contract.methods.setCollectionNesting(true, [unnsetedCollectionAddress]).send({from: owner});
expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, [unnestedCollsectionId.toString()]]);
- expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', true]]);
+ expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', true]]);
await contract.methods.setCollectionNesting(false).send({from: owner});
- expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', false]]);
+ expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', false]]);
});
itEth('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async ({helper}) => {
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 {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('NFT: Information getting', () => {
@@ -173,7 +174,58 @@
// const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
// expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ 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.nft.mintCollection(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ let event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ tokenId = result.events.Transfer.returnValues.tokenId;
+
+ expect(tokenId).to.be.equal(expectedTokenId);
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
+
//TODO: CORE-302 add eth methods
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const caller = await helper.eth.createAccountWithBalance(donor);
tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -17,6 +17,7 @@
import {Pallets, requirePalletsOrSkip} from '../util';
import {expect, itEth, usingEthPlaygrounds} from './util';
import {IKeyringPair} from '@polkadot/types/types';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
describe('Refungible: Information getting', () => {
let donor: IKeyringPair;
@@ -135,6 +136,50 @@
expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
});
+
+ itEth('Can perform mintCross()', async ({helper}) => {
+ const caller = await helper.eth.createAccountWithBalance(donor);
+ const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+ 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(minter, {
+ tokenPrefix: 'ethp',
+ tokenPropertyPermissions: permissions,
+ });
+ await collection.addAdmin(minter, {Ethereum: caller});
+
+ const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+ const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller, true);
+ let expectedTokenId = await contract.methods.nextTokenId().call();
+ let result = await contract.methods.mintCross(receiverCross, []).send();
+ let tokenId = result.events.Transfer.returnValues.tokenId;
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ let event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ expectedTokenId = await contract.methods.nextTokenId().call();
+ result = await contract.methods.mintCross(receiverCross, properties).send();
+ event = result.events.Transfer;
+ expect(event.address).to.be.equal(collectionAddress);
+ expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+ expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+
+ tokenId = result.events.Transfer.returnValues.tokenId;
+
+ expect(tokenId).to.be.equal(expectedTokenId);
+
+ expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+ .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+ });
itEth.skip('Can perform mintBulk()', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
tests/src/interfaces/augment-api-consts.tsdiffbeforeafterboth--- a/tests/src/interfaces/augment-api-consts.ts
+++ b/tests/src/interfaces/augment-api-consts.ts
@@ -83,7 +83,7 @@
dayRelayBlocks: u32 & AugmentedConst<ApiType>;
defaultMinGasPrice: u64 & AugmentedConst<ApiType>;
defaultWeightToFeeCoefficient: u32 & AugmentedConst<ApiType>;
- maxOverridedAllowedLocations: u32 & AugmentedConst<ApiType>;
+ maxXcmAllowedLocations: u32 & AugmentedConst<ApiType>;
/**
* Generic const
**/