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
before · pallets/common/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//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	types::Property as PropertyStruct,25	execution::{Result, Error},26	weight,27};28use pallet_evm_coder_substrate::dispatch_to_evm;29use sp_std::{vec, vec::Vec};30use up_data_structs::{31	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,32	SponsoringRateLimit, SponsorshipState,33};34use alloc::format;3536use crate::{37	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,38	eth::{39		EthCrossAccount, convert_cross_account_to_uint256, CollectionPermissions as EvmPermissions,40		CollectionLimits as EvmCollectionLimits,41	},42	weights::WeightInfo,43};4445/// Events for ethereum collection helper.46#[derive(ToLog)]47pub enum CollectionHelpersEvents {48	/// The collection has been created.49	CollectionCreated {50		/// Collection owner.51		#[indexed]52		owner: address,5354		/// Collection ID.55		#[indexed]56		collection_id: address,57	},58	/// The collection has been destroyed.59	CollectionDestroyed {60		/// Collection ID.61		#[indexed]62		collection_id: address,63	},64	/// The collection has been changed.65	CollectionChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69	},7071	/// The token has been changed.72	TokenChanged {73		/// Collection ID.74		#[indexed]75		collection_id: address,76		/// Token ID.77		token_id: uint256,78	},79}8081/// Does not always represent a full collection, for RFT it is either82/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).83pub trait CommonEvmHandler {84	/// Raw compiled binary code of the contract stub85	const CODE: &'static [u8];8687	/// Call precompiled handle.88	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;89}9091/// @title A contract that allows you to work with collections.92#[solidity_interface(name = Collection)]93impl<T: Config> CollectionHandle<T>94where95	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,96{97	/// Set collection property.98	///99	/// @param key Property key.100	/// @param value Propery value.101	#[solidity(hide)]102	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]103	fn set_collection_property(104		&mut self,105		caller: caller,106		key: string,107		value: bytes,108	) -> Result<void> {109		let caller = T::CrossAccountId::from_eth(caller);110		let key = <Vec<u8>>::from(key)111			.try_into()112			.map_err(|_| "key too large")?;113		let value = value.0.try_into().map_err(|_| "value too large")?;114115		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })116			.map_err(dispatch_to_evm::<T>)117	}118119	/// Set collection properties.120	///121	/// @param properties Vector of properties key/value pair.122	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]123	fn set_collection_properties(124		&mut self,125		caller: caller,126		properties: Vec<PropertyStruct>,127	) -> Result<void> {128		let caller = T::CrossAccountId::from_eth(caller);129130		let properties = properties131			.into_iter()132			.map(|PropertyStruct { key, value }| {133				let key = <Vec<u8>>::from(key)134					.try_into()135					.map_err(|_| "key too large")?;136137				let value = value.0.try_into().map_err(|_| "value too large")?;138139				Ok(Property { key, value })140			})141			.collect::<Result<Vec<_>>>()?;142143		<Pallet<T>>::set_collection_properties(self, &caller, properties)144			.map_err(dispatch_to_evm::<T>)145	}146147	/// Delete collection property.148	///149	/// @param key Property key.150	#[solidity(hide)]151	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]152	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {153		let caller = T::CrossAccountId::from_eth(caller);154		let key = <Vec<u8>>::from(key)155			.try_into()156			.map_err(|_| "key too large")?;157158		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)159	}160161	/// Delete collection properties.162	///163	/// @param keys Properties keys.164	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]165	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {166		let caller = T::CrossAccountId::from_eth(caller);167		let keys = keys168			.into_iter()169			.map(|key| {170				<Vec<u8>>::from(key)171					.try_into()172					.map_err(|_| Error::Revert("key too large".into()))173			})174			.collect::<Result<Vec<_>>>()?;175176		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)177	}178179	/// Get collection property.180	///181	/// @dev Throws error if key not found.182	///183	/// @param key Property key.184	/// @return bytes The property corresponding to the key.185	fn collection_property(&self, key: string) -> Result<bytes> {186		let key = <Vec<u8>>::from(key)187			.try_into()188			.map_err(|_| "key too large")?;189190		let props = CollectionProperties::<T>::get(self.id);191		let prop = props.get(&key).ok_or("key not found")?;192193		Ok(bytes(prop.to_vec()))194	}195196	/// Get collection properties.197	///198	/// @param keys Properties keys. Empty keys for all propertyes.199	/// @return Vector of properties key/value pairs.200	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {201		let keys = keys202			.into_iter()203			.map(|key| {204				<Vec<u8>>::from(key)205					.try_into()206					.map_err(|_| Error::Revert("key too large".into()))207			})208			.collect::<Result<Vec<_>>>()?;209210		let properties = Pallet::<T>::filter_collection_properties(211			self.id,212			if keys.is_empty() { None } else { Some(keys) },213		)214		.map_err(dispatch_to_evm::<T>)?;215216		let properties = properties217			.into_iter()218			.map(|p| {219				let key =220					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;221				let value = bytes(p.value.to_vec());222				Ok(PropertyStruct { key, value })223			})224			.collect::<Result<Vec<_>>>()?;225		Ok(properties)226	}227228	/// Set the sponsor of the collection.229	///230	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.231	///232	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.233	#[solidity(hide)]234	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {235		self.consume_store_reads_and_writes(1, 1)?;236237		let caller = T::CrossAccountId::from_eth(caller);238239		let sponsor = T::CrossAccountId::from_eth(sponsor);240		self.set_sponsor(&caller, sponsor.as_sub().clone())241			.map_err(dispatch_to_evm::<T>)242	}243244	/// Set the sponsor of the collection.245	///246	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.247	///248	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.249	fn set_collection_sponsor_cross(250		&mut self,251		caller: caller,252		sponsor: EthCrossAccount,253	) -> Result<void> {254		self.consume_store_reads_and_writes(1, 1)?;255256		let caller = T::CrossAccountId::from_eth(caller);257258		let sponsor = sponsor.into_sub_cross_account::<T>()?;259		self.set_sponsor(&caller, sponsor.as_sub().clone())260			.map_err(dispatch_to_evm::<T>)261	}262263	/// Whether there is a pending sponsor.264	fn has_collection_pending_sponsor(&self) -> Result<bool> {265		Ok(matches!(266			self.collection.sponsorship,267			SponsorshipState::Unconfirmed(_)268		))269	}270271	/// Collection sponsorship confirmation.272	///273	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.274	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {275		self.consume_store_writes(1)?;276277		let caller = T::CrossAccountId::from_eth(caller);278		self.confirm_sponsorship(caller.as_sub())279			.map_err(dispatch_to_evm::<T>)280	}281282	/// Remove collection sponsor.283	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {284		self.consume_store_reads_and_writes(1, 1)?;285		let caller = T::CrossAccountId::from_eth(caller);286		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)287	}288289	/// Get current sponsor.290	///291	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.292	fn collection_sponsor(&self) -> Result<(address, uint256)> {293		let sponsor = match self.collection.sponsorship.sponsor() {294			Some(sponsor) => sponsor,295			None => return Ok(Default::default()),296		};297		let sponsor = T::CrossAccountId::from_sub(sponsor.clone());298		let result: (address, uint256) = if sponsor.is_canonical_substrate() {299			let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);300			(Default::default(), sponsor)301		} else {302			let sponsor = *sponsor.as_eth();303			(sponsor, Default::default())304		};305		Ok(result)306	}307308	/// Get current collection limits.309	///310	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:311	/// 	"accountTokenOwnershipLimit",312	/// 	"sponsoredDataSize",313	/// 	"sponsoredDataRateLimit",314	/// 	"tokenLimit",315	/// 	"sponsorTransferTimeout",316	/// 	"sponsorApproveTimeout"317	///  	"ownerCanTransfer",318	/// 	"ownerCanDestroy",319	/// 	"transfersEnabled"320	/// Return `false` if a limit not set.321	fn collection_limits(&self) -> Result<Vec<(EvmCollectionLimits, bool, uint256)>> {322		let convert_value_limit = |limit: EvmCollectionLimits,323		                           value: Option<u32>|324		 -> (EvmCollectionLimits, bool, uint256) {325			value326				.map(|v| (limit, true, v.into()))327				.unwrap_or((limit, false, Default::default()))328		};329330		let convert_bool_limit = |limit: EvmCollectionLimits,331		                          value: Option<bool>|332		 -> (EvmCollectionLimits, bool, uint256) {333			value334				.map(|v| {335					(336						limit,337						true,338						if v {339							uint256::from(1)340						} else {341							Default::default()342						},343					)344				})345				.unwrap_or((limit, false, Default::default()))346		};347348		let limits = &self.collection.limits;349350		Ok(vec![351			convert_value_limit(352				EvmCollectionLimits::AccountTokenOwnership,353				limits.account_token_ownership_limit,354			),355			convert_value_limit(356				EvmCollectionLimits::SponsoredDataSize,357				limits.sponsored_data_size,358			),359			limits360				.sponsored_data_rate_limit361				.and_then(|limit| {362					if let SponsoringRateLimit::Blocks(blocks) = limit {363						Some((364							EvmCollectionLimits::SponsoredDataRateLimit,365							true,366							blocks.into(),367						))368					} else {369						None370					}371				})372				.unwrap_or((373					EvmCollectionLimits::SponsoredDataRateLimit,374					false,375					Default::default(),376				)),377			convert_value_limit(EvmCollectionLimits::TokenLimit, limits.token_limit),378			convert_value_limit(379				EvmCollectionLimits::SponsorTransferTimeout,380				limits.sponsor_transfer_timeout,381			),382			convert_value_limit(383				EvmCollectionLimits::SponsorApproveTimeout,384				limits.sponsor_approve_timeout,385			),386			convert_bool_limit(387				EvmCollectionLimits::OwnerCanTransfer,388				limits.owner_can_transfer,389			),390			convert_bool_limit(391				EvmCollectionLimits::OwnerCanDestroy,392				limits.owner_can_destroy,393			),394			convert_bool_limit(395				EvmCollectionLimits::TransferEnabled,396				limits.transfers_enabled,397			),398		])399	}400401	/// Set limits for the collection.402	/// @dev Throws error if limit not found.403	/// @param limit Name of the limit. Valid names:404	/// 	"accountTokenOwnershipLimit",405	/// 	"sponsoredDataSize",406	/// 	"sponsoredDataRateLimit",407	/// 	"tokenLimit",408	/// 	"sponsorTransferTimeout",409	/// 	"sponsorApproveTimeout"410	///  	"ownerCanTransfer",411	/// 	"ownerCanDestroy",412	/// 	"transfersEnabled"413	/// @param status enable\disable limit. Works only with `true`.414	/// @param value Value of the limit.415	#[solidity(rename_selector = "setCollectionLimit")]416	fn set_collection_limit(417		&mut self,418		caller: caller,419		limit: EvmCollectionLimits,420		status: bool,421		value: uint256,422	) -> Result<void> {423		self.consume_store_reads_and_writes(1, 1)?;424425		if !status {426			return Err(Error::Revert("user can't disable limits".into()));427		}428429		let value = value430			.try_into()431			.map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;432433		let convert_value_to_bool = || match value {434			0 => Ok(false),435			1 => Ok(true),436			_ => {437				return Err(Error::Revert(format!(438					"can't convert value to boolean \"{}\"",439					value440				)))441			}442		};443444		let mut limits = self.limits.clone();445446		match limit {447			EvmCollectionLimits::AccountTokenOwnership => {448				limits.account_token_ownership_limit = Some(value);449			}450			EvmCollectionLimits::SponsoredDataSize => {451				limits.sponsored_data_size = Some(value);452			}453			EvmCollectionLimits::SponsoredDataRateLimit => {454				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));455			}456			EvmCollectionLimits::TokenLimit => {457				limits.token_limit = Some(value);458			}459			EvmCollectionLimits::SponsorTransferTimeout => {460				limits.sponsor_transfer_timeout = Some(value);461			}462			EvmCollectionLimits::SponsorApproveTimeout => {463				limits.sponsor_approve_timeout = Some(value);464			}465			EvmCollectionLimits::OwnerCanTransfer => {466				limits.owner_can_transfer = Some(convert_value_to_bool()?);467			}468			EvmCollectionLimits::OwnerCanDestroy => {469				limits.owner_can_destroy = Some(convert_value_to_bool()?);470			}471			EvmCollectionLimits::TransferEnabled => {472				limits.transfers_enabled = Some(convert_value_to_bool()?);473			}474			_ => return Err(Error::Revert(format!("unknown limit \"{:?}\"", limit))),475		}476477		let caller = T::CrossAccountId::from_eth(caller);478		<Pallet<T>>::update_limits(&caller, self, limits).map_err(dispatch_to_evm::<T>)479	}480481	/// Get contract address.482	fn contract_address(&self) -> Result<address> {483		Ok(crate::eth::collection_id_to_address(self.id))484	}485486	/// Add collection admin.487	/// @param newAdmin Cross account administrator address.488	fn add_collection_admin_cross(489		&mut self,490		caller: caller,491		new_admin: EthCrossAccount,492	) -> Result<void> {493		self.consume_store_reads_and_writes(2, 2)?;494495		let caller = T::CrossAccountId::from_eth(caller);496		let new_admin = new_admin.into_sub_cross_account::<T>()?;497		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;498		Ok(())499	}500501	/// Remove collection admin.502	/// @param admin Cross account administrator address.503	fn remove_collection_admin_cross(504		&mut self,505		caller: caller,506		admin: EthCrossAccount,507	) -> Result<void> {508		self.consume_store_reads_and_writes(2, 2)?;509510		let caller = T::CrossAccountId::from_eth(caller);511		let admin = admin.into_sub_cross_account::<T>()?;512		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;513		Ok(())514	}515516	/// Add collection admin.517	/// @param newAdmin Address of the added administrator.518	#[solidity(hide)]519	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {520		self.consume_store_reads_and_writes(2, 2)?;521522		let caller = T::CrossAccountId::from_eth(caller);523		let new_admin = T::CrossAccountId::from_eth(new_admin);524		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;525		Ok(())526	}527528	/// Remove collection admin.529	///530	/// @param admin Address of the removed administrator.531	#[solidity(hide)]532	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {533		self.consume_store_reads_and_writes(2, 2)?;534535		let caller = T::CrossAccountId::from_eth(caller);536		let admin = T::CrossAccountId::from_eth(admin);537		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;538		Ok(())539	}540541	/// Toggle accessibility of collection nesting.542	///543	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'544	#[solidity(rename_selector = "setCollectionNesting")]545	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {546		self.consume_store_reads_and_writes(1, 1)?;547548		let caller = T::CrossAccountId::from_eth(caller);549550		let mut permissions = self.collection.permissions.clone();551		let mut nesting = permissions.nesting().clone();552		nesting.token_owner = enable;553		nesting.restricted = None;554		permissions.nesting = Some(nesting);555556		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)557	}558559	/// Toggle accessibility of collection nesting.560	///561	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'562	/// @param collections Addresses of collections that will be available for nesting.563	#[solidity(rename_selector = "setCollectionNesting")]564	fn set_nesting(565		&mut self,566		caller: caller,567		enable: bool,568		collections: Vec<address>,569	) -> Result<void> {570		self.consume_store_reads_and_writes(1, 1)?;571572		if collections.is_empty() {573			return Err("no addresses provided".into());574		}575		let caller = T::CrossAccountId::from_eth(caller);576577		let mut permissions = self.collection.permissions.clone();578		match enable {579			false => {580				let mut nesting = permissions.nesting().clone();581				nesting.token_owner = false;582				nesting.restricted = None;583				permissions.nesting = Some(nesting);584			}585			true => {586				let mut bv = OwnerRestrictedSet::new();587				for i in collections {588					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {589						Error::Revert("Can't convert address into collection id".into())590					})?)591					.map_err(|_| "too many collections")?;592				}593				let mut nesting = permissions.nesting().clone();594				nesting.token_owner = true;595				nesting.restricted = Some(bv);596				permissions.nesting = Some(nesting);597			}598		};599600		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)601	}602603	/// Returns nesting for a collection604	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]605	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {606		let nesting = self.collection.permissions.nesting();607608		Ok((609			nesting.token_owner,610			nesting611				.restricted612				.clone()613				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())614				.unwrap_or_default(),615		))616	}617618	/// Returns permissions for a collection619	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {620		let nesting = self.collection.permissions.nesting();621		Ok(vec![622			(EvmPermissions::CollectionAdmin, nesting.collection_admin),623			(EvmPermissions::TokenOwner, nesting.token_owner),624		])625	}626	/// Set the collection access method.627	/// @param mode Access mode628	/// 	0 for Normal629	/// 	1 for AllowList630	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {631		self.consume_store_reads_and_writes(1, 1)?;632633		let caller = T::CrossAccountId::from_eth(caller);634		let permissions = CollectionPermissions {635			access: Some(match mode {636				0 => AccessMode::Normal,637				1 => AccessMode::AllowList,638				_ => return Err("not supported access mode".into()),639			}),640			..Default::default()641		};642		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)643	}644645	/// Checks that user allowed to operate with collection.646	///647	/// @param user User address to check.648	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {649		let user = user.into_sub_cross_account::<T>()?;650		Ok(Pallet::<T>::allowed(self.id, user))651	}652653	/// Add the user to the allowed list.654	///655	/// @param user Address of a trusted user.656	#[solidity(hide)]657	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {658		self.consume_store_writes(1)?;659660		let caller = T::CrossAccountId::from_eth(caller);661		let user = T::CrossAccountId::from_eth(user);662		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;663		Ok(())664	}665666	/// Add user to allowed list.667	///668	/// @param user User cross account address.669	fn add_to_collection_allow_list_cross(670		&mut self,671		caller: caller,672		user: EthCrossAccount,673	) -> Result<void> {674		self.consume_store_writes(1)?;675676		let caller = T::CrossAccountId::from_eth(caller);677		let user = user.into_sub_cross_account::<T>()?;678		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;679		Ok(())680	}681682	/// Remove the user from the allowed list.683	///684	/// @param user Address of a removed user.685	#[solidity(hide)]686	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {687		self.consume_store_writes(1)?;688689		let caller = T::CrossAccountId::from_eth(caller);690		let user = T::CrossAccountId::from_eth(user);691		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;692		Ok(())693	}694695	/// Remove user from allowed list.696	///697	/// @param user User cross account address.698	fn remove_from_collection_allow_list_cross(699		&mut self,700		caller: caller,701		user: EthCrossAccount,702	) -> Result<void> {703		self.consume_store_writes(1)?;704705		let caller = T::CrossAccountId::from_eth(caller);706		let user = user.into_sub_cross_account::<T>()?;707		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;708		Ok(())709	}710711	/// Switch permission for minting.712	///713	/// @param mode Enable if "true".714	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {715		self.consume_store_reads_and_writes(1, 1)?;716717		let caller = T::CrossAccountId::from_eth(caller);718		let permissions = CollectionPermissions {719			mint_mode: Some(mode),720			..Default::default()721		};722		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)723	}724725	/// Check that account is the owner or admin of the collection726	///727	/// @param user account to verify728	/// @return "true" if account is the owner or admin729	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]730	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {731		let user = T::CrossAccountId::from_eth(user);732		Ok(self.is_owner_or_admin(&user))733	}734735	/// Check that account is the owner or admin of the collection736	///737	/// @param user User cross account to verify738	/// @return "true" if account is the owner or admin739	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {740		let user = user.into_sub_cross_account::<T>()?;741		Ok(self.is_owner_or_admin(&user))742	}743744	/// Returns collection type745	///746	/// @return `Fungible` or `NFT` or `ReFungible`747	fn unique_collection_type(&self) -> Result<string> {748		let mode = match self.collection.mode {749			CollectionMode::Fungible(_) => "Fungible",750			CollectionMode::NFT => "NFT",751			CollectionMode::ReFungible => "ReFungible",752		};753		Ok(mode.into())754	}755756	/// Get collection owner.757	///758	/// @return Tuble with sponsor address and his substrate mirror.759	/// If address is canonical then substrate mirror is zero and vice versa.760	fn collection_owner(&self) -> Result<EthCrossAccount> {761		Ok(EthCrossAccount::from_sub_cross_account::<T>(762			&T::CrossAccountId::from_sub(self.owner.clone()),763		))764	}765766	/// Changes collection owner to another account767	///768	/// @dev Owner can be changed only by current owner769	/// @param newOwner new owner account770	#[solidity(hide, rename_selector = "changeCollectionOwner")]771	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {772		self.consume_store_writes(1)?;773774		let caller = T::CrossAccountId::from_eth(caller);775		let new_owner = T::CrossAccountId::from_eth(new_owner);776		self.change_owner(caller, new_owner)777			.map_err(dispatch_to_evm::<T>)778	}779780	/// Get collection administrators781	///782	/// @return Vector of tuples with admins address and his substrate mirror.783	/// If address is canonical then substrate mirror is zero and vice versa.784	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {785		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))786			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))787			.collect();788		Ok(result)789	}790791	/// Changes collection owner to another account792	///793	/// @dev Owner can be changed only by current owner794	/// @param newOwner new owner cross account795	fn change_collection_owner_cross(796		&mut self,797		caller: caller,798		new_owner: EthCrossAccount,799	) -> Result<void> {800		self.consume_store_writes(1)?;801802		let caller = T::CrossAccountId::from_eth(caller);803		let new_owner = new_owner.into_sub_cross_account::<T>()?;804		self.change_owner(caller, new_owner)805			.map_err(dispatch_to_evm::<T>)806	}807}808809/// ### Note810/// Do not forget to add: `self.consume_store_reads(1)?;`811fn check_is_owner_or_admin<T: Config>(812	caller: caller,813	collection: &CollectionHandle<T>,814) -> Result<T::CrossAccountId> {815	let caller = T::CrossAccountId::from_eth(caller);816	collection817		.check_is_owner_or_admin(&caller)818		.map_err(dispatch_to_evm::<T>)?;819	Ok(caller)820}821822/// ### Note823/// Do not forget to add: `self.consume_store_writes(1)?;`824fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {825	collection826		.check_is_internal()827		.map_err(dispatch_to_evm::<T>)?;828	collection.save().map_err(dispatch_to_evm::<T>)?;829	Ok(())830}831832/// Contains static property keys and values.833pub mod static_property {834	use evm_coder::{835		execution::{Result, Error},836	};837	use alloc::format;838839	const EXPECT_CONVERT_ERROR: &str = "length < limit";840841	/// Keys.842	pub mod key {843		use super::*;844845		/// Key "baseURI".846		pub fn base_uri() -> up_data_structs::PropertyKey {847			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)848		}849850		/// Key "url".851		pub fn url() -> up_data_structs::PropertyKey {852			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)853		}854855		/// Key "suffix".856		pub fn suffix() -> up_data_structs::PropertyKey {857			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)858		}859860		/// Key "parentNft".861		pub fn parent_nft() -> up_data_structs::PropertyKey {862			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)863		}864	}865866	/// Convert `byte` to [`PropertyKey`].867	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {868		bytes.to_vec().try_into().map_err(|_| {869			Error::Revert(format!(870				"Property key is too long. Max length is {}.",871				up_data_structs::PropertyKey::bound()872			))873		})874	}875876	/// Convert `bytes` to [`PropertyValue`].877	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {878		bytes.to_vec().try_into().map_err(|_| {879			Error::Revert(format!(880				"Property key is too long. Max length is {}.",881				up_data_structs::PropertyKey::bound()882			))883		})884	}885}
after · pallets/common/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//! This module contains the implementation of pallet methods for evm.1819pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};20use evm_coder::{21	abi::AbiType,22	solidity_interface, solidity, ToLog,23	types::*,24	types::Property as PropertyStruct,25	execution::{Result, Error},26	weight,27};28use pallet_evm_coder_substrate::dispatch_to_evm;29use sp_std::{vec, vec::Vec};30use up_data_structs::{31	AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,32	SponsoringRateLimit, SponsorshipState,33};34use alloc::format;3536use crate::{37	Pallet, CollectionHandle, Config, CollectionProperties, SelfWeightOf,38	eth::{39		EthCrossAccount, CollectionPermissions as EvmPermissions,40		CollectionLimits as EvmCollectionLimits,41	},42	weights::WeightInfo,43};4445/// Events for ethereum collection helper.46#[derive(ToLog)]47pub enum CollectionHelpersEvents {48	/// The collection has been created.49	CollectionCreated {50		/// Collection owner.51		#[indexed]52		owner: address,5354		/// Collection ID.55		#[indexed]56		collection_id: address,57	},58	/// The collection has been destroyed.59	CollectionDestroyed {60		/// Collection ID.61		#[indexed]62		collection_id: address,63	},64	/// The collection has been changed.65	CollectionChanged {66		/// Collection ID.67		#[indexed]68		collection_id: address,69	},7071	/// The token has been changed.72	TokenChanged {73		/// Collection ID.74		#[indexed]75		collection_id: address,76		/// Token ID.77		token_id: uint256,78	},79}8081/// Does not always represent a full collection, for RFT it is either82/// collection (Implementing ERC721), or specific collection token (Implementing ERC20).83pub trait CommonEvmHandler {84	/// Raw compiled binary code of the contract stub85	const CODE: &'static [u8];8687	/// Call precompiled handle.88	fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;89}9091/// @title A contract that allows you to work with collections.92#[solidity_interface(name = Collection)]93impl<T: Config> CollectionHandle<T>94where95	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,96{97	/// Set collection property.98	///99	/// @param key Property key.100	/// @param value Propery value.101	#[solidity(hide)]102	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]103	fn set_collection_property(104		&mut self,105		caller: caller,106		key: string,107		value: bytes,108	) -> Result<void> {109		let caller = T::CrossAccountId::from_eth(caller);110		let key = <Vec<u8>>::from(key)111			.try_into()112			.map_err(|_| "key too large")?;113		let value = value.0.try_into().map_err(|_| "value too large")?;114115		<Pallet<T>>::set_collection_property(self, &caller, Property { key, value })116			.map_err(dispatch_to_evm::<T>)117	}118119	/// Set collection properties.120	///121	/// @param properties Vector of properties key/value pair.122	#[weight(<SelfWeightOf<T>>::set_collection_properties(properties.len() as u32))]123	fn set_collection_properties(124		&mut self,125		caller: caller,126		properties: Vec<PropertyStruct>,127	) -> Result<void> {128		let caller = T::CrossAccountId::from_eth(caller);129130		let properties = properties131			.into_iter()132			.map(|PropertyStruct { key, value }| {133				let key = <Vec<u8>>::from(key)134					.try_into()135					.map_err(|_| "key too large")?;136137				let value = value.0.try_into().map_err(|_| "value too large")?;138139				Ok(Property { key, value })140			})141			.collect::<Result<Vec<_>>>()?;142143		<Pallet<T>>::set_collection_properties(self, &caller, properties)144			.map_err(dispatch_to_evm::<T>)145	}146147	/// Delete collection property.148	///149	/// @param key Property key.150	#[solidity(hide)]151	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]152	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {153		let caller = T::CrossAccountId::from_eth(caller);154		let key = <Vec<u8>>::from(key)155			.try_into()156			.map_err(|_| "key too large")?;157158		<Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)159	}160161	/// Delete collection properties.162	///163	/// @param keys Properties keys.164	#[weight(<SelfWeightOf<T>>::delete_collection_properties(keys.len() as u32))]165	fn delete_collection_properties(&mut self, caller: caller, keys: Vec<string>) -> Result<()> {166		let caller = T::CrossAccountId::from_eth(caller);167		let keys = keys168			.into_iter()169			.map(|key| {170				<Vec<u8>>::from(key)171					.try_into()172					.map_err(|_| Error::Revert("key too large".into()))173			})174			.collect::<Result<Vec<_>>>()?;175176		<Pallet<T>>::delete_collection_properties(self, &caller, keys).map_err(dispatch_to_evm::<T>)177	}178179	/// Get collection property.180	///181	/// @dev Throws error if key not found.182	///183	/// @param key Property key.184	/// @return bytes The property corresponding to the key.185	fn collection_property(&self, key: string) -> Result<bytes> {186		let key = <Vec<u8>>::from(key)187			.try_into()188			.map_err(|_| "key too large")?;189190		let props = CollectionProperties::<T>::get(self.id);191		let prop = props.get(&key).ok_or("key not found")?;192193		Ok(bytes(prop.to_vec()))194	}195196	/// Get collection properties.197	///198	/// @param keys Properties keys. Empty keys for all propertyes.199	/// @return Vector of properties key/value pairs.200	fn collection_properties(&self, keys: Vec<string>) -> Result<Vec<PropertyStruct>> {201		let keys = keys202			.into_iter()203			.map(|key| {204				<Vec<u8>>::from(key)205					.try_into()206					.map_err(|_| Error::Revert("key too large".into()))207			})208			.collect::<Result<Vec<_>>>()?;209210		let properties = Pallet::<T>::filter_collection_properties(211			self.id,212			if keys.is_empty() { None } else { Some(keys) },213		)214		.map_err(dispatch_to_evm::<T>)?;215216		let properties = properties217			.into_iter()218			.map(|p| {219				let key =220					string::from_utf8(p.key.into()).map_err(|e| Error::Revert(format!("{}", e)))?;221				let value = bytes(p.value.to_vec());222				Ok(PropertyStruct { key, value })223			})224			.collect::<Result<Vec<_>>>()?;225		Ok(properties)226	}227228	/// Set the sponsor of the collection.229	///230	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.231	///232	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.233	#[solidity(hide)]234	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {235		self.consume_store_reads_and_writes(1, 1)?;236237		let caller = T::CrossAccountId::from_eth(caller);238239		let sponsor = T::CrossAccountId::from_eth(sponsor);240		self.set_sponsor(&caller, sponsor.as_sub().clone())241			.map_err(dispatch_to_evm::<T>)242	}243244	/// Set the sponsor of the collection.245	///246	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.247	///248	/// @param sponsor Cross account address of the sponsor from whose account funds will be debited for operations with the contract.249	fn set_collection_sponsor_cross(250		&mut self,251		caller: caller,252		sponsor: EthCrossAccount,253	) -> Result<void> {254		self.consume_store_reads_and_writes(1, 1)?;255256		let caller = T::CrossAccountId::from_eth(caller);257258		let sponsor = sponsor.into_sub_cross_account::<T>()?;259		self.set_sponsor(&caller, sponsor.as_sub().clone())260			.map_err(dispatch_to_evm::<T>)261	}262263	/// Whether there is a pending sponsor.264	fn has_collection_pending_sponsor(&self) -> Result<bool> {265		Ok(matches!(266			self.collection.sponsorship,267			SponsorshipState::Unconfirmed(_)268		))269	}270271	/// Collection sponsorship confirmation.272	///273	/// @dev After setting the sponsor for the collection, it must be confirmed with this function.274	fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {275		self.consume_store_writes(1)?;276277		let caller = T::CrossAccountId::from_eth(caller);278		self.confirm_sponsorship(caller.as_sub())279			.map_err(dispatch_to_evm::<T>)280	}281282	/// Remove collection sponsor.283	fn remove_collection_sponsor(&mut self, caller: caller) -> Result<void> {284		self.consume_store_reads_and_writes(1, 1)?;285		let caller = T::CrossAccountId::from_eth(caller);286		self.remove_sponsor(&caller).map_err(dispatch_to_evm::<T>)287	}288289	/// Get current sponsor.290	///291	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.292	fn collection_sponsor(&self) -> Result<EthCrossAccount> {293		let sponsor = match self.collection.sponsorship.sponsor() {294			Some(sponsor) => sponsor,295			None => return Ok(Default::default()),296		};297298		Ok(EthCrossAccount::from_sub::<T>(&sponsor))299	}300301	/// Get current collection limits.302	///303	/// @return Array of tuples (byte, bool, uint256) with limits and their values. Order of limits:304	/// 	"accountTokenOwnershipLimit",305	/// 	"sponsoredDataSize",306	/// 	"sponsoredDataRateLimit",307	/// 	"tokenLimit",308	/// 	"sponsorTransferTimeout",309	/// 	"sponsorApproveTimeout"310	///  	"ownerCanTransfer",311	/// 	"ownerCanDestroy",312	/// 	"transfersEnabled"313	/// Return `false` if a limit not set.314	fn collection_limits(&self) -> Result<Vec<(EvmCollectionLimits, bool, uint256)>> {315		let convert_value_limit = |limit: EvmCollectionLimits,316		                           value: Option<u32>|317		 -> (EvmCollectionLimits, bool, uint256) {318			value319				.map(|v| (limit, true, v.into()))320				.unwrap_or((limit, false, Default::default()))321		};322323		let convert_bool_limit = |limit: EvmCollectionLimits,324		                          value: Option<bool>|325		 -> (EvmCollectionLimits, bool, uint256) {326			value327				.map(|v| {328					(329						limit,330						true,331						if v {332							uint256::from(1)333						} else {334							Default::default()335						},336					)337				})338				.unwrap_or((limit, false, Default::default()))339		};340341		let limits = &self.collection.limits;342343		Ok(vec![344			convert_value_limit(345				EvmCollectionLimits::AccountTokenOwnership,346				limits.account_token_ownership_limit,347			),348			convert_value_limit(349				EvmCollectionLimits::SponsoredDataSize,350				limits.sponsored_data_size,351			),352			limits353				.sponsored_data_rate_limit354				.and_then(|limit| {355					if let SponsoringRateLimit::Blocks(blocks) = limit {356						Some((357							EvmCollectionLimits::SponsoredDataRateLimit,358							true,359							blocks.into(),360						))361					} else {362						None363					}364				})365				.unwrap_or((366					EvmCollectionLimits::SponsoredDataRateLimit,367					false,368					Default::default(),369				)),370			convert_value_limit(EvmCollectionLimits::TokenLimit, limits.token_limit),371			convert_value_limit(372				EvmCollectionLimits::SponsorTransferTimeout,373				limits.sponsor_transfer_timeout,374			),375			convert_value_limit(376				EvmCollectionLimits::SponsorApproveTimeout,377				limits.sponsor_approve_timeout,378			),379			convert_bool_limit(380				EvmCollectionLimits::OwnerCanTransfer,381				limits.owner_can_transfer,382			),383			convert_bool_limit(384				EvmCollectionLimits::OwnerCanDestroy,385				limits.owner_can_destroy,386			),387			convert_bool_limit(388				EvmCollectionLimits::TransferEnabled,389				limits.transfers_enabled,390			),391		])392	}393394	/// Set limits for the collection.395	/// @dev Throws error if limit not found.396	/// @param limit Name of the limit. Valid names:397	/// 	"accountTokenOwnershipLimit",398	/// 	"sponsoredDataSize",399	/// 	"sponsoredDataRateLimit",400	/// 	"tokenLimit",401	/// 	"sponsorTransferTimeout",402	/// 	"sponsorApproveTimeout"403	///  	"ownerCanTransfer",404	/// 	"ownerCanDestroy",405	/// 	"transfersEnabled"406	/// @param status enable\disable limit. Works only with `true`.407	/// @param value Value of the limit.408	#[solidity(rename_selector = "setCollectionLimit")]409	fn set_collection_limit(410		&mut self,411		caller: caller,412		limit: EvmCollectionLimits,413		status: bool,414		value: uint256,415	) -> Result<void> {416		self.consume_store_reads_and_writes(1, 1)?;417418		if !status {419			return Err(Error::Revert("user can't disable limits".into()));420		}421422		let value = value423			.try_into()424			.map_err(|_| Error::Revert(format!("can't convert value to u32 \"{}\"", value)))?;425426		let convert_value_to_bool = || match value {427			0 => Ok(false),428			1 => Ok(true),429			_ => {430				return Err(Error::Revert(format!(431					"can't convert value to boolean \"{}\"",432					value433				)))434			}435		};436437		let mut limits = self.limits.clone();438439		match limit {440			EvmCollectionLimits::AccountTokenOwnership => {441				limits.account_token_ownership_limit = Some(value);442			}443			EvmCollectionLimits::SponsoredDataSize => {444				limits.sponsored_data_size = Some(value);445			}446			EvmCollectionLimits::SponsoredDataRateLimit => {447				limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));448			}449			EvmCollectionLimits::TokenLimit => {450				limits.token_limit = Some(value);451			}452			EvmCollectionLimits::SponsorTransferTimeout => {453				limits.sponsor_transfer_timeout = Some(value);454			}455			EvmCollectionLimits::SponsorApproveTimeout => {456				limits.sponsor_approve_timeout = Some(value);457			}458			EvmCollectionLimits::OwnerCanTransfer => {459				limits.owner_can_transfer = Some(convert_value_to_bool()?);460			}461			EvmCollectionLimits::OwnerCanDestroy => {462				limits.owner_can_destroy = Some(convert_value_to_bool()?);463			}464			EvmCollectionLimits::TransferEnabled => {465				limits.transfers_enabled = Some(convert_value_to_bool()?);466			}467			_ => return Err(Error::Revert(format!("unknown limit \"{:?}\"", limit))),468		}469470		let caller = T::CrossAccountId::from_eth(caller);471		<Pallet<T>>::update_limits(&caller, self, limits).map_err(dispatch_to_evm::<T>)472	}473474	/// Get contract address.475	fn contract_address(&self) -> Result<address> {476		Ok(crate::eth::collection_id_to_address(self.id))477	}478479	/// Add collection admin.480	/// @param newAdmin Cross account administrator address.481	fn add_collection_admin_cross(482		&mut self,483		caller: caller,484		new_admin: EthCrossAccount,485	) -> Result<void> {486		self.consume_store_reads_and_writes(2, 2)?;487488		let caller = T::CrossAccountId::from_eth(caller);489		let new_admin = new_admin.into_sub_cross_account::<T>()?;490		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;491		Ok(())492	}493494	/// Remove collection admin.495	/// @param admin Cross account administrator address.496	fn remove_collection_admin_cross(497		&mut self,498		caller: caller,499		admin: EthCrossAccount,500	) -> Result<void> {501		self.consume_store_reads_and_writes(2, 2)?;502503		let caller = T::CrossAccountId::from_eth(caller);504		let admin = admin.into_sub_cross_account::<T>()?;505		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;506		Ok(())507	}508509	/// Add collection admin.510	/// @param newAdmin Address of the added administrator.511	#[solidity(hide)]512	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {513		self.consume_store_reads_and_writes(2, 2)?;514515		let caller = T::CrossAccountId::from_eth(caller);516		let new_admin = T::CrossAccountId::from_eth(new_admin);517		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;518		Ok(())519	}520521	/// Remove collection admin.522	///523	/// @param admin Address of the removed administrator.524	#[solidity(hide)]525	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {526		self.consume_store_reads_and_writes(2, 2)?;527528		let caller = T::CrossAccountId::from_eth(caller);529		let admin = T::CrossAccountId::from_eth(admin);530		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;531		Ok(())532	}533534	/// Toggle accessibility of collection nesting.535	///536	/// @param enable If "true" degenerates to nesting: 'Owner' else to nesting: 'Disabled'537	#[solidity(rename_selector = "setCollectionNesting")]538	fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {539		self.consume_store_reads_and_writes(1, 1)?;540541		let caller = T::CrossAccountId::from_eth(caller);542543		let mut permissions = self.collection.permissions.clone();544		let mut nesting = permissions.nesting().clone();545		nesting.token_owner = enable;546		nesting.restricted = None;547		permissions.nesting = Some(nesting);548549		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)550	}551552	/// Toggle accessibility of collection nesting.553	///554	/// @param enable If "true" degenerates to nesting: {OwnerRestricted: [1, 2, 3]} else to nesting: 'Disabled'555	/// @param collections Addresses of collections that will be available for nesting.556	#[solidity(rename_selector = "setCollectionNesting")]557	fn set_nesting(558		&mut self,559		caller: caller,560		enable: bool,561		collections: Vec<address>,562	) -> Result<void> {563		self.consume_store_reads_and_writes(1, 1)?;564565		if collections.is_empty() {566			return Err("no addresses provided".into());567		}568		let caller = T::CrossAccountId::from_eth(caller);569570		let mut permissions = self.collection.permissions.clone();571		match enable {572			false => {573				let mut nesting = permissions.nesting().clone();574				nesting.token_owner = false;575				nesting.restricted = None;576				permissions.nesting = Some(nesting);577			}578			true => {579				let mut bv = OwnerRestrictedSet::new();580				for i in collections {581					bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {582						Error::Revert("Can't convert address into collection id".into())583					})?)584					.map_err(|_| "too many collections")?;585				}586				let mut nesting = permissions.nesting().clone();587				nesting.token_owner = true;588				nesting.restricted = Some(bv);589				permissions.nesting = Some(nesting);590			}591		};592593		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)594	}595596	/// Returns nesting for a collection597	#[solidity(rename_selector = "collectionNestingRestrictedCollectionIds")]598	fn collection_nesting_restricted_ids(&self) -> Result<(bool, Vec<uint256>)> {599		let nesting = self.collection.permissions.nesting();600601		Ok((602			nesting.token_owner,603			nesting604				.restricted605				.clone()606				.map(|b| b.0.into_inner().iter().map(|id| id.0.into()).collect())607				.unwrap_or_default(),608		))609	}610611	/// Returns permissions for a collection612	fn collection_nesting_permissions(&self) -> Result<Vec<(EvmPermissions, bool)>> {613		let nesting = self.collection.permissions.nesting();614		Ok(vec![615			(EvmPermissions::CollectionAdmin, nesting.collection_admin),616			(EvmPermissions::TokenOwner, nesting.token_owner),617		])618	}619	/// Set the collection access method.620	/// @param mode Access mode621	/// 	0 for Normal622	/// 	1 for AllowList623	fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {624		self.consume_store_reads_and_writes(1, 1)?;625626		let caller = T::CrossAccountId::from_eth(caller);627		let permissions = CollectionPermissions {628			access: Some(match mode {629				0 => AccessMode::Normal,630				1 => AccessMode::AllowList,631				_ => return Err("not supported access mode".into()),632			}),633			..Default::default()634		};635		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)636	}637638	/// Checks that user allowed to operate with collection.639	///640	/// @param user User address to check.641	fn allowlisted_cross(&self, user: EthCrossAccount) -> Result<bool> {642		let user = user.into_sub_cross_account::<T>()?;643		Ok(Pallet::<T>::allowed(self.id, user))644	}645646	/// Add the user to the allowed list.647	///648	/// @param user Address of a trusted user.649	#[solidity(hide)]650	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {651		self.consume_store_writes(1)?;652653		let caller = T::CrossAccountId::from_eth(caller);654		let user = T::CrossAccountId::from_eth(user);655		<Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;656		Ok(())657	}658659	/// Add user to allowed list.660	///661	/// @param user User cross account address.662	fn add_to_collection_allow_list_cross(663		&mut self,664		caller: caller,665		user: EthCrossAccount,666	) -> Result<void> {667		self.consume_store_writes(1)?;668669		let caller = T::CrossAccountId::from_eth(caller);670		let user = user.into_sub_cross_account::<T>()?;671		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;672		Ok(())673	}674675	/// Remove the user from the allowed list.676	///677	/// @param user Address of a removed user.678	#[solidity(hide)]679	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {680		self.consume_store_writes(1)?;681682		let caller = T::CrossAccountId::from_eth(caller);683		let user = T::CrossAccountId::from_eth(user);684		<Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;685		Ok(())686	}687688	/// Remove user from allowed list.689	///690	/// @param user User cross account address.691	fn remove_from_collection_allow_list_cross(692		&mut self,693		caller: caller,694		user: EthCrossAccount,695	) -> Result<void> {696		self.consume_store_writes(1)?;697698		let caller = T::CrossAccountId::from_eth(caller);699		let user = user.into_sub_cross_account::<T>()?;700		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;701		Ok(())702	}703704	/// Switch permission for minting.705	///706	/// @param mode Enable if "true".707	fn set_collection_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {708		self.consume_store_reads_and_writes(1, 1)?;709710		let caller = T::CrossAccountId::from_eth(caller);711		let permissions = CollectionPermissions {712			mint_mode: Some(mode),713			..Default::default()714		};715		<Pallet<T>>::update_permissions(&caller, self, permissions).map_err(dispatch_to_evm::<T>)716	}717718	/// Check that account is the owner or admin of the collection719	///720	/// @param user account to verify721	/// @return "true" if account is the owner or admin722	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]723	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {724		let user = T::CrossAccountId::from_eth(user);725		Ok(self.is_owner_or_admin(&user))726	}727728	/// Check that account is the owner or admin of the collection729	///730	/// @param user User cross account to verify731	/// @return "true" if account is the owner or admin732	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {733		let user = user.into_sub_cross_account::<T>()?;734		Ok(self.is_owner_or_admin(&user))735	}736737	/// Returns collection type738	///739	/// @return `Fungible` or `NFT` or `ReFungible`740	fn unique_collection_type(&self) -> Result<string> {741		let mode = match self.collection.mode {742			CollectionMode::Fungible(_) => "Fungible",743			CollectionMode::NFT => "NFT",744			CollectionMode::ReFungible => "ReFungible",745		};746		Ok(mode.into())747	}748749	/// Get collection owner.750	///751	/// @return Tuble with sponsor address and his substrate mirror.752	/// If address is canonical then substrate mirror is zero and vice versa.753	fn collection_owner(&self) -> Result<EthCrossAccount> {754		Ok(EthCrossAccount::from_sub_cross_account::<T>(755			&T::CrossAccountId::from_sub(self.owner.clone()),756		))757	}758759	/// Changes collection owner to another account760	///761	/// @dev Owner can be changed only by current owner762	/// @param newOwner new owner account763	#[solidity(hide, rename_selector = "changeCollectionOwner")]764	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {765		self.consume_store_writes(1)?;766767		let caller = T::CrossAccountId::from_eth(caller);768		let new_owner = T::CrossAccountId::from_eth(new_owner);769		self.change_owner(caller, new_owner)770			.map_err(dispatch_to_evm::<T>)771	}772773	/// Get collection administrators774	///775	/// @return Vector of tuples with admins address and his substrate mirror.776	/// If address is canonical then substrate mirror is zero and vice versa.777	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {778		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))779			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))780			.collect();781		Ok(result)782	}783784	/// Changes collection owner to another account785	///786	/// @dev Owner can be changed only by current owner787	/// @param newOwner new owner cross account788	fn change_collection_owner_cross(789		&mut self,790		caller: caller,791		new_owner: EthCrossAccount,792	) -> Result<void> {793		self.consume_store_writes(1)?;794795		let caller = T::CrossAccountId::from_eth(caller);796		let new_owner = new_owner.into_sub_cross_account::<T>()?;797		self.change_owner(caller, new_owner)798			.map_err(dispatch_to_evm::<T>)799	}800}801802/// ### Note803/// Do not forget to add: `self.consume_store_reads(1)?;`804fn check_is_owner_or_admin<T: Config>(805	caller: caller,806	collection: &CollectionHandle<T>,807) -> Result<T::CrossAccountId> {808	let caller = T::CrossAccountId::from_eth(caller);809	collection810		.check_is_owner_or_admin(&caller)811		.map_err(dispatch_to_evm::<T>)?;812	Ok(caller)813}814815/// ### Note816/// Do not forget to add: `self.consume_store_writes(1)?;`817fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {818	collection819		.check_is_internal()820		.map_err(dispatch_to_evm::<T>)?;821	collection.save().map_err(dispatch_to_evm::<T>)?;822	Ok(())823}824825/// Contains static property keys and values.826pub mod static_property {827	use evm_coder::{828		execution::{Result, Error},829	};830	use alloc::format;831832	const EXPECT_CONVERT_ERROR: &str = "length < limit";833834	/// Keys.835	pub mod key {836		use super::*;837838		/// Key "baseURI".839		pub fn base_uri() -> up_data_structs::PropertyKey {840			property_key_from_bytes(b"baseURI").expect(EXPECT_CONVERT_ERROR)841		}842843		/// Key "url".844		pub fn url() -> up_data_structs::PropertyKey {845			property_key_from_bytes(b"URI").expect(EXPECT_CONVERT_ERROR)846		}847848		/// Key "suffix".849		pub fn suffix() -> up_data_structs::PropertyKey {850			property_key_from_bytes(b"URISuffix").expect(EXPECT_CONVERT_ERROR)851		}852853		/// Key "parentNft".854		pub fn parent_nft() -> up_data_structs::PropertyKey {855			property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)856		}857	}858859	/// Convert `byte` to [`PropertyKey`].860	pub fn property_key_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyKey> {861		bytes.to_vec().try_into().map_err(|_| {862			Error::Revert(format!(863				"Property key is too long. Max length is {}.",864				up_data_structs::PropertyKey::bound()865			))866		})867	}868869	/// Convert `bytes` to [`PropertyValue`].870	pub fn property_value_from_bytes(bytes: &[u8]) -> Result<up_data_structs::PropertyValue> {871		bytes.to_vec().try_into().map_err(|_| {872			Error::Revert(format!(873				"Property key is too long. Max length is {}.",874				up_data_structs::PropertyKey::bound()875			))876		})877	}878}
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -53,15 +53,6 @@
 	address[0..16] == ETH_COLLECTION_PREFIX
 }
 
