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
before · pallets/refungible/src/erc.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 Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{29	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30	types::Property as PropertyStruct, weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,35	erc::{CommonEvmHandler, CollectionCall, static_property::key},36	eth::{EthCrossAccount, EthTokenPermissions},37	Error as CommonError,38};39use pallet_evm::{account::CrossAccountId, PrecompileHandle};40use pallet_evm_coder_substrate::{call, dispatch_to_evm};41use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};42use sp_core::{H160, Get};43use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};44use up_data_structs::{45	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,46	PropertyKeyPermission, PropertyPermission, TokenId,47};4849use crate::{50	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,51	TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,52};5354pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5556/// @title A contract that allows to set and delete token properties and change token property permissions.57#[solidity_interface(name = TokenProperties)]58impl<T: Config> RefungibleHandle<T> {59	/// @notice Set permissions for token property.60	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.61	/// @param key Property key.62	/// @param isMutable Permission to mutate property.63	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.64	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.65	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]66	#[solidity(hide)]67	fn set_token_property_permission(68		&mut self,69		caller: caller,70		key: string,71		is_mutable: bool,72		collection_admin: bool,73		token_owner: bool,74	) -> Result<()> {75		let caller = T::CrossAccountId::from_eth(caller);76		<Pallet<T>>::set_token_property_permissions(77			self,78			&caller,79			vec![PropertyKeyPermission {80				key: <Vec<u8>>::from(key)81					.try_into()82					.map_err(|_| "too long key")?,83				permission: PropertyPermission {84					mutable: is_mutable,85					collection_admin,86					token_owner,87				},88			}],89		)90		.map_err(dispatch_to_evm::<T>)91	}9293	/// @notice Set permissions for token property.94	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.95	/// @param permissions Permissions for keys.96	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]97	fn set_token_property_permissions(98		&mut self,99		caller: caller,100		permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,101	) -> Result<()> {102		let caller = T::CrossAccountId::from_eth(caller);103		const PERMISSIONS_FIELDS_COUNT: usize = 3;104105		let mut perms = Vec::new();106107		for (key, pp) in permissions {108			if pp.len() > PERMISSIONS_FIELDS_COUNT {109				return Err(alloc::format!(110					"Actual number of fields {} for {}, which exceeds the maximum value of {}",111					pp.len(),112					stringify!(EthTokenPermissions),113					PERMISSIONS_FIELDS_COUNT114				)115				.as_str()116				.into());117			}118119			let mut token_permission = PropertyPermission {120				mutable: false,121				collection_admin: false,122				token_owner: false,123			};124125			for (perm, value) in pp {126				match perm {127					EthTokenPermissions::Mutable => token_permission.mutable = value,128					EthTokenPermissions::TokenOwner => token_permission.token_owner = value,129					EthTokenPermissions::CollectionAdmin => {130						token_permission.collection_admin = value131					}132				}133			}134135			perms.push(PropertyKeyPermission {136				key: key.into_bytes().try_into().map_err(|_| "too long key")?,137				permission: token_permission,138			});139		}140141		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)142			.map_err(dispatch_to_evm::<T>)143	}144145	/// @notice Get permissions for token properties.146	fn token_property_permissions(147		&self,148	) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {149		let perms = <Pallet<T>>::token_property_permission(self.id);150		Ok(perms151			.into_iter()152			.map(|(key, pp)| {153				let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");154				let pp = vec![155					(EthTokenPermissions::Mutable, pp.mutable),156					(EthTokenPermissions::TokenOwner, pp.token_owner),157					(EthTokenPermissions::CollectionAdmin, pp.collection_admin),158				];159				(key, pp)160			})161			.collect())162	}163164	/// @notice Set token property value.165	/// @dev Throws error if `msg.sender` has no permission to edit the property.166	/// @param tokenId ID of the token.167	/// @param key Property key.168	/// @param value Property value.169	#[solidity(hide)]170	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]171	fn set_property(172		&mut self,173		caller: caller,174		token_id: uint256,175		key: string,176		value: bytes,177	) -> Result<()> {178		let caller = T::CrossAccountId::from_eth(caller);179		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;180		let key = <Vec<u8>>::from(key)181			.try_into()182			.map_err(|_| "key too long")?;183		let value = value.0.try_into().map_err(|_| "value too long")?;184185		let nesting_budget = self186			.recorder187			.weight_calls_budget(<StructureWeight<T>>::find_parent());188189		<Pallet<T>>::set_token_property(190			self,191			&caller,192			TokenId(token_id),193			Property { key, value },194			&nesting_budget,195		)196		.map_err(dispatch_to_evm::<T>)197	}198199	/// @notice Set token properties value.200	/// @dev Throws error if `msg.sender` has no permission to edit the property.201	/// @param tokenId ID of the token.202	/// @param properties settable properties203	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]204	fn set_properties(205		&mut self,206		caller: caller,207		token_id: uint256,208		properties: Vec<PropertyStruct>,209	) -> Result<()> {210		let caller = T::CrossAccountId::from_eth(caller);211		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;212213		let nesting_budget = self214			.recorder215			.weight_calls_budget(<StructureWeight<T>>::find_parent());216217		let properties = properties218			.into_iter()219			.map(|PropertyStruct { key, value }| {220				let key = <Vec<u8>>::from(key)221					.try_into()222					.map_err(|_| "key too large")?;223224				let value = value.0.try_into().map_err(|_| "value too large")?;225226				Ok(Property { key, value })227			})228			.collect::<Result<Vec<_>>>()?;229230		<Pallet<T>>::set_token_properties(231			self,232			&caller,233			TokenId(token_id),234			properties.into_iter(),235			false,236			&nesting_budget,237		)238		.map_err(dispatch_to_evm::<T>)239	}240241	/// @notice Delete token property value.242	/// @dev Throws error if `msg.sender` has no permission to edit the property.243	/// @param tokenId ID of the token.244	/// @param key Property key.245	#[solidity(hide)]246	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]247	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {248		let caller = T::CrossAccountId::from_eth(caller);249		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;250		let key = <Vec<u8>>::from(key)251			.try_into()252			.map_err(|_| "key too long")?;253254		let nesting_budget = self255			.recorder256			.weight_calls_budget(<StructureWeight<T>>::find_parent());257258		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)259			.map_err(dispatch_to_evm::<T>)260	}261262	/// @notice Delete token properties value.263	/// @dev Throws error if `msg.sender` has no permission to edit the property.264	/// @param tokenId ID of the token.265	/// @param keys Properties key.266	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]267	fn delete_properties(268		&mut self,269		token_id: uint256,270		caller: caller,271		keys: Vec<string>,272	) -> Result<()> {273		let caller = T::CrossAccountId::from_eth(caller);274		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;275		let keys = keys276			.into_iter()277			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))278			.collect::<Result<Vec<_>>>()?;279280		let nesting_budget = self281			.recorder282			.weight_calls_budget(<StructureWeight<T>>::find_parent());283284		<Pallet<T>>::delete_token_properties(285			self,286			&caller,287			TokenId(token_id),288			keys.into_iter(),289			&nesting_budget,290		)291		.map_err(dispatch_to_evm::<T>)292	}293294	/// @notice Get token property value.295	/// @dev Throws error if key not found296	/// @param tokenId ID of the token.297	/// @param key Property key.298	/// @return Property value bytes299	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {300		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;301		let key = <Vec<u8>>::from(key)302			.try_into()303			.map_err(|_| "key too long")?;304305		let props = <TokenProperties<T>>::get((self.id, token_id));306		let prop = props.get(&key).ok_or("key not found")?;307308		Ok(prop.to_vec().into())309	}310}311312#[derive(ToLog)]313pub enum ERC721Events {314	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed315	///  (`to` == 0). Exception: during contract creation, any number of RFTs316	///  may be created and assigned without emitting Transfer.317	Transfer {318		#[indexed]319		from: address,320		#[indexed]321		to: address,322		#[indexed]323		token_id: uint256,324	},325	/// @dev Not supported326	Approval {327		#[indexed]328		owner: address,329		#[indexed]330		approved: address,331		#[indexed]332		token_id: uint256,333	},334	/// @dev Not supported335	#[allow(dead_code)]336	ApprovalForAll {337		#[indexed]338		owner: address,339		#[indexed]340		operator: address,341		approved: bool,342	},343}344345#[derive(ToLog)]346pub enum ERC721UniqueMintableEvents {347	/// @dev Not supported348	#[allow(dead_code)]349	MintingFinished {},350}351352#[solidity_interface(name = ERC721Metadata)]353impl<T: Config> RefungibleHandle<T>354where355	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,356{357	/// @notice A descriptive name for a collection of NFTs in this contract358	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`359	#[solidity(hide, rename_selector = "name")]360	fn name_proxy(&self) -> Result<string> {361		self.name()362	}363364	/// @notice An abbreviated name for NFTs in this contract365	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`366	#[solidity(hide, rename_selector = "symbol")]367	fn symbol_proxy(&self) -> Result<string> {368		self.symbol()369	}370371	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.372	///373	/// @dev If the token has a `url` property and it is not empty, it is returned.374	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.375	///  If the collection property `baseURI` is empty or absent, return "" (empty string)376	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix377	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).378	///379	/// @return token's const_metadata380	#[solidity(rename_selector = "tokenURI")]381	fn token_uri(&self, token_id: uint256) -> Result<string> {382		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;383384		match get_token_property(self, token_id_u32, &key::url()).as_deref() {385			Err(_) | Ok("") => (),386			Ok(url) => {387				return Ok(url.into());388			}389		};390391		let base_uri =392			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())393				.map(BoundedVec::into_inner)394				.map(string::from_utf8)395				.transpose()396				.map_err(|e| {397					Error::Revert(alloc::format!(398						"Can not convert value \"baseURI\" to string with error \"{}\"",399						e400					))401				})?;402403		let base_uri = match base_uri.as_deref() {404			None | Some("") => {405				return Ok("".into());406			}407			Some(base_uri) => base_uri.into(),408		};409410		Ok(411			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {412				Err(_) | Ok("") => base_uri,413				Ok(suffix) => base_uri + suffix,414			},415		)416	}417}418419/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension420/// @dev See https://eips.ethereum.org/EIPS/eip-721421#[solidity_interface(name = ERC721Enumerable)]422impl<T: Config> RefungibleHandle<T> {423	/// @notice Enumerate valid RFTs424	/// @param index A counter less than `totalSupply()`425	/// @return The token identifier for the `index`th NFT,426	///  (sort order not specified)427	fn token_by_index(&self, index: uint256) -> Result<uint256> {428		Ok(index)429	}430431	/// Not implemented432	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {433		// TODO: Not implemetable434		Err("not implemented".into())435	}436437	/// @notice Count RFTs tracked by this contract438	/// @return A count of valid RFTs tracked by this contract, where each one of439	///  them has an assigned and queryable owner not equal to the zero address440	fn total_supply(&self) -> Result<uint256> {441		self.consume_store_reads(1)?;442		Ok(<Pallet<T>>::total_supply(self).into())443	}444}445446/// @title ERC-721 Non-Fungible Token Standard447/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md448#[solidity_interface(name = ERC721, events(ERC721Events))]449impl<T: Config> RefungibleHandle<T> {450	/// @notice Count all RFTs assigned to an owner451	/// @dev RFTs assigned to the zero address are considered invalid, and this452	///  function throws for queries about the zero address.453	/// @param owner An address for whom to query the balance454	/// @return The number of RFTs owned by `owner`, possibly zero455	fn balance_of(&self, owner: address) -> Result<uint256> {456		self.consume_store_reads(1)?;457		let owner = T::CrossAccountId::from_eth(owner);458		let balance = <AccountBalance<T>>::get((self.id, owner));459		Ok(balance.into())460	}461462	/// @notice Find the owner of an RFT463	/// @dev RFTs assigned to zero address are considered invalid, and queries464	///  about them do throw.465	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for466	///  the tokens that are partially owned.467	/// @param tokenId The identifier for an RFT468	/// @return The address of the owner of the RFT469	fn owner_of(&self, token_id: uint256) -> Result<address> {470		self.consume_store_reads(2)?;471		let token = token_id.try_into()?;472		let owner = <Pallet<T>>::token_owner(self.id, token);473		Ok(owner474			.map(|address| *address.as_eth())475			.unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))476	}477478	/// @dev Not implemented479	fn safe_transfer_from_with_data(480		&mut self,481		_from: address,482		_to: address,483		_token_id: uint256,484		_data: bytes,485	) -> Result<void> {486		// TODO: Not implemetable487		Err("not implemented".into())488	}489490	/// @dev Not implemented491	fn safe_transfer_from(492		&mut self,493		_from: address,494		_to: address,495		_token_id: uint256,496	) -> Result<void> {497		// TODO: Not implemetable498		Err("not implemented".into())499	}500501	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE502	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE503	///  THEY MAY BE PERMANENTLY LOST504	/// @dev Throws unless `msg.sender` is the current owner or an authorized505	///  operator for this RFT. Throws if `from` is not the current owner. Throws506	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.507	///  Throws if RFT pieces have multiple owners.508	/// @param from The current owner of the NFT509	/// @param to The new owner510	/// @param tokenId The NFT to transfer511	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]512	fn transfer_from(513		&mut self,514		caller: caller,515		from: address,516		to: address,517		token_id: uint256,518	) -> Result<void> {519		let caller = T::CrossAccountId::from_eth(caller);520		let from = T::CrossAccountId::from_eth(from);521		let to = T::CrossAccountId::from_eth(to);522		let token = token_id.try_into()?;523		let budget = self524			.recorder525			.weight_calls_budget(<StructureWeight<T>>::find_parent());526527		let balance = balance(&self, token, &from)?;528		ensure_single_owner(&self, token, balance)?;529530		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)531			.map_err(dispatch_to_evm::<T>)?;532533		Ok(())534	}535536	/// @dev Not implemented537	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {538		Err("not implemented".into())539	}540541	/// @notice Sets or unsets the approval of a given operator.542	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.543	/// @param operator Operator544	/// @param approved Should operator status be granted or revoked?545	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]546	fn set_approval_for_all(547		&mut self,548		caller: caller,549		operator: address,550		approved: bool,551	) -> Result<void> {552		let caller = T::CrossAccountId::from_eth(caller);553		let operator = T::CrossAccountId::from_eth(operator);554555		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)556			.map_err(dispatch_to_evm::<T>)?;557		Ok(())558	}559560	/// @dev Not implemented561	fn get_approved(&self, _token_id: uint256) -> Result<address> {562		// TODO: Not implemetable563		Err("not implemented".into())564	}565566	/// @notice Tells whether the given `owner` approves the `operator`.567	#[weight(<SelfWeightOf<T>>::allowance_for_all())]568	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {569		let owner = T::CrossAccountId::from_eth(owner);570		let operator = T::CrossAccountId::from_eth(operator);571572		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))573	}574575	/// @notice Returns collection helper contract address576	fn collection_helper_address(&self) -> Result<address> {577		Ok(T::ContractAddress::get())578	}579}580581/// Returns amount of pieces of `token` that `owner` have582pub fn balance<T: Config>(583	collection: &RefungibleHandle<T>,584	token: TokenId,585	owner: &T::CrossAccountId,586) -> Result<u128> {587	collection.consume_store_reads(1)?;588	let balance = <Balance<T>>::get((collection.id, token, &owner));589	Ok(balance)590}591592/// Throws if `owner_balance` is lower than total amount of `token` pieces593pub fn ensure_single_owner<T: Config>(594	collection: &RefungibleHandle<T>,595	token: TokenId,596	owner_balance: u128,597) -> Result<()> {598	collection.consume_store_reads(1)?;599	let total_supply = <TotalSupply<T>>::get((collection.id, token));600601	if owner_balance == 0 {602		return Err(dispatch_to_evm::<T>(603			<CommonError<T>>::MustBeTokenOwner.into(),604		));605	}606607	if total_supply != owner_balance {608		return Err("token has multiple owners".into());609	}610	Ok(())611}612613/// @title ERC721 Token that can be irreversibly burned (destroyed).614#[solidity_interface(name = ERC721Burnable)]615impl<T: Config> RefungibleHandle<T> {616	/// @notice Burns a specific ERC721 token.617	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized618	///  operator of the current owner.619	/// @param tokenId The RFT to approve620	#[weight(<SelfWeightOf<T>>::burn_item_fully())]621	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {622		let caller = T::CrossAccountId::from_eth(caller);623		let token = token_id.try_into()?;624625		let balance = balance(&self, token, &caller)?;626		ensure_single_owner(&self, token, balance)?;627628		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;629		Ok(())630	}631}632633/// @title ERC721 minting logic.634#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]635impl<T: Config> RefungibleHandle<T> {636	fn minting_finished(&self) -> Result<bool> {637		Ok(false)638	}639640	/// @notice Function to mint token.641	/// @param to The new owner642	/// @return uint256 The id of the newly minted token643	#[weight(<SelfWeightOf<T>>::create_item())]644	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {645		let token_id: uint256 = <TokensMinted<T>>::get(self.id)646			.checked_add(1)647			.ok_or("item id overflow")?648			.into();649		self.mint_check_id(caller, to, token_id)?;650		Ok(token_id)651	}652653	/// @notice Function to mint token.654	/// @dev `tokenId` should be obtained with `nextTokenId` method,655	///  unlike standard, you can't specify it manually656	/// @param to The new owner657	/// @param tokenId ID of the minted RFT658	#[solidity(hide, rename_selector = "mint")]659	#[weight(<SelfWeightOf<T>>::create_item())]660	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {661		let caller = T::CrossAccountId::from_eth(caller);662		let to = T::CrossAccountId::from_eth(to);663		let token_id: u32 = token_id.try_into()?;664		let budget = self665			.recorder666			.weight_calls_budget(<StructureWeight<T>>::find_parent());667668		if <TokensMinted<T>>::get(self.id)669			.checked_add(1)670			.ok_or("item id overflow")?671			!= token_id672		{673			return Err("item id should be next".into());674		}675676		let users = [(to.clone(), 1)]677			.into_iter()678			.collect::<BTreeMap<_, _>>()679			.try_into()680			.unwrap();681		<Pallet<T>>::create_item(682			self,683			&caller,684			CreateItemData::<T::CrossAccountId> {685				users,686				properties: CollectionPropertiesVec::default(),687			},688			&budget,689		)690		.map_err(dispatch_to_evm::<T>)?;691692		Ok(true)693	}694695	/// @notice Function to mint token with the given tokenUri.696	/// @param to The new owner697	/// @param tokenUri Token URI that would be stored in the NFT properties698	/// @return uint256 The id of the newly minted token699	#[solidity(rename_selector = "mintWithTokenURI")]700	#[weight(<SelfWeightOf<T>>::create_item())]701	fn mint_with_token_uri(702		&mut self,703		caller: caller,704		to: address,705		token_uri: string,706	) -> Result<uint256> {707		let token_id: uint256 = <TokensMinted<T>>::get(self.id)708			.checked_add(1)709			.ok_or("item id overflow")?710			.into();711		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;712		Ok(token_id)713	}714715	/// @notice Function to mint token with the given tokenUri.716	/// @dev `tokenId` should be obtained with `nextTokenId` method,717	///  unlike standard, you can't specify it manually718	/// @param to The new owner719	/// @param tokenId ID of the minted RFT720	/// @param tokenUri Token URI that would be stored in the RFT properties721	#[solidity(hide, rename_selector = "mintWithTokenURI")]722	#[weight(<SelfWeightOf<T>>::create_item())]723	fn mint_with_token_uri_check_id(724		&mut self,725		caller: caller,726		to: address,727		token_id: uint256,728		token_uri: string,729	) -> Result<bool> {730		let key = key::url();731		let permission = get_token_permission::<T>(self.id, &key)?;732		if !permission.collection_admin {733			return Err("Operation is not allowed".into());734		}735736		let caller = T::CrossAccountId::from_eth(caller);737		let to = T::CrossAccountId::from_eth(to);738		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;739		let budget = self740			.recorder741			.weight_calls_budget(<StructureWeight<T>>::find_parent());742743		if <TokensMinted<T>>::get(self.id)744			.checked_add(1)745			.ok_or("item id overflow")?746			!= token_id747		{748			return Err("item id should be next".into());749		}750751		let mut properties = CollectionPropertiesVec::default();752		properties753			.try_push(Property {754				key,755				value: token_uri756					.into_bytes()757					.try_into()758					.map_err(|_| "token uri is too long")?,759			})760			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;761762		let users = [(to.clone(), 1)]763			.into_iter()764			.collect::<BTreeMap<_, _>>()765			.try_into()766			.unwrap();767		<Pallet<T>>::create_item(768			self,769			&caller,770			CreateItemData::<T::CrossAccountId> { users, properties },771			&budget,772		)773		.map_err(dispatch_to_evm::<T>)?;774		Ok(true)775	}776777	/// @dev Not implemented778	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {779		Err("not implementable".into())780	}781}782783fn get_token_property<T: Config>(784	collection: &CollectionHandle<T>,785	token_id: u32,786	key: &up_data_structs::PropertyKey,787) -> Result<string> {788	collection.consume_store_reads(1)?;789	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))790		.map_err(|_| Error::Revert("Token properties not found".into()))?;791	if let Some(property) = properties.get(key) {792		return Ok(string::from_utf8_lossy(property).into());793	}794795	Err("Property tokenURI not found".into())796}797798fn get_token_permission<T: Config>(799	collection_id: CollectionId,800	key: &PropertyKey,801) -> Result<PropertyPermission> {802	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)803		.map_err(|_| Error::Revert("No permissions for collection".into()))?;804	let a = token_property_permissions805		.get(key)806		.map(Clone::clone)807		.ok_or_else(|| {808			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();809			Error::Revert(alloc::format!("No permission for key {}", key))810		})?;811	Ok(a)812}813814/// @title Unique extensions for ERC721.815#[solidity_interface(name = ERC721UniqueExtensions)]816impl<T: Config> RefungibleHandle<T>817where818	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,819{820	/// @notice A descriptive name for a collection of NFTs in this contract821	fn name(&self) -> Result<string> {822		Ok(decode_utf16(self.name.iter().copied())823			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))824			.collect::<string>())825	}826827	/// @notice An abbreviated name for NFTs in this contract828	fn symbol(&self) -> Result<string> {829		Ok(string::from_utf8_lossy(&self.token_prefix).into())830	}831832	/// @notice A description for the collection.833	fn description(&self) -> Result<string> {834		Ok(decode_utf16(self.description.iter().copied())835			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))836			.collect::<string>())837	}838839	/// Returns the owner (in cross format) of the token.840	///841	/// @param tokenId Id for the token.842	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {843		Self::token_owner(&self, token_id.try_into()?)844			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))845			.ok_or(Error::Revert("key too large".into()))846	}847848	/// Returns the token properties.849	///850	/// @param tokenId Id for the token.851	/// @param keys Properties keys. Empty keys for all propertyes.852	/// @return Vector of properties key/value pairs.853	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {854		let keys = keys855			.into_iter()856			.map(|key| {857				<Vec<u8>>::from(key)858					.try_into()859					.map_err(|_| Error::Revert("key too large".into()))860			})861			.collect::<Result<Vec<_>>>()?;862863		<Self as CommonCollectionOperations<T>>::token_properties(864			&self,865			token_id.try_into()?,866			if keys.is_empty() { None } else { Some(keys) },867		)868		.into_iter()869		.map(|p| {870			let key = string::from_utf8(p.key.to_vec())871				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;872			let value = bytes(p.value.to_vec());873			Ok(PropertyStruct { key, value })874		})875		.collect::<Result<Vec<_>>>()876	}877	/// @notice Transfer ownership of an RFT878	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`879	///  is the zero address. Throws if `tokenId` is not a valid RFT.880	///  Throws if RFT pieces have multiple owners.881	/// @param to The new owner882	/// @param tokenId The RFT to transfer883	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]884	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {885		let caller = T::CrossAccountId::from_eth(caller);886		let to = T::CrossAccountId::from_eth(to);887		let token = token_id.try_into()?;888		let budget = self889			.recorder890			.weight_calls_budget(<StructureWeight<T>>::find_parent());891892		let balance = balance(self, token, &caller)?;893		ensure_single_owner(self, token, balance)?;894895		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)896			.map_err(dispatch_to_evm::<T>)?;897		Ok(())898	}899900	/// @notice Transfer ownership of an RFT901	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`902	///  is the zero address. Throws if `tokenId` is not a valid RFT.903	///  Throws if RFT pieces have multiple owners.904	/// @param to The new owner905	/// @param tokenId The RFT to transfer906	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]907	fn transfer_cross(908		&mut self,909		caller: caller,910		to: EthCrossAccount,911		token_id: uint256,912	) -> Result<void> {913		let caller = T::CrossAccountId::from_eth(caller);914		let to = to.into_sub_cross_account::<T>()?;915		let token = token_id.try_into()?;916		let budget = self917			.recorder918			.weight_calls_budget(<StructureWeight<T>>::find_parent());919920		let balance = balance(self, token, &caller)?;921		ensure_single_owner(self, token, balance)?;922923		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)924			.map_err(dispatch_to_evm::<T>)?;925		Ok(())926	}927928	/// @notice Transfer ownership of an RFT929	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`930	///  is the zero address. Throws if `tokenId` is not a valid RFT.931	///  Throws if RFT pieces have multiple owners.932	/// @param to The new owner933	/// @param tokenId The RFT to transfer934	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]935	fn transfer_from_cross(936		&mut self,937		caller: caller,938		from: EthCrossAccount,939		to: EthCrossAccount,940		token_id: uint256,941	) -> Result<void> {942		let caller = T::CrossAccountId::from_eth(caller);943		let from = from.into_sub_cross_account::<T>()?;944		let to = to.into_sub_cross_account::<T>()?;945		let token_id = token_id.try_into()?;946		let budget = self947			.recorder948			.weight_calls_budget(<StructureWeight<T>>::find_parent());949950		let balance = balance(self, token_id, &from)?;951		ensure_single_owner(self, token_id, balance)?;952953		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)954			.map_err(dispatch_to_evm::<T>)?;955		Ok(())956	}957958	/// @notice Burns a specific ERC721 token.959	/// @dev Throws unless `msg.sender` is the current owner or an authorized960	///  operator for this RFT. Throws if `from` is not the current owner. Throws961	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.962	///  Throws if RFT pieces have multiple owners.963	/// @param from The current owner of the RFT964	/// @param tokenId The RFT to transfer965	#[solidity(hide)]966	#[weight(<SelfWeightOf<T>>::burn_from())]967	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {968		let caller = T::CrossAccountId::from_eth(caller);969		let from = T::CrossAccountId::from_eth(from);970		let token = token_id.try_into()?;971		let budget = self972			.recorder973			.weight_calls_budget(<StructureWeight<T>>::find_parent());974975		let balance = balance(self, token, &from)?;976		ensure_single_owner(self, token, balance)?;977978		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)979			.map_err(dispatch_to_evm::<T>)?;980		Ok(())981	}982983	/// @notice Burns a specific ERC721 token.984	/// @dev Throws unless `msg.sender` is the current owner or an authorized985	///  operator for this RFT. Throws if `from` is not the current owner. Throws986	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.987	///  Throws if RFT pieces have multiple owners.988	/// @param from The current owner of the RFT989	/// @param tokenId The RFT to transfer990	#[weight(<SelfWeightOf<T>>::burn_from())]991	fn burn_from_cross(992		&mut self,993		caller: caller,994		from: EthCrossAccount,995		token_id: uint256,996	) -> Result<void> {997		let caller = T::CrossAccountId::from_eth(caller);998		let from = from.into_sub_cross_account::<T>()?;999		let token = token_id.try_into()?;1000		let budget = self1001			.recorder1002			.weight_calls_budget(<StructureWeight<T>>::find_parent());10031004		let balance = balance(self, token, &from)?;1005		ensure_single_owner(self, token, balance)?;10061007		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)1008			.map_err(dispatch_to_evm::<T>)?;1009		Ok(())1010	}10111012	/// @notice Returns next free RFT ID.1013	fn next_token_id(&self) -> Result<uint256> {1014		self.consume_store_reads(1)?;1015		Ok(<TokensMinted<T>>::get(self.id)1016			.checked_add(1)1017			.ok_or("item id overflow")?1018			.into())1019	}10201021	/// @notice Function to mint multiple tokens.1022	/// @dev `tokenIds` should be an array of consecutive numbers and first number1023	///  should be obtained with `nextTokenId` method1024	/// @param to The new owner1025	/// @param tokenIds IDs of the minted RFTs1026	#[solidity(hide)]1027	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]1028	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {1029		let caller = T::CrossAccountId::from_eth(caller);1030		let to = T::CrossAccountId::from_eth(to);1031		let mut expected_index = <TokensMinted<T>>::get(self.id)1032			.checked_add(1)1033			.ok_or("item id overflow")?;1034		let budget = self1035			.recorder1036			.weight_calls_budget(<StructureWeight<T>>::find_parent());10371038		let total_tokens = token_ids.len();1039		for id in token_ids.into_iter() {1040			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1041			if id != expected_index {1042				return Err("item id should be next".into());1043			}1044			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1045		}1046		let users = [(to.clone(), 1)]1047			.into_iter()1048			.collect::<BTreeMap<_, _>>()1049			.try_into()1050			.unwrap();1051		let create_item_data = CreateItemData::<T::CrossAccountId> {1052			users,1053			properties: CollectionPropertiesVec::default(),1054		};1055		let data = (0..total_tokens)1056			.map(|_| create_item_data.clone())1057			.collect();10581059		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1060			.map_err(dispatch_to_evm::<T>)?;1061		Ok(true)1062	}10631064	/// @notice Function to mint multiple tokens with the given tokenUris.1065	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1066	///  numbers and first number should be obtained with `nextTokenId` method1067	/// @param to The new owner1068	/// @param tokens array of pairs of token ID and token URI for minted tokens1069	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1070	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1071	fn mint_bulk_with_token_uri(1072		&mut self,1073		caller: caller,1074		to: address,1075		tokens: Vec<(uint256, string)>,1076	) -> Result<bool> {1077		let key = key::url();1078		let caller = T::CrossAccountId::from_eth(caller);1079		let to = T::CrossAccountId::from_eth(to);1080		let mut expected_index = <TokensMinted<T>>::get(self.id)1081			.checked_add(1)1082			.ok_or("item id overflow")?;1083		let budget = self1084			.recorder1085			.weight_calls_budget(<StructureWeight<T>>::find_parent());10861087		let mut data = Vec::with_capacity(tokens.len());1088		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1089			.into_iter()1090			.collect::<BTreeMap<_, _>>()1091			.try_into()1092			.unwrap();1093		for (id, token_uri) in tokens {1094			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1095			if id != expected_index {1096				return Err("item id should be next".into());1097			}1098			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10991100			let mut properties = CollectionPropertiesVec::default();1101			properties1102				.try_push(Property {1103					key: key.clone(),1104					value: token_uri1105						.into_bytes()1106						.try_into()1107						.map_err(|_| "token uri is too long")?,1108				})1109				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;11101111			let create_item_data = CreateItemData::<T::CrossAccountId> {1112				users: users.clone(),1113				properties,1114			};1115			data.push(create_item_data);1116		}11171118		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1119			.map_err(dispatch_to_evm::<T>)?;1120		Ok(true)1121	}11221123	/// Returns EVM address for refungible token1124	///1125	/// @param token ID of the token1126	fn token_contract_address(&self, token: uint256) -> Result<address> {1127		Ok(T::EvmTokenAddressMapping::token_to_address(1128			self.id,1129			token.try_into().map_err(|_| "token id overflow")?,1130		))1131	}1132}11331134#[solidity_interface(1135	name = UniqueRefungible,1136	is(1137		ERC721,1138		ERC721Enumerable,1139		ERC721UniqueExtensions,1140		ERC721UniqueMintable,1141		ERC721Burnable,1142		ERC721Metadata(if(this.flags.erc721metadata)),1143		Collection(via(common_mut returns CollectionHandle<T>)),1144		TokenProperties,1145	)1146)]1147impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11481149// Not a tests, but code generators1150generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1151generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11521153impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1154where1155	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1156{1157	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1158	fn call(1159		self,1160		handle: &mut impl PrecompileHandle,1161	) -> Option<pallet_common::erc::PrecompileResult> {1162		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1163	}1164}
after · pallets/refungible/src/erc.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 Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{29	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,30	types::Property as PropertyStruct, weight,31};32use frame_support::{BoundedBTreeMap, BoundedVec};33use pallet_common::{34	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,35	erc::{CommonEvmHandler, CollectionCall, static_property::key},36	eth::{EthCrossAccount, EthTokenPermissions},37	Error as CommonError,38};39use pallet_evm::{account::CrossAccountId, PrecompileHandle};40use pallet_evm_coder_substrate::{call, dispatch_to_evm};41use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};42use sp_core::{H160, Get};43use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};44use up_data_structs::{45	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,46	PropertyKeyPermission, PropertyPermission, TokenId,47};4849use crate::{50	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, SelfWeightOf,51	TokenProperties, TokensMinted, TotalSupply, weights::WeightInfo,52};5354pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);5556/// @title A contract that allows to set and delete token properties and change token property permissions.57#[solidity_interface(name = TokenProperties)]58impl<T: Config> RefungibleHandle<T> {59	/// @notice Set permissions for token property.60	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.61	/// @param key Property key.62	/// @param isMutable Permission to mutate property.63	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.64	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.65	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]66	#[solidity(hide)]67	fn set_token_property_permission(68		&mut self,69		caller: caller,70		key: string,71		is_mutable: bool,72		collection_admin: bool,73		token_owner: bool,74	) -> Result<()> {75		let caller = T::CrossAccountId::from_eth(caller);76		<Pallet<T>>::set_token_property_permissions(77			self,78			&caller,79			vec![PropertyKeyPermission {80				key: <Vec<u8>>::from(key)81					.try_into()82					.map_err(|_| "too long key")?,83				permission: PropertyPermission {84					mutable: is_mutable,85					collection_admin,86					token_owner,87				},88			}],89		)90		.map_err(dispatch_to_evm::<T>)91	}9293	/// @notice Set permissions for token property.94	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.95	/// @param permissions Permissions for keys.96	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]97	fn set_token_property_permissions(98		&mut self,99		caller: caller,100		permissions: Vec<(string, Vec<(EthTokenPermissions, bool)>)>,101	) -> Result<()> {102		let caller = T::CrossAccountId::from_eth(caller);103		const PERMISSIONS_FIELDS_COUNT: usize = 3;104105		let mut perms = Vec::new();106107		for (key, pp) in permissions {108			if pp.len() > PERMISSIONS_FIELDS_COUNT {109				return Err(alloc::format!(110					"Actual number of fields {} for {}, which exceeds the maximum value of {}",111					pp.len(),112					stringify!(EthTokenPermissions),113					PERMISSIONS_FIELDS_COUNT114				)115				.as_str()116				.into());117			}118119			let mut token_permission = PropertyPermission {120				mutable: false,121				collection_admin: false,122				token_owner: false,123			};124125			for (perm, value) in pp {126				match perm {127					EthTokenPermissions::Mutable => token_permission.mutable = value,128					EthTokenPermissions::TokenOwner => token_permission.token_owner = value,129					EthTokenPermissions::CollectionAdmin => {130						token_permission.collection_admin = value131					}132				}133			}134135			perms.push(PropertyKeyPermission {136				key: key.into_bytes().try_into().map_err(|_| "too long key")?,137				permission: token_permission,138			});139		}140141		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)142			.map_err(dispatch_to_evm::<T>)143	}144145	/// @notice Get permissions for token properties.146	fn token_property_permissions(147		&self,148	) -> Result<Vec<(string, Vec<(EthTokenPermissions, bool)>)>> {149		let perms = <Pallet<T>>::token_property_permission(self.id);150		Ok(perms151			.into_iter()152			.map(|(key, pp)| {153				let key = string::from_utf8(key.into_inner()).expect("Stored key must be valid");154				let pp = vec![155					(EthTokenPermissions::Mutable, pp.mutable),156					(EthTokenPermissions::TokenOwner, pp.token_owner),157					(EthTokenPermissions::CollectionAdmin, pp.collection_admin),158				];159				(key, pp)160			})161			.collect())162	}163164	/// @notice Set token property value.165	/// @dev Throws error if `msg.sender` has no permission to edit the property.166	/// @param tokenId ID of the token.167	/// @param key Property key.168	/// @param value Property value.169	#[solidity(hide)]170	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]171	fn set_property(172		&mut self,173		caller: caller,174		token_id: uint256,175		key: string,176		value: bytes,177	) -> Result<()> {178		let caller = T::CrossAccountId::from_eth(caller);179		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;180		let key = <Vec<u8>>::from(key)181			.try_into()182			.map_err(|_| "key too long")?;183		let value = value.0.try_into().map_err(|_| "value too long")?;184185		let nesting_budget = self186			.recorder187			.weight_calls_budget(<StructureWeight<T>>::find_parent());188189		<Pallet<T>>::set_token_property(190			self,191			&caller,192			TokenId(token_id),193			Property { key, value },194			&nesting_budget,195		)196		.map_err(dispatch_to_evm::<T>)197	}198199	/// @notice Set token properties value.200	/// @dev Throws error if `msg.sender` has no permission to edit the property.201	/// @param tokenId ID of the token.202	/// @param properties settable properties203	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]204	fn set_properties(205		&mut self,206		caller: caller,207		token_id: uint256,208		properties: Vec<PropertyStruct>,209	) -> Result<()> {210		let caller = T::CrossAccountId::from_eth(caller);211		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;212213		let nesting_budget = self214			.recorder215			.weight_calls_budget(<StructureWeight<T>>::find_parent());216217		let properties = properties218			.into_iter()219			.map(|PropertyStruct { key, value }| {220				let key = <Vec<u8>>::from(key)221					.try_into()222					.map_err(|_| "key too large")?;223224				let value = value.0.try_into().map_err(|_| "value too large")?;225226				Ok(Property { key, value })227			})228			.collect::<Result<Vec<_>>>()?;229230		<Pallet<T>>::set_token_properties(231			self,232			&caller,233			TokenId(token_id),234			properties.into_iter(),235			false,236			&nesting_budget,237		)238		.map_err(dispatch_to_evm::<T>)239	}240241	/// @notice Delete token property value.242	/// @dev Throws error if `msg.sender` has no permission to edit the property.243	/// @param tokenId ID of the token.244	/// @param key Property key.245	#[solidity(hide)]246	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]247	fn delete_property(&mut self, token_id: uint256, caller: caller, key: string) -> Result<()> {248		let caller = T::CrossAccountId::from_eth(caller);249		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;250		let key = <Vec<u8>>::from(key)251			.try_into()252			.map_err(|_| "key too long")?;253254		let nesting_budget = self255			.recorder256			.weight_calls_budget(<StructureWeight<T>>::find_parent());257258		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)259			.map_err(dispatch_to_evm::<T>)260	}261262	/// @notice Delete token properties value.263	/// @dev Throws error if `msg.sender` has no permission to edit the property.264	/// @param tokenId ID of the token.265	/// @param keys Properties key.266	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]267	fn delete_properties(268		&mut self,269		token_id: uint256,270		caller: caller,271		keys: Vec<string>,272	) -> Result<()> {273		let caller = T::CrossAccountId::from_eth(caller);274		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;275		let keys = keys276			.into_iter()277			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))278			.collect::<Result<Vec<_>>>()?;279280		let nesting_budget = self281			.recorder282			.weight_calls_budget(<StructureWeight<T>>::find_parent());283284		<Pallet<T>>::delete_token_properties(285			self,286			&caller,287			TokenId(token_id),288			keys.into_iter(),289			&nesting_budget,290		)291		.map_err(dispatch_to_evm::<T>)292	}293294	/// @notice Get token property value.295	/// @dev Throws error if key not found296	/// @param tokenId ID of the token.297	/// @param key Property key.298	/// @return Property value bytes299	fn property(&self, token_id: uint256, key: string) -> Result<bytes> {300		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;301		let key = <Vec<u8>>::from(key)302			.try_into()303			.map_err(|_| "key too long")?;304305		let props = <TokenProperties<T>>::get((self.id, token_id));306		let prop = props.get(&key).ok_or("key not found")?;307308		Ok(prop.to_vec().into())309	}310}311312#[derive(ToLog)]313pub enum ERC721Events {314	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed315	///  (`to` == 0). Exception: during contract creation, any number of RFTs316	///  may be created and assigned without emitting Transfer.317	Transfer {318		#[indexed]319		from: address,320		#[indexed]321		to: address,322		#[indexed]323		token_id: uint256,324	},325	/// @dev Not supported326	Approval {327		#[indexed]328		owner: address,329		#[indexed]330		approved: address,331		#[indexed]332		token_id: uint256,333	},334	/// @dev Not supported335	#[allow(dead_code)]336	ApprovalForAll {337		#[indexed]338		owner: address,339		#[indexed]340		operator: address,341		approved: bool,342	},343}344345#[derive(ToLog)]346pub enum ERC721UniqueMintableEvents {347	/// @dev Not supported348	#[allow(dead_code)]349	MintingFinished {},350}351352#[solidity_interface(name = ERC721Metadata)]353impl<T: Config> RefungibleHandle<T>354where355	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,356{357	/// @notice A descriptive name for a collection of NFTs in this contract358	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`359	#[solidity(hide, rename_selector = "name")]360	fn name_proxy(&self) -> Result<string> {361		self.name()362	}363364	/// @notice An abbreviated name for NFTs in this contract365	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`366	#[solidity(hide, rename_selector = "symbol")]367	fn symbol_proxy(&self) -> Result<string> {368		self.symbol()369	}370371	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.372	///373	/// @dev If the token has a `url` property and it is not empty, it is returned.374	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.375	///  If the collection property `baseURI` is empty or absent, return "" (empty string)376	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix377	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).378	///379	/// @return token's const_metadata380	#[solidity(rename_selector = "tokenURI")]381	fn token_uri(&self, token_id: uint256) -> Result<string> {382		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;383384		match get_token_property(self, token_id_u32, &key::url()).as_deref() {385			Err(_) | Ok("") => (),386			Ok(url) => {387				return Ok(url.into());388			}389		};390391		let base_uri =392			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())393				.map(BoundedVec::into_inner)394				.map(string::from_utf8)395				.transpose()396				.map_err(|e| {397					Error::Revert(alloc::format!(398						"Can not convert value \"baseURI\" to string with error \"{}\"",399						e400					))401				})?;402403		let base_uri = match base_uri.as_deref() {404			None | Some("") => {405				return Ok("".into());406			}407			Some(base_uri) => base_uri.into(),408		};409410		Ok(411			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {412				Err(_) | Ok("") => base_uri,413				Ok(suffix) => base_uri + suffix,414			},415		)416	}417}418419/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension420/// @dev See https://eips.ethereum.org/EIPS/eip-721421#[solidity_interface(name = ERC721Enumerable)]422impl<T: Config> RefungibleHandle<T> {423	/// @notice Enumerate valid RFTs424	/// @param index A counter less than `totalSupply()`425	/// @return The token identifier for the `index`th NFT,426	///  (sort order not specified)427	fn token_by_index(&self, index: uint256) -> Result<uint256> {428		Ok(index)429	}430431	/// Not implemented432	fn token_of_owner_by_index(&self, _owner: address, _index: uint256) -> Result<uint256> {433		// TODO: Not implemetable434		Err("not implemented".into())435	}436437	/// @notice Count RFTs tracked by this contract438	/// @return A count of valid RFTs tracked by this contract, where each one of439	///  them has an assigned and queryable owner not equal to the zero address440	fn total_supply(&self) -> Result<uint256> {441		self.consume_store_reads(1)?;442		Ok(<Pallet<T>>::total_supply(self).into())443	}444}445446/// @title ERC-721 Non-Fungible Token Standard447/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md448#[solidity_interface(name = ERC721, events(ERC721Events))]449impl<T: Config> RefungibleHandle<T> {450	/// @notice Count all RFTs assigned to an owner451	/// @dev RFTs assigned to the zero address are considered invalid, and this452	///  function throws for queries about the zero address.453	/// @param owner An address for whom to query the balance454	/// @return The number of RFTs owned by `owner`, possibly zero455	fn balance_of(&self, owner: address) -> Result<uint256> {456		self.consume_store_reads(1)?;457		let owner = T::CrossAccountId::from_eth(owner);458		let balance = <AccountBalance<T>>::get((self.id, owner));459		Ok(balance.into())460	}461462	/// @notice Find the owner of an RFT463	/// @dev RFTs assigned to zero address are considered invalid, and queries464	///  about them do throw.465	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for466	///  the tokens that are partially owned.467	/// @param tokenId The identifier for an RFT468	/// @return The address of the owner of the RFT469	fn owner_of(&self, token_id: uint256) -> Result<address> {470		self.consume_store_reads(2)?;471		let token = token_id.try_into()?;472		let owner = <Pallet<T>>::token_owner(self.id, token);473		Ok(owner474			.map(|address| *address.as_eth())475			.unwrap_or_else(|| ADDRESS_FOR_PARTIALLY_OWNED_TOKENS))476	}477478	/// @dev Not implemented479	fn safe_transfer_from_with_data(480		&mut self,481		_from: address,482		_to: address,483		_token_id: uint256,484		_data: bytes,485	) -> Result<void> {486		// TODO: Not implemetable487		Err("not implemented".into())488	}489490	/// @dev Not implemented491	fn safe_transfer_from(492		&mut self,493		_from: address,494		_to: address,495		_token_id: uint256,496	) -> Result<void> {497		// TODO: Not implemetable498		Err("not implemented".into())499	}500501	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE502	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE503	///  THEY MAY BE PERMANENTLY LOST504	/// @dev Throws unless `msg.sender` is the current owner or an authorized505	///  operator for this RFT. Throws if `from` is not the current owner. Throws506	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.507	///  Throws if RFT pieces have multiple owners.508	/// @param from The current owner of the NFT509	/// @param to The new owner510	/// @param tokenId The NFT to transfer511	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]512	fn transfer_from(513		&mut self,514		caller: caller,515		from: address,516		to: address,517		token_id: uint256,518	) -> Result<void> {519		let caller = T::CrossAccountId::from_eth(caller);520		let from = T::CrossAccountId::from_eth(from);521		let to = T::CrossAccountId::from_eth(to);522		let token = token_id.try_into()?;523		let budget = self524			.recorder525			.weight_calls_budget(<StructureWeight<T>>::find_parent());526527		let balance = balance(&self, token, &from)?;528		ensure_single_owner(&self, token, balance)?;529530		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)531			.map_err(dispatch_to_evm::<T>)?;532533		Ok(())534	}535536	/// @dev Not implemented537	fn approve(&mut self, _caller: caller, _approved: address, _token_id: uint256) -> Result<void> {538		Err("not implemented".into())539	}540541	/// @notice Sets or unsets the approval of a given operator.542	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.543	/// @param operator Operator544	/// @param approved Should operator status be granted or revoked?545	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]546	fn set_approval_for_all(547		&mut self,548		caller: caller,549		operator: address,550		approved: bool,551	) -> Result<void> {552		let caller = T::CrossAccountId::from_eth(caller);553		let operator = T::CrossAccountId::from_eth(operator);554555		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)556			.map_err(dispatch_to_evm::<T>)?;557		Ok(())558	}559560	/// @dev Not implemented561	fn get_approved(&self, _token_id: uint256) -> Result<address> {562		// TODO: Not implemetable563		Err("not implemented".into())564	}565566	/// @notice Tells whether the given `owner` approves the `operator`.567	#[weight(<SelfWeightOf<T>>::allowance_for_all())]568	fn is_approved_for_all(&self, owner: address, operator: address) -> Result<bool> {569		let owner = T::CrossAccountId::from_eth(owner);570		let operator = T::CrossAccountId::from_eth(operator);571572		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))573	}574575	/// @notice Returns collection helper contract address576	fn collection_helper_address(&self) -> Result<address> {577		Ok(T::ContractAddress::get())578	}579}580581/// Returns amount of pieces of `token` that `owner` have582pub fn balance<T: Config>(583	collection: &RefungibleHandle<T>,584	token: TokenId,585	owner: &T::CrossAccountId,586) -> Result<u128> {587	collection.consume_store_reads(1)?;588	let balance = <Balance<T>>::get((collection.id, token, &owner));589	Ok(balance)590}591592/// Throws if `owner_balance` is lower than total amount of `token` pieces593pub fn ensure_single_owner<T: Config>(594	collection: &RefungibleHandle<T>,595	token: TokenId,596	owner_balance: u128,597) -> Result<()> {598	collection.consume_store_reads(1)?;599	let total_supply = <TotalSupply<T>>::get((collection.id, token));600601	if owner_balance == 0 {602		return Err(dispatch_to_evm::<T>(603			<CommonError<T>>::MustBeTokenOwner.into(),604		));605	}606607	if total_supply != owner_balance {608		return Err("token has multiple owners".into());609	}610	Ok(())611}612613/// @title ERC721 Token that can be irreversibly burned (destroyed).614#[solidity_interface(name = ERC721Burnable)]615impl<T: Config> RefungibleHandle<T> {616	/// @notice Burns a specific ERC721 token.617	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized618	///  operator of the current owner.619	/// @param tokenId The RFT to approve620	#[weight(<SelfWeightOf<T>>::burn_item_fully())]621	fn burn(&mut self, caller: caller, token_id: uint256) -> Result<void> {622		let caller = T::CrossAccountId::from_eth(caller);623		let token = token_id.try_into()?;624625		let balance = balance(&self, token, &caller)?;626		ensure_single_owner(&self, token, balance)?;627628		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;629		Ok(())630	}631}632633/// @title ERC721 minting logic.634#[solidity_interface(name = ERC721UniqueMintable, events(ERC721UniqueMintableEvents))]635impl<T: Config> RefungibleHandle<T> {636	fn minting_finished(&self) -> Result<bool> {637		Ok(false)638	}639640	/// @notice Function to mint a token.641	/// @param to The new owner642	/// @return uint256 The id of the newly minted token643	#[weight(<SelfWeightOf<T>>::create_item())]644	fn mint(&mut self, caller: caller, to: address) -> Result<uint256> {645		let token_id: uint256 = <TokensMinted<T>>::get(self.id)646			.checked_add(1)647			.ok_or("item id overflow")?648			.into();649		self.mint_check_id(caller, to, token_id)?;650		Ok(token_id)651	}652653	/// @notice Function to mint a token.654	/// @dev `tokenId` should be obtained with `nextTokenId` method,655	///  unlike standard, you can't specify it manually656	/// @param to The new owner657	/// @param tokenId ID of the minted RFT658	#[solidity(hide, rename_selector = "mint")]659	#[weight(<SelfWeightOf<T>>::create_item())]660	fn mint_check_id(&mut self, caller: caller, to: address, token_id: uint256) -> Result<bool> {661		let caller = T::CrossAccountId::from_eth(caller);662		let to = T::CrossAccountId::from_eth(to);663		let token_id: u32 = token_id.try_into()?;664		let budget = self665			.recorder666			.weight_calls_budget(<StructureWeight<T>>::find_parent());667668		if <TokensMinted<T>>::get(self.id)669			.checked_add(1)670			.ok_or("item id overflow")?671			!= token_id672		{673			return Err("item id should be next".into());674		}675676		let users = [(to.clone(), 1)]677			.into_iter()678			.collect::<BTreeMap<_, _>>()679			.try_into()680			.unwrap();681		<Pallet<T>>::create_item(682			self,683			&caller,684			CreateItemData::<T> {685				users,686				properties: CollectionPropertiesVec::default(),687			},688			&budget,689		)690		.map_err(dispatch_to_evm::<T>)?;691692		Ok(true)693	}694695	/// @notice Function to mint token with the given tokenUri.696	/// @param to The new owner697	/// @param tokenUri Token URI that would be stored in the NFT properties698	/// @return uint256 The id of the newly minted token699	#[solidity(rename_selector = "mintWithTokenURI")]700	#[weight(<SelfWeightOf<T>>::create_item())]701	fn mint_with_token_uri(702		&mut self,703		caller: caller,704		to: address,705		token_uri: string,706	) -> Result<uint256> {707		let token_id: uint256 = <TokensMinted<T>>::get(self.id)708			.checked_add(1)709			.ok_or("item id overflow")?710			.into();711		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;712		Ok(token_id)713	}714715	/// @notice Function to mint token with the given tokenUri.716	/// @dev `tokenId` should be obtained with `nextTokenId` method,717	///  unlike standard, you can't specify it manually718	/// @param to The new owner719	/// @param tokenId ID of the minted RFT720	/// @param tokenUri Token URI that would be stored in the RFT properties721	#[solidity(hide, rename_selector = "mintWithTokenURI")]722	#[weight(<SelfWeightOf<T>>::create_item())]723	fn mint_with_token_uri_check_id(724		&mut self,725		caller: caller,726		to: address,727		token_id: uint256,728		token_uri: string,729	) -> Result<bool> {730		let key = key::url();731		let permission = get_token_permission::<T>(self.id, &key)?;732		if !permission.collection_admin {733			return Err("Operation is not allowed".into());734		}735736		let caller = T::CrossAccountId::from_eth(caller);737		let to = T::CrossAccountId::from_eth(to);738		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;739		let budget = self740			.recorder741			.weight_calls_budget(<StructureWeight<T>>::find_parent());742743		if <TokensMinted<T>>::get(self.id)744			.checked_add(1)745			.ok_or("item id overflow")?746			!= token_id747		{748			return Err("item id should be next".into());749		}750751		let mut properties = CollectionPropertiesVec::default();752		properties753			.try_push(Property {754				key,755				value: token_uri756					.into_bytes()757					.try_into()758					.map_err(|_| "token uri is too long")?,759			})760			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;761762		let users = [(to.clone(), 1)]763			.into_iter()764			.collect::<BTreeMap<_, _>>()765			.try_into()766			.unwrap();767		<Pallet<T>>::create_item(768			self,769			&caller,770			CreateItemData::<T> { users, properties },771			&budget,772		)773		.map_err(dispatch_to_evm::<T>)?;774		Ok(true)775	}776777	/// @dev Not implemented778	fn finish_minting(&mut self, _caller: caller) -> Result<bool> {779		Err("not implementable".into())780	}781}782783fn get_token_property<T: Config>(784	collection: &CollectionHandle<T>,785	token_id: u32,786	key: &up_data_structs::PropertyKey,787) -> Result<string> {788	collection.consume_store_reads(1)?;789	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))790		.map_err(|_| Error::Revert("Token properties not found".into()))?;791	if let Some(property) = properties.get(key) {792		return Ok(string::from_utf8_lossy(property).into());793	}794795	Err("Property tokenURI not found".into())796}797798fn get_token_permission<T: Config>(799	collection_id: CollectionId,800	key: &PropertyKey,801) -> Result<PropertyPermission> {802	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)803		.map_err(|_| Error::Revert("No permissions for collection".into()))?;804	let a = token_property_permissions805		.get(key)806		.map(Clone::clone)807		.ok_or_else(|| {808			let key = string::from_utf8(key.clone().into_inner()).unwrap_or_default();809			Error::Revert(alloc::format!("No permission for key {}", key))810		})?;811	Ok(a)812}813814/// @title Unique extensions for ERC721.815#[solidity_interface(name = ERC721UniqueExtensions)]816impl<T: Config> RefungibleHandle<T>817where818	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,819{820	/// @notice A descriptive name for a collection of NFTs in this contract821	fn name(&self) -> Result<string> {822		Ok(decode_utf16(self.name.iter().copied())823			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))824			.collect::<string>())825	}826827	/// @notice An abbreviated name for NFTs in this contract828	fn symbol(&self) -> Result<string> {829		Ok(string::from_utf8_lossy(&self.token_prefix).into())830	}831832	/// @notice A description for the collection.833	fn description(&self) -> Result<string> {834		Ok(decode_utf16(self.description.iter().copied())835			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))836			.collect::<string>())837	}838839	/// Returns the owner (in cross format) of the token.840	///841	/// @param tokenId Id for the token.842	fn cross_owner_of(&self, token_id: uint256) -> Result<EthCrossAccount> {843		Self::token_owner(&self, token_id.try_into()?)844			.map(|o| EthCrossAccount::from_sub_cross_account::<T>(&o))845			.ok_or(Error::Revert("key too large".into()))846	}847848	/// Returns the token properties.849	///850	/// @param tokenId Id for the token.851	/// @param keys Properties keys. Empty keys for all propertyes.852	/// @return Vector of properties key/value pairs.853	fn properties(&self, token_id: uint256, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {854		let keys = keys855			.into_iter()856			.map(|key| {857				<Vec<u8>>::from(key)858					.try_into()859					.map_err(|_| Error::Revert("key too large".into()))860			})861			.collect::<Result<Vec<_>>>()?;862863		<Self as CommonCollectionOperations<T>>::token_properties(864			&self,865			token_id.try_into()?,866			if keys.is_empty() { None } else { Some(keys) },867		)868		.into_iter()869		.map(|p| {870			let key = string::from_utf8(p.key.to_vec())871				.map_err(|e| Error::Revert(alloc::format!("{}", e)))?;872			let value = bytes(p.value.to_vec());873			Ok(PropertyStruct { key, value })874		})875		.collect::<Result<Vec<_>>>()876	}877	/// @notice Transfer ownership of an RFT878	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`879	///  is the zero address. Throws if `tokenId` is not a valid RFT.880	///  Throws if RFT pieces have multiple owners.881	/// @param to The new owner882	/// @param tokenId The RFT to transfer883	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]884	fn transfer(&mut self, caller: caller, to: address, token_id: uint256) -> Result<void> {885		let caller = T::CrossAccountId::from_eth(caller);886		let to = T::CrossAccountId::from_eth(to);887		let token = token_id.try_into()?;888		let budget = self889			.recorder890			.weight_calls_budget(<StructureWeight<T>>::find_parent());891892		let balance = balance(self, token, &caller)?;893		ensure_single_owner(self, token, balance)?;894895		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)896			.map_err(dispatch_to_evm::<T>)?;897		Ok(())898	}899900	/// @notice Transfer ownership of an RFT901	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`902	///  is the zero address. Throws if `tokenId` is not a valid RFT.903	///  Throws if RFT pieces have multiple owners.904	/// @param to The new owner905	/// @param tokenId The RFT to transfer906	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]907	fn transfer_cross(908		&mut self,909		caller: caller,910		to: EthCrossAccount,911		token_id: uint256,912	) -> Result<void> {913		let caller = T::CrossAccountId::from_eth(caller);914		let to = to.into_sub_cross_account::<T>()?;915		let token = token_id.try_into()?;916		let budget = self917			.recorder918			.weight_calls_budget(<StructureWeight<T>>::find_parent());919920		let balance = balance(self, token, &caller)?;921		ensure_single_owner(self, token, balance)?;922923		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)924			.map_err(dispatch_to_evm::<T>)?;925		Ok(())926	}927928	/// @notice Transfer ownership of an RFT929	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`930	///  is the zero address. Throws if `tokenId` is not a valid RFT.931	///  Throws if RFT pieces have multiple owners.932	/// @param to The new owner933	/// @param tokenId The RFT to transfer934	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]935	fn transfer_from_cross(936		&mut self,937		caller: caller,938		from: EthCrossAccount,939		to: EthCrossAccount,940		token_id: uint256,941	) -> Result<void> {942		let caller = T::CrossAccountId::from_eth(caller);943		let from = from.into_sub_cross_account::<T>()?;944		let to = to.into_sub_cross_account::<T>()?;945		let token_id = token_id.try_into()?;946		let budget = self947			.recorder948			.weight_calls_budget(<StructureWeight<T>>::find_parent());949950		let balance = balance(self, token_id, &from)?;951		ensure_single_owner(self, token_id, balance)?;952953		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)954			.map_err(dispatch_to_evm::<T>)?;955		Ok(())956	}957958	/// @notice Burns a specific ERC721 token.959	/// @dev Throws unless `msg.sender` is the current owner or an authorized960	///  operator for this RFT. Throws if `from` is not the current owner. Throws961	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.962	///  Throws if RFT pieces have multiple owners.963	/// @param from The current owner of the RFT964	/// @param tokenId The RFT to transfer965	#[solidity(hide)]966	#[weight(<SelfWeightOf<T>>::burn_from())]967	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {968		let caller = T::CrossAccountId::from_eth(caller);969		let from = T::CrossAccountId::from_eth(from);970		let token = token_id.try_into()?;971		let budget = self972			.recorder973			.weight_calls_budget(<StructureWeight<T>>::find_parent());974975		let balance = balance(self, token, &from)?;976		ensure_single_owner(self, token, balance)?;977978		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)979			.map_err(dispatch_to_evm::<T>)?;980		Ok(())981	}982983	/// @notice Burns a specific ERC721 token.984	/// @dev Throws unless `msg.sender` is the current owner or an authorized985	///  operator for this RFT. Throws if `from` is not the current owner. Throws986	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.987	///  Throws if RFT pieces have multiple owners.988	/// @param from The current owner of the RFT989	/// @param tokenId The RFT to transfer990	#[weight(<SelfWeightOf<T>>::burn_from())]991	fn burn_from_cross(992		&mut self,993		caller: caller,994		from: EthCrossAccount,995		token_id: uint256,996	) -> Result<void> {997		let caller = T::CrossAccountId::from_eth(caller);998		let from = from.into_sub_cross_account::<T>()?;999		let token = token_id.try_into()?;1000		let budget = self1001			.recorder1002			.weight_calls_budget(<StructureWeight<T>>::find_parent());10031004		let balance = balance(self, token, &from)?;1005		ensure_single_owner(self, token, balance)?;10061007		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)1008			.map_err(dispatch_to_evm::<T>)?;1009		Ok(())1010	}10111012	/// @notice Returns next free RFT ID.1013	fn next_token_id(&self) -> Result<uint256> {1014		self.consume_store_reads(1)?;1015		Ok(<TokensMinted<T>>::get(self.id)1016			.checked_add(1)1017			.ok_or("item id overflow")?1018			.into())1019	}10201021	/// @notice Function to mint multiple tokens.1022	/// @dev `tokenIds` should be an array of consecutive numbers and first number1023	///  should be obtained with `nextTokenId` method1024	/// @param to The new owner1025	/// @param tokenIds IDs of the minted RFTs1026	#[solidity(hide)]1027	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]1028	fn mint_bulk(&mut self, caller: caller, to: address, token_ids: Vec<uint256>) -> Result<bool> {1029		let caller = T::CrossAccountId::from_eth(caller);1030		let to = T::CrossAccountId::from_eth(to);1031		let mut expected_index = <TokensMinted<T>>::get(self.id)1032			.checked_add(1)1033			.ok_or("item id overflow")?;1034		let budget = self1035			.recorder1036			.weight_calls_budget(<StructureWeight<T>>::find_parent());10371038		let total_tokens = token_ids.len();1039		for id in token_ids.into_iter() {1040			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1041			if id != expected_index {1042				return Err("item id should be next".into());1043			}1044			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1045		}1046		let users = [(to.clone(), 1)]1047			.into_iter()1048			.collect::<BTreeMap<_, _>>()1049			.try_into()1050			.unwrap();1051		let create_item_data = CreateItemData::<T> {1052			users,1053			properties: CollectionPropertiesVec::default(),1054		};1055		let data = (0..total_tokens)1056			.map(|_| create_item_data.clone())1057			.collect();10581059		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1060			.map_err(dispatch_to_evm::<T>)?;1061		Ok(true)1062	}10631064	/// @notice Function to mint multiple tokens with the given tokenUris.1065	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1066	///  numbers and first number should be obtained with `nextTokenId` method1067	/// @param to The new owner1068	/// @param tokens array of pairs of token ID and token URI for minted tokens1069	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1070	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32))]1071	fn mint_bulk_with_token_uri(1072		&mut self,1073		caller: caller,1074		to: address,1075		tokens: Vec<(uint256, string)>,1076	) -> Result<bool> {1077		let key = key::url();1078		let caller = T::CrossAccountId::from_eth(caller);1079		let to = T::CrossAccountId::from_eth(to);1080		let mut expected_index = <TokensMinted<T>>::get(self.id)1081			.checked_add(1)1082			.ok_or("item id overflow")?;1083		let budget = self1084			.recorder1085			.weight_calls_budget(<StructureWeight<T>>::find_parent());10861087		let mut data = Vec::with_capacity(tokens.len());1088		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1089			.into_iter()1090			.collect::<BTreeMap<_, _>>()1091			.try_into()1092			.unwrap();1093		for (id, token_uri) in tokens {1094			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1095			if id != expected_index {1096				return Err("item id should be next".into());1097			}1098			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10991100			let mut properties = CollectionPropertiesVec::default();1101			properties1102				.try_push(Property {1103					key: key.clone(),1104					value: token_uri1105						.into_bytes()1106						.try_into()1107						.map_err(|_| "token uri is too long")?,1108				})1109				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;11101111			let create_item_data = CreateItemData::<T> {1112				users: users.clone(),1113				properties,1114			};1115			data.push(create_item_data);1116		}11171118		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1119			.map_err(dispatch_to_evm::<T>)?;1120		Ok(true)1121	}11221123	/// @notice Function to mint a token.1124	/// @param to The new owner crossAccountId1125	/// @param properties Properties of minted token1126	/// @return uint256 The id of the newly minted token1127	#[weight(<SelfWeightOf<T>>::create_item())]1128	fn mint_cross(1129		&mut self,1130		caller: caller,1131		to: EthCrossAccount,1132		properties: Vec<PropertyStruct>,1133	) -> Result<uint256> {1134		let token_id = <TokensMinted<T>>::get(self.id)1135			.checked_add(1)1136			.ok_or("item id overflow")?;11371138		let to = to.into_sub_cross_account::<T>()?;11391140		let properties = properties1141			.into_iter()1142			.map(|PropertyStruct { key, value }| {1143				let key = <Vec<u8>>::from(key)1144					.try_into()1145					.map_err(|_| "key too large")?;11461147				let value = value.0.try_into().map_err(|_| "value too large")?;11481149				Ok(Property { key, value })1150			})1151			.collect::<Result<Vec<_>>>()?1152			.try_into()1153			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11541155		let caller = T::CrossAccountId::from_eth(caller);11561157		let budget = self1158			.recorder1159			.weight_calls_budget(<StructureWeight<T>>::find_parent());11601161		let users = [(to, 1)]1162			.into_iter()1163			.collect::<BTreeMap<_, _>>()1164			.try_into()1165			.unwrap();1166		<Pallet<T>>::create_item(1167			self,1168			&caller,1169			CreateItemData::<T> { users, properties },1170			&budget,1171		)1172		.map_err(dispatch_to_evm::<T>)?;11731174		Ok(token_id.into())1175	}11761177	/// Returns EVM address for refungible token1178	///1179	/// @param token ID of the token1180	fn token_contract_address(&self, token: uint256) -> Result<address> {1181		Ok(T::EvmTokenAddressMapping::token_to_address(1182			self.id,1183			token.try_into().map_err(|_| "token id overflow")?,1184		))1185	}1186}11871188#[solidity_interface(1189	name = UniqueRefungible,1190	is(1191		ERC721,1192		ERC721Enumerable,1193		ERC721UniqueExtensions,1194		ERC721UniqueMintable,1195		ERC721Burnable,1196		ERC721Metadata(if(this.flags.erc721metadata)),1197		Collection(via(common_mut returns CollectionHandle<T>)),1198		TokenProperties,1199	)1200)]1201impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}12021203// Not a tests, but code generators1204generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1205generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);12061207impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1208where1209	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1210{1211	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1212	fn call(1213		self,1214		handle: &mut impl PrecompileHandle,1215	) -> Option<pallet_common::erc::PrecompileResult> {1216		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1217	}1218}
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -114,6 +114,7 @@
 	CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
 	MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
 	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+	CreateRefungibleExMultipleOwners,
 };
 
 pub use pallet::*;
