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
before · pallets/refungible/src/lib.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet18//!19//! The Refungible pallet provides functionality for handling refungible collections and tokens.20//!21//! - [`Config`]22//! - [`RefungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Refungible pallet provides functions for:29//!30//! - RFT collection creation and removal31//! - Minting and burning of RFT tokens32//! - Partition and repartition of RFT tokens33//! - Retrieving number of pieces of RFT token34//! - Retrieving account balances35//! - Transfering RFT token pieces36//! - Burning RFT token pieces37//! - Setting and checking allowance for RFT tokens38//!39//! ### Terminology40//!41//! - **RFT token:** Non fungible token that was partitioned to pieces. If an account owns all42//!   of the RFT token pieces than it owns the RFT token and can repartition it.43//!44//! - **RFT Collection:** A collection of RFT tokens. All RFT tokens are part of a collection.45//!   Each collection has its own settings and set of permissions.46//!47//! - **RFT token piece:** A fungible part of an RFT token.48//!49//! - **Balance:** RFT token pieces owned by an account50//!51//! - **Allowance:** Maximum number of RFT token pieces that one account is allowed to52//!   transfer from the balance of another account53//!54//! - **Burning:** The process of “deleting” a token from a collection or removing token pieces from55//!   an account balance.56//!57//! ### Implementations58//!59//! The Refungible pallet provides implementations for the following traits. If these traits provide60//! the functionality that you need, then you can avoid coupling with the Refungible pallet.61//!62//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight63//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing64//!   with collections65//! - [`RefungibleExtensions`](pallet_common::RefungibleExtensions): Functions specific for refungible66//!   collection67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create RFT collection. RFT collection can be configured to allow or deny access for73//!   some accounts.74//! - `destroy_collection` - Destroy exising RFT collection. There should be no tokens in the collection.75//! - `burn` - Burn some amount of RFT token pieces owned by account. Burns the RFT token if no pieces left.76//! - `transfer` - Transfer some amount of RFT token pieces. Transfers should be enabled for RFT collection.77//!   Nests the RFT token if RFT token pieces are sent to another token.78//! - `create_item` - Mint RFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account to transfer balance from sender's account.80//! - `repartition` - Repartition token to selected number of pieces. Sender should own all existing pieces.81//!82//! ## Assumptions83//!84//! * Total number of pieces for one token shouldn't exceed `up_data_structs::MAX_REFUNGIBLE_PIECES`.85//! * Total number of tokens of all types shouldn't be greater than `up_data_structs::MAX_TOKEN_PREFIX_LENGTH`.86//! * Sender should be in collection's allow list to perform operations on tokens.8788#![cfg_attr(not(feature = "std"), no_std)]8990use crate::erc_token::ERC20Events;91use crate::erc::ERC721Events;9293use codec::{Encode, Decode, MaxEncodedLen};94use core::ops::Deref;95use derivative::Derivative;96use evm_coder::ToLog;97use frame_support::{98	BoundedBTreeMap, BoundedVec, ensure, fail, storage::with_transaction, transactional,99	pallet_prelude::ConstU32,100};101use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};102use pallet_evm_coder_substrate::WithRecorder;103use pallet_common::{104	CommonCollectionOperations, Error as CommonError, eth::collection_id_to_address,105	Event as CommonEvent, Pallet as PalletCommon, erc::CollectionHelpersEvents,106};107use pallet_structure::Pallet as PalletStructure;108use scale_info::TypeInfo;109use sp_core::{Get, H160};110use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};111use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};112use up_data_structs::{113	AccessMode, budget::Budget, CollectionId, CollectionFlags, CollectionPropertiesVec,114	CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,115	MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,116	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,117};118119pub use pallet::*;120#[cfg(feature = "runtime-benchmarks")]121pub mod benchmarking;122pub mod common;123pub mod erc;124pub mod erc_token;125pub mod weights;126127#[derive(Derivative, Clone)]128pub struct CreateItemData<CrossAccountId> {129	#[derivative(Debug(format_with = "bounded::map_debug"))]130	pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,131	#[derivative(Debug(format_with = "bounded::vec_debug"))]132	pub properties: CollectionPropertiesVec,133}134pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;135136/// Token data, stored independently from other data used to describe it137/// for the convenience of database access. Notably contains the token metadata.138#[struct_versioning::versioned(version = 2, upper)]139#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]140pub struct ItemData {141	pub const_data: BoundedVec<u8, CustomDataLimit>,142143	#[version(..2)]144	pub variable_data: BoundedVec<u8, CustomDataLimit>,145}146147#[frame_support::pallet]148pub mod pallet {149	use super::*;150	use frame_support::{151		Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key,152		traits::StorageVersion,153	};154	use frame_system::pallet_prelude::*;155	use up_data_structs::{CollectionId, TokenId};156	use super::weights::WeightInfo;157158	#[pallet::error]159	pub enum Error<T> {160		/// Not Refungible item data used to mint in Refungible collection.161		NotRefungibleDataUsedToMintFungibleCollectionToken,162		/// Maximum refungibility exceeded.163		WrongRefungiblePieces,164		/// Refungible token can't be repartitioned by user who isn't owns all pieces.165		RepartitionWhileNotOwningAllPieces,166		/// Refungible token can't nest other tokens.167		RefungibleDisallowsNesting,168		/// Setting item properties is not allowed.169		SettingPropertiesNotAllowed,170	}171172	#[pallet::config]173	pub trait Config:174		frame_system::Config + pallet_common::Config + pallet_structure::Config175	{176		type WeightInfo: WeightInfo;177	}178179	const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);180181	#[pallet::pallet]182	#[pallet::storage_version(STORAGE_VERSION)]183	#[pallet::generate_store(pub(super) trait Store)]184	pub struct Pallet<T>(_);185186	/// Total amount of minted tokens in a collection.187	#[pallet::storage]188	pub type TokensMinted<T: Config> =189		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;190191	/// Amount of tokens burnt in a collection.192	#[pallet::storage]193	pub type TokensBurnt<T: Config> =194		StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;195196	/// Token data, used to partially describe a token.197	// TODO: remove198	#[pallet::storage]199	#[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]200	pub type TokenData<T: Config> = StorageNMap<201		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),202		Value = ItemData,203		QueryKind = ValueQuery,204	>;205206	/// Amount of pieces a refungible token is split into.207	#[pallet::storage]208	#[pallet::getter(fn token_properties)]209	pub type TokenProperties<T: Config> = StorageNMap<210		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),211		Value = up_data_structs::Properties,212		QueryKind = ValueQuery,213		OnEmpty = up_data_structs::TokenProperties,214	>;215216	/// Total amount of pieces for token217	#[pallet::storage]218	pub type TotalSupply<T: Config> = StorageNMap<219		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),220		Value = u128,221		QueryKind = ValueQuery,222	>;223224	/// Used to enumerate tokens owned by account.225	#[pallet::storage]226	pub type Owned<T: Config> = StorageNMap<227		Key = (228			Key<Twox64Concat, CollectionId>,229			Key<Blake2_128Concat, T::CrossAccountId>,230			Key<Twox64Concat, TokenId>,231		),232		Value = bool,233		QueryKind = ValueQuery,234	>;235236	/// Amount of tokens (not pieces) partially owned by an account within a collection.237	#[pallet::storage]238	pub type AccountBalance<T: Config> = StorageNMap<239		Key = (240			Key<Twox64Concat, CollectionId>,241			// Owner242			Key<Blake2_128Concat, T::CrossAccountId>,243		),244		Value = u32,245		QueryKind = ValueQuery,246	>;247248	/// Amount of token pieces owned by account.249	#[pallet::storage]250	pub type Balance<T: Config> = StorageNMap<251		Key = (252			Key<Twox64Concat, CollectionId>,253			Key<Twox64Concat, TokenId>,254			// Owner255			Key<Blake2_128Concat, T::CrossAccountId>,256		),257		Value = u128,258		QueryKind = ValueQuery,259	>;260261	/// Allowance set by a token owner for another user to perform one of certain transactions on a number of pieces of a token.262	#[pallet::storage]263	pub type Allowance<T: Config> = StorageNMap<264		Key = (265			Key<Twox64Concat, CollectionId>,266			Key<Twox64Concat, TokenId>,267			// Owner268			Key<Blake2_128, T::CrossAccountId>,269			// Spender270			Key<Blake2_128Concat, T::CrossAccountId>,271		),272		Value = u128,273		QueryKind = ValueQuery,274	>;275276	/// Operator set by a wallet owner that could perform certain transactions on all tokens in the wallet.277	#[pallet::storage]278	pub type CollectionAllowance<T: Config> = StorageNMap<279		Key = (280			Key<Twox64Concat, CollectionId>,281			Key<Blake2_128Concat, T::CrossAccountId>,282			Key<Blake2_128Concat, T::CrossAccountId>,283		),284		Value = bool,285		QueryKind = ValueQuery,286	>;287288	#[pallet::hooks]289	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {290		fn on_runtime_upgrade() -> Weight {291			let storage_version = StorageVersion::get::<Pallet<T>>();292			if storage_version < StorageVersion::new(2) {293				#[allow(deprecated)]294				let _ = <TokenData<T>>::clear(u32::MAX, None);295			}296			StorageVersion::new(2).put::<Pallet<T>>();297298			Weight::zero()299		}300	}301}302303pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);304impl<T: Config> RefungibleHandle<T> {305	pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {306		Self(inner)307	}308	pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {309		self.0310	}311	pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {312		&mut self.0313	}314}315316impl<T: Config> Deref for RefungibleHandle<T> {317	type Target = pallet_common::CollectionHandle<T>;318319	fn deref(&self) -> &Self::Target {320		&self.0321	}322}323324impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {325	fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {326		self.0.recorder()327	}328	fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {329		self.0.into_recorder()330	}331}332333impl<T: Config> Pallet<T> {334	/// Get number of RFT tokens in collection335	pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {336		<TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)337	}338339	/// Check that RFT token exists340	///341	/// - `token`: Token ID.342	pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {343		<TotalSupply<T>>::contains_key((collection.id, token))344	}345346	pub fn set_scoped_token_property(347		collection_id: CollectionId,348		token_id: TokenId,349		scope: PropertyScope,350		property: Property,351	) -> DispatchResult {352		TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {353			properties.try_scoped_set(scope, property.key, property.value)354		})355		.map_err(<CommonError<T>>::from)?;356357		Ok(())358	}359360	pub fn set_scoped_token_properties(361		collection_id: CollectionId,362		token_id: TokenId,363		scope: PropertyScope,364		properties: impl Iterator<Item = Property>,365	) -> DispatchResult {366		TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {367			stored_properties.try_scoped_set_from_iter(scope, properties)368		})369		.map_err(<CommonError<T>>::from)?;370371		Ok(())372	}373}374375// unchecked calls skips any permission checks376impl<T: Config> Pallet<T> {377	/// Create RFT collection378	///379	/// `init_collection` will take non-refundable deposit for collection creation.380	///381	/// - `data`: Contains settings for collection limits and permissions.382	pub fn init_collection(383		owner: T::CrossAccountId,384		payer: T::CrossAccountId,385		data: CreateCollectionData<T::AccountId>,386		flags: CollectionFlags,387	) -> Result<CollectionId, DispatchError> {388		<PalletCommon<T>>::init_collection(owner, payer, data, flags)389	}390391	/// Destroy RFT collection392	///393	/// `destroy_collection` will throw error if collection contains any tokens.394	/// Only owner can destroy collection.395	pub fn destroy_collection(396		collection: RefungibleHandle<T>,397		sender: &T::CrossAccountId,398	) -> DispatchResult {399		let id = collection.id;400401		if Self::collection_has_tokens(id) {402			return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());403		}404405		// =========406407		PalletCommon::destroy_collection(collection.0, sender)?;408409		<TokensMinted<T>>::remove(id);410		<TokensBurnt<T>>::remove(id);411		let _ = <TotalSupply<T>>::clear_prefix((id,), u32::MAX, None);412		let _ = <Balance<T>>::clear_prefix((id,), u32::MAX, None);413		let _ = <Allowance<T>>::clear_prefix((id,), u32::MAX, None);414		let _ = <Owned<T>>::clear_prefix((id,), u32::MAX, None);415		let _ = <AccountBalance<T>>::clear_prefix((id,), u32::MAX, None);416		Ok(())417	}418419	fn collection_has_tokens(collection_id: CollectionId) -> bool {420		<TotalSupply<T>>::iter_prefix((collection_id,))421			.next()422			.is_some()423	}424425	pub fn burn_token_unchecked(426		collection: &RefungibleHandle<T>,427		owner: &T::CrossAccountId,428		token_id: TokenId,429	) -> DispatchResult {430		let burnt = <TokensBurnt<T>>::get(collection.id)431			.checked_add(1)432			.ok_or(ArithmeticError::Overflow)?;433434		<TokensBurnt<T>>::insert(collection.id, burnt);435		<TokenProperties<T>>::remove((collection.id, token_id));436		<TotalSupply<T>>::remove((collection.id, token_id));437		let _ = <Balance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);438		let _ = <Allowance<T>>::clear_prefix((collection.id, token_id), u32::MAX, None);439		<PalletEvm<T>>::deposit_log(440			ERC721Events::Transfer {441				from: *owner.as_eth(),442				to: H160::default(),443				token_id: token_id.into(),444			}445			.to_log(collection_id_to_address(collection.id)),446		);447		Ok(())448	}449450	/// Burn RFT token pieces451	///452	/// `burn` will decrease total amount of token pieces and amount owned by sender.453	/// `burn` can be called even if there are multiple owners of the RFT token.454	/// If sender wouldn't have any pieces left after `burn` than she will stop being455	/// one of the owners of the token. If there is no account that owns any pieces of456	/// the token than token will be burned too.457	///458	/// - `amount`: Amount of token pieces to burn.459	/// - `token`: Token who's pieces should be burned460	/// - `collection`: Collection that contains the token461	pub fn burn(462		collection: &RefungibleHandle<T>,463		owner: &T::CrossAccountId,464		token: TokenId,465		amount: u128,466	) -> DispatchResult {467		if <Balance<T>>::get((collection.id, token, owner)) == 0 {468			return Err(<CommonError<T>>::TokenValueTooLow.into());469		}470471		let total_supply = <TotalSupply<T>>::get((collection.id, token))472			.checked_sub(amount)473			.ok_or(<CommonError<T>>::TokenValueTooLow)?;474475		// This was probally last owner of this token?476		if total_supply == 0 {477			// Ensure user actually owns this amount478			ensure!(479				<Balance<T>>::get((collection.id, token, owner)) == amount,480				<CommonError<T>>::TokenValueTooLow481			);482			let account_balance = <AccountBalance<T>>::get((collection.id, owner))483				.checked_sub(1)484				// Should not occur485				.ok_or(ArithmeticError::Underflow)?;486487			// =========488489			<Owned<T>>::remove((collection.id, owner, token));490			<PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);491			<AccountBalance<T>>::insert((collection.id, owner), account_balance);492			Self::burn_token_unchecked(collection, owner, token)?;493			<PalletEvm<T>>::deposit_log(494				ERC20Events::Transfer {495					from: *owner.as_eth(),496					to: H160::default(),497					value: amount.into(),498				}499				.to_log(collection_id_to_address(collection.id)),500			);501			<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(502				collection.id,503				token,504				owner.clone(),505				amount,506			));507			return Ok(());508		}509510		let balance = <Balance<T>>::get((collection.id, token, owner))511			.checked_sub(amount)512			.ok_or(<CommonError<T>>::TokenValueTooLow)?;513		let account_balance = if balance == 0 {514			<AccountBalance<T>>::get((collection.id, owner))515				.checked_sub(1)516				// Should not occur517				.ok_or(ArithmeticError::Underflow)?518		} else {519			0520		};521522		// =========523524		if balance == 0 {525			<Owned<T>>::remove((collection.id, owner, token));526			<PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);527			<Balance<T>>::remove((collection.id, token, owner));528			<AccountBalance<T>>::insert((collection.id, owner), account_balance);529530			if let Some(user) = Self::token_owner(collection.id, token) {531				<PalletEvm<T>>::deposit_log(532					ERC721Events::Transfer {533						from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,534						to: *user.as_eth(),535						token_id: token.into(),536					}537					.to_log(collection_id_to_address(collection.id)),538				);539			}540		} else {541			<Balance<T>>::insert((collection.id, token, owner), balance);542		}543		<TotalSupply<T>>::insert((collection.id, token), total_supply);544545		<PalletEvm<T>>::deposit_log(546			ERC20Events::Transfer {547				from: *owner.as_eth(),548				to: H160::default(),549				value: amount.into(),550			}551			.to_log(T::EvmTokenAddressMapping::token_to_address(552				collection.id,553				token,554			)),555		);556		<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(557			collection.id,558			token,559			owner.clone(),560			amount,561		));562		Ok(())563	}564565	#[transactional]566	fn modify_token_properties(567		collection: &RefungibleHandle<T>,568		sender: &T::CrossAccountId,569		token_id: TokenId,570		properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,571		is_token_create: bool,572		nesting_budget: &dyn Budget,573	) -> DispatchResult {574		let is_collection_admin = || collection.is_owner_or_admin(sender);575		let is_token_owner = || -> Result<bool, DispatchError> {576			let balance = collection.balance(sender.clone(), token_id);577			let total_pieces: u128 =578				Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);579			if balance != total_pieces {580				return Ok(false);581			}582583			let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(584				sender.clone(),585				collection.id,586				token_id,587				None,588				nesting_budget,589			)?;590591			Ok(is_bundle_owner)592		};593594		for (key, value) in properties {595			let permission = <PalletCommon<T>>::property_permissions(collection.id)596				.get(&key)597				.cloned()598				.unwrap_or_else(PropertyPermission::none);599600			let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))601				.get(&key)602				.is_some();603604			match permission {605				PropertyPermission { mutable: false, .. } if is_property_exists => {606					return Err(<CommonError<T>>::NoPermission.into());607				}608609				PropertyPermission {610					collection_admin,611					token_owner,612					..613				} => {614					//TODO: investigate threats during public minting.615					let is_token_create =616						is_token_create && (collection_admin || token_owner) && value.is_some();617					if !(is_token_create618						|| (collection_admin && is_collection_admin())619						|| (token_owner && is_token_owner()?))620					{621						fail!(<CommonError<T>>::NoPermission);622					}623				}624			}625626			match value {627				Some(value) => {628					<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {629						properties.try_set(key.clone(), value)630					})631					.map_err(<CommonError<T>>::from)?;632633					<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(634						collection.id,635						token_id,636						key,637					));638				}639				None => {640					<TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {641						properties.remove(&key)642					})643					.map_err(<CommonError<T>>::from)?;644645					<PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(646						collection.id,647						token_id,648						key,649					));650				}651			}652653			<PalletEvm<T>>::deposit_log(654				CollectionHelpersEvents::TokenChanged {655					collection_id: collection_id_to_address(collection.id),656					token_id: token_id.into(),657				}658				.to_log(T::ContractAddress::get()),659			);660		}661662		Ok(())663	}664665	pub fn set_token_properties(666		collection: &RefungibleHandle<T>,667		sender: &T::CrossAccountId,668		token_id: TokenId,669		properties: impl Iterator<Item = Property>,670		is_token_create: bool,671		nesting_budget: &dyn Budget,672	) -> DispatchResult {673		Self::modify_token_properties(674			collection,675			sender,676			token_id,677			properties.map(|p| (p.key, Some(p.value))),678			is_token_create,679			nesting_budget,680		)681	}682683	pub fn set_token_property(684		collection: &RefungibleHandle<T>,685		sender: &T::CrossAccountId,686		token_id: TokenId,687		property: Property,688		nesting_budget: &dyn Budget,689	) -> DispatchResult {690		let is_token_create = false;691692		Self::set_token_properties(693			collection,694			sender,695			token_id,696			[property].into_iter(),697			is_token_create,698			nesting_budget,699		)700	}701702	pub fn delete_token_properties(703		collection: &RefungibleHandle<T>,704		sender: &T::CrossAccountId,705		token_id: TokenId,706		property_keys: impl Iterator<Item = PropertyKey>,707		nesting_budget: &dyn Budget,708	) -> DispatchResult {709		let is_token_create = false;710711		Self::modify_token_properties(712			collection,713			sender,714			token_id,715			property_keys.into_iter().map(|key| (key, None)),716			is_token_create,717			nesting_budget,718		)719	}720721	pub fn delete_token_property(722		collection: &RefungibleHandle<T>,723		sender: &T::CrossAccountId,724		token_id: TokenId,725		property_key: PropertyKey,726		nesting_budget: &dyn Budget,727	) -> DispatchResult {728		Self::delete_token_properties(729			collection,730			sender,731			token_id,732			[property_key].into_iter(),733			nesting_budget,734		)735	}736737	/// Transfer RFT token pieces from one account to another.738	///739	/// If the sender is no longer owns any pieces after the `transfer` than she stops being an owner of the token.740	///741	/// - `from`: Owner of token pieces to transfer.742	/// - `to`: Recepient of transfered token pieces.743	/// - `amount`: Amount of token pieces to transfer.744	/// - `token`: Token whos pieces should be transfered745	/// - `collection`: Collection that contains the token746	pub fn transfer(747		collection: &RefungibleHandle<T>,748		from: &T::CrossAccountId,749		to: &T::CrossAccountId,750		token: TokenId,751		amount: u128,752		nesting_budget: &dyn Budget,753	) -> DispatchResult {754		ensure!(755			collection.limits.transfers_enabled(),756			<CommonError<T>>::TransferNotAllowed757		);758759		if collection.permissions.access() == AccessMode::AllowList {760			collection.check_allowlist(from)?;761			collection.check_allowlist(to)?;762		}763		<PalletCommon<T>>::ensure_correct_receiver(to)?;764765		let initial_balance_from = <Balance<T>>::get((collection.id, token, from));766767		if initial_balance_from == 0 {768			return Err(<CommonError<T>>::TokenValueTooLow.into());769		}770771		let updated_balance_from = initial_balance_from772			.checked_sub(amount)773			.ok_or(<CommonError<T>>::TokenValueTooLow)?;774		let mut create_target = false;775		let from_to_differ = from != to;776		let updated_balance_to = if from != to && amount != 0 {777			let old_balance = <Balance<T>>::get((collection.id, token, to));778			if old_balance == 0 {779				create_target = true;780			}781			Some(782				old_balance783					.checked_add(amount)784					.ok_or(ArithmeticError::Overflow)?,785			)786		} else {787			None788		};789790		let account_balance_from = if updated_balance_from == 0 {791			Some(792				<AccountBalance<T>>::get((collection.id, from))793					.checked_sub(1)794					// Should not occur795					.ok_or(ArithmeticError::Underflow)?,796			)797		} else {798			None799		};800		// Account data is created in token, AccountBalance should be increased801		// But only if from != to as we shouldn't check overflow in this case802		let account_balance_to = if create_target && from_to_differ {803			let account_balance_to = <AccountBalance<T>>::get((collection.id, to))804				.checked_add(1)805				.ok_or(ArithmeticError::Overflow)?;806			ensure!(807				account_balance_to < collection.limits.account_token_ownership_limit(),808				<CommonError<T>>::AccountTokenLimitExceeded,809			);810811			Some(account_balance_to)812		} else {813			None814		};815816		// =========817818		if let Some(updated_balance_to) = updated_balance_to {819			// from != to && amount != 0820821			<PalletStructure<T>>::nest_if_sent_to_token(822				from.clone(),823				to,824				collection.id,825				token,826				nesting_budget,827			)?;828829			if updated_balance_from == 0 {830				<Balance<T>>::remove((collection.id, token, from));831				<PalletStructure<T>>::unnest_if_nested(from, collection.id, token);832			} else {833				<Balance<T>>::insert((collection.id, token, from), updated_balance_from);834			}835			<Balance<T>>::insert((collection.id, token, to), updated_balance_to);836			if let Some(account_balance_from) = account_balance_from {837				<AccountBalance<T>>::insert((collection.id, from), account_balance_from);838				<Owned<T>>::remove((collection.id, from, token));839			}840			if let Some(account_balance_to) = account_balance_to {841				<AccountBalance<T>>::insert((collection.id, to), account_balance_to);842				<Owned<T>>::insert((collection.id, to, token), true);843			}844		}845846		<PalletEvm<T>>::deposit_log(847			ERC20Events::Transfer {848				from: *from.as_eth(),849				to: *to.as_eth(),850				value: amount.into(),851			}852			.to_log(T::EvmTokenAddressMapping::token_to_address(853				collection.id,854				token,855			)),856		);857858		<PalletCommon<T>>::deposit_event(CommonEvent::Transfer(859			collection.id,860			token,861			from.clone(),862			to.clone(),863			amount,864		));865866		let total_supply = <TotalSupply<T>>::get((collection.id, token));867868		if amount == total_supply {869			// if token was fully owned by `from` and will be fully owned by `to` after transfer870			<PalletEvm<T>>::deposit_log(871				ERC721Events::Transfer {872					from: *from.as_eth(),873					to: *to.as_eth(),874					token_id: token.into(),875				}876				.to_log(collection_id_to_address(collection.id)),877			);878		} else if let Some(updated_balance_to) = updated_balance_to {879			// if `from` not equals `to`. This condition is needed to avoid sending event880			// when `from` fully owns token and sends part of token pieces to itself.881			if initial_balance_from == total_supply {882				// if token was fully owned by `from` and will be only partially owned by `to`883				// and `from` after transfer884				<PalletEvm<T>>::deposit_log(885					ERC721Events::Transfer {886						from: *from.as_eth(),887						to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,888						token_id: token.into(),889					}890					.to_log(collection_id_to_address(collection.id)),891				);892			} else if updated_balance_to == total_supply {893				// if token was partially owned by `from` and will be fully owned by `to` after transfer894				<PalletEvm<T>>::deposit_log(895					ERC721Events::Transfer {896						from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,897						to: *to.as_eth(),898						token_id: token.into(),899					}900					.to_log(collection_id_to_address(collection.id)),901				);902			}903		}904905		Ok(())906	}907908	/// Batched operation to create multiple RFT tokens.909	///910	/// Same as `create_item` but creates multiple tokens.911	///912	/// - `data`: Same as 'data` in `create_item` but contains data for multiple tokens.913	pub fn create_multiple_items(914		collection: &RefungibleHandle<T>,915		sender: &T::CrossAccountId,916		data: Vec<CreateItemData<T::CrossAccountId>>,917		nesting_budget: &dyn Budget,918	) -> DispatchResult {919		if !collection.is_owner_or_admin(sender) {920			ensure!(921				collection.permissions.mint_mode(),922				<CommonError<T>>::PublicMintingNotAllowed923			);924			collection.check_allowlist(sender)?;925926			for item in data.iter() {927				for user in item.users.keys() {928					collection.check_allowlist(user)?;929				}930			}931		}932933		for item in data.iter() {934			for (owner, _) in item.users.iter() {935				<PalletCommon<T>>::ensure_correct_receiver(owner)?;936			}937		}938939		// Total pieces per tokens940		let totals = data941			.iter()942			.map(|data| {943				Ok(data944					.users945					.iter()946					.map(|u| u.1)947					.try_fold(0u128, |acc, v| acc.checked_add(*v))948					.ok_or(ArithmeticError::Overflow)?)949			})950			.collect::<Result<Vec<_>, DispatchError>>()?;951		for total in &totals {952			ensure!(953				*total <= MAX_REFUNGIBLE_PIECES,954				<Error<T>>::WrongRefungiblePieces955			);956		}957958		let first_token_id = <TokensMinted<T>>::get(collection.id);959		let tokens_minted = first_token_id960			.checked_add(data.len() as u32)961			.ok_or(ArithmeticError::Overflow)?;962		ensure!(963			tokens_minted < collection.limits.token_limit(),964			<CommonError<T>>::CollectionTokenLimitExceeded965		);966967		let mut balances = BTreeMap::new();968		for data in &data {969			for owner in data.users.keys() {970				let balance = balances971					.entry(owner)972					.or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));973				*balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;974975				ensure!(976					*balance <= collection.limits.account_token_ownership_limit(),977					<CommonError<T>>::AccountTokenLimitExceeded,978				);979			}980		}981982		for (i, token) in data.iter().enumerate() {983			let token_id = TokenId(first_token_id + i as u32 + 1);984			for (to, _) in token.users.iter() {985				<PalletStructure<T>>::check_nesting(986					sender.clone(),987					to,988					collection.id,989					token_id,990					nesting_budget,991				)?;992			}993		}994995		// =========996997		with_transaction(|| {998			for (i, data) in data.iter().enumerate() {999				let token_id = first_token_id + i as u32 + 1;1000				<TotalSupply<T>>::insert((collection.id, token_id), totals[i]);10011002				for (user, amount) in data.users.iter() {1003					if *amount == 0 {1004						continue;1005					}1006					<Balance<T>>::insert((collection.id, token_id, &user), amount);1007					<Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);1008					<PalletStructure<T>>::nest_if_sent_to_token_unchecked(1009						user,1010						collection.id,1011						TokenId(token_id),1012					);1013				}10141015				if let Err(e) = Self::set_token_properties(1016					collection,1017					sender,1018					TokenId(token_id),1019					data.properties.clone().into_iter(),1020					true,1021					nesting_budget,1022				) {1023					return TransactionOutcome::Rollback(Err(e));1024				}1025			}1026			TransactionOutcome::Commit(Ok(()))1027		})?;10281029		<TokensMinted<T>>::insert(collection.id, tokens_minted);10301031		for (account, balance) in balances {1032			<AccountBalance<T>>::insert((collection.id, account), balance);1033		}10341035		for (i, token) in data.into_iter().enumerate() {1036			let token_id = first_token_id + i as u32 + 1;10371038			let receivers = token1039				.users1040				.into_iter()1041				.filter(|(_, amount)| *amount > 0)1042				.collect::<Vec<_>>();10431044			if let [(user, _)] = receivers.as_slice() {1045				// if there is exactly one receiver1046				<PalletEvm<T>>::deposit_log(1047					ERC721Events::Transfer {1048						from: H160::default(),1049						to: *user.as_eth(),1050						token_id: token_id.into(),1051					}1052					.to_log(collection_id_to_address(collection.id)),1053				);1054			} else if let [_, ..] = receivers.as_slice() {1055				// if there is more than one receiver1056				<PalletEvm<T>>::deposit_log(1057					ERC721Events::Transfer {1058						from: H160::default(),1059						to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,1060						token_id: token_id.into(),1061					}1062					.to_log(collection_id_to_address(collection.id)),1063				);1064			}10651066			for (user, amount) in receivers.into_iter() {1067				<PalletEvm<T>>::deposit_log(1068					ERC20Events::Transfer {1069						from: H160::default(),1070						to: *user.as_eth(),1071						value: amount.into(),1072					}1073					.to_log(T::EvmTokenAddressMapping::token_to_address(1074						collection.id,1075						TokenId(token_id),1076					)),1077				);1078				<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1079					collection.id,1080					TokenId(token_id),1081					user,1082					amount,1083				));1084			}1085		}1086		Ok(())1087	}10881089	pub fn set_allowance_unchecked(1090		collection: &RefungibleHandle<T>,1091		sender: &T::CrossAccountId,1092		spender: &T::CrossAccountId,1093		token: TokenId,1094		amount: u128,1095	) {1096		if amount == 0 {1097			<Allowance<T>>::remove((collection.id, token, sender, spender));1098		} else {1099			<Allowance<T>>::insert((collection.id, token, sender, spender), amount);1100		}11011102		<PalletEvm<T>>::deposit_log(1103			ERC20Events::Approval {1104				owner: *sender.as_eth(),1105				spender: *spender.as_eth(),1106				value: amount.into(),1107			}1108			.to_log(T::EvmTokenAddressMapping::token_to_address(1109				collection.id,1110				token,1111			)),1112		);1113		<PalletCommon<T>>::deposit_event(CommonEvent::Approved(1114			collection.id,1115			token,1116			sender.clone(),1117			spender.clone(),1118			amount,1119		))1120	}11211122	/// Set allowance for the spender to `transfer` or `burn` sender's token pieces.1123	///1124	/// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.1125	pub fn set_allowance(1126		collection: &RefungibleHandle<T>,1127		sender: &T::CrossAccountId,1128		spender: &T::CrossAccountId,1129		token: TokenId,1130		amount: u128,1131	) -> DispatchResult {1132		if collection.permissions.access() == AccessMode::AllowList {1133			collection.check_allowlist(sender)?;1134			collection.check_allowlist(spender)?;1135		}11361137		<PalletCommon<T>>::ensure_correct_receiver(spender)?;11381139		if <Balance<T>>::get((collection.id, token, sender)) < amount {1140			ensure!(1141				collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),1142				<CommonError<T>>::CantApproveMoreThanOwned1143			);1144		}11451146		// =========11471148		Self::set_allowance_unchecked(collection, sender, spender, token, amount);1149		Ok(())1150	}11511152	/// Returns allowance, which should be set after transaction1153	fn check_allowed(1154		collection: &RefungibleHandle<T>,1155		spender: &T::CrossAccountId,1156		from: &T::CrossAccountId,1157		token: TokenId,1158		amount: u128,1159		nesting_budget: &dyn Budget,1160	) -> Result<Option<u128>, DispatchError> {1161		if spender.conv_eq(from) {1162			return Ok(None);1163		}1164		if collection.permissions.access() == AccessMode::AllowList {1165			// `from`, `to` checked in [`transfer`]1166			collection.check_allowlist(spender)?;1167		}1168		if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1169			// TODO: should collection owner be allowed to perform this transfer?1170			ensure!(1171				<PalletStructure<T>>::check_indirectly_owned(1172					spender.clone(),1173					source.0,1174					source.1,1175					None,1176					nesting_budget1177				)?,1178				<CommonError<T>>::ApprovedValueTooLow,1179			);1180			return Ok(None);1181		}1182		let allowance =1183			<Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);11841185		// Allowance (if any) would be reduced if spender is also wallet operator1186		if <CollectionAllowance<T>>::get((collection.id, from, spender)) {1187			return Ok(allowance);1188		}11891190		if allowance.is_none() {1191			ensure!(1192				collection.ignores_allowance(spender),1193				<CommonError<T>>::ApprovedValueTooLow1194			);1195		}1196		Ok(allowance)1197	}11981199	/// Transfer RFT token pieces from one account to another.1200	///1201	/// Same as the [`transfer`] but spender doesn't needs to be an owner of the token pieces.1202	/// The owner should set allowance for the spender to transfer pieces.1203	///1204	/// [`transfer`]: struct.Pallet.html#method.transfer1205	pub fn transfer_from(1206		collection: &RefungibleHandle<T>,1207		spender: &T::CrossAccountId,1208		from: &T::CrossAccountId,1209		to: &T::CrossAccountId,1210		token: TokenId,1211		amount: u128,1212		nesting_budget: &dyn Budget,1213	) -> DispatchResult {1214		let allowance =1215			Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12161217		// =========12181219		Self::transfer(collection, from, to, token, amount, nesting_budget)?;1220		if let Some(allowance) = allowance {1221			Self::set_allowance_unchecked(collection, from, spender, token, allowance);1222		}1223		Ok(())1224	}12251226	/// Burn RFT token pieces from the account.1227	///1228	/// Same as the [`burn`] but spender doesn't need to be an owner of the token pieces. The owner should1229	/// set allowance for the spender to burn pieces1230	///1231	/// [`burn`]: struct.Pallet.html#method.burn1232	pub fn burn_from(1233		collection: &RefungibleHandle<T>,1234		spender: &T::CrossAccountId,1235		from: &T::CrossAccountId,1236		token: TokenId,1237		amount: u128,1238		nesting_budget: &dyn Budget,1239	) -> DispatchResult {1240		let allowance =1241			Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12421243		// =========12441245		Self::burn(collection, from, token, amount)?;1246		if let Some(allowance) = allowance {1247			Self::set_allowance_unchecked(collection, from, spender, token, allowance);1248		}1249		Ok(())1250	}12511252	/// Create RFT token.1253	///1254	/// The sender should be the owner/admin of the collection or collection should be configured1255	/// to allow public minting.1256	///1257	/// - `data`: Contains list of users who will become the owners of the token pieces and amount1258	///   of token pieces they will receive.1259	pub fn create_item(1260		collection: &RefungibleHandle<T>,1261		sender: &T::CrossAccountId,1262		data: CreateItemData<T::CrossAccountId>,1263		nesting_budget: &dyn Budget,1264	) -> DispatchResult {1265		Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1266	}12671268	/// Repartition RFT token.1269	///1270	/// `repartition` will set token balance of the sender and total amount of token pieces.1271	/// Sender should own all of the token pieces. `repartition' could be done even if some1272	/// token pieces were burned before.1273	///1274	/// - `amount`: Total amount of token pieces that the token will have after `repartition`.1275	pub fn repartition(1276		collection: &RefungibleHandle<T>,1277		owner: &T::CrossAccountId,1278		token: TokenId,1279		amount: u128,1280	) -> DispatchResult {1281		ensure!(1282			amount <= MAX_REFUNGIBLE_PIECES,1283			<Error<T>>::WrongRefungiblePieces1284		);1285		ensure!(amount > 0, <CommonError<T>>::TokenValueTooLow);1286		// Ensure user owns all pieces1287		let total_pieces = Self::total_pieces(collection.id, token).unwrap_or(u128::MAX);1288		let balance = <Balance<T>>::get((collection.id, token, owner));1289		ensure!(1290			total_pieces == balance,1291			<Error<T>>::RepartitionWhileNotOwningAllPieces1292		);12931294		<Balance<T>>::insert((collection.id, token, owner), amount);1295		<TotalSupply<T>>::insert((collection.id, token), amount);12961297		if amount > total_pieces {1298			let mint_amount = amount - total_pieces;1299			<PalletEvm<T>>::deposit_log(1300				ERC20Events::Transfer {1301					from: H160::default(),1302					to: *owner.as_eth(),1303					value: mint_amount.into(),1304				}1305				.to_log(T::EvmTokenAddressMapping::token_to_address(1306					collection.id,1307					token,1308				)),1309			);1310			<PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1311				collection.id,1312				token,1313				owner.clone(),1314				mint_amount,1315			));1316		} else if total_pieces > amount {1317			let burn_amount = total_pieces - amount;1318			<PalletEvm<T>>::deposit_log(1319				ERC20Events::Transfer {1320					from: *owner.as_eth(),1321					to: H160::default(),1322					value: burn_amount.into(),1323				}1324				.to_log(T::EvmTokenAddressMapping::token_to_address(1325					collection.id,1326					token,1327				)),1328			);1329			<PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(1330				collection.id,1331				token,1332				owner.clone(),1333				burn_amount,1334			));1335		}13361337		Ok(())1338	}13391340	fn token_owner(collection_id: CollectionId, token_id: TokenId) -> Option<T::CrossAccountId> {1341		let mut owner = None;1342		let mut count = 0;1343		for key in Balance::<T>::iter_key_prefix((collection_id, token_id)) {1344			count += 1;1345			if count > 1 {1346				return None;1347			}1348			owner = Some(key);1349		}1350		owner1351	}13521353	fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {1354		<TotalSupply<T>>::try_get((collection_id, token_id)).ok()1355	}13561357	pub fn set_collection_properties(1358		collection: &RefungibleHandle<T>,1359		sender: &T::CrossAccountId,1360		properties: Vec<Property>,1361	) -> DispatchResult {1362		<PalletCommon<T>>::set_collection_properties(collection, sender, properties)1363	}13641365	pub fn delete_collection_properties(1366		collection: &RefungibleHandle<T>,1367		sender: &T::CrossAccountId,1368		property_keys: Vec<PropertyKey>,1369	) -> DispatchResult {1370		<PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)1371	}13721373	pub fn set_token_property_permissions(1374		collection: &RefungibleHandle<T>,1375		sender: &T::CrossAccountId,1376		property_permissions: Vec<PropertyKeyPermission>,1377	) -> DispatchResult {1378		<PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)1379	}13801381	pub fn token_property_permission(collection_id: CollectionId) -> PropertiesPermissionMap {1382		<PalletCommon<T>>::property_permissions(collection_id)1383	}13841385	pub fn set_scoped_token_property_permissions(1386		collection: &RefungibleHandle<T>,1387		sender: &T::CrossAccountId,1388		scope: PropertyScope,1389		property_permissions: Vec<PropertyKeyPermission>,1390	) -> DispatchResult {1391		<PalletCommon<T>>::set_scoped_token_property_permissions(1392			collection,1393			sender,1394			scope,1395			property_permissions,1396		)1397	}13981399	/// Returns 10 token in no particular order.1400	///1401	/// There is no direct way to get token holders in ascending order,1402	/// since `iter_prefix` returns values in no particular order.1403	/// Therefore, getting the 10 largest holders with a large value of holders1404	/// can lead to impact memory allocation + sorting with  `n * log (n)`.1405	pub fn token_owners(1406		collection_id: CollectionId,1407		token: TokenId,1408	) -> Option<Vec<T::CrossAccountId>> {1409		let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))1410			.map(|(owner, _amount)| owner)1411			.take(10)1412			.collect();14131414		if res.is_empty() {1415			None1416		} else {1417			Some(res)1418		}1419	}14201421	/// Sets or unsets the approval of a given operator.1422	///1423	/// The `operator` is allowed to transfer all token pieces of the `owner` on their behalf.1424	/// - `owner`: Token owner1425	/// - `operator`: Operator1426	/// - `approve`: Should operator status be granted or revoked?1427	pub fn set_allowance_for_all(1428		collection: &RefungibleHandle<T>,1429		owner: &T::CrossAccountId,1430		operator: &T::CrossAccountId,1431		approve: bool,1432	) -> DispatchResult {1433		if collection.permissions.access() == AccessMode::AllowList {1434			collection.check_allowlist(owner)?;1435			collection.check_allowlist(operator)?;1436		}14371438		<PalletCommon<T>>::ensure_correct_receiver(operator)?;14391440		// =========14411442		<CollectionAllowance<T>>::insert((collection.id, owner, operator), approve);1443		<PalletEvm<T>>::deposit_log(1444			ERC721Events::ApprovalForAll {1445				owner: *owner.as_eth(),1446				operator: *operator.as_eth(),1447				approved: approve,1448			}1449			.to_log(collection_id_to_address(collection.id)),1450		);1451		<PalletCommon<T>>::deposit_event(CommonEvent::ApprovedForAll(1452			collection.id,1453			owner.clone(),1454			operator.clone(),1455			approve,1456		));1457		Ok(())1458	}14591460	/// Tells whether the given `owner` approves the `operator`.1461	pub fn allowance_for_all(1462		collection: &RefungibleHandle<T>,1463		owner: &T::CrossAccountId,1464		operator: &T::CrossAccountId,1465	) -> bool {1466		<CollectionAllowance<T>>::get((collection.id, owner, operator))1467	}14681469	pub fn repair_item(collection: &RefungibleHandle<T>, token: TokenId) -> DispatchResult {1470		<TokenProperties<T>>::mutate((collection.id, token), |properties| {1471			properties.recompute_consumed_space();1472		});14731474		Ok(())1475	}1476}
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
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,6 +17,7 @@
 import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
 import {IKeyringPair} from '@polkadot/types/types';
 import {Contract} from 'web3-eth-contract';