-/// Convert `CrossAccountId` to `uint256`.
-pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint256
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	let slice = from.as_sub().as_ref();
-	uint256::from_big_endian(slice)
-}
-
 /// Convert `uint256` to `CrossAccountId`.
 pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId
 where
@@ -71,46 +62,6 @@
 	from.to_big_endian(&mut new_admin_arr);
 	let account_id = T::AccountId::from(new_admin_arr);
 	T::CrossAccountId::from_sub(account_id)
-}
-
-/// Convert `CrossAccountId` to `(address, uint256)`.
-pub fn convert_cross_account_to_tuple<T: Config>(
-	cross_account_id: &T::CrossAccountId,
-) -> (address, uint256)
-where
-	T::AccountId: AsRef<[u8; 32]>,
-{
-	if cross_account_id.is_canonical_substrate() {
-		let sub = convert_cross_account_to_uint256::<T>(cross_account_id);
-		(Default::default(), sub)
-	} else {
-		let eth = *cross_account_id.as_eth();
-		(eth, Default::default())
-	}
-}
-
-/// Convert tuple `(address, uint256)` to `CrossAccountId`.
-///
-/// If `address` in the tuple has *default* value, then the canonical form is substrate,
-/// if `uint256` has *default* value, then the ethereum form is canonical,
-/// if both values are *default* or *non default*, then this is considered an invalid address and `Error` is returned.
-pub fn convert_tuple_to_cross_account<T: Config>(
-	eth_cross_account_id: (address, uint256),
-) -> evm_coder::execution::Result<T::CrossAccountId>
-where
-	T::AccountId: From<[u8; 32]>,
-{
-	if eth_cross_account_id == Default::default() {
-		Err("All fields of cross account is zeroed".into())
-	} else if eth_cross_account_id.0 == Default::default() {
-		Ok(convert_uint256_to_cross_account::<T>(
-			eth_cross_account_id.1,
-		))
-	} else if eth_cross_account_id.1 == Default::default() {
-		Ok(T::CrossAccountId::from_eth(eth_cross_account_id.0))
-	} else {
-		Err("All fields of cross account is non zeroed".into())
-	}
 }
 
 /// Cross account struct