@@ -124,13 +125,8 @@
 pub mod erc_token;
 pub mod weights;
 
-#[derive(Derivative, Clone)]
-pub struct CreateItemData<CrossAccountId> {
-	#[derivative(Debug(format_with = "bounded::map_debug"))]
-	pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
-	#[derivative(Debug(format_with = "bounded::vec_debug"))]
-	pub properties: CollectionPropertiesVec,
-}
+pub type CreateItemData<T> =
+	CreateRefungibleExMultipleOwners<<T as pallet_evm::Config>::CrossAccountId>;
 pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
 
 /// Token data, stored independently from other data used to describe it
@@ -913,7 +909,7 @@
 	pub fn create_multiple_items(
 		collection: &RefungibleHandle<T>,
 		sender: &T::CrossAccountId,
-		data: Vec<CreateItemData<T::CrossAccountId>>,
+		data: Vec<CreateItemData<T>>,
 		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
@@ -1259,7 +1255,7 @@
 	pub fn create_item(
 		collection: &RefungibleHandle<T>,
 		sender: &T::CrossAccountId,
-		data: CreateItemData<T::CrossAccountId>,
+		data: CreateItemData<T>,
 		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth
--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -42,7 +42,7 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple58[] memory permissions) public {
+	function setTokenPropertyPermissions(Tuple60[] memory permissions) public {
 		require(false, stub_error);
 		permissions;
 		dummy = 0;
@@ -51,10 +51,10 @@
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() public view returns (Tuple58[] memory) {
+	function tokenPropertyPermissions() public view returns (Tuple60[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple58[](0);
+		return new Tuple60[](0);
 	}
 
 	// /// @notice Set token property value.
@@ -144,13 +144,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple58 {
+struct Tuple60 {
 	string field_0;
-	Tuple56[] field_1;
+	Tuple58[] field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple56 {
+struct Tuple58 {
 	EthTokenPermissions field_0;
 	bool field_1;
 }
@@ -290,10 +290,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple29 memory) {
+	function collectionSponsor() public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple29(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -311,10 +311,10 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple32[] memory) {
+	function collectionLimits() public view returns (Tuple34[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple32[](0);
+		return new Tuple34[](0);
 	}
 
 	/// Set limits for the collection.
@@ -422,19 +422,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple38 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple40 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple38(false, new uint256[](0));
+		return Tuple40(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple41[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple43[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple41[](0);
+		return new Tuple43[](0);
 	}
 
 	/// Set the collection access method.
@@ -614,13 +614,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple41 {
+struct Tuple43 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple38 {
+struct Tuple40 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -648,18 +648,12 @@
 }
 
 /// @dev anonymous struct
-struct Tuple32 {
+struct Tuple34 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
 }
 
-/// @dev anonymous struct
-struct Tuple29 {
-	address field_0;
-	uint256 field_1;
-}
-
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 contract ERC721Metadata is Dummy, ERC165 {
 	// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -733,7 +727,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -745,7 +739,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to mint a token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -802,7 +796,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -979,6 +973,20 @@
 	// 	return false;
 	// }
 
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	/// @dev EVM selector for this function is: 0xb904db03,
+	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
+	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+		require(false, stub_error);
+		to;
+		properties;
+		dummy = 0;
+		return 0;
+	}
+
 	/// Returns EVM address for refungible token
 	///
 	/// @param token ID of the token
modifiedtests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple0",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "type": "tuple"
       }
modifiedtests/src/eth/abi/fungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/fungible.json
+++ b/tests/src/eth/abi/fungible.json
@@ -220,7 +220,7 @@
           { "internalType": "bool", "name": "field_1", "type": "bool" },
           { "internalType": "uint256", "name": "field_2", "type": "uint256" }
         ],
-        "internalType": "struct Tuple20[]",
+        "internalType": "struct Tuple23[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -241,7 +241,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple29[]",
+        "internalType": "struct Tuple32[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -262,7 +262,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple26",
+        "internalType": "struct Tuple29",
         "name": "",
         "type": "tuple"
       }
@@ -319,10 +319,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple8",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -408,7 +408,7 @@
           { "internalType": "address", "name": "field_0", "type": "address" },
           { "internalType": "uint256", "name": "field_1", "type": "uint256" }
         ],
-        "internalType": "struct Tuple8[]",
+        "internalType": "struct Tuple9[]",
         "name": "amounts",
         "type": "tuple[]"
       }
@@ -419,6 +419,24 @@
     "type": "function"
   },
   {
+    "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "to",
+        "type": "tuple"
+      },
+      { "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "mintCross",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
     "inputs": [],
     "name": "name",
     "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -250,7 +250,7 @@
           { "internalType": "bool", "name": "field_1", "type": "bool" },
           { "internalType": "uint256", "name": "field_2", "type": "uint256" }
         ],
-        "internalType": "struct Tuple33[]",
+        "internalType": "struct Tuple35[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -271,7 +271,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple42[]",
+        "internalType": "struct Tuple44[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -292,7 +292,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple39",
+        "internalType": "struct Tuple41",
         "name": "",
         "type": "tuple"
       }
@@ -349,10 +349,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple30",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -478,6 +478,32 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "to",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "string", "name": "key", "type": "string" },
+          { "internalType": "bytes", "name": "value", "type": "bytes" }
+        ],
+        "internalType": "struct Property[]",
+        "name": "properties",
+        "type": "tuple[]"
+      }
+    ],
+    "name": "mintCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "string", "name": "tokenUri", "type": "string" }
     ],
@@ -736,12 +762,12 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
-            "internalType": "struct Tuple57[]",
+            "internalType": "struct Tuple59[]",
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple59[]",
+        "internalType": "struct Tuple61[]",
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -802,12 +828,12 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
-            "internalType": "struct Tuple57[]",
+            "internalType": "struct Tuple59[]",
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple59[]",
+        "internalType": "struct Tuple61[]",
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -232,7 +232,7 @@
           { "internalType": "bool", "name": "field_1", "type": "bool" },
           { "internalType": "uint256", "name": "field_2", "type": "uint256" }
         ],
-        "internalType": "struct Tuple32[]",
+        "internalType": "struct Tuple34[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -253,7 +253,7 @@
           },
           { "internalType": "bool", "name": "field_1", "type": "bool" }
         ],
