git.delta.rocks / unique-network / refs/commits / d8b03ef62dde

difftreelog

Merge pull request #743 from UniqueNetwork/feature/mintCross

ut-akuznetsov2022-12-16parents: #0a1b898 #94acd92.patch.diff
in: master
added `mintCross` function for `UniqueExtensoins` interfaces

39 files changed

modifiedCargo.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",
modifiedpallets/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.
modifiedpallets/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.
modifiedpallets/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"]
modifiedpallets/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")?,
 		))
 	}
 
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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;
 }
modifiedpallets/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
modifiedpallets/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"
 
modifiedpallets/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,
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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;
 }
modifiedpallets/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
modifiedpallets/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"
 
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,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())]
@@ -618,7 +618,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
@@ -1069,6 +1069,58 @@
 			.map_err(dispatch_to_evm::<T>)?;
 		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());
+
+		<Pallet<T>>::create_item(
+			self,
+			&caller,
+			CreateItemData::<T> {
+				properties,
+				owner: to,
+			},
+			&budget,
+		)
+		.map_err(dispatch_to_evm::<T>)?;
+
+		Ok(token_id.into())
+	}
 }
 
 #[solidity_interface(
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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
modifiedpallets/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
modifiedpallets/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"
 
modifiedpallets/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"),
modifiedpallets/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
modifiedpallets/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)
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/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
modifiedtests/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"
       }
modifiedtests/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" }],
modifiedtests/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[]"
       }
modifiedtests/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[]"
       }
modifiedtests/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;
 }
modifiedtests/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;
 }
modifiedtests/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
modifiedtests/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
modifiedtests/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);
   });
 