@@ -121,16 +72,14 @@
 }
 
 impl EthCrossAccount {
+	/// Converts `CrossAccountId` to `EthCrossAccountId`
 	pub fn from_sub_cross_account<T>(cross_account_id: &T::CrossAccountId) -> Self
 	where
 		T: pallet_evm::Config,
 		T::AccountId: AsRef<[u8; 32]>,
 	{
 		if cross_account_id.is_canonical_substrate() {
-			Self {
-				eth: Default::default(),
-				sub: convert_cross_account_to_uint256::<T>(cross_account_id),
-			}
+			Self::from_sub::<T>(cross_account_id.as_sub())
 		} else {
 			Self {
 				eth: *cross_account_id.as_eth(),
@@ -138,7 +87,18 @@
 			}
 		}
 	}
-
+	/// Creates `EthCrossAccount` from substrate account
+	pub fn from_sub<T>(account_id: &T::AccountId) -> Self
+	where
+		T: pallet_evm::Config,
+		T::AccountId: AsRef<[u8; 32]>,
+	{
+		Self {
+			eth: Default::default(),
+			sub: uint256::from_big_endian(account_id.as_ref()),
+		}
+	}
+	/// Converts `EthCrossAccount` to `CrossAccountId`
 	pub fn into_sub_cross_account<T>(&self) -> evm_coder::execution::Result<T::CrossAccountId>
 	where
 		T: pallet_evm::Config,
@@ -163,29 +123,41 @@
 	/// How many tokens can a user have on one account.
 	#[default]
 	AccountTokenOwnership,
+
 	/// How many bytes of data are available for sponsorship.
 	SponsoredDataSize,
+
 	/// In any case, chain default: [`SponsoringRateLimit::SponsoringDisabled`]
 	SponsoredDataRateLimit,
+
 	/// How many tokens can be mined into this collection.
 	TokenLimit,
+
 	/// Timeouts for transfer sponsoring.
 	SponsorTransferTimeout,
+
 	/// Timeout for sponsoring an approval in passed blocks.
 	SponsorApproveTimeout,
+
 	/// Whether the collection owner of the collection can send tokens (which belong to other users).
 	OwnerCanTransfer,
+
 	/// Can the collection owner burn other people's tokens.
 	OwnerCanDestroy,
+
 	/// Is it possible to send tokens from this collection between users.
 	TransferEnabled,
 }