-        "internalType": "struct Tuple41[]",
+        "internalType": "struct Tuple43[]",
         "name": "",
         "type": "tuple[]"
       }
@@ -274,7 +274,7 @@
             "type": "uint256[]"
           }
         ],
-        "internalType": "struct Tuple38",
+        "internalType": "struct Tuple40",
         "name": "",
         "type": "tuple"
       }
@@ -331,10 +331,10 @@
     "outputs": [
       {
         "components": [
-          { "internalType": "address", "name": "field_0", "type": "address" },
-          { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
         ],
-        "internalType": "struct Tuple29",
+        "internalType": "struct EthCrossAccount",
         "name": "",
         "type": "tuple"
       }
@@ -460,6 +460,32 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct EthCrossAccount",
+        "name": "to",
+        "type": "tuple"
+      },
+      {
+        "components": [
+          { "internalType": "string", "name": "key", "type": "string" },
+          { "internalType": "bytes", "name": "value", "type": "bytes" }
+        ],
+        "internalType": "struct Property[]",
+        "name": "properties",
+        "type": "tuple[]"
+      }
+    ],
+    "name": "mintCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "string", "name": "tokenUri", "type": "string" }
     ],
@@ -718,12 +744,12 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
-            "internalType": "struct Tuple56[]",
+            "internalType": "struct Tuple58[]",
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple58[]",
+        "internalType": "struct Tuple60[]",
         "name": "permissions",
         "type": "tuple[]"
       }