+import {ITokenPropertyPermission} from '../util/playgrounds/types';
 
 
 describe('NFT: Information getting', () => {
@@ -173,7 +174,58 @@
     // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
     // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
   });
+  
+  itEth('Can perform mintCross()', async ({helper}) => {
+    const caller = await helper.eth.createAccountWithBalance(donor);
+    const receiverCross = helper.ethCrossAccount.fromKeyringPair(bob);
+    const properties = Array(5).fill(0).map((_, i) => { return {key: `key_${i}`, value: Buffer.from(`value_${i}`)}; });
+    const permissions: ITokenPropertyPermission[] = properties
+      .map(p => {
+        return {
+          key: p.key, permission: {
+            tokenOwner: true,
+            collectionAdmin: true,
+            mutable: true,
+          },
+        };
+      });
+    
+    
+    const collection = await helper.nft.mintCollection(minter, {
+      tokenPrefix: 'ethp',
+      tokenPropertyPermissions: permissions,
+    });
+    await collection.addAdmin(minter, {Ethereum: caller});
+    
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller, true);
+    let expectedTokenId = await contract.methods.nextTokenId().call();
+    let result = await contract.methods.mintCross(receiverCross, []).send();
+    let tokenId = result.events.Transfer.returnValues.tokenId;
+    expect(tokenId).to.be.equal(expectedTokenId);
+
+    let event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
+    expectedTokenId = await contract.methods.nextTokenId().call();
+    result = await contract.methods.mintCross(receiverCross, properties).send();
+    event = result.events.Transfer;
+    expect(event.address).to.be.equal(collectionAddress);
+    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(bob.address));
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like([]);
+    
+    tokenId = result.events.Transfer.returnValues.tokenId;
+    
+    expect(tokenId).to.be.equal(expectedTokenId);
 
+    expect(await contract.methods.properties(tokenId, []).call()).to.be.like(properties
+      .map(p => { return helper.ethProperty.property(p.key, p.value.toString()); }));
+  });
+  
   //TODO: CORE-302 add eth methods
   itEth.skip('Can perform mintBulk()', async ({helper}) => {
     const caller = await helper.eth.createAccountWithBalance(donor);
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
        **/