+/// Ethereum representation of `NestingPermissions` (see [`up_data_structs::NestingPermissions`]) fields as an enumeration.
 #[derive(Default, Debug, Clone, Copy, AbiCoder)]
 #[repr(u8)]
 pub enum CollectionPermissions {
+	/// Owner of token can nest tokens under it.
 	#[default]
-	CollectionAdmin,
 	TokenOwner,
+
+	/// Admin of token collection can nest tokens under token.
+	CollectionAdmin,
 }
 
 /// Ethereum representation of TokenPermissions (see [`up_data_structs::PropertyPermission`]) fields as an enumeration.
modifiedpallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -50,6 +50,7 @@
     "pallet-evm-coder-substrate/std",
     "pallet-evm/std",
     "up-sponsorship/std",
+    "pallet-common/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
-stubgen = ["evm-coder/stubgen"]
+stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -25,6 +25,7 @@
 	types::*,
 	ToLog,
 };
+use pallet_common::eth::EthCrossAccount;
 use pallet_evm::{
 	ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
 	account::CrossAccountId,
@@ -174,11 +175,9 @@
 	///
 	/// @param contractAddress The contract for which a sponsor is requested.
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
-	fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
-		let sponsor =
-			Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
-		Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
-			&sponsor,
+	fn sponsor(&self, contract_address: address) -> Result<EthCrossAccount> {
+		Ok(EthCrossAccount::from_sub_cross_account::<T>(
+			&Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
 		))
 	}
 
modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth
--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x766c4f37,
 	///  or in textual repr: sponsor(address)
-	function sponsor(address contractAddress) public view returns (Tuple0 memory) {
+	function sponsor(address contractAddress) public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		contractAddress;
 		dummy;
-		return Tuple0(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Check tat contract has confirmed sponsor.
@@ -265,8 +265,8 @@
 	}
 }
 
-/// @dev anonymous struct
-struct Tuple0 {
-	address field_0;
-	uint256 field_1;
+/// @dev Cross account struct
+struct EthCrossAccount {
+	address eth;
+	uint256 sub;
 }
modifiedpallets/fungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 <!-- bureaucrate goes here -->
 
+## [0.1.9] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC20UniqueExtensions` interface.
+
 ## [0.1.8] - 2022-11-18
 
 ### Added
modifiedpallets/fungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/fungible/Cargo.toml
+++ b/pallets/fungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-fungible"
-version = "0.1.7"
+version = "0.1.9"
 license = "GPLv3"
 edition = "2021"
 
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -174,6 +174,19 @@
 			.collect::<string>())
 	}
 