modifiedtests/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');
     }));
 
   [
modifiedtests/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);
modifiedtests/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}) => {
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
before · tests/src/eth/nonFungible.test.ts
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/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23  let donor: IKeyringPair;24  let alice: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (helper, privateKey) => {28      donor = await privateKey({filename: __filename});29      [alice] = await helper.arrange.createAccounts([10n], donor);30    });31  });3233  itEth('totalSupply', async ({helper}) => {34    const collection = await helper.nft.mintCollection(alice, {});35    await collection.mintToken(alice);3637    const caller = await helper.eth.createAccountWithBalance(donor);3839    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40    const totalSupply = await contract.methods.totalSupply().call();4142    expect(totalSupply).to.equal('1');43  });4445  itEth('balanceOf', async ({helper}) => {46    const collection = await helper.nft.mintCollection(alice, {});47    const caller = await helper.eth.createAccountWithBalance(donor);4849    await collection.mintToken(alice, {Ethereum: caller});50    await collection.mintToken(alice, {Ethereum: caller});51    await collection.mintToken(alice, {Ethereum: caller});5253    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54    const balance = await contract.methods.balanceOf(caller).call();5556    expect(balance).to.equal('3');57  });5859  itEth('ownerOf', async ({helper}) => {60    const collection = await helper.nft.mintCollection(alice, {});61    const caller = await helper.eth.createAccountWithBalance(donor);6263    const token = await collection.mintToken(alice, {Ethereum: caller});6465    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667    const owner = await contract.methods.ownerOf(token.tokenId).call();6869    expect(owner).to.equal(caller);70  });7172  itEth('name/symbol is available regardless of ERC721Metadata support', async ({helper}) => {73    const collection = await helper.nft.mintCollection(alice, {name: 'test', tokenPrefix: 'TEST'});74    const caller = helper.eth.createAccount();7576    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);7778    expect(await contract.methods.name().call()).to.equal('test');79    expect(await contract.methods.symbol().call()).to.equal('TEST');80  });81});8283describe('Check ERC721 token URI for NFT', () => {84  let donor: IKeyringPair;8586  before(async function() {87    await usingEthPlaygrounds(async (_helper, privateKey) => {88      donor = await privateKey({filename: __filename});89    });90  });9192  async function setup(helper: EthUniqueHelper, baseUri: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {93    const owner = await helper.eth.createAccountWithBalance(donor);94    const receiver = helper.eth.createAccount();9596    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', baseUri);97    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);9899    const result = await contract.methods.mint(receiver).send();100    const tokenId = result.events.Transfer.returnValues.tokenId;101    expect(tokenId).to.be.equal('1');102103    if (propertyKey && propertyValue) {104      // Set URL or suffix105      await contract.methods.setProperties(tokenId, [{key: propertyKey, value: Buffer.from(propertyValue)}]).send();106    }107108    const event = result.events.Transfer;109    expect(event.address).to.be.equal(collectionAddress);110    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');111    expect(event.returnValues.to).to.be.equal(receiver);112    expect(event.returnValues.tokenId).to.be.equal(tokenId);113114    return {contract, nextTokenId: tokenId};115  }116117  itEth('Empty tokenURI', async ({helper}) => {118    const {contract, nextTokenId} = await setup(helper, '');119    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');120  });121122  itEth('TokenURI from url', async ({helper}) => {123    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');124    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');125  });126127  itEth('TokenURI from baseURI', async ({helper}) => {128    const {contract, nextTokenId} = await setup(helper, 'BaseURI_');129    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_');130  });131132  itEth('TokenURI from baseURI + suffix', async ({helper}) => {133    const suffix = '/some/suffix';134    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);135    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);136  });137});138139describe('NFT: Plain calls', () => {140  let donor: IKeyringPair;141  let minter: IKeyringPair;142  let bob: IKeyringPair;143  let charlie: IKeyringPair;144145  before(async function() {146    await usingEthPlaygrounds(async (helper, privateKey) => {147      donor = await privateKey({filename: __filename});148      [minter, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);149    });150  });151152  itEth('Can perform mint() & get crossOwner()', async ({helper}) => {153    const owner = await helper.eth.createAccountWithBalance(donor);154    const receiver = helper.eth.createAccount();155156    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', '');157    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);158159    const result = await contract.methods.mintWithTokenURI(receiver, 'Test URI').send();160    const tokenId = result.events.Transfer.returnValues.tokenId;161    expect(tokenId).to.be.equal('1');162163    const event = result.events.Transfer;164    expect(event.address).to.be.equal(collectionAddress);165    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');166    expect(event.returnValues.to).to.be.equal(receiver);167168    expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');169    console.log(await contract.methods.crossOwnerOf(tokenId).call());170    expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);171    // TODO: this wont work right now, need release 919000 first172    // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();173    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();174    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);175  });176177  //TODO: CORE-302 add eth methods178  itEth.skip('Can perform mintBulk()', async ({helper}) => {179    const caller = await helper.eth.createAccountWithBalance(donor);180    const receiver = helper.eth.createAccount();181182    const collection = await helper.nft.mintCollection(minter);183    await collection.addAdmin(minter, {Ethereum: caller});184185    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);186    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);187    {188      const bulkSize = 3;189      const nextTokenId = await contract.methods.nextTokenId().call();190      expect(nextTokenId).to.be.equal('1');191      const result = await contract.methods.mintBulkWithTokenURI(192        receiver,193        Array.from({length: bulkSize}, (_, i) => (194          [+nextTokenId + i, `Test URI ${i}`]195        )),196      ).send({from: caller});197198      const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);199      for (let i = 0; i < bulkSize; i++) {200        const event = events[i];201        expect(event.address).to.equal(collectionAddress);202        expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');203        expect(event.returnValues.to).to.equal(receiver);204        expect(event.returnValues.tokenId).to.equal(`${+nextTokenId + i}`);205206        expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);207      }208    }209  });210211  itEth('Can perform burn()', async ({helper}) => {212    const caller = await helper.eth.createAccountWithBalance(donor);213214    const collection = await helper.nft.mintCollection(minter, {});215    const {tokenId} = await collection.mintToken(minter, {Ethereum: caller});216217    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);218    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);219220    {221      const result = await contract.methods.burn(tokenId).send({from: caller});222223      const event = result.events.Transfer;224      expect(event.address).to.be.equal(collectionAddress);225      expect(event.returnValues.from).to.be.equal(caller);226      expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');227      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);228    }229  });230231  itEth('Can perform approve()', async ({helper}) => {232    const owner = await helper.eth.createAccountWithBalance(donor);233    const spender = helper.eth.createAccount();234235    const collection = await helper.nft.mintCollection(minter, {});236    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});237238    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);239    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);240241    {242      const result = await contract.methods.approve(spender, tokenId).send({from: owner});243244      const event = result.events.Approval;245      expect(event.address).to.be.equal(collectionAddress);246      expect(event.returnValues.owner).to.be.equal(owner);247      expect(event.returnValues.approved).to.be.equal(spender);248      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);249    }250  });251252  itEth('Can perform setApprovalForAll()', async ({helper}) => {253    const owner = await helper.eth.createAccountWithBalance(donor);254    const operator = helper.eth.createAccount();255256    const collection = await helper.nft.mintCollection(minter, {});257258    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);259    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);260261    const approvedBefore = await contract.methods.isApprovedForAll(owner, operator).call();262    expect(approvedBefore).to.be.equal(false);263264    {265      const result = await contract.methods.setApprovalForAll(operator, true).send({from: owner});266267      expect(result.events.ApprovalForAll).to.be.like({268        address: collectionAddress,269        event: 'ApprovalForAll',270        returnValues: {271          owner,272          operator,273          approved: true,274        },275      });276277      const approvedAfter = await contract.methods.isApprovedForAll(owner, operator).call();278      expect(approvedAfter).to.be.equal(true);279    }280281    {282      const result = await contract.methods.setApprovalForAll(operator, false).send({from: owner});283284      expect(result.events.ApprovalForAll).to.be.like({285        address: collectionAddress,286        event: 'ApprovalForAll',287        returnValues: {288          owner,289          operator,290          approved: false,291        },292      });293294      const approvedAfter = await contract.methods.isApprovedForAll(owner, operator).call();295      expect(approvedAfter).to.be.equal(false);296    }297  });298299  itEth('Can perform burn with ApprovalForAll', async ({helper}) => {300    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});301302    const owner = await helper.eth.createAccountWithBalance(donor);303    const operator = await helper.eth.createAccountWithBalance(donor, 100n);304305    const token = await collection.mintToken(minter, {Ethereum: owner});306307    const address = helper.ethAddress.fromCollectionId(collection.collectionId);308    const contract = helper.ethNativeContract.collection(address, 'nft');309310    {311      await contract.methods.setApprovalForAll(operator, true).send({from: owner});312      const ownerCross = helper.ethCrossAccount.fromAddress(owner);313      const result = await contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: operator});314      const events = result.events.Transfer;315316      expect(events).to.be.like({317        address,318        event: 'Transfer',319        returnValues: {320          from: owner,321          to: '0x0000000000000000000000000000000000000000',322          tokenId: token.tokenId.toString(),323        },324      });325    }326  });327  328  itEth('Can perform transfer with ApprovalForAll', async ({helper}) => {329    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});330331    const owner = await helper.eth.createAccountWithBalance(donor);332    const operator = await helper.eth.createAccountWithBalance(donor);333    const receiver = charlie;334335    const token = await collection.mintToken(minter, {Ethereum: owner});336337    const address = helper.ethAddress.fromCollectionId(collection.collectionId);338    const contract = helper.ethNativeContract.collection(address, 'nft');339340    {341      await contract.methods.setApprovalForAll(operator, true).send({from: owner});342      const ownerCross = helper.ethCrossAccount.fromAddress(owner);343      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);344      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: operator});345      const event = result.events.Transfer;346      expect(event).to.be.like({347        address: helper.ethAddress.fromCollectionId(collection.collectionId),348        event: 'Transfer',349        returnValues: {350          from: owner,351          to: helper.address.substrateToEth(receiver.address),352          tokenId: token.tokenId.toString(),353        },354      });355    }356357    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});358  });359360  itEth('Can perform burnFromCross()', async ({helper}) => {361    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});362    const ownerSub = bob;363    const ownerCrossSub = helper.ethCrossAccount.fromKeyringPair(ownerSub);364    const ownerEth = await helper.eth.createAccountWithBalance(donor, 100n);365    const ownerCrossEth = helper.ethCrossAccount.fromAddress(ownerEth);366367    const burnerEth = await helper.eth.createAccountWithBalance(donor, 100n);368    const burnerCrossEth = helper.ethCrossAccount.fromAddress(burnerEth);369370    const token1 = await collection.mintToken(minter, {Substrate: ownerSub.address});371    const token2 = await collection.mintToken(minter, {Ethereum: ownerEth});372373    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);374    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft');375376    // Approve tokens from substrate and ethereum:377    await token1.approve(ownerSub, {Ethereum: burnerEth});378    await collectionEvm.methods.approveCross(burnerCrossEth, token2.tokenId).send({from: ownerEth});379380    // can burnFromCross:381    const result1 = await collectionEvm.methods.burnFromCross(ownerCrossSub, token1.tokenId).send({from: burnerEth});382    const result2 = await collectionEvm.methods.burnFromCross(ownerCrossEth, token2.tokenId).send({from: burnerEth});383    const events1 = result1.events.Transfer;384    const events2 = result2.events.Transfer;385386    // Check events for burnFromCross (substrate and ethereum):387    [388      [events1, token1, helper.address.substrateToEth(ownerSub.address)], 389      [events2, token2, ownerEth],390    ].map(burnData => {391      expect(burnData[0]).to.be.like({392        address: collectionAddress,393        event: 'Transfer',394        returnValues: {395          from: burnData[2],396          to: '0x0000000000000000000000000000000000000000',397          tokenId: burnData[1].tokenId.toString(),398        },399      });400    });401402    expect(await token1.doesExist()).to.be.false;403    expect(await token2.doesExist()).to.be.false;404  });405406  itEth('Can perform approveCross()', async ({helper}) => {407    // arrange: create accounts408    const owner = await helper.eth.createAccountWithBalance(donor, 100n);409    const ownerCross = helper.ethCrossAccount.fromAddress(owner);410    const receiverSub = charlie;411    const recieverCrossSub = helper.ethCrossAccount.fromKeyringPair(receiverSub);412    const receiverEth = await helper.eth.createAccountWithBalance(donor, 100n);413    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);414415    // arrange: create collection and tokens:416    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});417    const token1 = await collection.mintToken(minter, {Ethereum: owner});418    const token2 = await collection.mintToken(minter, {Ethereum: owner});419420    const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');421422    // Can approveCross substrate and ethereum address:423    const resultSub = await collectionEvm.methods.approveCross(recieverCrossSub, token1.tokenId).send({from: owner});424    const resultEth = await collectionEvm.methods.approveCross(receiverCrossEth, token2.tokenId).send({from: owner});425    const eventSub = resultSub.events.Approval;426    const eventEth = resultEth.events.Approval;427    expect(eventSub).to.be.like({428      address: helper.ethAddress.fromCollectionId(collection.collectionId),429      event: 'Approval',430      returnValues: {431        owner,432        approved: helper.address.substrateToEth(receiverSub.address),433        tokenId: token1.tokenId.toString(),434      },435    });436    expect(eventEth).to.be.like({437      address: helper.ethAddress.fromCollectionId(collection.collectionId),438      event: 'Approval',439      returnValues: {440        owner,441        approved: receiverEth,442        tokenId: token2.tokenId.toString(),443      },444    });445446    // Substrate address can transferFrom approved tokens:447    await helper.nft.transferTokenFrom(receiverSub, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiverSub.address});448    expect(await helper.nft.getTokenOwner(collection.collectionId, token1.tokenId)).to.deep.eq({Substrate: receiverSub.address});449    // Ethereum address can transferFromCross approved tokens:450    await collectionEvm.methods.transferFromCross(ownerCross, receiverCrossEth, token2.tokenId).send({from: receiverEth});451    expect(await helper.nft.getTokenOwner(collection.collectionId, token2.tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});452  });453454  itEth('Can reaffirm approved address', async ({helper}) => {455    const owner = await helper.eth.createAccountWithBalance(donor, 100n);456    const ownerCrossEth = helper.ethCrossAccount.fromAddress(owner);457    const [receiver1, receiver2] = await helper.arrange.createAccounts([100n, 100n], donor);458    const receiver1Cross = helper.ethCrossAccount.fromKeyringPair(receiver1);459    const receiver2Cross = helper.ethCrossAccount.fromKeyringPair(receiver2);460    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});461    const token1 = await collection.mintToken(minter, {Ethereum: owner});462    const token2 = await collection.mintToken(minter, {Ethereum: owner});463    const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');464465    // Can approve and reaffirm approved address:466    await collectionEvm.methods.approveCross(receiver1Cross, token1.tokenId).send({from: owner});467    await collectionEvm.methods.approveCross(receiver2Cross, token1.tokenId).send({from: owner});468469    // receiver1 cannot transferFrom:470    await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;471    // receiver2 can transferFrom:472    await helper.nft.transferTokenFrom(receiver2, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver2.address});473474    // can set approved address to self address to remove approval:475    await collectionEvm.methods.approveCross(receiver1Cross, token2.tokenId).send({from: owner});476    await collectionEvm.methods.approveCross(ownerCrossEth, token2.tokenId).send({from: owner});477478    // receiver1 cannot transfer token anymore:479    await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token2.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;480  });481482  itEth('Can perform transferFrom()', async ({helper}) => {483    const owner = await helper.eth.createAccountWithBalance(donor);484    const spender = await helper.eth.createAccountWithBalance(donor);485    const receiver = helper.eth.createAccount();486487    const collection = await helper.nft.mintCollection(minter, {});488    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});489490    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);491    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);492493    await contract.methods.approve(spender, tokenId).send({from: owner});494495    {496      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});497498      const event = result.events.Transfer;499      expect(event.address).to.be.equal(collectionAddress);500      expect(event.returnValues.from).to.be.equal(owner);501      expect(event.returnValues.to).to.be.equal(receiver);502      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);503    }504505    {506      const balance = await contract.methods.balanceOf(receiver).call();507      expect(+balance).to.equal(1);508    }509510    {511      const balance = await contract.methods.balanceOf(owner).call();512      expect(+balance).to.equal(0);513    }514  });515516  itEth('Can perform transferFromCross()', async ({helper}) => {517    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});518519    const [owner, receiver] = await helper.arrange.createAccounts([100n, 100n], donor);520    const spender = await helper.eth.createAccountWithBalance(donor);521522    const token = await collection.mintToken(minter, {Substrate: owner.address});523524    const address = helper.ethAddress.fromCollectionId(collection.collectionId);525    const contract = helper.ethNativeContract.collection(address, 'nft');526527    await token.approve(owner, {Ethereum: spender});528529    {530      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);531      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);532      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});533      const event = result.events.Transfer;534      expect(event).to.be.like({535        address: helper.ethAddress.fromCollectionId(collection.collectionId),536        event: 'Transfer',537        returnValues: {538          from: helper.address.substrateToEth(owner.address),539          to: helper.address.substrateToEth(receiver.address),540          tokenId: token.tokenId.toString(),541        },542      });543    }544545    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});546  });547548  itEth('Can perform transfer()', async ({helper}) => {549    const collection = await helper.nft.mintCollection(minter, {});550    const owner = await helper.eth.createAccountWithBalance(donor);551    const receiver = helper.eth.createAccount();552553    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});554555    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);556    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);557558    {559      const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});560561      const event = result.events.Transfer;562      expect(event.address).to.be.equal(collectionAddress);563      expect(event.returnValues.from).to.be.equal(owner);564      expect(event.returnValues.to).to.be.equal(receiver);565      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);566    }567568    {569      const balance = await contract.methods.balanceOf(owner).call();570      expect(+balance).to.equal(0);571    }572573    {574      const balance = await contract.methods.balanceOf(receiver).call();575      expect(+balance).to.equal(1);576    }577  });578  579  itEth('Can perform transferCross()', async ({helper}) => {580    const collection = await helper.nft.mintCollection(minter, {});581    const owner = await helper.eth.createAccountWithBalance(donor);582    const receiverEth = await helper.eth.createAccountWithBalance(donor);583    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);584    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);585    586    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});587588    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);589    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);590591    {592      // Can transferCross to ethereum address:593      const result = await collectionEvm.methods.transferCross(receiverCrossEth, tokenId).send({from: owner});594      // Check events:595      const event = result.events.Transfer;596      expect(event.address).to.be.equal(collectionAddress);597      expect(event.returnValues.from).to.be.equal(owner);598      expect(event.returnValues.to).to.be.equal(receiverEth);599      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);600      601      // owner has balance = 0:602      const ownerBalance = await collectionEvm.methods.balanceOf(owner).call();603      expect(+ownerBalance).to.equal(0);604      // receiver owns token:605      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();606      expect(+receiverBalance).to.equal(1);607      expect(await helper.nft.getTokenOwner(collection.collectionId, tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});608    }609    610    {611      // Can transferCross to substrate address:612      const substrateResult = await collectionEvm.methods.transferCross(receiverCrossSub, tokenId).send({from: receiverEth});613      // Check events:614      const event = substrateResult.events.Transfer;615      expect(event.address).to.be.equal(collectionAddress);616      expect(event.returnValues.from).to.be.equal(receiverEth);617      expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(minter.address));618      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);619      620      // owner has balance = 0:621      const ownerBalance = await collectionEvm.methods.balanceOf(receiverEth).call();622      expect(+ownerBalance).to.equal(0);623      // receiver owns token:624      const receiverBalance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});625      expect(receiverBalance).to.contain(tokenId);626    }627  });628629  ['transfer', 'transferCross'].map(testCase => itEth(`Cannot ${testCase} non-owned token`, async ({helper}) => {630    const sender = await helper.eth.createAccountWithBalance(donor);631    const tokenOwner = await helper.eth.createAccountWithBalance(donor);632    const receiverSub = minter;633    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);634635    const collection = await helper.nft.mintCollection(minter, {});636    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);637    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', sender);638639    await collection.mintToken(minter, {Ethereum: sender});640    const nonSendersToken = await collection.mintToken(minter, {Ethereum: tokenOwner});641642    // Cannot transferCross someone else's token:643    const receiver = testCase === 'transfer' ? helper.address.substrateToEth(receiverSub.address) : receiverCrossSub;644    await expect(collectionEvm.methods[testCase](receiver, nonSendersToken.tokenId).send({from: sender})).to.be.rejected;645    // Cannot transfer token if it does not exist:646    await expect(collectionEvm.methods[testCase](receiver, 999999).send({from: sender})).to.be.rejected;647  }));648});649650describe('NFT: Fees', () => {651  let donor: IKeyringPair;652  let alice: IKeyringPair;653  let bob: IKeyringPair;654  let charlie: IKeyringPair;655656  before(async function() {657    await usingEthPlaygrounds(async (helper, privateKey) => {658      donor = await privateKey({filename: __filename});659      [alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);660    });661  });662663  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {664    const owner = await helper.eth.createAccountWithBalance(donor);665    const spender = helper.eth.createAccount();666667    const collection = await helper.nft.mintCollection(alice, {});668    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});669670    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);671672    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));673    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));674  });675676  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {677    const owner = await helper.eth.createAccountWithBalance(donor);678    const spender = await helper.eth.createAccountWithBalance(donor);679680    const collection = await helper.nft.mintCollection(alice, {});681    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});682683    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);684685    await contract.methods.approve(spender, tokenId).send({from: owner});686687    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));688    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));689  });690691  itEth('Can perform transferFromCross()', async ({helper}) => {692    const collectionMinter = alice;693    const owner = bob;694    const receiver = charlie;695    const collection = await helper.nft.mintCollection(collectionMinter, {name: 'A', description: 'B', tokenPrefix: 'C'});696697    const spender = await helper.eth.createAccountWithBalance(donor, 100n);698699    const token = await collection.mintToken(collectionMinter, {Substrate: owner.address});700701    const address = helper.ethAddress.fromCollectionId(collection.collectionId);702    const contract = helper.ethNativeContract.collection(address, 'nft');703704    await token.approve(owner, {Ethereum: spender});705706    {707      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);708      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);709      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});710      const event = result.events.Transfer;711      expect(event).to.be.like({712        address: helper.ethAddress.fromCollectionId(collection.collectionId),713        event: 'Transfer',714        returnValues: {715          from: helper.address.substrateToEth(owner.address),716          to: helper.address.substrateToEth(receiver.address),717          tokenId: token.tokenId.toString(),718        },719      });720    }721722    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});723  });724725  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {726    const owner = await helper.eth.createAccountWithBalance(donor);727    const receiver = helper.eth.createAccount();728729    const collection = await helper.nft.mintCollection(alice, {});730    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});731732    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);733734    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));735    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));736  });737});738739describe('NFT: Substrate calls', () => {740  let donor: IKeyringPair;741  let alice: IKeyringPair;742743  before(async function() {744    await usingEthPlaygrounds(async (helper, privateKey) => {745      donor = await privateKey({filename: __filename});746      [alice] = await helper.arrange.createAccounts([20n], donor);747    });748  });749750  itEth('Events emitted for mint()', async ({helper}) => {751    const collection = await helper.nft.mintCollection(alice, {});752    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);753    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');754755    const events: any = [];756    contract.events.allEvents((_: any, event: any) => {757      events.push(event);758    });759760    const {tokenId} = await collection.mintToken(alice);761    if (events.length == 0) await helper.wait.newBlocks(1);762    const event = events[0];763764    expect(event.event).to.be.equal('Transfer');765    expect(event.address).to.be.equal(collectionAddress);766    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');767    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));768    expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());769  });770771  itEth('Events emitted for burn()', async ({helper}) => {772    const collection = await helper.nft.mintCollection(alice, {});773    const token = await collection.mintToken(alice);774775    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);776    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');777778    const events: any = [];779    contract.events.allEvents((_: any, event: any) => {780      events.push(event);781    });782783    await token.burn(alice);784    if (events.length == 0) await helper.wait.newBlocks(1);785    const event = events[0];786787    expect(event.event).to.be.equal('Transfer');788    expect(event.address).to.be.equal(collectionAddress);789    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));790    expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');791    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());792  });793794  itEth('Events emitted for approve()', async ({helper}) => {795    const receiver = helper.eth.createAccount();796797    const collection = await helper.nft.mintCollection(alice, {});798    const token = await collection.mintToken(alice);799800    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);801    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');802803    const events: any = [];804    contract.events.allEvents((_: any, event: any) => {805      events.push(event);806    });807808    await token.approve(alice, {Ethereum: receiver});809    if (events.length == 0) await helper.wait.newBlocks(1);810    const event = events[0];811812    expect(event.event).to.be.equal('Approval');813    expect(event.address).to.be.equal(collectionAddress);814    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));815    expect(event.returnValues.approved).to.be.equal(receiver);816    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());817  });818819  itEth('Events emitted for transferFrom()', async ({helper}) => {820    const [bob] = await helper.arrange.createAccounts([10n], donor);821    const receiver = helper.eth.createAccount();822823    const collection = await helper.nft.mintCollection(alice, {});824    const token = await collection.mintToken(alice);825    await token.approve(alice, {Substrate: bob.address});826827    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);828    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');829830    const events: any = [];831    contract.events.allEvents((_: any, event: any) => {832      events.push(event);833    });834835    await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});836837    if (events.length == 0) await helper.wait.newBlocks(1);838    const event = events[0];839840    expect(event.address).to.be.equal(collectionAddress);841    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));842    expect(event.returnValues.to).to.be.equal(receiver);843    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);844  });845846  itEth('Events emitted for transfer()', async ({helper}) => {847    const receiver = helper.eth.createAccount();848849    const collection = await helper.nft.mintCollection(alice, {});850    const token = await collection.mintToken(alice);851852    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);853    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');854855    const events: any = [];856    contract.events.allEvents((_: any, event: any) => {857      events.push(event);858    });859860    await token.transfer(alice, {Ethereum: receiver});861862    if (events.length == 0) await helper.wait.newBlocks(1);863    const event = events[0];864865    expect(event.address).to.be.equal(collectionAddress);866    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));867    expect(event.returnValues.to).to.be.equal(receiver);868    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);869  });870});871872describe('Common metadata', () => {873  let donor: IKeyringPair;874  let alice: IKeyringPair;875876  before(async function() {877    await usingEthPlaygrounds(async (helper, privateKey) => {878      donor = await privateKey({filename: __filename});879      [alice] = await helper.arrange.createAccounts([20n], donor);880    });881  });882883  itEth('Returns collection name', async ({helper}) => {884    const caller = await helper.eth.createAccountWithBalance(donor);885    const tokenPropertyPermissions = [{886      key: 'URI',887      permission: {888        mutable: true,889        collectionAdmin: true,890        tokenOwner: false,891      },892    }];893    const collection = await helper.nft.mintCollection(894      alice,895      {896        name: 'oh River',897        tokenPrefix: 'CHANGE',898        properties: [{key: 'ERC721Metadata', value: '1'}],899        tokenPropertyPermissions,900      },901    );902903    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);904    const name = await contract.methods.name().call();905    expect(name).to.equal('oh River');906  });907908  itEth('Returns symbol name', async ({helper}) => {909    const caller = await helper.eth.createAccountWithBalance(donor);910    const tokenPropertyPermissions = [{911      key: 'URI',912      permission: {913        mutable: true,914        collectionAdmin: true,915        tokenOwner: false,916      },917    }];918    const collection = await helper.nft.mintCollection(919      alice,920      {921        name: 'oh River',922        tokenPrefix: 'CHANGE',923        properties: [{key: 'ERC721Metadata', value: '1'}],924        tokenPropertyPermissions,925      },926    );927928    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);929    const symbol = await contract.methods.symbol().call();930    expect(symbol).to.equal('CHANGE');931  });932});933934describe('Negative tests', () => {935  let donor: IKeyringPair;936  let minter: IKeyringPair;937  let alice: IKeyringPair;938939  before(async function() {940    await usingEthPlaygrounds(async (helper, privateKey) => {941      donor = await privateKey({filename: __filename});942      [minter, alice] = await helper.arrange.createAccounts([100n, 100n], donor);943    });944  });945946  itEth('[negative] Cant perform burn without approval', async ({helper}) => {947    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});948949    const owner = await helper.eth.createAccountWithBalance(donor, 100n);950    const spender = await helper.eth.createAccountWithBalance(donor, 100n);951952    const token = await collection.mintToken(minter, {Ethereum: owner});953954    const address = helper.ethAddress.fromCollectionId(collection.collectionId);955    const contract = helper.ethNativeContract.collection(address, 'nft');956957    const ownerCross = helper.ethCrossAccount.fromAddress(owner);958    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;959960    await contract.methods.setApprovalForAll(spender, true).send({from: owner});961    await contract.methods.setApprovalForAll(spender, false).send({from: owner});962963    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;964  });965966  itEth('[negative] Cant perform transfer without approval', async ({helper}) => {967    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});968    const receiver = alice;969970    const owner = await helper.eth.createAccountWithBalance(donor, 100n);971    const spender = await helper.eth.createAccountWithBalance(donor, 100n);972973    const token = await collection.mintToken(minter, {Ethereum: owner});974975    const address = helper.ethAddress.fromCollectionId(collection.collectionId);976    const contract = helper.ethNativeContract.collection(address, 'nft');977978    const ownerCross = helper.ethCrossAccount.fromAddress(owner);979    const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);980981    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;982983    await contract.methods.setApprovalForAll(spender, true).send({from: owner});984    await contract.methods.setApprovalForAll(spender, false).send({from: owner});985    986    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;987  });988});
after · tests/src/eth/nonFungible.test.ts
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/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';20import {ITokenPropertyPermission} from '../util/playgrounds/types';212223describe('NFT: Information getting', () => {24  let donor: IKeyringPair;25  let alice: IKeyringPair;2627  before(async function() {28    await usingEthPlaygrounds(async (helper, privateKey) => {29      donor = await privateKey({filename: __filename});30      [alice] = await helper.arrange.createAccounts([10n], donor);31    });32  });3334  itEth('totalSupply', async ({helper}) => {35    const collection = await helper.nft.mintCollection(alice, {});36    await collection.mintToken(alice);3738    const caller = await helper.eth.createAccountWithBalance(donor);3940    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);41    const totalSupply = await contract.methods.totalSupply().call();4243    expect(totalSupply).to.equal('1');44  });4546  itEth('balanceOf', async ({helper}) => {47    const collection = await helper.nft.mintCollection(alice, {});48    const caller = await helper.eth.createAccountWithBalance(donor);4950    await collection.mintToken(alice, {Ethereum: caller});51    await collection.mintToken(alice, {Ethereum: caller});52    await collection.mintToken(alice, {Ethereum: caller});5354    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);55    const balance = await contract.methods.balanceOf(caller).call();5657    expect(balance).to.equal('3');58  });5960  itEth('ownerOf', async ({helper}) => {61    const collection = await helper.nft.mintCollection(alice, {});62    const caller = await helper.eth.createAccountWithBalance(donor);6364    const token = await collection.mintToken(alice, {Ethereum: caller});6566    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6768    const owner = await contract.methods.ownerOf(token.tokenId).call();6970    expect(owner).to.equal(caller);71  });7273  itEth('name/symbol is available regardless of ERC721Metadata support', async ({helper}) => {74    const collection = await helper.nft.mintCollection(alice, {name: 'test', tokenPrefix: 'TEST'});75    const caller = helper.eth.createAccount();7677    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);7879    expect(await contract.methods.name().call()).to.equal('test');80    expect(await contract.methods.symbol().call()).to.equal('TEST');81  });82});8384describe('Check ERC721 token URI for NFT', () => {85  let donor: IKeyringPair;8687  before(async function() {88    await usingEthPlaygrounds(async (_helper, privateKey) => {89      donor = await privateKey({filename: __filename});90    });91  });9293  async function setup(helper: EthUniqueHelper, baseUri: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {94    const owner = await helper.eth.createAccountWithBalance(donor);95    const receiver = helper.eth.createAccount();9697    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', baseUri);98    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);99100    const result = await contract.methods.mint(receiver).send();101    const tokenId = result.events.Transfer.returnValues.tokenId;102    expect(tokenId).to.be.equal('1');103104    if (propertyKey && propertyValue) {105      // Set URL or suffix106      await contract.methods.setProperties(tokenId, [{key: propertyKey, value: Buffer.from(propertyValue)}]).send();107    }108109    const event = result.events.Transfer;110    expect(event.address).to.be.equal(collectionAddress);111    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');112    expect(event.returnValues.to).to.be.equal(receiver);113    expect(event.returnValues.tokenId).to.be.equal(tokenId);114115    return {contract, nextTokenId: tokenId};116  }117118  itEth('Empty tokenURI', async ({helper}) => {119    const {contract, nextTokenId} = await setup(helper, '');120    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');121  });122123  itEth('TokenURI from url', async ({helper}) => {124    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');125    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');126  });127128  itEth('TokenURI from baseURI', async ({helper}) => {129    const {contract, nextTokenId} = await setup(helper, 'BaseURI_');130    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_');131  });132133  itEth('TokenURI from baseURI + suffix', async ({helper}) => {134    const suffix = '/some/suffix';135    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);136    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);137  });138});139140describe('NFT: Plain calls', () => {141  let donor: IKeyringPair;142  let minter: IKeyringPair;143  let bob: IKeyringPair;144  let charlie: IKeyringPair;145146  before(async function() {147    await usingEthPlaygrounds(async (helper, privateKey) => {148      donor = await privateKey({filename: __filename});149      [minter, bob, charlie] = await helper.arrange.createAccounts([100n, 100n, 100n], donor);150    });151  });152153  itEth('Can perform mint() & get crossOwner()', async ({helper}) => {154    const owner = await helper.eth.createAccountWithBalance(donor);155    const receiver = helper.eth.createAccount();156157    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', '');158    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);159160    const result = await contract.methods.mintWithTokenURI(receiver, 'Test URI').send();161    const tokenId = result.events.Transfer.returnValues.tokenId;162    expect(tokenId).to.be.equal('1');163164    const event = result.events.Transfer;165    expect(event.address).to.be.equal(collectionAddress);166    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');167    expect(event.returnValues.to).to.be.equal(receiver);168169    expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');170    console.log(await contract.methods.crossOwnerOf(tokenId).call());171    expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);172    // TODO: this wont work right now, need release 919000 first173    // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();174    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();175    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);176  });177  178  itEth('Can perform mintCross()', async ({helper}) => {179    const caller = await helper.eth.createAccountWithBalance(donor);180    const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);181    const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });182    const permissions: ITokenPropertyPermission[] = properties183      .map(p => {184        return {185          key: p.key, permission: {186            tokenOwner: true,187            collectionAdmin: true,188            mutable: true,189          },190        };191      });192    193    194    const collection = await helper.nft.mintCollection(minter, {195      tokenPrefix: 'ethp',196      tokenPropertyPermissions: permissions,197    });198    await collection.addAdmin(minter, {Ethereum: caller});199    200    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);201    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);202    let expectedTokenId = await contract.methods.nextTokenId().call();203    let result = await contract.methods.mintCross(receiverCross, []).send();204    let tokenId = result.events.Transfer.returnValues.tokenId;205    expect(tokenId).to.be.equal(expectedTokenId);206207    let event = result.events.Transfer;208    expect(event.address).to.be.equal(collectionAddress);209    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');210    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));211    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);212    213    expectedTokenId = await contract.methods.nextTokenId().call();214    result = await contract.methods.mintCross(receiverCross, properties).send();215    event = result.events.Transfer;216    expect(event.address).to.be.equal(collectionAddress);217    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');218    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));219    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);220    221    tokenId = result.events.Transfer.returnValues.tokenId;222    223    expect(tokenId).to.be.equal(expectedTokenId);224225    expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties226      .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));227  });228  229  //TODO: CORE-302 add eth methods230  itEth.skip('Can perform mintBulk()', async ({helper}) => {231    const caller = await helper.eth.createAccountWithBalance(donor);232    const receiver = helper.eth.createAccount();233234    const collection = await helper.nft.mintCollection(minter);235    await collection.addAdmin(minter, {Ethereum: caller});236237    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);238    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);239    {240      const bulkSize = 3;241      const nextTokenId = await contract.methods.nextTokenId().call();242      expect(nextTokenId).to.be.equal('1');243      const result = await contract.methods.mintBulkWithTokenURI(244        receiver,245        Array.from({length: bulkSize}, (_, i) => (246          [+nextTokenId + i, `Test URI ${i}`]247        )),248      ).send({from: caller});249250      const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);251      for (let i = 0; i < bulkSize; i++) {252        const event = events[i];253        expect(event.address).to.equal(collectionAddress);254        expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');255        expect(event.returnValues.to).to.equal(receiver);256        expect(event.returnValues.tokenId).to.equal(`${+nextTokenId + i}`);257258        expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);259      }260    }261  });262263  itEth('Can perform burn()', async ({helper}) => {264    const caller = await helper.eth.createAccountWithBalance(donor);265266    const collection = await helper.nft.mintCollection(minter, {});267    const {tokenId} = await collection.mintToken(minter, {Ethereum: caller});268269    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);270    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);271272    {273      const result = await contract.methods.burn(tokenId).send({from: caller});274275      const event = result.events.Transfer;276      expect(event.address).to.be.equal(collectionAddress);277      expect(event.returnValues.from).to.be.equal(caller);278      expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');279      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);280    }281  });282283  itEth('Can perform approve()', async ({helper}) => {284    const owner = await helper.eth.createAccountWithBalance(donor);285    const spender = helper.eth.createAccount();286287    const collection = await helper.nft.mintCollection(minter, {});288    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});289290    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);291    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);292293    {294      const result = await contract.methods.approve(spender, tokenId).send({from: owner});295296      const event = result.events.Approval;297      expect(event.address).to.be.equal(collectionAddress);298      expect(event.returnValues.owner).to.be.equal(owner);299      expect(event.returnValues.approved).to.be.equal(spender);300      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);301    }302  });303304  itEth('Can perform setApprovalForAll()', async ({helper}) => {305    const owner = await helper.eth.createAccountWithBalance(donor);306    const operator = helper.eth.createAccount();307308    const collection = await helper.nft.mintCollection(minter, {});309310    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);311    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);312313    const approvedBefore = await contract.methods.isApprovedForAll(owner, operator).call();314    expect(approvedBefore).to.be.equal(false);315316    {317      const result = await contract.methods.setApprovalForAll(operator, true).send({from: owner});318319      expect(result.events.ApprovalForAll).to.be.like({320        address: collectionAddress,321        event: 'ApprovalForAll',322        returnValues: {323          owner,324          operator,325          approved: true,326        },327      });328329      const approvedAfter = await contract.methods.isApprovedForAll(owner, operator).call();330      expect(approvedAfter).to.be.equal(true);331    }332333    {334      const result = await contract.methods.setApprovalForAll(operator, false).send({from: owner});335336      expect(result.events.ApprovalForAll).to.be.like({337        address: collectionAddress,338        event: 'ApprovalForAll',339        returnValues: {340          owner,341          operator,342          approved: false,343        },344      });345346      const approvedAfter = await contract.methods.isApprovedForAll(owner, operator).call();347      expect(approvedAfter).to.be.equal(false);348    }349  });350351  itEth('Can perform burn with ApprovalForAll', async ({helper}) => {352    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});353354    const owner = await helper.eth.createAccountWithBalance(donor);355    const operator = await helper.eth.createAccountWithBalance(donor, 100n);356357    const token = await collection.mintToken(minter, {Ethereum: owner});358359    const address = helper.ethAddress.fromCollectionId(collection.collectionId);360    const contract = helper.ethNativeContract.collection(address, 'nft');361362    {363      await contract.methods.setApprovalForAll(operator, true).send({from: owner});364      const ownerCross = helper.ethCrossAccount.fromAddress(owner);365      const result = await contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: operator});366      const events = result.events.Transfer;367368      expect(events).to.be.like({369        address,370        event: 'Transfer',371        returnValues: {372          from: owner,373          to: '0x0000000000000000000000000000000000000000',374          tokenId: token.tokenId.toString(),375        },376      });377    }378  });379  380  itEth('Can perform transfer with ApprovalForAll', async ({helper}) => {381    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});382383    const owner = await helper.eth.createAccountWithBalance(donor);384    const operator = await helper.eth.createAccountWithBalance(donor);385    const receiver = charlie;386387    const token = await collection.mintToken(minter, {Ethereum: owner});388389    const address = helper.ethAddress.fromCollectionId(collection.collectionId);390    const contract = helper.ethNativeContract.collection(address, 'nft');391392    {393      await contract.methods.setApprovalForAll(operator, true).send({from: owner});394      const ownerCross = helper.ethCrossAccount.fromAddress(owner);395      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);396      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: operator});397      const event = result.events.Transfer;398      expect(event).to.be.like({399        address: helper.ethAddress.fromCollectionId(collection.collectionId),400        event: 'Transfer',401        returnValues: {402          from: owner,403          to: helper.address.substrateToEth(receiver.address),404          tokenId: token.tokenId.toString(),405        },406      });407    }408409    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});410  });411412  itEth('Can perform burnFromCross()', async ({helper}) => {413    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});414    const ownerSub = bob;415    const ownerCrossSub = helper.ethCrossAccount.fromKeyringPair(ownerSub);416    const ownerEth = await helper.eth.createAccountWithBalance(donor, 100n);417    const ownerCrossEth = helper.ethCrossAccount.fromAddress(ownerEth);418419    const burnerEth = await helper.eth.createAccountWithBalance(donor, 100n);420    const burnerCrossEth = helper.ethCrossAccount.fromAddress(burnerEth);421422    const token1 = await collection.mintToken(minter, {Substrate: ownerSub.address});423    const token2 = await collection.mintToken(minter, {Ethereum: ownerEth});424425    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);426    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft');427428    // Approve tokens from substrate and ethereum:429    await token1.approve(ownerSub, {Ethereum: burnerEth});430    await collectionEvm.methods.approveCross(burnerCrossEth, token2.tokenId).send({from: ownerEth});431432    // can burnFromCross:433    const result1 = await collectionEvm.methods.burnFromCross(ownerCrossSub, token1.tokenId).send({from: burnerEth});434    const result2 = await collectionEvm.methods.burnFromCross(ownerCrossEth, token2.tokenId).send({from: burnerEth});435    const events1 = result1.events.Transfer;436    const events2 = result2.events.Transfer;437438    // Check events for burnFromCross (substrate and ethereum):439    [440      [events1, token1, helper.address.substrateToEth(ownerSub.address)], 441      [events2, token2, ownerEth],442    ].map(burnData => {443      expect(burnData[0]).to.be.like({444        address: collectionAddress,445        event: 'Transfer',446        returnValues: {447          from: burnData[2],448          to: '0x0000000000000000000000000000000000000000',449          tokenId: burnData[1].tokenId.toString(),450        },451      });452    });453454    expect(await token1.doesExist()).to.be.false;455    expect(await token2.doesExist()).to.be.false;456  });457458  itEth('Can perform approveCross()', async ({helper}) => {459    // arrange: create accounts460    const owner = await helper.eth.createAccountWithBalance(donor, 100n);461    const ownerCross = helper.ethCrossAccount.fromAddress(owner);462    const receiverSub = charlie;463    const recieverCrossSub = helper.ethCrossAccount.fromKeyringPair(receiverSub);464    const receiverEth = await helper.eth.createAccountWithBalance(donor, 100n);465    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);466467    // arrange: create collection and tokens:468    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});469    const token1 = await collection.mintToken(minter, {Ethereum: owner});470    const token2 = await collection.mintToken(minter, {Ethereum: owner});471472    const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');473474    // Can approveCross substrate and ethereum address:475    const resultSub = await collectionEvm.methods.approveCross(recieverCrossSub, token1.tokenId).send({from: owner});476    const resultEth = await collectionEvm.methods.approveCross(receiverCrossEth, token2.tokenId).send({from: owner});477    const eventSub = resultSub.events.Approval;478    const eventEth = resultEth.events.Approval;479    expect(eventSub).to.be.like({480      address: helper.ethAddress.fromCollectionId(collection.collectionId),481      event: 'Approval',482      returnValues: {483        owner,484        approved: helper.address.substrateToEth(receiverSub.address),485        tokenId: token1.tokenId.toString(),486      },487    });488    expect(eventEth).to.be.like({489      address: helper.ethAddress.fromCollectionId(collection.collectionId),490      event: 'Approval',491      returnValues: {492        owner,493        approved: receiverEth,494        tokenId: token2.tokenId.toString(),495      },496    });497498    // Substrate address can transferFrom approved tokens:499    await helper.nft.transferTokenFrom(receiverSub, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiverSub.address});500    expect(await helper.nft.getTokenOwner(collection.collectionId, token1.tokenId)).to.deep.eq({Substrate: receiverSub.address});501    // Ethereum address can transferFromCross approved tokens:502    await collectionEvm.methods.transferFromCross(ownerCross, receiverCrossEth, token2.tokenId).send({from: receiverEth});503    expect(await helper.nft.getTokenOwner(collection.collectionId, token2.tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});504  });505506  itEth('Can reaffirm approved address', async ({helper}) => {507    const owner = await helper.eth.createAccountWithBalance(donor, 100n);508    const ownerCrossEth = helper.ethCrossAccount.fromAddress(owner);509    const [receiver1, receiver2] = await helper.arrange.createAccounts([100n, 100n], donor);510    const receiver1Cross = helper.ethCrossAccount.fromKeyringPair(receiver1);511    const receiver2Cross = helper.ethCrossAccount.fromKeyringPair(receiver2);512    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});513    const token1 = await collection.mintToken(minter, {Ethereum: owner});514    const token2 = await collection.mintToken(minter, {Ethereum: owner});515    const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');516517    // Can approve and reaffirm approved address:518    await collectionEvm.methods.approveCross(receiver1Cross, token1.tokenId).send({from: owner});519    await collectionEvm.methods.approveCross(receiver2Cross, token1.tokenId).send({from: owner});520521    // receiver1 cannot transferFrom:522    await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;523    // receiver2 can transferFrom:524    await helper.nft.transferTokenFrom(receiver2, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver2.address});525526    // can set approved address to self address to remove approval:527    await collectionEvm.methods.approveCross(receiver1Cross, token2.tokenId).send({from: owner});528    await collectionEvm.methods.approveCross(ownerCrossEth, token2.tokenId).send({from: owner});529530    // receiver1 cannot transfer token anymore:531    await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token2.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;532  });533534  itEth('Can perform transferFrom()', async ({helper}) => {535    const owner = await helper.eth.createAccountWithBalance(donor);536    const spender = await helper.eth.createAccountWithBalance(donor);537    const receiver = helper.eth.createAccount();538539    const collection = await helper.nft.mintCollection(minter, {});540    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});541542    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);543    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);544545    await contract.methods.approve(spender, tokenId).send({from: owner});546547    {548      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});549550      const event = result.events.Transfer;551      expect(event.address).to.be.equal(collectionAddress);552      expect(event.returnValues.from).to.be.equal(owner);553      expect(event.returnValues.to).to.be.equal(receiver);554      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);555    }556557    {558      const balance = await contract.methods.balanceOf(receiver).call();559      expect(+balance).to.equal(1);560    }561562    {563      const balance = await contract.methods.balanceOf(owner).call();564      expect(+balance).to.equal(0);565    }566  });567568  itEth('Can perform transferFromCross()', async ({helper}) => {569    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});570571    const [owner, receiver] = await helper.arrange.createAccounts([100n, 100n], donor);572    const spender = await helper.eth.createAccountWithBalance(donor);573574    const token = await collection.mintToken(minter, {Substrate: owner.address});575576    const address = helper.ethAddress.fromCollectionId(collection.collectionId);577    const contract = helper.ethNativeContract.collection(address, 'nft');578579    await token.approve(owner, {Ethereum: spender});580581    {582      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);583      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);584      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});585      const event = result.events.Transfer;586      expect(event).to.be.like({587        address: helper.ethAddress.fromCollectionId(collection.collectionId),588        event: 'Transfer',589        returnValues: {590          from: helper.address.substrateToEth(owner.address),591          to: helper.address.substrateToEth(receiver.address),592          tokenId: token.tokenId.toString(),593        },594      });595    }596597    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});598  });599600  itEth('Can perform transfer()', async ({helper}) => {601    const collection = await helper.nft.mintCollection(minter, {});602    const owner = await helper.eth.createAccountWithBalance(donor);603    const receiver = helper.eth.createAccount();604605    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});606607    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);608    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);609610    {611      const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});612613      const event = result.events.Transfer;614      expect(event.address).to.be.equal(collectionAddress);615      expect(event.returnValues.from).to.be.equal(owner);616      expect(event.returnValues.to).to.be.equal(receiver);617      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);618    }619620    {621      const balance = await contract.methods.balanceOf(owner).call();622      expect(+balance).to.equal(0);623    }624625    {626      const balance = await contract.methods.balanceOf(receiver).call();627      expect(+balance).to.equal(1);628    }629  });630  631  itEth('Can perform transferCross()', async ({helper}) => {632    const collection = await helper.nft.mintCollection(minter, {});633    const owner = await helper.eth.createAccountWithBalance(donor);634    const receiverEth = await helper.eth.createAccountWithBalance(donor);635    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);636    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);637    638    const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});639640    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);641    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);642643    {644      // Can transferCross to ethereum address:645      const result = await collectionEvm.methods.transferCross(receiverCrossEth, tokenId).send({from: owner});646      // Check events:647      const event = result.events.Transfer;648      expect(event.address).to.be.equal(collectionAddress);649      expect(event.returnValues.from).to.be.equal(owner);650      expect(event.returnValues.to).to.be.equal(receiverEth);651      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);652      653      // owner has balance = 0:654      const ownerBalance = await collectionEvm.methods.balanceOf(owner).call();655      expect(+ownerBalance).to.equal(0);656      // receiver owns token:657      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();658      expect(+receiverBalance).to.equal(1);659      expect(await helper.nft.getTokenOwner(collection.collectionId, tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});660    }661    662    {663      // Can transferCross to substrate address:664      const substrateResult = await collectionEvm.methods.transferCross(receiverCrossSub, tokenId).send({from: receiverEth});665      // Check events:666      const event = substrateResult.events.Transfer;667      expect(event.address).to.be.equal(collectionAddress);668      expect(event.returnValues.from).to.be.equal(receiverEth);669      expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(minter.address));670      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);671      672      // owner has balance = 0:673      const ownerBalance = await collectionEvm.methods.balanceOf(receiverEth).call();674      expect(+ownerBalance).to.equal(0);675      // receiver owns token:676      const receiverBalance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});677      expect(receiverBalance).to.contain(tokenId);678    }679  });680681  ['transfer', 'transferCross'].map(testCase => itEth(`Cannot ${testCase} non-owned token`, async ({helper}) => {682    const sender = await helper.eth.createAccountWithBalance(donor);683    const tokenOwner = await helper.eth.createAccountWithBalance(donor);684    const receiverSub = minter;685    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);686687    const collection = await helper.nft.mintCollection(minter, {});688    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);689    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', sender);690691    await collection.mintToken(minter, {Ethereum: sender});692    const nonSendersToken = await collection.mintToken(minter, {Ethereum: tokenOwner});693694    // Cannot transferCross someone else's token:695    const receiver = testCase === 'transfer' ? helper.address.substrateToEth(receiverSub.address) : receiverCrossSub;696    await expect(collectionEvm.methods[testCase](receiver, nonSendersToken.tokenId).send({from: sender})).to.be.rejected;697    // Cannot transfer token if it does not exist:698    await expect(collectionEvm.methods[testCase](receiver, 999999).send({from: sender})).to.be.rejected;699  }));700});701702describe('NFT: Fees', () => {703  let donor: IKeyringPair;704  let alice: IKeyringPair;705  let bob: IKeyringPair;706  let charlie: IKeyringPair;707708  before(async function() {709    await usingEthPlaygrounds(async (helper, privateKey) => {710      donor = await privateKey({filename: __filename});711      [alice, bob, charlie] = await helper.arrange.createAccounts([10n, 10n, 10n], donor);712    });713  });714715  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {716    const owner = await helper.eth.createAccountWithBalance(donor);717    const spender = helper.eth.createAccount();718719    const collection = await helper.nft.mintCollection(alice, {});720    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});721722    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);723724    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));725    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));726  });727728  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {729    const owner = await helper.eth.createAccountWithBalance(donor);730    const spender = await helper.eth.createAccountWithBalance(donor);731732    const collection = await helper.nft.mintCollection(alice, {});733    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});734735    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);736737    await contract.methods.approve(spender, tokenId).send({from: owner});738739    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));740    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));741  });742743  itEth('Can perform transferFromCross()', async ({helper}) => {744    const collectionMinter = alice;745    const owner = bob;746    const receiver = charlie;747    const collection = await helper.nft.mintCollection(collectionMinter, {name: 'A', description: 'B', tokenPrefix: 'C'});748749    const spender = await helper.eth.createAccountWithBalance(donor, 100n);750751    const token = await collection.mintToken(collectionMinter, {Substrate: owner.address});752753    const address = helper.ethAddress.fromCollectionId(collection.collectionId);754    const contract = helper.ethNativeContract.collection(address, 'nft');755756    await token.approve(owner, {Ethereum: spender});757758    {759      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);760      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);761      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});762      const event = result.events.Transfer;763      expect(event).to.be.like({764        address: helper.ethAddress.fromCollectionId(collection.collectionId),765        event: 'Transfer',766        returnValues: {767          from: helper.address.substrateToEth(owner.address),768          to: helper.address.substrateToEth(receiver.address),769          tokenId: token.tokenId.toString(),770        },771      });772    }773774    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});775  });776777  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {778    const owner = await helper.eth.createAccountWithBalance(donor);779    const receiver = helper.eth.createAccount();780781    const collection = await helper.nft.mintCollection(alice, {});782    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});783784    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);785786    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));787    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));788  });789});790791describe('NFT: Substrate calls', () => {792  let donor: IKeyringPair;793  let alice: IKeyringPair;794795  before(async function() {796    await usingEthPlaygrounds(async (helper, privateKey) => {797      donor = await privateKey({filename: __filename});798      [alice] = await helper.arrange.createAccounts([20n], donor);799    });800  });801802  itEth('Events emitted for mint()', async ({helper}) => {803    const collection = await helper.nft.mintCollection(alice, {});804    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);805    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');806807    const events: any = [];808    contract.events.allEvents((_: any, event: any) => {809      events.push(event);810    });811812    const {tokenId} = await collection.mintToken(alice);813    if (events.length == 0) await helper.wait.newBlocks(1);814    const event = events[0];815816    expect(event.event).to.be.equal('Transfer');817    expect(event.address).to.be.equal(collectionAddress);818    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');819    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));820    expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());821  });822823  itEth('Events emitted for burn()', async ({helper}) => {824    const collection = await helper.nft.mintCollection(alice, {});825    const token = await collection.mintToken(alice);826827    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);828    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');829830    const events: any = [];831    contract.events.allEvents((_: any, event: any) => {832      events.push(event);833    });834835    await token.burn(alice);836    if (events.length == 0) await helper.wait.newBlocks(1);837    const event = events[0];838839    expect(event.event).to.be.equal('Transfer');840    expect(event.address).to.be.equal(collectionAddress);841    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));842    expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');843    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());844  });845846  itEth('Events emitted for approve()', async ({helper}) => {847    const receiver = helper.eth.createAccount();848849    const collection = await helper.nft.mintCollection(alice, {});850    const token = await collection.mintToken(alice);851852    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);853    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');854855    const events: any = [];856    contract.events.allEvents((_: any, event: any) => {857      events.push(event);858    });859860    await token.approve(alice, {Ethereum: receiver});861    if (events.length == 0) await helper.wait.newBlocks(1);862    const event = events[0];863864    expect(event.event).to.be.equal('Approval');865    expect(event.address).to.be.equal(collectionAddress);866    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));867    expect(event.returnValues.approved).to.be.equal(receiver);868    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());869  });870871  itEth('Events emitted for transferFrom()', async ({helper}) => {872    const [bob] = await helper.arrange.createAccounts([10n], donor);873    const receiver = helper.eth.createAccount();874875    const collection = await helper.nft.mintCollection(alice, {});876    const token = await collection.mintToken(alice);877    await token.approve(alice, {Substrate: bob.address});878879    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);880    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');881882    const events: any = [];883    contract.events.allEvents((_: any, event: any) => {884      events.push(event);885    });886887    await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});888889    if (events.length == 0) await helper.wait.newBlocks(1);890    const event = events[0];891892    expect(event.address).to.be.equal(collectionAddress);893    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));894    expect(event.returnValues.to).to.be.equal(receiver);895    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);896  });897898  itEth('Events emitted for transfer()', async ({helper}) => {899    const receiver = helper.eth.createAccount();900901    const collection = await helper.nft.mintCollection(alice, {});902    const token = await collection.mintToken(alice);903904    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);905    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');906907    const events: any = [];908    contract.events.allEvents((_: any, event: any) => {909      events.push(event);910    });911912    await token.transfer(alice, {Ethereum: receiver});913914    if (events.length == 0) await helper.wait.newBlocks(1);915    const event = events[0];916917    expect(event.address).to.be.equal(collectionAddress);918    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));919    expect(event.returnValues.to).to.be.equal(receiver);920    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);921  });922});923924describe('Common metadata', () => {925  let donor: IKeyringPair;926  let alice: IKeyringPair;927928  before(async function() {929    await usingEthPlaygrounds(async (helper, privateKey) => {930      donor = await privateKey({filename: __filename});931      [alice] = await helper.arrange.createAccounts([20n], donor);932    });933  });934935  itEth('Returns collection name', async ({helper}) => {936    const caller = await helper.eth.createAccountWithBalance(donor);937    const tokenPropertyPermissions = [{938      key: 'URI',939      permission: {940        mutable: true,941        collectionAdmin: true,942        tokenOwner: false,943      },944    }];945    const collection = await helper.nft.mintCollection(946      alice,947      {948        name: 'oh River',949        tokenPrefix: 'CHANGE',950        properties: [{key: 'ERC721Metadata', value: '1'}],951        tokenPropertyPermissions,952      },953    );954955    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);956    const name = await contract.methods.name().call();957    expect(name).to.equal('oh River');958  });959960  itEth('Returns symbol name', async ({helper}) => {961    const caller = await helper.eth.createAccountWithBalance(donor);962    const tokenPropertyPermissions = [{963      key: 'URI',964      permission: {965        mutable: true,966        collectionAdmin: true,967        tokenOwner: false,968      },969    }];970    const collection = await helper.nft.mintCollection(971      alice,972      {973        name: 'oh River',974        tokenPrefix: 'CHANGE',975        properties: [{key: 'ERC721Metadata', value: '1'}],976        tokenPropertyPermissions,977      },978    );979980    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);981    const symbol = await contract.methods.symbol().call();982    expect(symbol).to.equal('CHANGE');983  });984});985986describe('Negative tests', () => {987  let donor: IKeyringPair;988  let minter: IKeyringPair;989  let alice: IKeyringPair;990991  before(async function() {992    await usingEthPlaygrounds(async (helper, privateKey) => {993      donor = await privateKey({filename: __filename});994      [minter, alice] = await helper.arrange.createAccounts([100n, 100n], donor);995    });996  });997998  itEth('[negative] Cant perform burn without approval', async ({helper}) => {999    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});10001001    const owner = await helper.eth.createAccountWithBalance(donor, 100n);1002    const spender = await helper.eth.createAccountWithBalance(donor, 100n);10031004    const token = await collection.mintToken(minter, {Ethereum: owner});10051006    const address = helper.ethAddress.fromCollectionId(collection.collectionId);1007    const contract = helper.ethNativeContract.collection(address, 'nft');10081009    const ownerCross = helper.ethCrossAccount.fromAddress(owner);1010    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;10111012    await contract.methods.setApprovalForAll(spender, true).send({from: owner});1013    await contract.methods.setApprovalForAll(spender, false).send({from: owner});10141015    await expect(contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender})).to.be.rejected;1016  });10171018  itEth('[negative] Cant perform transfer without approval', async ({helper}) => {1019    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});1020    const receiver = alice;10211022    const owner = await helper.eth.createAccountWithBalance(donor, 100n);1023    const spender = await helper.eth.createAccountWithBalance(donor, 100n);10241025    const token = await collection.mintToken(minter, {Ethereum: owner});10261027    const address = helper.ethAddress.fromCollectionId(collection.collectionId);1028    const contract = helper.ethNativeContract.collection(address, 'nft');10291030    const ownerCross = helper.ethCrossAccount.fromAddress(owner);1031    const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);10321033    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;10341035    await contract.methods.setApprovalForAll(spender, true).send({from: owner});1036    await contract.methods.setApprovalForAll(spender, false).send({from: owner});1037    1038    await expect(contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender})).to.be.rejected;1039  });1040});
modifiedtests/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);
modifiedtests/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
        **/