@@ -793,12 +819,12 @@
               },
               { "internalType": "bool", "name": "field_1", "type": "bool" }
             ],
-            "internalType": "struct Tuple56[]",
+            "internalType": "struct Tuple58[]",
             "name": "field_1",
             "type": "tuple[]"
           }
         ],
-        "internalType": "struct Tuple58[]",
+        "internalType": "struct Tuple60[]",
         "name": "",
         "type": "tuple[]"
       }
modifiedtests/src/eth/api/ContractHelpers.soldiffbeforeafterboth
--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) external view returns (Tuple0 memory);
+	function sponsor(address contractAddress) external view returns (EthCrossAccount memory);
 
 	/// Check tat contract has confirmed sponsor.
 	///
@@ -171,8 +171,8 @@
 	function toggleAllowlist(address contractAddress, bool enabled) external;
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedtests/src/eth/api/UniqueFungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -102,7 +102,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple8 memory);
+	function collectionSponsor() external view returns (EthCrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -119,7 +119,7 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple19[] memory);
+	function collectionLimits() external view returns (Tuple21[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -191,12 +191,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple24 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple26 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple27[] memory);
+	function collectionNestingPermissions() external view returns (Tuple29[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -311,7 +311,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple27 {
+struct Tuple29 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -322,7 +322,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple24 {
+struct Tuple26 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -350,7 +350,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple19 {
+struct Tuple21 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
@@ -362,13 +362,17 @@
 	bytes value;
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @notice A description for the collection.
 	/// @dev EVM selector for this function is: 0x7284e416,
 	///  or in textual repr: description()
 	function description() external view returns (string memory);
 
+	/// @dev EVM selector for this function is: 0x269e6158,
+	///  or in textual repr: mintCross((address,uint256),uint256)
+	function mintCross(EthCrossAccount memory to, uint256 amount) external returns (bool);
+
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
@@ -395,7 +399,7 @@
 	/// @param amounts array of pairs of account address and amount
 	/// @dev EVM selector for this function is: 0x1acf2d55,
 	///  or in textual repr: mintBulk((address,uint256)[])
-	function mintBulk(Tuple8[] memory amounts) external returns (bool);
+	function mintBulk(Tuple9[] memory amounts) external returns (bool);
 
 	/// @dev EVM selector for this function is: 0x2ada85ff,
 	///  or in textual repr: transferCross((address,uint256),uint256)
@@ -411,7 +415,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
 	address field_0;
 	uint256 field_1;
 }
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,12 +30,12 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
+	function setTokenPropertyPermissions(Tuple53[] memory permissions) external;
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() external view returns (Tuple52[] memory);
+	function tokenPropertyPermissions() external view returns (Tuple53[] memory);
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple52 {
+struct Tuple53 {
 	string field_0;
-	Tuple50[] field_1;
+	Tuple51[] field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple50 {
+struct Tuple51 {
 	EthTokenPermissions field_0;
 	bool field_1;
 }
@@ -198,7 +198,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple27 memory);
+	function collectionSponsor() external view returns (EthCrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -215,7 +215,7 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple30[] memory);
+	function collectionLimits() external view returns (Tuple31[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple36 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple38[] memory);
+	function collectionNestingPermissions() external view returns (Tuple39[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -407,7 +407,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple38 {
+struct Tuple39 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -418,7 +418,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple35 {
+struct Tuple36 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -446,18 +446,12 @@
 }
 
 /// @dev anonymous struct
-struct Tuple30 {
+struct Tuple31 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
 }
 
-/// @dev anonymous struct
-struct Tuple27 {
-	address field_0;
-	uint256 field_1;
-}
-
 /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -512,14 +506,14 @@
 	///  or in textual repr: mintingFinished()
 	function mintingFinished() external view returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
 	///  or in textual repr: mint(address)
 	function mint(address to) external returns (uint256);
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to mint a token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -553,7 +547,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -652,6 +646,7 @@
 	/// @dev EVM selector for this function is: 0x75794a3c,
 	///  or in textual repr: nextTokenId()
 	function nextTokenId() external view returns (uint256);
+
 	// /// @notice Function to mint multiple tokens.
 	// /// @dev `tokenIds` should be an array of consecutive numbers and first number
 	// ///  should be obtained with `nextTokenId` method
@@ -670,6 +665,13 @@
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple13[] memory tokens) external returns (bool);
 
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	/// @dev EVM selector for this function is: 0xb904db03,
+	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
+	function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
 }
 
 /// @dev anonymous struct
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,12 +30,12 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple51[] memory permissions) external;
+	function setTokenPropertyPermissions(Tuple52[] memory permissions) external;
 
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() external view returns (Tuple51[] memory);
+	function tokenPropertyPermissions() external view returns (Tuple52[] memory);
 
 	// /// @notice Set token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -97,13 +97,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple51 {
+struct Tuple52 {
 	string field_0;
-	Tuple49[] field_1;
+	Tuple50[] field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple49 {
+struct Tuple50 {
 	EthTokenPermissions field_0;
 	bool field_1;
 }
@@ -198,7 +198,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple26 memory);
+	function collectionSponsor() external view returns (EthCrossAccount memory);
 
 	/// Get current collection limits.
 	///
@@ -215,7 +215,7 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() external view returns (Tuple29[] memory);
+	function collectionLimits() external view returns (Tuple30[] memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -287,12 +287,12 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() external view returns (Tuple34 memory);
+	function collectionNestingRestrictedCollectionIds() external view returns (Tuple35 memory);
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() external view returns (Tuple37[] memory);
+	function collectionNestingPermissions() external view returns (Tuple38[] memory);
 
 	/// Set the collection access method.
 	/// @param mode Access mode
@@ -407,7 +407,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple37 {
+struct Tuple38 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
@@ -418,7 +418,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple34 {
+struct Tuple35 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -446,18 +446,12 @@
 }
 
 /// @dev anonymous struct
-struct Tuple29 {
+struct Tuple30 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
 }
 
-/// @dev anonymous struct
-struct Tuple26 {
-	address field_0;
-	uint256 field_1;
-}
-
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
 interface ERC721Metadata is Dummy, ERC165 {
 	// /// @notice A descriptive name for a collection of NFTs in this contract
@@ -510,14 +504,14 @@
 	///  or in textual repr: mintingFinished()
 	function mintingFinished() external view returns (bool);
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
 	///  or in textual repr: mint(address)
 	function mint(address to) external returns (uint256);
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to mint a token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -551,7 +545,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x12f7d6c1
+/// @dev the ERC-165 identifier for this interface is 0xabf30dc2
 interface ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -663,6 +657,14 @@
 	// ///  or in textual repr: mintBulkWithTokenURI(address,(uint256,string)[])
 	// function mintBulkWithTokenURI(address to, Tuple12[] memory tokens) external returns (bool);
 
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	/// @dev EVM selector for this function is: 0xb904db03,
+	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
+	function mintCross(EthCrossAccount memory to, Property[] memory properties) external returns (uint256);
+
 	/// Returns EVM address for refungible token
 	///
 	/// @param token ID of the token
modifiedtests/src/eth/base.test.tsdiffbeforeafterboth
--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -116,7 +116,7 @@
     await checkInterface(helper, '0x780e9d63', true, true);
   });
 
-  itEth('ERC721UniqueExtensions support', async ({helper}) => {
+  itEth.skip('ERC721UniqueExtensions support', async ({helper}) => {
     await checkInterface(helper, '0xb74c26b7', true, true);
   });
 
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -106,7 +106,7 @@
       await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
   
       const sponsorTuple = await collectionEvm.methods.collectionSponsor().call({from: owner});
-      expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
+      expect(sponsorTuple.eth).to.be.eq('0x0000000000000000000000000000000000000000');
     }));
 
   [
modifiedtests/src/eth/fungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -57,7 +57,7 @@
   before(async function() {
     await usingEthPlaygrounds(async (helper, privateKey) => {
       donor = await privateKey({filename: __filename});
-      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);
+      [alice, owner] = await helper.arrange.createAccounts([30n, 20n], donor);
     });
   });
 
@@ -78,6 +78,25 @@
     expect(event.returnValues.to).to.equal(receiver);
     expect(event.returnValues.value).to.equal('100');
   });
+  
+  
+  itEth('Can perform mintCross()', async ({helper}) => {
+    const receiverCross = helper.ethCrossAccount.fromKeyringPair(owner);
+    const ethOwner = await helper.eth.createAccountWithBalance(donor);
+    const collection = await helper.ft.mintCollection(alice);
+    await collection.addAdmin(alice, {Ethereum: ethOwner});
+
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', ethOwner);
+
+    const result = await contract.methods.mintCross(receiverCross, 100).send();
+    
+    const event = result.events.Transfer;
+    expect(event.address).to.equal(collectionAddress);
+    expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');
+    expect(event.returnValues.to).to.equal(helper.address.substrateToEth(owner.address));
+    expect(event.returnValues.value).to.equal('100');
+  });
 
   itEth('Can perform mintBulk()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
modifiedtests/src/eth/nesting/nest.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nesting/nest.test.ts
+++ b/tests/src/eth/nesting/nest.test.ts
@@ -62,9 +62,9 @@
       expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, []]);
       await contract.methods.setCollectionNesting(true, [unnsetedCollectionAddress]).send({from: owner});
       expect(await contract.methods.collectionNestingRestrictedCollectionIds().call({from: owner})).to.be.like([true, [unnestedCollsectionId.toString()]]);
-      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', true]]);
+      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', true]]);
       await contract.methods.setCollectionNesting(false).send({from: owner});
-      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['0', false], ['1', false]]);
+      expect(await contract.methods.collectionNestingPermissions().call({from: owner})).to.be.like([['1', false], ['0', false]]);
     });
     
     itEth('NFT: allows an Owner to nest/unnest their token (Restricted nesting)', async ({helper}) => {
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- 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
        **/