+	#[weight(<SelfWeightOf<T>>::create_item())]
+	fn mint_cross(&mut self, caller: caller, to: EthCrossAccount, amount: uint256) -> Result<bool> {
+		let caller = T::CrossAccountId::from_eth(caller);
+		let to = to.into_sub_cross_account::<T>()?;
+		let amount = amount.try_into().map_err(|_| "amount overflow")?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+		<Pallet<T>>::create_item(&self, &caller, (to, amount), &budget)
+			.map_err(dispatch_to_evm::<T>)?;
+		Ok(true)
+	}
+
 	#[weight(<SelfWeightOf<T>>::approve())]
 	fn approve_cross(
 		&mut self,
modifiedpallets/fungible/src/stubs/UniqueFungible.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth
--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -152,10 +152,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple8 memory) {
+	function collectionSponsor() public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple8(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -173,10 +173,10 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple20[] memory) {
+	function collectionLimits() public view returns (Tuple23[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple20[](0);
+		return new Tuple23[](0);
 	}
 
 	/// Set limits for the collection.
@@ -284,19 +284,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple26 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple29 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple26(false, new uint256[](0));
+		return Tuple29(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple29[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple32[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple29[](0);
+		return new Tuple32[](0);
 	}
 
 	/// Set the collection access method.
@@ -476,13 +476,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple29 {
+struct Tuple32 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple26 {
+struct Tuple29 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -510,7 +510,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple20 {
+struct Tuple23 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
@@ -522,7 +522,7 @@
 	bytes value;
 }
 
-/// @dev the ERC-165 identifier for this interface is 0x5b7038cf
+/// @dev the ERC-165 identifier for this interface is 0x7dee5997
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @notice A description for the collection.
 	/// @dev EVM selector for this function is: 0x7284e416,
@@ -533,6 +533,16 @@
 		return "";
 	}
 
+	/// @dev EVM selector for this function is: 0x269e6158,
+	///  or in textual repr: mintCross((address,uint256),uint256)
+	function mintCross(EthCrossAccount memory to, uint256 amount) public returns (bool) {
+		require(false, stub_error);
+		to;
+		amount;
+		dummy = 0;
+		return false;
+	}
+
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(EthCrossAccount memory spender, uint256 amount) public returns (bool) {
@@ -577,7 +587,7 @@
 	/// @param amounts array of pairs of account address and amount
 	/// @dev EVM selector for this function is: 0x1acf2d55,
 	///  or in textual repr: mintBulk((address,uint256)[])
-	function mintBulk(Tuple8[] memory amounts) public returns (bool) {
+	function mintBulk(Tuple9[] memory amounts) public returns (bool) {
 		require(false, stub_error);
 		amounts;
 		dummy = 0;
@@ -611,7 +621,7 @@
 }
 
 /// @dev anonymous struct
-struct Tuple8 {
+struct Tuple9 {
 	address field_0;
 	uint256 field_1;
 }
modifiedpallets/nonfungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 <!-- bureaucrate goes here -->
 
-## [0.1.11] - 2022-12-16
+## [0.1.12] - 2022-12-16
 
 ### Added
 
@@ -14,6 +14,12 @@
 
 - Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
 
+## [0.1.11] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
 ## [0.1.10] - 2022-11-18
 
 ### Added
modifiedpallets/nonfungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/nonfungible/Cargo.toml
+++ b/pallets/nonfungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nonfungible"
-version = "0.1.11"
+version = "0.1.12"
 license = "GPLv3"
 edition = "2021"
 
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -605,7 +605,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -618,7 +618,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -1069,6 +1069,58 @@
 			.map_err(dispatch_to_evm::<T>)?;
 		Ok(true)
 	}
+
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	#[weight(<SelfWeightOf<T>>::create_item())]
+	fn mint_cross(
+		&mut self,
+		caller: caller,
+		to: EthCrossAccount,
+		properties: Vec<PropertyStruct>,
+	) -> Result<uint256> {
+		let token_id = <TokensMinted<T>>::get(self.id)
+			.checked_add(1)
+			.ok_or("item id overflow")?;
+
+		let to = to.into_sub_cross_account::<T>()?;
+
+		let properties = properties
+			.into_iter()
+			.map(|PropertyStruct { key, value }| {
+				let key = <Vec<u8>>::from(key)
+					.try_into()
+					.map_err(|_| "key too large")?;
+
+				let value = value.0.try_into().map_err(|_| "value too large")?;
+
+				Ok(Property { key, value })
+			})
+			.collect::<Result<Vec<_>>>()?
+			.try_into()
+			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+		let caller = T::CrossAccountId::from_eth(caller);
+
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		<Pallet<T>>::create_item(
+			self,
+			&caller,
+			CreateItemData::<T> {
+				properties,
+				owner: to,
+			},
+			&budget,
+		)
+		.map_err(dispatch_to_evm::<T>)?;
+
+		Ok(token_id.into())
+	}
 }
 
 #[solidity_interface(
modifiedpallets/nonfungible/src/stubs/UniqueNFT.rawdiffbeforeafterboth

binary blob — no preview

modifiedpallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth
--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,7 +42,7 @@
 	/// @param permissions Permissions for keys.
 	/// @dev EVM selector for this function is: 0xbd92983a,
 	///  or in textual repr: setTokenPropertyPermissions((string,(uint8,bool)[])[])
-	function setTokenPropertyPermissions(Tuple59[] memory permissions) public {
+	function setTokenPropertyPermissions(Tuple61[] memory permissions) public {
 		require(false, stub_error);
 		permissions;
 		dummy = 0;
@@ -51,10 +51,10 @@
 	/// @notice Get permissions for token properties.
 	/// @dev EVM selector for this function is: 0xf23d7790,
 	///  or in textual repr: tokenPropertyPermissions()
-	function tokenPropertyPermissions() public view returns (Tuple59[] memory) {
+	function tokenPropertyPermissions() public view returns (Tuple61[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple59[](0);
+		return new Tuple61[](0);
 	}
 
 	// /// @notice Set token property value.
@@ -144,13 +144,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple59 {
+struct Tuple61 {
 	string field_0;
-	Tuple57[] field_1;
+	Tuple59[] field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple57 {
+struct Tuple59 {
 	EthTokenPermissions field_0;
 	bool field_1;
 }
@@ -290,10 +290,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple30 memory) {
+	function collectionSponsor() public view returns (EthCrossAccount memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple30(0x0000000000000000000000000000000000000000, 0);
+		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Get current collection limits.
@@ -311,10 +311,10 @@
 	/// Return `false` if a limit not set.
 	/// @dev EVM selector for this function is: 0xf63bc572,
 	///  or in textual repr: collectionLimits()
-	function collectionLimits() public view returns (Tuple33[] memory) {
+	function collectionLimits() public view returns (Tuple35[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple33[](0);
+		return new Tuple35[](0);
 	}
 
 	/// Set limits for the collection.
@@ -422,19 +422,19 @@
 	/// Returns nesting for a collection
 	/// @dev EVM selector for this function is: 0x22d25bfe,
 	///  or in textual repr: collectionNestingRestrictedCollectionIds()
-	function collectionNestingRestrictedCollectionIds() public view returns (Tuple39 memory) {
+	function collectionNestingRestrictedCollectionIds() public view returns (Tuple41 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple39(false, new uint256[](0));
+		return Tuple41(false, new uint256[](0));
 	}
 
 	/// Returns permissions for a collection
 	/// @dev EVM selector for this function is: 0x5b2eaf4b,
 	///  or in textual repr: collectionNestingPermissions()
-	function collectionNestingPermissions() public view returns (Tuple42[] memory) {
+	function collectionNestingPermissions() public view returns (Tuple44[] memory) {
 		require(false, stub_error);
 		dummy;
-		return new Tuple42[](0);
+		return new Tuple44[](0);
 	}
 
 	/// Set the collection access method.
@@ -614,13 +614,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple42 {
+struct Tuple44 {
 	CollectionPermissions field_0;
 	bool field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple39 {
+struct Tuple41 {
 	bool field_0;
 	uint256[] field_1;
 }
@@ -648,18 +648,12 @@
 }
 
 /// @dev anonymous struct
-struct Tuple33 {
+struct Tuple35 {
 	CollectionLimits field_0;
 	bool field_1;
 	uint256 field_2;
 }
 
-/// @dev anonymous struct
-struct Tuple30 {
-	address field_0;
-	uint256 field_1;
-}
-
 /// @title ERC-721 Non-Fungible Token Standard, optional metadata extension
 /// @dev See https://eips.ethereum.org/EIPS/eip-721
 /// @dev the ERC-165 identifier for this interface is 0x5b5e139f
@@ -735,7 +729,7 @@
 		return false;
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	/// @dev EVM selector for this function is: 0x6a627842,
@@ -747,7 +741,7 @@
 		return 0;
 	}
 
-	// /// @notice Function to mint token.
+	// /// @notice Function to mint a token.
 	// /// @dev `tokenId` should be obtained with `nextTokenId` method,
 	// ///  unlike standard, you can't specify it manually
 	// /// @param to The new owner
@@ -804,7 +798,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0xb74c26b7
+/// @dev the ERC-165 identifier for this interface is 0x0e48fdb4
 contract ERC721UniqueExtensions is Dummy, ERC165 {
 	/// @notice A descriptive name for a collection of NFTs in this contract
 	/// @dev EVM selector for this function is: 0x06fdde03,
@@ -961,6 +955,7 @@
 		dummy;
 		return 0;
 	}
+
 	// /// @notice Function to mint multiple tokens.
 	// /// @dev `tokenIds` should be an array of consecutive numbers and first number
 	// ///  should be obtained with `nextTokenId` method
@@ -991,6 +986,19 @@
 	// 	return false;
 	// }
 
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	/// @dev EVM selector for this function is: 0xb904db03,
+	///  or in textual repr: mintCross((address,uint256),(string,bytes)[])
+	function mintCross(EthCrossAccount memory to, Property[] memory properties) public returns (uint256) {
+		require(false, stub_error);
+		to;
+		properties;
+		dummy = 0;
+		return 0;
+	}
 }
 
 /// @dev anonymous struct
modifiedpallets/refungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 <!-- bureaucrate goes here -->
 
-## [0.2.10] - 2022-12-16
+## [0.2.11] - 2022-12-16
 
 ### Added
 
@@ -14,6 +14,12 @@
 
 - Hide `setTokenPropertyPermission` function in `TokenProperties` interface.
 
+## [0.2.10] - 2022-12-01
+
+### Added
+
+- The functions `mintCross` to `ERC721UniqueExtensions` interface.
+
 ## [0.2.9] - 2022-11-18
 
 ### Added
modifiedpallets/refungible/Cargo.tomldiffbeforeafterboth
--- a/pallets/refungible/Cargo.toml
+++ b/pallets/refungible/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-refungible"
-version = "0.2.10"
+version = "0.2.11"
 license = "GPLv3"
 edition = "2021"
 
modifiedpallets/refungible/src/common.rsdiffbeforeafterboth
--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -165,9 +165,9 @@
 fn map_create_data<T: Config>(
 	data: up_data_structs::CreateItemData,
 	to: &T::CrossAccountId,
-) -> Result<CreateItemData<T::CrossAccountId>, DispatchError> {
+) -> Result<CreateItemData<T>, DispatchError> {
 	match data {
-		up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData {
+		up_data_structs::CreateItemData::ReFungible(data) => Ok(CreateItemData::<T> {
 			users: {
 				let mut out = BTreeMap::new();
 				out.insert(to.clone(), data.pieces);
@@ -230,7 +230,7 @@
 			CreateItemExData::RefungibleMultipleOwners(CreateRefungibleExMultipleOwners {
 				users,
 				properties,
-			}) => vec![CreateItemData { users, properties }],
+			}) => vec![CreateItemData::<T> { users, properties }],
 			CreateItemExData::RefungibleMultipleItems(r) => r
 				.into_inner()
 				.into_iter()
@@ -239,7 +239,7 @@
 					     user,
 					     pieces,
 					     properties,
-					 }| CreateItemData {
+					 }| CreateItemData::<T> {
 						users: BTreeMap::from([(user, pieces)])
 							.try_into()
 							.expect("limit >= 1"),
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -637,7 +637,7 @@
 		Ok(false)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @param to The new owner
 	/// @return uint256 The id of the newly minted token
 	#[weight(<SelfWeightOf<T>>::create_item())]
@@ -650,7 +650,7 @@
 		Ok(token_id)
 	}
 
-	/// @notice Function to mint token.
+	/// @notice Function to mint a token.
 	/// @dev `tokenId` should be obtained with `nextTokenId` method,
 	///  unlike standard, you can't specify it manually
 	/// @param to The new owner
@@ -681,7 +681,7 @@
 		<Pallet<T>>::create_item(
 			self,
 			&caller,
-			CreateItemData::<T::CrossAccountId> {
+			CreateItemData::<T> {
 				users,
 				properties: CollectionPropertiesVec::default(),
 			},
@@ -767,7 +767,7 @@
 		<Pallet<T>>::create_item(
 			self,
 			&caller,
-			CreateItemData::<T::CrossAccountId> { users, properties },
+			CreateItemData::<T> { users, properties },
 			&budget,
 		)
 		.map_err(dispatch_to_evm::<T>)?;
@@ -1048,7 +1048,7 @@
 			.collect::<BTreeMap<_, _>>()
 			.try_into()
 			.unwrap();
-		let create_item_data = CreateItemData::<T::CrossAccountId> {
+		let create_item_data = CreateItemData::<T> {
 			users,
 			properties: CollectionPropertiesVec::default(),
 		};
@@ -1108,7 +1108,7 @@
 				})
 				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;
 
-			let create_item_data = CreateItemData::<T::CrossAccountId> {
+			let create_item_data = CreateItemData::<T> {
 				users: users.clone(),
 				properties,
 			};
@@ -1120,6 +1120,60 @@
 		Ok(true)
 	}
 
+	/// @notice Function to mint a token.
+	/// @param to The new owner crossAccountId
+	/// @param properties Properties of minted token
+	/// @return uint256 The id of the newly minted token
+	#[weight(<SelfWeightOf<T>>::create_item())]
+	fn mint_cross(
+		&mut self,
+		caller: caller,
+		to: EthCrossAccount,
+		properties: Vec<PropertyStruct>,
+	) -> Result<uint256> {
+		let token_id = <TokensMinted<T>>::get(self.id)
+			.checked_add(1)
+			.ok_or("item id overflow")?;
+
+		let to = to.into_sub_cross_account::<T>()?;
+
+		let properties = properties
+			.into_iter()
+			.map(|PropertyStruct { key, value }| {
+				let key = <Vec<u8>>::from(key)
+					.try_into()
+					.map_err(|_| "key too large")?;
+
+				let value = value.0.try_into().map_err(|_| "value too large")?;
+
+				Ok(Property { key, value })
+			})
+			.collect::<Result<Vec<_>>>()?
+			.try_into()
+			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;
+
+		let caller = T::CrossAccountId::from_eth(caller);
+
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
+
+		let users = [(to, 1)]
+			.into_iter()
+			.collect::<BTreeMap<_, _>>()
+			.try_into()
+			.unwrap();
+		<Pallet<T>>::create_item(
+			self,
+			&caller,
+			CreateItemData::<T> { users, properties },
+			&budget,
+		)
+		.map_err(dispatch_to_evm::<T>)?;
+
+		Ok(token_id.into())
+	}
+
 	/// Returns EVM address for refungible token
 	///
 	/// @param token ID of the token
modifiedpallets/refungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -114,6 +114,7 @@
 	CreateCollectionData, CustomDataLimit, mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH,
 	MAX_REFUNGIBLE_PIECES, Property, PropertyKey, PropertyKeyPermission, PropertyPermission,
 	PropertyScope, PropertyValue, TokenId, TrySetProperty, PropertiesPermissionMap,
+	CreateRefungibleExMultipleOwners,
 };
 
 pub use pallet::*;
@@ -124,13 +125,8 @@
 pub mod erc_token;
 pub mod weights;
 
-#[derive(Derivative, Clone)]
-pub struct CreateItemData<CrossAccountId> {
-	#[derivative(Debug(format_with = "bounded::map_debug"))]
-	pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,
-	#[derivative(Debug(format_with = "bounded::vec_debug"))]
-	pub properties: CollectionPropertiesVec,
-}
+pub type CreateItemData<T> =
+	CreateRefungibleExMultipleOwners<<T as pallet_evm::Config>::CrossAccountId>;
 pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;
 
 /// Token data, stored independently from other data used to describe it
@@ -913,7 +909,7 @@
 	pub fn create_multiple_items(
 		collection: &RefungibleHandle<T>,
 		sender: &T::CrossAccountId,
-		data: Vec<CreateItemData<T::CrossAccountId>>,
+		data: Vec<CreateItemData<T>>,
 		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		if !collection.is_owner_or_admin(sender) {
@@ -1259,7 +1255,7 @@
 	pub fn create_item(
 		collection: &RefungibleHandle<T>,
 		sender: &T::CrossAccountId,
-		data: CreateItemData<T::CrossAccountId>,
+		data: CreateItemData<T>,
 		nesting_budget: &dyn Budget,
 	) -> DispatchResult {
 		Self::create_multiple_items(collection, sender, vec![data], nesting_budget)
modifiedpallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterboth

binary blob — no preview

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