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

difftreelog

Change prefixed names to postfixed

Trubnikov Sergey2023-04-17parent: #b77279f.patch.diff
in: master

14 files changed

modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -749,18 +749,24 @@
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
+	#[solidity(hide)]
 	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {
+		Self::owner_of_cross(&self, token_id)
+	}
+
+	/// Returns the owner (in cross format) of the token.
+	///
+	/// @param tokenId Id for the token.
+	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {
 		Self::token_owner(&self, token_id.try_into()?)
 			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))
 			.map_err(|_| Error::Revert("token not found".into()))
 	}
 
 	/// @notice Count all NFTs assigned to an owner
-	/// @dev NFTs assigned to the zero address are considered invalid, and this
-	///  function throws for queries about the zero address.
 	/// @param owner An cross address for whom to query the balance
 	/// @return The number of NFTs owned by `owner`, possibly zero
-	fn cross_balance_of(&self, owner: eth::CrossAddress) -> Result<U256> {
+	fn balance_of_cross(&self, owner: eth::CrossAddress) -> Result<U256> {
 		self.consume_store_reads(1)?;
 		let balance = <AccountBalance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));
 		Ok(balance.into())
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
@@ -774,7 +774,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x323b1db8
+/// @dev the ERC-165 identifier for this interface is 0x307b061a
 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,
@@ -803,12 +803,24 @@
 		return "";
 	}
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @param tokenId Id for the token.
+	// /// @dev EVM selector for this function is: 0x2b29dace,
+	// ///  or in textual repr: crossOwnerOf(uint256)
+	// function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	dummy;
+	// 	return CrossAddress(0x0000000000000000000000000000000000000000,0);
+	// }
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	/// @dev EVM selector for this function is: 0x2b29dace,
-	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) public view returns (CrossAddress memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
@@ -816,13 +828,11 @@
 	}
 
 	/// @notice Count all NFTs assigned to an owner
-	/// @dev NFTs assigned to the zero address are considered invalid, and this
-	///  function throws for queries about the zero address.
 	/// @param owner An cross address for whom to query the balance
 	/// @return The number of NFTs owned by `owner`, possibly zero
-	/// @dev EVM selector for this function is: 0x24e52cea,
-	///  or in textual repr: crossBalanceOf((address,uint256))
-	function crossBalanceOf(CrossAddress memory owner) public view returns (uint256) {
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
 		require(false, stub_error);
 		owner;
 		dummy;
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
before · pallets/refungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{abi::AbiType, ToLog, generate_stubgen, solidity_interface, types::*};29use frame_support::{BoundedBTreeMap, BoundedVec};30use pallet_common::{31	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,32	Error as CommonError,33	erc::{CommonEvmHandler, CollectionCall, static_property::key},34	eth::{self, TokenUri},35};36use pallet_evm::{account::CrossAccountId, PrecompileHandle};37use pallet_evm_coder_substrate::{38	call, dispatch_to_evm,39	execution::{PreDispatch, Result, Error},40	frontier_contract,41};42use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};43use sp_core::{H160, U256, Get};44use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};45use up_data_structs::{46	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,47	PropertyKeyPermission, PropertyPermission, TokenId, TokenOwnerError,48};4950use crate::{51	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, TokenProperties,52	TokensMinted, TotalSupply, SelfWeightOf, weights::WeightInfo,53};5455frontier_contract! {56	macro_rules! RefungibleHandle_result {...}57	impl<T: Config> Contract for RefungibleHandle<T> {...}58}5960pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);6162/// Rft events.63#[derive(ToLog)]64pub enum ERC721TokenEvent {65	/// The token has been changed.66	TokenChanged {67		/// Token ID.68		#[indexed]69		token_id: U256,70	},71}7273/// @title A contract that allows to set and delete token properties and change token property permissions.74#[solidity_interface(name = TokenProperties, events(ERC721TokenEvent), enum(derive(PreDispatch)), enum_attr(weight))]75impl<T: Config> RefungibleHandle<T> {76	/// @notice Set permissions for token property.77	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.78	/// @param key Property key.79	/// @param isMutable Permission to mutate property.80	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.81	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.82	#[solidity(hide)]83	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]84	fn set_token_property_permission(85		&mut self,86		caller: Caller,87		key: String,88		is_mutable: bool,89		collection_admin: bool,90		token_owner: bool,91	) -> Result<()> {92		let caller = T::CrossAccountId::from_eth(caller);93		<Pallet<T>>::set_token_property_permissions(94			self,95			&caller,96			vec![PropertyKeyPermission {97				key: <Vec<u8>>::from(key)98					.try_into()99					.map_err(|_| "too long key")?,100				permission: PropertyPermission {101					mutable: is_mutable,102					collection_admin,103					token_owner,104				},105			}],106		)107		.map_err(dispatch_to_evm::<T>)108	}109110	/// @notice Set permissions for token property.111	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.112	/// @param permissions Permissions for keys.113	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]114	fn set_token_property_permissions(115		&mut self,116		caller: Caller,117		permissions: Vec<eth::TokenPropertyPermission>,118	) -> Result<()> {119		let caller = T::CrossAccountId::from_eth(caller);120		let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;121122		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)123			.map_err(dispatch_to_evm::<T>)124	}125126	/// @notice Get permissions for token properties.127	fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {128		let perms = <Pallet<T>>::token_property_permission(self.id);129		Ok(perms130			.into_iter()131			.map(eth::TokenPropertyPermission::from)132			.collect())133	}134135	/// @notice Set token property value.136	/// @dev Throws error if `msg.sender` has no permission to edit the property.137	/// @param tokenId ID of the token.138	/// @param key Property key.139	/// @param value Property value.140	#[solidity(hide)]141	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]142	fn set_property(143		&mut self,144		caller: Caller,145		token_id: U256,146		key: String,147		value: Bytes,148	) -> Result<()> {149		let caller = T::CrossAccountId::from_eth(caller);150		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;151		let key = <Vec<u8>>::from(key)152			.try_into()153			.map_err(|_| "key too long")?;154		let value = value.0.try_into().map_err(|_| "value too long")?;155156		let nesting_budget = self157			.recorder158			.weight_calls_budget(<StructureWeight<T>>::find_parent());159160		<Pallet<T>>::set_token_property(161			self,162			&caller,163			TokenId(token_id),164			Property { key, value },165			&nesting_budget,166		)167		.map_err(dispatch_to_evm::<T>)168	}169170	/// @notice Set token properties value.171	/// @dev Throws error if `msg.sender` has no permission to edit the property.172	/// @param tokenId ID of the token.173	/// @param properties settable properties174	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]175	fn set_properties(176		&mut self,177		caller: Caller,178		token_id: U256,179		properties: Vec<eth::Property>,180	) -> Result<()> {181		let caller = T::CrossAccountId::from_eth(caller);182		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;183184		let nesting_budget = self185			.recorder186			.weight_calls_budget(<StructureWeight<T>>::find_parent());187188		let properties = properties189			.into_iter()190			.map(eth::Property::try_into)191			.collect::<Result<Vec<_>>>()?;192193		<Pallet<T>>::set_token_properties(194			self,195			&caller,196			TokenId(token_id),197			properties.into_iter(),198			false,199			&nesting_budget,200		)201		.map_err(dispatch_to_evm::<T>)202	}203204	/// @notice Delete token property value.205	/// @dev Throws error if `msg.sender` has no permission to edit the property.206	/// @param tokenId ID of the token.207	/// @param key Property key.208	#[solidity(hide)]209	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]210	fn delete_property(&mut self, token_id: U256, caller: Caller, key: String) -> Result<()> {211		let caller = T::CrossAccountId::from_eth(caller);212		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;213		let key = <Vec<u8>>::from(key)214			.try_into()215			.map_err(|_| "key too long")?;216217		let nesting_budget = self218			.recorder219			.weight_calls_budget(<StructureWeight<T>>::find_parent());220221		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)222			.map_err(dispatch_to_evm::<T>)223	}224225	/// @notice Delete token properties value.226	/// @dev Throws error if `msg.sender` has no permission to edit the property.227	/// @param tokenId ID of the token.228	/// @param keys Properties key.229	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]230	fn delete_properties(231		&mut self,232		token_id: U256,233		caller: Caller,234		keys: Vec<String>,235	) -> Result<()> {236		let caller = T::CrossAccountId::from_eth(caller);237		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;238		let keys = keys239			.into_iter()240			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))241			.collect::<Result<Vec<_>>>()?;242243		let nesting_budget = self244			.recorder245			.weight_calls_budget(<StructureWeight<T>>::find_parent());246247		<Pallet<T>>::delete_token_properties(248			self,249			&caller,250			TokenId(token_id),251			keys.into_iter(),252			&nesting_budget,253		)254		.map_err(dispatch_to_evm::<T>)255	}256257	/// @notice Get token property value.258	/// @dev Throws error if key not found259	/// @param tokenId ID of the token.260	/// @param key Property key.261	/// @return Property value bytes262	fn property(&self, token_id: U256, key: String) -> Result<Bytes> {263		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;264		let key = <Vec<u8>>::from(key)265			.try_into()266			.map_err(|_| "key too long")?;267268		let props = <TokenProperties<T>>::get((self.id, token_id));269		let prop = props.get(&key).ok_or("key not found")?;270271		Ok(prop.to_vec().into())272	}273}274275#[derive(ToLog)]276pub enum ERC721Events {277	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed278	///  (`to` == 0). Exception: during contract creation, any number of RFTs279	///  may be created and assigned without emitting Transfer.280	Transfer {281		#[indexed]282		from: Address,283		#[indexed]284		to: Address,285		#[indexed]286		token_id: U256,287	},288	/// @dev Not supported289	Approval {290		#[indexed]291		owner: Address,292		#[indexed]293		approved: Address,294		#[indexed]295		token_id: U256,296	},297	/// @dev Not supported298	#[allow(dead_code)]299	ApprovalForAll {300		#[indexed]301		owner: Address,302		#[indexed]303		operator: Address,304		approved: bool,305	},306}307308/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension309/// @dev See https://eips.ethereum.org/EIPS/eip-721310#[solidity_interface(name = ERC721Metadata, enum(derive(PreDispatch)), expect_selector = 0x5b5e139f)]311impl<T: Config> RefungibleHandle<T>312where313	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,314{315	/// @notice A descriptive name for a collection of NFTs in this contract316	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`317	#[solidity(hide, rename_selector = "name")]318	fn name_proxy(&self) -> Result<String> {319		self.name()320	}321322	/// @notice An abbreviated name for NFTs in this contract323	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`324	#[solidity(hide, rename_selector = "symbol")]325	fn symbol_proxy(&self) -> Result<String> {326		self.symbol()327	}328329	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.330	///331	/// @dev If the token has a `url` property and it is not empty, it is returned.332	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.333	///  If the collection property `baseURI` is empty or absent, return "" (empty string)334	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix335	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).336	///337	/// @return token's const_metadata338	#[solidity(rename_selector = "tokenURI")]339	fn token_uri(&self, token_id: U256) -> Result<String> {340		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;341342		match get_token_property(self, token_id_u32, &key::url()).as_deref() {343			Err(_) | Ok("") => (),344			Ok(url) => {345				return Ok(url.into());346			}347		};348349		let base_uri =350			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())351				.map(BoundedVec::into_inner)352				.map(String::from_utf8)353				.transpose()354				.map_err(|e| {355					Error::Revert(alloc::format!(356						"Can not convert value \"baseURI\" to string with error \"{}\"",357						e358					))359				})?;360361		let base_uri = match base_uri.as_deref() {362			None | Some("") => {363				return Ok("".into());364			}365			Some(base_uri) => base_uri.into(),366		};367368		Ok(369			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {370				Err(_) | Ok("") => base_uri,371				Ok(suffix) => base_uri + suffix,372			},373		)374	}375}376377/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension378/// @dev See https://eips.ethereum.org/EIPS/eip-721379#[solidity_interface(name = ERC721Enumerable, enum(derive(PreDispatch)), expect_selector = 0x780e9d63)]380impl<T: Config> RefungibleHandle<T> {381	/// @notice Enumerate valid RFTs382	/// @param index A counter less than `totalSupply()`383	/// @return The token identifier for the `index`th NFT,384	///  (sort order not specified)385	fn token_by_index(&self, index: U256) -> U256 {386		index387	}388389	/// Not implemented390	fn token_of_owner_by_index(&self, _owner: Address, _index: U256) -> Result<U256> {391		// TODO: Not implemetable392		Err("not implemented".into())393	}394395	/// @notice Count RFTs tracked by this contract396	/// @return A count of valid RFTs tracked by this contract, where each one of397	///  them has an assigned and queryable owner not equal to the zero address398	fn total_supply(&self) -> Result<U256> {399		self.consume_store_reads(1)?;400		Ok(<Pallet<T>>::total_supply(self).into())401	}402}403404/// @title ERC-721 Non-Fungible Token Standard405/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md406#[solidity_interface(name = ERC721, events(ERC721Events), enum(derive(PreDispatch)), enum_attr(weight), expect_selector = 0x80ac58cd)]407impl<T: Config> RefungibleHandle<T> {408	/// @notice Count all RFTs assigned to an owner409	/// @dev RFTs assigned to the zero address are considered invalid, and this410	///  function throws for queries about the zero address.411	/// @param owner An address for whom to query the balance412	/// @return The number of RFTs owned by `owner`, possibly zero413	fn balance_of(&self, owner: Address) -> Result<U256> {414		self.consume_store_reads(1)?;415		let owner = T::CrossAccountId::from_eth(owner);416		let balance = <AccountBalance<T>>::get((self.id, owner));417		Ok(balance.into())418	}419420	/// @notice Find the owner of an RFT421	/// @dev RFTs assigned to zero address are considered invalid, and queries422	///  about them do throw.423	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for424	///  the tokens that are partially owned.425	/// @param tokenId The identifier for an RFT426	/// @return The address of the owner of the RFT427	fn owner_of(&self, token_id: U256) -> Result<Address> {428		self.consume_store_reads(2)?;429		let token = token_id.try_into()?;430		let owner = <Pallet<T>>::token_owner(self.id, token);431		owner432			.map(|address| *address.as_eth())433			.or_else(|err| match err {434				TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),435				TokenOwnerError::MultipleOwners => Ok(ADDRESS_FOR_PARTIALLY_OWNED_TOKENS),436			})437	}438439	/// @dev Not implemented440	#[solidity(rename_selector = "safeTransferFrom")]441	fn safe_transfer_from_with_data(442		&mut self,443		_from: Address,444		_to: Address,445		_token_id: U256,446		_data: Bytes,447	) -> Result<()> {448		// TODO: Not implemetable449		Err("not implemented".into())450	}451452	/// @dev Not implemented453	#[solidity(rename_selector = "safeTransferFrom")]454	fn safe_transfer_from(&mut self, _from: Address, _to: Address, _token_id: U256) -> Result<()> {455		// TODO: Not implemetable456		Err("not implemented".into())457	}458459	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE460	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE461	///  THEY MAY BE PERMANENTLY LOST462	/// @dev Throws unless `msg.sender` is the current owner or an authorized463	///  operator for this RFT. Throws if `from` is not the current owner. Throws464	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.465	///  Throws if RFT pieces have multiple owners.466	/// @param from The current owner of the NFT467	/// @param to The new owner468	/// @param tokenId The NFT to transfer469	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]470	fn transfer_from(471		&mut self,472		caller: Caller,473		from: Address,474		to: Address,475		token_id: U256,476	) -> Result<()> {477		let caller = T::CrossAccountId::from_eth(caller);478		let from = T::CrossAccountId::from_eth(from);479		let to = T::CrossAccountId::from_eth(to);480		let token = token_id.try_into()?;481		let budget = self482			.recorder483			.weight_calls_budget(<StructureWeight<T>>::find_parent());484485		let balance = balance(&self, token, &from)?;486		ensure_single_owner(&self, token, balance)?;487488		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)489			.map_err(dispatch_to_evm::<T>)?;490491		Ok(())492	}493494	/// @dev Not implemented495	fn approve(&mut self, _caller: Caller, _approved: Address, _token_id: U256) -> Result<()> {496		Err("not implemented".into())497	}498499	/// @notice Sets or unsets the approval of a given operator.500	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.501	/// @param operator Operator502	/// @param approved Should operator status be granted or revoked?503	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]504	fn set_approval_for_all(505		&mut self,506		caller: Caller,507		operator: Address,508		approved: bool,509	) -> Result<()> {510		let caller = T::CrossAccountId::from_eth(caller);511		let operator = T::CrossAccountId::from_eth(operator);512513		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)514			.map_err(dispatch_to_evm::<T>)?;515		Ok(())516	}517518	/// @dev Not implemented519	fn get_approved(&self, _token_id: U256) -> Result<Address> {520		// TODO: Not implemetable521		Err("not implemented".into())522	}523524	/// @notice Tells whether the given `owner` approves the `operator`.525	#[weight(<SelfWeightOf<T>>::allowance_for_all())]526	fn is_approved_for_all(&self, owner: Address, operator: Address) -> Result<bool> {527		let owner = T::CrossAccountId::from_eth(owner);528		let operator = T::CrossAccountId::from_eth(operator);529530		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))531	}532}533534/// Returns amount of pieces of `token` that `owner` have535pub fn balance<T: Config>(536	collection: &RefungibleHandle<T>,537	token: TokenId,538	owner: &T::CrossAccountId,539) -> Result<u128> {540	collection.consume_store_reads(1)?;541	let balance = <Balance<T>>::get((collection.id, token, &owner));542	Ok(balance)543}544545/// Throws if `owner_balance` is lower than total amount of `token` pieces546pub fn ensure_single_owner<T: Config>(547	collection: &RefungibleHandle<T>,548	token: TokenId,549	owner_balance: u128,550) -> Result<()> {551	collection.consume_store_reads(1)?;552	let total_supply = <TotalSupply<T>>::get((collection.id, token));553554	if owner_balance == 0 {555		return Err(dispatch_to_evm::<T>(556			<CommonError<T>>::MustBeTokenOwner.into(),557		));558	}559560	if total_supply != owner_balance {561		return Err("token has multiple owners".into());562	}563	Ok(())564}565566/// @title ERC721 Token that can be irreversibly burned (destroyed).567#[solidity_interface(name = ERC721Burnable, enum(derive(PreDispatch)), enum_attr(weight))]568impl<T: Config> RefungibleHandle<T> {569	/// @notice Burns a specific ERC721 token.570	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized571	///  operator of the current owner.572	/// @param tokenId The RFT to approve573	#[weight(<SelfWeightOf<T>>::burn_item_fully())]574	fn burn(&mut self, caller: Caller, token_id: U256) -> Result<()> {575		let caller = T::CrossAccountId::from_eth(caller);576		let token = token_id.try_into()?;577578		let balance = balance(&self, token, &caller)?;579		ensure_single_owner(&self, token, balance)?;580581		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;582		Ok(())583	}584}585586/// @title ERC721 minting logic.587#[solidity_interface(name = ERC721UniqueMintable, enum(derive(PreDispatch)), enum_attr(weight))]588impl<T: Config> RefungibleHandle<T> {589	/// @notice Function to mint a token.590	/// @param to The new owner591	/// @return uint256 The id of the newly minted token592	#[weight(<SelfWeightOf<T>>::create_item())]593	fn mint(&mut self, caller: Caller, to: Address) -> Result<U256> {594		let token_id: U256 = <TokensMinted<T>>::get(self.id)595			.checked_add(1)596			.ok_or("item id overflow")?597			.into();598		self.mint_check_id(caller, to, token_id)?;599		Ok(token_id)600	}601602	/// @notice Function to mint a token.603	/// @dev `tokenId` should be obtained with `nextTokenId` method,604	///  unlike standard, you can't specify it manually605	/// @param to The new owner606	/// @param tokenId ID of the minted RFT607	#[solidity(hide, rename_selector = "mint")]608	#[weight(<SelfWeightOf<T>>::create_item())]609	fn mint_check_id(&mut self, caller: Caller, to: Address, token_id: U256) -> Result<bool> {610		let caller = T::CrossAccountId::from_eth(caller);611		let to = T::CrossAccountId::from_eth(to);612		let token_id: u32 = token_id.try_into()?;613		let budget = self614			.recorder615			.weight_calls_budget(<StructureWeight<T>>::find_parent());616617		if <TokensMinted<T>>::get(self.id)618			.checked_add(1)619			.ok_or("item id overflow")?620			!= token_id621		{622			return Err("item id should be next".into());623		}624625		let users = [(to.clone(), 1)]626			.into_iter()627			.collect::<BTreeMap<_, _>>()628			.try_into()629			.unwrap();630		<Pallet<T>>::create_item(631			self,632			&caller,633			CreateItemData::<T> {634				users,635				properties: CollectionPropertiesVec::default(),636			},637			&budget,638		)639		.map_err(dispatch_to_evm::<T>)?;640641		Ok(true)642	}643644	/// @notice Function to mint token with the given tokenUri.645	/// @param to The new owner646	/// @param tokenUri Token URI that would be stored in the NFT properties647	/// @return uint256 The id of the newly minted token648	#[solidity(rename_selector = "mintWithTokenURI")]649	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]650	fn mint_with_token_uri(651		&mut self,652		caller: Caller,653		to: Address,654		token_uri: String,655	) -> Result<U256> {656		let token_id: U256 = <TokensMinted<T>>::get(self.id)657			.checked_add(1)658			.ok_or("item id overflow")?659			.into();660		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;661		Ok(token_id)662	}663664	/// @notice Function to mint token with the given tokenUri.665	/// @dev `tokenId` should be obtained with `nextTokenId` method,666	///  unlike standard, you can't specify it manually667	/// @param to The new owner668	/// @param tokenId ID of the minted RFT669	/// @param tokenUri Token URI that would be stored in the RFT properties670	#[solidity(hide, rename_selector = "mintWithTokenURI")]671	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]672	fn mint_with_token_uri_check_id(673		&mut self,674		caller: Caller,675		to: Address,676		token_id: U256,677		token_uri: String,678	) -> Result<bool> {679		let key = key::url();680		let permission = get_token_permission::<T>(self.id, &key)?;681		if !permission.collection_admin {682			return Err("Operation is not allowed".into());683		}684685		let caller = T::CrossAccountId::from_eth(caller);686		let to = T::CrossAccountId::from_eth(to);687		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;688		let budget = self689			.recorder690			.weight_calls_budget(<StructureWeight<T>>::find_parent());691692		if <TokensMinted<T>>::get(self.id)693			.checked_add(1)694			.ok_or("item id overflow")?695			!= token_id696		{697			return Err("item id should be next".into());698		}699700		let mut properties = CollectionPropertiesVec::default();701		properties702			.try_push(Property {703				key,704				value: token_uri705					.into_bytes()706					.try_into()707					.map_err(|_| "token uri is too long")?,708			})709			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;710711		let users = [(to.clone(), 1)]712			.into_iter()713			.collect::<BTreeMap<_, _>>()714			.try_into()715			.unwrap();716		<Pallet<T>>::create_item(717			self,718			&caller,719			CreateItemData::<T> { users, properties },720			&budget,721		)722		.map_err(dispatch_to_evm::<T>)?;723		Ok(true)724	}725}726727fn get_token_property<T: Config>(728	collection: &CollectionHandle<T>,729	token_id: u32,730	key: &up_data_structs::PropertyKey,731) -> Result<String> {732	collection.consume_store_reads(1)?;733	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))734		.map_err(|_| Error::Revert("Token properties not found".into()))?;735	if let Some(property) = properties.get(key) {736		return Ok(String::from_utf8_lossy(property).into());737	}738739	Err("Property tokenURI not found".into())740}741742fn get_token_permission<T: Config>(743	collection_id: CollectionId,744	key: &PropertyKey,745) -> Result<PropertyPermission> {746	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)747		.map_err(|_| Error::Revert("No permissions for collection".into()))?;748	let a = token_property_permissions749		.get(key)750		.map(Clone::clone)751		.ok_or_else(|| {752			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();753			Error::Revert(alloc::format!("No permission for key {}", key))754		})?;755	Ok(a)756}757758/// @title Unique extensions for ERC721.759#[solidity_interface(name = ERC721UniqueExtensions, enum(derive(PreDispatch)), enum_attr(weight))]760impl<T: Config> RefungibleHandle<T>761where762	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,763{764	/// @notice A descriptive name for a collection of NFTs in this contract765	fn name(&self) -> Result<String> {766		Ok(decode_utf16(self.name.iter().copied())767			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))768			.collect::<String>())769	}770771	/// @notice An abbreviated name for NFTs in this contract772	fn symbol(&self) -> Result<String> {773		Ok(String::from_utf8_lossy(&self.token_prefix).into())774	}775776	/// @notice A description for the collection.777	fn description(&self) -> Result<String> {778		Ok(decode_utf16(self.description.iter().copied())779			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))780			.collect::<String>())781	}782783	/// Returns the owner (in cross format) of the token.784	///785	/// @param tokenId Id for the token.786	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {787		Self::token_owner(&self, token_id.try_into()?)788			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))789			.or_else(|err| match err {790				TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),791				TokenOwnerError::MultipleOwners => Ok(eth::CrossAddress::from_eth(792					ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,793				)),794			})795	}796797	/// @notice Count all RFTs assigned to an owner798	/// @dev RFTs assigned to the zero address are considered invalid, and this799	///  function throws for queries about the zero address.800	/// @param owner An cross address for whom to query the balance801	/// @return The number of RFTs owned by `owner`, possibly zero802	fn cross_balance_of(&self, owner: eth::CrossAddress) -> Result<U256> {803		self.consume_store_reads(1)?;804		let balance = <AccountBalance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));805		Ok(balance.into())806	}807808	/// Returns the token properties.809	///810	/// @param tokenId Id for the token.811	/// @param keys Properties keys. Empty keys for all propertyes.812	/// @return Vector of properties key/value pairs.813	fn properties(&self, token_id: U256, keys: Vec<String>) -> Result<Vec<eth::Property>> {814		let keys = keys815			.into_iter()816			.map(|key| {817				<Vec<u8>>::from(key)818					.try_into()819					.map_err(|_| Error::Revert("key too large".into()))820			})821			.collect::<Result<Vec<_>>>()?;822823		<Self as CommonCollectionOperations<T>>::token_properties(824			&self,825			token_id.try_into()?,826			if keys.is_empty() { None } else { Some(keys) },827		)828		.into_iter()829		.map(eth::Property::try_from)830		.collect::<Result<Vec<_>>>()831	}832	/// @notice Transfer ownership of an RFT833	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`834	///  is the zero address. Throws if `tokenId` is not a valid RFT.835	///  Throws if RFT pieces have multiple owners.836	/// @param to The new owner837	/// @param tokenId The RFT to transfer838	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]839	fn transfer(&mut self, caller: Caller, to: Address, token_id: U256) -> Result<()> {840		let caller = T::CrossAccountId::from_eth(caller);841		let to = T::CrossAccountId::from_eth(to);842		let token = token_id.try_into()?;843		let budget = self844			.recorder845			.weight_calls_budget(<StructureWeight<T>>::find_parent());846847		let balance = balance(self, token, &caller)?;848		ensure_single_owner(self, token, balance)?;849850		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)851			.map_err(dispatch_to_evm::<T>)?;852		Ok(())853	}854855	/// @notice Transfer ownership of an RFT856	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`857	///  is the zero address. Throws if `tokenId` is not a valid RFT.858	///  Throws if RFT pieces have multiple owners.859	/// @param to The new owner860	/// @param tokenId The RFT to transfer861	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]862	fn transfer_cross(863		&mut self,864		caller: Caller,865		to: eth::CrossAddress,866		token_id: U256,867	) -> Result<()> {868		let caller = T::CrossAccountId::from_eth(caller);869		let to = to.into_sub_cross_account::<T>()?;870		let token = token_id.try_into()?;871		let budget = self872			.recorder873			.weight_calls_budget(<StructureWeight<T>>::find_parent());874875		let balance = balance(self, token, &caller)?;876		ensure_single_owner(self, token, balance)?;877878		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)879			.map_err(dispatch_to_evm::<T>)?;880		Ok(())881	}882883	/// @notice Transfer ownership of an RFT884	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`885	///  is the zero address. Throws if `tokenId` is not a valid RFT.886	///  Throws if RFT pieces have multiple owners.887	/// @param to The new owner888	/// @param tokenId The RFT to transfer889	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]890	fn transfer_from_cross(891		&mut self,892		caller: Caller,893		from: eth::CrossAddress,894		to: eth::CrossAddress,895		token_id: U256,896	) -> Result<()> {897		let caller = T::CrossAccountId::from_eth(caller);898		let from = from.into_sub_cross_account::<T>()?;899		let to = to.into_sub_cross_account::<T>()?;900		let token_id = token_id.try_into()?;901		let budget = self902			.recorder903			.weight_calls_budget(<StructureWeight<T>>::find_parent());904905		let balance = balance(self, token_id, &from)?;906		ensure_single_owner(self, token_id, balance)?;907908		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)909			.map_err(dispatch_to_evm::<T>)?;910		Ok(())911	}912913	/// @notice Burns a specific ERC721 token.914	/// @dev Throws unless `msg.sender` is the current owner or an authorized915	///  operator for this RFT. Throws if `from` is not the current owner. Throws916	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.917	///  Throws if RFT pieces have multiple owners.918	/// @param from The current owner of the RFT919	/// @param tokenId The RFT to transfer920	#[solidity(hide)]921	#[weight(<SelfWeightOf<T>>::burn_from())]922	fn burn_from(&mut self, caller: Caller, from: Address, token_id: U256) -> Result<()> {923		let caller = T::CrossAccountId::from_eth(caller);924		let from = T::CrossAccountId::from_eth(from);925		let token = token_id.try_into()?;926		let budget = self927			.recorder928			.weight_calls_budget(<StructureWeight<T>>::find_parent());929930		let balance = balance(self, token, &from)?;931		ensure_single_owner(self, token, balance)?;932933		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)934			.map_err(dispatch_to_evm::<T>)?;935		Ok(())936	}937938	/// @notice Burns a specific ERC721 token.939	/// @dev Throws unless `msg.sender` is the current owner or an authorized940	///  operator for this RFT. Throws if `from` is not the current owner. Throws941	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.942	///  Throws if RFT pieces have multiple owners.943	/// @param from The current owner of the RFT944	/// @param tokenId The RFT to transfer945	#[weight(<SelfWeightOf<T>>::burn_from())]946	fn burn_from_cross(947		&mut self,948		caller: Caller,949		from: eth::CrossAddress,950		token_id: U256,951	) -> Result<()> {952		let caller = T::CrossAccountId::from_eth(caller);953		let from = from.into_sub_cross_account::<T>()?;954		let token = token_id.try_into()?;955		let budget = self956			.recorder957			.weight_calls_budget(<StructureWeight<T>>::find_parent());958959		let balance = balance(self, token, &from)?;960		ensure_single_owner(self, token, balance)?;961962		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)963			.map_err(dispatch_to_evm::<T>)?;964		Ok(())965	}966967	/// @notice Returns next free RFT ID.968	fn next_token_id(&self) -> Result<U256> {969		self.consume_store_reads(1)?;970		Ok(<TokensMinted<T>>::get(self.id)971			.checked_add(1)972			.ok_or("item id overflow")?973			.into())974	}975976	/// @notice Function to mint multiple tokens.977	/// @dev `tokenIds` should be an array of consecutive numbers and first number978	///  should be obtained with `nextTokenId` method979	/// @param to The new owner980	/// @param tokenIds IDs of the minted RFTs981	#[solidity(hide)]982	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]983	fn mint_bulk(&mut self, caller: Caller, to: Address, token_ids: Vec<U256>) -> Result<bool> {984		let caller = T::CrossAccountId::from_eth(caller);985		let to = T::CrossAccountId::from_eth(to);986		let mut expected_index = <TokensMinted<T>>::get(self.id)987			.checked_add(1)988			.ok_or("item id overflow")?;989		let budget = self990			.recorder991			.weight_calls_budget(<StructureWeight<T>>::find_parent());992993		let total_tokens = token_ids.len();994		for id in token_ids.into_iter() {995			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;996			if id != expected_index {997				return Err("item id should be next".into());998			}999			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1000		}1001		let users = [(to.clone(), 1)]1002			.into_iter()1003			.collect::<BTreeMap<_, _>>()1004			.try_into()1005			.unwrap();1006		let create_item_data = CreateItemData::<T> {1007			users,1008			properties: CollectionPropertiesVec::default(),1009		};1010		let data = (0..total_tokens)1011			.map(|_| create_item_data.clone())1012			.collect();10131014		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1015			.map_err(dispatch_to_evm::<T>)?;1016		Ok(true)1017	}10181019	/// @notice Function to mint multiple tokens with the given tokenUris.1020	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1021	///  numbers and first number should be obtained with `nextTokenId` method1022	/// @param to The new owner1023	/// @param tokens array of pairs of token ID and token URI for minted tokens1024	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1025	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32) + <SelfWeightOf<T>>::set_token_properties(tokens.len() as u32))]1026	fn mint_bulk_with_token_uri(1027		&mut self,1028		caller: Caller,1029		to: Address,1030		tokens: Vec<TokenUri>,1031	) -> Result<bool> {1032		let key = key::url();1033		let caller = T::CrossAccountId::from_eth(caller);1034		let to = T::CrossAccountId::from_eth(to);1035		let mut expected_index = <TokensMinted<T>>::get(self.id)1036			.checked_add(1)1037			.ok_or("item id overflow")?;1038		let budget = self1039			.recorder1040			.weight_calls_budget(<StructureWeight<T>>::find_parent());10411042		let mut data = Vec::with_capacity(tokens.len());1043		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1044			.into_iter()1045			.collect::<BTreeMap<_, _>>()1046			.try_into()1047			.unwrap();1048		for TokenUri { id, uri } in tokens {1049			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1050			if id != expected_index {1051				return Err("item id should be next".into());1052			}1053			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10541055			let mut properties = CollectionPropertiesVec::default();1056			properties1057				.try_push(Property {1058					key: key.clone(),1059					value: uri1060						.into_bytes()1061						.try_into()1062						.map_err(|_| "token uri is too long")?,1063				})1064				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10651066			let create_item_data = CreateItemData::<T> {1067				users: users.clone(),1068				properties,1069			};1070			data.push(create_item_data);1071		}10721073		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1074			.map_err(dispatch_to_evm::<T>)?;1075		Ok(true)1076	}10771078	/// @notice Function to mint a token.1079	/// @param to The new owner crossAccountId1080	/// @param properties Properties of minted token1081	/// @return uint256 The id of the newly minted token1082	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]1083	fn mint_cross(1084		&mut self,1085		caller: Caller,1086		to: eth::CrossAddress,1087		properties: Vec<eth::Property>,1088	) -> Result<U256> {1089		let token_id = <TokensMinted<T>>::get(self.id)1090			.checked_add(1)1091			.ok_or("item id overflow")?;10921093		let to = to.into_sub_cross_account::<T>()?;10941095		let properties = properties1096			.into_iter()1097			.map(eth::Property::try_into)1098			.collect::<Result<Vec<_>>>()?1099			.try_into()1100			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11011102		let caller = T::CrossAccountId::from_eth(caller);11031104		let budget = self1105			.recorder1106			.weight_calls_budget(<StructureWeight<T>>::find_parent());11071108		let users = [(to, 1)]1109			.into_iter()1110			.collect::<BTreeMap<_, _>>()1111			.try_into()1112			.unwrap();1113		<Pallet<T>>::create_item(1114			self,1115			&caller,1116			CreateItemData::<T> { users, properties },1117			&budget,1118		)1119		.map_err(dispatch_to_evm::<T>)?;11201121		Ok(token_id.into())1122	}11231124	/// Returns EVM address for refungible token1125	///1126	/// @param token ID of the token1127	fn token_contract_address(&self, token: U256) -> Result<Address> {1128		Ok(T::EvmTokenAddressMapping::token_to_address(1129			self.id,1130			token.try_into().map_err(|_| "token id overflow")?,1131		))1132	}11331134	/// @notice Returns collection helper contract address1135	fn collection_helper_address(&self) -> Result<Address> {1136		Ok(T::ContractAddress::get())1137	}1138}11391140#[solidity_interface(1141	name = UniqueRefungible,1142	is(1143		ERC721,1144		ERC721Enumerable,1145		ERC721UniqueExtensions,1146		ERC721UniqueMintable,1147		ERC721Burnable,1148		ERC721Metadata(if(this.flags.erc721metadata)),1149		Collection(via(common_mut returns CollectionHandle<T>)),1150		TokenProperties,1151	),1152	enum(derive(PreDispatch)),1153)]1154impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11551156// Not a tests, but code generators1157generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1158generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11591160impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1161where1162	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1163{1164	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1165	fn call(1166		self,1167		handle: &mut impl PrecompileHandle,1168	) -> Option<pallet_common::erc::PrecompileResult> {1169		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1170	}1171}
after · pallets/refungible/src/erc.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet EVM API for tokens18//!19//! Provides ERC-721 standart support implementation and EVM API for unique extensions for Refungible Pallet.20//! Method implementations are mostly doing parameter conversion and calling Refungible Pallet methods.2122extern crate alloc;2324use core::{25	char::{REPLACEMENT_CHARACTER, decode_utf16},26	convert::TryInto,27};28use evm_coder::{abi::AbiType, ToLog, generate_stubgen, solidity_interface, types::*};29use frame_support::{BoundedBTreeMap, BoundedVec};30use pallet_common::{31	CollectionHandle, CollectionPropertyPermissions, CommonCollectionOperations,32	Error as CommonError,33	erc::{CommonEvmHandler, CollectionCall, static_property::key},34	eth::{self, TokenUri},35};36use pallet_evm::{account::CrossAccountId, PrecompileHandle};37use pallet_evm_coder_substrate::{38	call, dispatch_to_evm,39	execution::{PreDispatch, Result, Error},40	frontier_contract,41};42use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};43use sp_core::{H160, U256, Get};44use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};45use up_data_structs::{46	CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,47	PropertyKeyPermission, PropertyPermission, TokenId, TokenOwnerError,48};4950use crate::{51	AccountBalance, Balance, Config, CreateItemData, Pallet, RefungibleHandle, TokenProperties,52	TokensMinted, TotalSupply, SelfWeightOf, weights::WeightInfo,53};5455frontier_contract! {56	macro_rules! RefungibleHandle_result {...}57	impl<T: Config> Contract for RefungibleHandle<T> {...}58}5960pub const ADDRESS_FOR_PARTIALLY_OWNED_TOKENS: H160 = H160::repeat_byte(0xff);6162/// Rft events.63#[derive(ToLog)]64pub enum ERC721TokenEvent {65	/// The token has been changed.66	TokenChanged {67		/// Token ID.68		#[indexed]69		token_id: U256,70	},71}7273/// @title A contract that allows to set and delete token properties and change token property permissions.74#[solidity_interface(name = TokenProperties, events(ERC721TokenEvent), enum(derive(PreDispatch)), enum_attr(weight))]75impl<T: Config> RefungibleHandle<T> {76	/// @notice Set permissions for token property.77	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.78	/// @param key Property key.79	/// @param isMutable Permission to mutate property.80	/// @param collectionAdmin Permission to mutate property by collection admin if property is mutable.81	/// @param tokenOwner Permission to mutate property by token owner if property is mutable.82	#[solidity(hide)]83	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(1))]84	fn set_token_property_permission(85		&mut self,86		caller: Caller,87		key: String,88		is_mutable: bool,89		collection_admin: bool,90		token_owner: bool,91	) -> Result<()> {92		let caller = T::CrossAccountId::from_eth(caller);93		<Pallet<T>>::set_token_property_permissions(94			self,95			&caller,96			vec![PropertyKeyPermission {97				key: <Vec<u8>>::from(key)98					.try_into()99					.map_err(|_| "too long key")?,100				permission: PropertyPermission {101					mutable: is_mutable,102					collection_admin,103					token_owner,104				},105			}],106		)107		.map_err(dispatch_to_evm::<T>)108	}109110	/// @notice Set permissions for token property.111	/// @dev Throws error if `msg.sender` is not admin or owner of the collection.112	/// @param permissions Permissions for keys.113	#[weight(<SelfWeightOf<T>>::set_token_property_permissions(permissions.len() as u32))]114	fn set_token_property_permissions(115		&mut self,116		caller: Caller,117		permissions: Vec<eth::TokenPropertyPermission>,118	) -> Result<()> {119		let caller = T::CrossAccountId::from_eth(caller);120		let perms = eth::TokenPropertyPermission::into_property_key_permissions(permissions)?;121122		<Pallet<T>>::set_token_property_permissions(self, &caller, perms)123			.map_err(dispatch_to_evm::<T>)124	}125126	/// @notice Get permissions for token properties.127	fn token_property_permissions(&self) -> Result<Vec<eth::TokenPropertyPermission>> {128		let perms = <Pallet<T>>::token_property_permission(self.id);129		Ok(perms130			.into_iter()131			.map(eth::TokenPropertyPermission::from)132			.collect())133	}134135	/// @notice Set token property value.136	/// @dev Throws error if `msg.sender` has no permission to edit the property.137	/// @param tokenId ID of the token.138	/// @param key Property key.139	/// @param value Property value.140	#[solidity(hide)]141	#[weight(<SelfWeightOf<T>>::set_token_properties(1))]142	fn set_property(143		&mut self,144		caller: Caller,145		token_id: U256,146		key: String,147		value: Bytes,148	) -> Result<()> {149		let caller = T::CrossAccountId::from_eth(caller);150		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;151		let key = <Vec<u8>>::from(key)152			.try_into()153			.map_err(|_| "key too long")?;154		let value = value.0.try_into().map_err(|_| "value too long")?;155156		let nesting_budget = self157			.recorder158			.weight_calls_budget(<StructureWeight<T>>::find_parent());159160		<Pallet<T>>::set_token_property(161			self,162			&caller,163			TokenId(token_id),164			Property { key, value },165			&nesting_budget,166		)167		.map_err(dispatch_to_evm::<T>)168	}169170	/// @notice Set token properties value.171	/// @dev Throws error if `msg.sender` has no permission to edit the property.172	/// @param tokenId ID of the token.173	/// @param properties settable properties174	#[weight(<SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]175	fn set_properties(176		&mut self,177		caller: Caller,178		token_id: U256,179		properties: Vec<eth::Property>,180	) -> Result<()> {181		let caller = T::CrossAccountId::from_eth(caller);182		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;183184		let nesting_budget = self185			.recorder186			.weight_calls_budget(<StructureWeight<T>>::find_parent());187188		let properties = properties189			.into_iter()190			.map(eth::Property::try_into)191			.collect::<Result<Vec<_>>>()?;192193		<Pallet<T>>::set_token_properties(194			self,195			&caller,196			TokenId(token_id),197			properties.into_iter(),198			false,199			&nesting_budget,200		)201		.map_err(dispatch_to_evm::<T>)202	}203204	/// @notice Delete token property value.205	/// @dev Throws error if `msg.sender` has no permission to edit the property.206	/// @param tokenId ID of the token.207	/// @param key Property key.208	#[solidity(hide)]209	#[weight(<SelfWeightOf<T>>::delete_token_properties(1))]210	fn delete_property(&mut self, token_id: U256, caller: Caller, key: String) -> Result<()> {211		let caller = T::CrossAccountId::from_eth(caller);212		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;213		let key = <Vec<u8>>::from(key)214			.try_into()215			.map_err(|_| "key too long")?;216217		let nesting_budget = self218			.recorder219			.weight_calls_budget(<StructureWeight<T>>::find_parent());220221		<Pallet<T>>::delete_token_property(self, &caller, TokenId(token_id), key, &nesting_budget)222			.map_err(dispatch_to_evm::<T>)223	}224225	/// @notice Delete token properties value.226	/// @dev Throws error if `msg.sender` has no permission to edit the property.227	/// @param tokenId ID of the token.228	/// @param keys Properties key.229	#[weight(<SelfWeightOf<T>>::delete_token_properties(keys.len() as u32))]230	fn delete_properties(231		&mut self,232		token_id: U256,233		caller: Caller,234		keys: Vec<String>,235	) -> Result<()> {236		let caller = T::CrossAccountId::from_eth(caller);237		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;238		let keys = keys239			.into_iter()240			.map(|k| Ok(<Vec<u8>>::from(k).try_into().map_err(|_| "key too long")?))241			.collect::<Result<Vec<_>>>()?;242243		let nesting_budget = self244			.recorder245			.weight_calls_budget(<StructureWeight<T>>::find_parent());246247		<Pallet<T>>::delete_token_properties(248			self,249			&caller,250			TokenId(token_id),251			keys.into_iter(),252			&nesting_budget,253		)254		.map_err(dispatch_to_evm::<T>)255	}256257	/// @notice Get token property value.258	/// @dev Throws error if key not found259	/// @param tokenId ID of the token.260	/// @param key Property key.261	/// @return Property value bytes262	fn property(&self, token_id: U256, key: String) -> Result<Bytes> {263		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;264		let key = <Vec<u8>>::from(key)265			.try_into()266			.map_err(|_| "key too long")?;267268		let props = <TokenProperties<T>>::get((self.id, token_id));269		let prop = props.get(&key).ok_or("key not found")?;270271		Ok(prop.to_vec().into())272	}273}274275#[derive(ToLog)]276pub enum ERC721Events {277	/// @dev This event emits when NFTs are created (`from` == 0) and destroyed278	///  (`to` == 0). Exception: during contract creation, any number of RFTs279	///  may be created and assigned without emitting Transfer.280	Transfer {281		#[indexed]282		from: Address,283		#[indexed]284		to: Address,285		#[indexed]286		token_id: U256,287	},288	/// @dev Not supported289	Approval {290		#[indexed]291		owner: Address,292		#[indexed]293		approved: Address,294		#[indexed]295		token_id: U256,296	},297	/// @dev Not supported298	#[allow(dead_code)]299	ApprovalForAll {300		#[indexed]301		owner: Address,302		#[indexed]303		operator: Address,304		approved: bool,305	},306}307308/// @title ERC-721 Non-Fungible Token Standard, optional metadata extension309/// @dev See https://eips.ethereum.org/EIPS/eip-721310#[solidity_interface(name = ERC721Metadata, enum(derive(PreDispatch)), expect_selector = 0x5b5e139f)]311impl<T: Config> RefungibleHandle<T>312where313	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,314{315	/// @notice A descriptive name for a collection of NFTs in this contract316	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`317	#[solidity(hide, rename_selector = "name")]318	fn name_proxy(&self) -> Result<String> {319		self.name()320	}321322	/// @notice An abbreviated name for NFTs in this contract323	/// @dev real implementation of this function lies in `ERC721UniqueExtensions`324	#[solidity(hide, rename_selector = "symbol")]325	fn symbol_proxy(&self) -> Result<String> {326		self.symbol()327	}328329	/// @notice A distinct Uniform Resource Identifier (URI) for a given asset.330	///331	/// @dev If the token has a `url` property and it is not empty, it is returned.332	///  Else If the collection does not have a property with key `schemaName` or its value is not equal to `ERC721Metadata`, it return an error `tokenURI not set`.333	///  If the collection property `baseURI` is empty or absent, return "" (empty string)334	///  otherwise, if token property `suffix` present and is non-empty, return concatenation of baseURI and suffix335	///  otherwise, return concatenation of `baseURI` and stringified token id (decimal stringifying, without paddings).336	///337	/// @return token's const_metadata338	#[solidity(rename_selector = "tokenURI")]339	fn token_uri(&self, token_id: U256) -> Result<String> {340		let token_id_u32: u32 = token_id.try_into().map_err(|_| "token id overflow")?;341342		match get_token_property(self, token_id_u32, &key::url()).as_deref() {343			Err(_) | Ok("") => (),344			Ok(url) => {345				return Ok(url.into());346			}347		};348349		let base_uri =350			pallet_common::Pallet::<T>::get_collection_property(self.id, &key::base_uri())351				.map(BoundedVec::into_inner)352				.map(String::from_utf8)353				.transpose()354				.map_err(|e| {355					Error::Revert(alloc::format!(356						"Can not convert value \"baseURI\" to string with error \"{}\"",357						e358					))359				})?;360361		let base_uri = match base_uri.as_deref() {362			None | Some("") => {363				return Ok("".into());364			}365			Some(base_uri) => base_uri.into(),366		};367368		Ok(369			match get_token_property(self, token_id_u32, &key::suffix()).as_deref() {370				Err(_) | Ok("") => base_uri,371				Ok(suffix) => base_uri + suffix,372			},373		)374	}375}376377/// @title ERC-721 Non-Fungible Token Standard, optional enumeration extension378/// @dev See https://eips.ethereum.org/EIPS/eip-721379#[solidity_interface(name = ERC721Enumerable, enum(derive(PreDispatch)), expect_selector = 0x780e9d63)]380impl<T: Config> RefungibleHandle<T> {381	/// @notice Enumerate valid RFTs382	/// @param index A counter less than `totalSupply()`383	/// @return The token identifier for the `index`th NFT,384	///  (sort order not specified)385	fn token_by_index(&self, index: U256) -> U256 {386		index387	}388389	/// Not implemented390	fn token_of_owner_by_index(&self, _owner: Address, _index: U256) -> Result<U256> {391		// TODO: Not implemetable392		Err("not implemented".into())393	}394395	/// @notice Count RFTs tracked by this contract396	/// @return A count of valid RFTs tracked by this contract, where each one of397	///  them has an assigned and queryable owner not equal to the zero address398	fn total_supply(&self) -> Result<U256> {399		self.consume_store_reads(1)?;400		Ok(<Pallet<T>>::total_supply(self).into())401	}402}403404/// @title ERC-721 Non-Fungible Token Standard405/// @dev See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md406#[solidity_interface(name = ERC721, events(ERC721Events), enum(derive(PreDispatch)), enum_attr(weight), expect_selector = 0x80ac58cd)]407impl<T: Config> RefungibleHandle<T> {408	/// @notice Count all RFTs assigned to an owner409	/// @dev RFTs assigned to the zero address are considered invalid, and this410	///  function throws for queries about the zero address.411	/// @param owner An address for whom to query the balance412	/// @return The number of RFTs owned by `owner`, possibly zero413	fn balance_of(&self, owner: Address) -> Result<U256> {414		self.consume_store_reads(1)?;415		let owner = T::CrossAccountId::from_eth(owner);416		let balance = <AccountBalance<T>>::get((self.id, owner));417		Ok(balance.into())418	}419420	/// @notice Find the owner of an RFT421	/// @dev RFTs assigned to zero address are considered invalid, and queries422	///  about them do throw.423	///  Returns special 0xffffffffffffffffffffffffffffffffffffffff address for424	///  the tokens that are partially owned.425	/// @param tokenId The identifier for an RFT426	/// @return The address of the owner of the RFT427	fn owner_of(&self, token_id: U256) -> Result<Address> {428		self.consume_store_reads(2)?;429		let token = token_id.try_into()?;430		let owner = <Pallet<T>>::token_owner(self.id, token);431		owner432			.map(|address| *address.as_eth())433			.or_else(|err| match err {434				TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),435				TokenOwnerError::MultipleOwners => Ok(ADDRESS_FOR_PARTIALLY_OWNED_TOKENS),436			})437	}438439	/// @dev Not implemented440	#[solidity(rename_selector = "safeTransferFrom")]441	fn safe_transfer_from_with_data(442		&mut self,443		_from: Address,444		_to: Address,445		_token_id: U256,446		_data: Bytes,447	) -> Result<()> {448		// TODO: Not implemetable449		Err("not implemented".into())450	}451452	/// @dev Not implemented453	#[solidity(rename_selector = "safeTransferFrom")]454	fn safe_transfer_from(&mut self, _from: Address, _to: Address, _token_id: U256) -> Result<()> {455		// TODO: Not implemetable456		Err("not implemented".into())457	}458459	/// @notice Transfer ownership of an RFT -- THE CALLER IS RESPONSIBLE460	///  TO CONFIRM THAT `to` IS CAPABLE OF RECEIVING NFTS OR ELSE461	///  THEY MAY BE PERMANENTLY LOST462	/// @dev Throws unless `msg.sender` is the current owner or an authorized463	///  operator for this RFT. Throws if `from` is not the current owner. Throws464	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.465	///  Throws if RFT pieces have multiple owners.466	/// @param from The current owner of the NFT467	/// @param to The new owner468	/// @param tokenId The NFT to transfer469	#[weight(<SelfWeightOf<T>>::transfer_from_creating_removing())]470	fn transfer_from(471		&mut self,472		caller: Caller,473		from: Address,474		to: Address,475		token_id: U256,476	) -> Result<()> {477		let caller = T::CrossAccountId::from_eth(caller);478		let from = T::CrossAccountId::from_eth(from);479		let to = T::CrossAccountId::from_eth(to);480		let token = token_id.try_into()?;481		let budget = self482			.recorder483			.weight_calls_budget(<StructureWeight<T>>::find_parent());484485		let balance = balance(&self, token, &from)?;486		ensure_single_owner(&self, token, balance)?;487488		<Pallet<T>>::transfer_from(self, &caller, &from, &to, token, balance, &budget)489			.map_err(dispatch_to_evm::<T>)?;490491		Ok(())492	}493494	/// @dev Not implemented495	fn approve(&mut self, _caller: Caller, _approved: Address, _token_id: U256) -> Result<()> {496		Err("not implemented".into())497	}498499	/// @notice Sets or unsets the approval of a given operator.500	///  The `operator` is allowed to transfer all token pieces of the `caller` on their behalf.501	/// @param operator Operator502	/// @param approved Should operator status be granted or revoked?503	#[weight(<SelfWeightOf<T>>::set_allowance_for_all())]504	fn set_approval_for_all(505		&mut self,506		caller: Caller,507		operator: Address,508		approved: bool,509	) -> Result<()> {510		let caller = T::CrossAccountId::from_eth(caller);511		let operator = T::CrossAccountId::from_eth(operator);512513		<Pallet<T>>::set_allowance_for_all(self, &caller, &operator, approved)514			.map_err(dispatch_to_evm::<T>)?;515		Ok(())516	}517518	/// @dev Not implemented519	fn get_approved(&self, _token_id: U256) -> Result<Address> {520		// TODO: Not implemetable521		Err("not implemented".into())522	}523524	/// @notice Tells whether the given `owner` approves the `operator`.525	#[weight(<SelfWeightOf<T>>::allowance_for_all())]526	fn is_approved_for_all(&self, owner: Address, operator: Address) -> Result<bool> {527		let owner = T::CrossAccountId::from_eth(owner);528		let operator = T::CrossAccountId::from_eth(operator);529530		Ok(<Pallet<T>>::allowance_for_all(self, &owner, &operator))531	}532}533534/// Returns amount of pieces of `token` that `owner` have535pub fn balance<T: Config>(536	collection: &RefungibleHandle<T>,537	token: TokenId,538	owner: &T::CrossAccountId,539) -> Result<u128> {540	collection.consume_store_reads(1)?;541	let balance = <Balance<T>>::get((collection.id, token, &owner));542	Ok(balance)543}544545/// Throws if `owner_balance` is lower than total amount of `token` pieces546pub fn ensure_single_owner<T: Config>(547	collection: &RefungibleHandle<T>,548	token: TokenId,549	owner_balance: u128,550) -> Result<()> {551	collection.consume_store_reads(1)?;552	let total_supply = <TotalSupply<T>>::get((collection.id, token));553554	if owner_balance == 0 {555		return Err(dispatch_to_evm::<T>(556			<CommonError<T>>::MustBeTokenOwner.into(),557		));558	}559560	if total_supply != owner_balance {561		return Err("token has multiple owners".into());562	}563	Ok(())564}565566/// @title ERC721 Token that can be irreversibly burned (destroyed).567#[solidity_interface(name = ERC721Burnable, enum(derive(PreDispatch)), enum_attr(weight))]568impl<T: Config> RefungibleHandle<T> {569	/// @notice Burns a specific ERC721 token.570	/// @dev Throws unless `msg.sender` is the current RFT owner, or an authorized571	///  operator of the current owner.572	/// @param tokenId The RFT to approve573	#[weight(<SelfWeightOf<T>>::burn_item_fully())]574	fn burn(&mut self, caller: Caller, token_id: U256) -> Result<()> {575		let caller = T::CrossAccountId::from_eth(caller);576		let token = token_id.try_into()?;577578		let balance = balance(&self, token, &caller)?;579		ensure_single_owner(&self, token, balance)?;580581		<Pallet<T>>::burn(self, &caller, token, balance).map_err(dispatch_to_evm::<T>)?;582		Ok(())583	}584}585586/// @title ERC721 minting logic.587#[solidity_interface(name = ERC721UniqueMintable, enum(derive(PreDispatch)), enum_attr(weight))]588impl<T: Config> RefungibleHandle<T> {589	/// @notice Function to mint a token.590	/// @param to The new owner591	/// @return uint256 The id of the newly minted token592	#[weight(<SelfWeightOf<T>>::create_item())]593	fn mint(&mut self, caller: Caller, to: Address) -> Result<U256> {594		let token_id: U256 = <TokensMinted<T>>::get(self.id)595			.checked_add(1)596			.ok_or("item id overflow")?597			.into();598		self.mint_check_id(caller, to, token_id)?;599		Ok(token_id)600	}601602	/// @notice Function to mint a token.603	/// @dev `tokenId` should be obtained with `nextTokenId` method,604	///  unlike standard, you can't specify it manually605	/// @param to The new owner606	/// @param tokenId ID of the minted RFT607	#[solidity(hide, rename_selector = "mint")]608	#[weight(<SelfWeightOf<T>>::create_item())]609	fn mint_check_id(&mut self, caller: Caller, to: Address, token_id: U256) -> Result<bool> {610		let caller = T::CrossAccountId::from_eth(caller);611		let to = T::CrossAccountId::from_eth(to);612		let token_id: u32 = token_id.try_into()?;613		let budget = self614			.recorder615			.weight_calls_budget(<StructureWeight<T>>::find_parent());616617		if <TokensMinted<T>>::get(self.id)618			.checked_add(1)619			.ok_or("item id overflow")?620			!= token_id621		{622			return Err("item id should be next".into());623		}624625		let users = [(to.clone(), 1)]626			.into_iter()627			.collect::<BTreeMap<_, _>>()628			.try_into()629			.unwrap();630		<Pallet<T>>::create_item(631			self,632			&caller,633			CreateItemData::<T> {634				users,635				properties: CollectionPropertiesVec::default(),636			},637			&budget,638		)639		.map_err(dispatch_to_evm::<T>)?;640641		Ok(true)642	}643644	/// @notice Function to mint token with the given tokenUri.645	/// @param to The new owner646	/// @param tokenUri Token URI that would be stored in the NFT properties647	/// @return uint256 The id of the newly minted token648	#[solidity(rename_selector = "mintWithTokenURI")]649	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]650	fn mint_with_token_uri(651		&mut self,652		caller: Caller,653		to: Address,654		token_uri: String,655	) -> Result<U256> {656		let token_id: U256 = <TokensMinted<T>>::get(self.id)657			.checked_add(1)658			.ok_or("item id overflow")?659			.into();660		self.mint_with_token_uri_check_id(caller, to, token_id, token_uri)?;661		Ok(token_id)662	}663664	/// @notice Function to mint token with the given tokenUri.665	/// @dev `tokenId` should be obtained with `nextTokenId` method,666	///  unlike standard, you can't specify it manually667	/// @param to The new owner668	/// @param tokenId ID of the minted RFT669	/// @param tokenUri Token URI that would be stored in the RFT properties670	#[solidity(hide, rename_selector = "mintWithTokenURI")]671	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(1))]672	fn mint_with_token_uri_check_id(673		&mut self,674		caller: Caller,675		to: Address,676		token_id: U256,677		token_uri: String,678	) -> Result<bool> {679		let key = key::url();680		let permission = get_token_permission::<T>(self.id, &key)?;681		if !permission.collection_admin {682			return Err("Operation is not allowed".into());683		}684685		let caller = T::CrossAccountId::from_eth(caller);686		let to = T::CrossAccountId::from_eth(to);687		let token_id: u32 = token_id.try_into().map_err(|_| "amount overflow")?;688		let budget = self689			.recorder690			.weight_calls_budget(<StructureWeight<T>>::find_parent());691692		if <TokensMinted<T>>::get(self.id)693			.checked_add(1)694			.ok_or("item id overflow")?695			!= token_id696		{697			return Err("item id should be next".into());698		}699700		let mut properties = CollectionPropertiesVec::default();701		properties702			.try_push(Property {703				key,704				value: token_uri705					.into_bytes()706					.try_into()707					.map_err(|_| "token uri is too long")?,708			})709			.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;710711		let users = [(to.clone(), 1)]712			.into_iter()713			.collect::<BTreeMap<_, _>>()714			.try_into()715			.unwrap();716		<Pallet<T>>::create_item(717			self,718			&caller,719			CreateItemData::<T> { users, properties },720			&budget,721		)722		.map_err(dispatch_to_evm::<T>)?;723		Ok(true)724	}725}726727fn get_token_property<T: Config>(728	collection: &CollectionHandle<T>,729	token_id: u32,730	key: &up_data_structs::PropertyKey,731) -> Result<String> {732	collection.consume_store_reads(1)?;733	let properties = <TokenProperties<T>>::try_get((collection.id, token_id))734		.map_err(|_| Error::Revert("Token properties not found".into()))?;735	if let Some(property) = properties.get(key) {736		return Ok(String::from_utf8_lossy(property).into());737	}738739	Err("Property tokenURI not found".into())740}741742fn get_token_permission<T: Config>(743	collection_id: CollectionId,744	key: &PropertyKey,745) -> Result<PropertyPermission> {746	let token_property_permissions = CollectionPropertyPermissions::<T>::try_get(collection_id)747		.map_err(|_| Error::Revert("No permissions for collection".into()))?;748	let a = token_property_permissions749		.get(key)750		.map(Clone::clone)751		.ok_or_else(|| {752			let key = String::from_utf8(key.clone().into_inner()).unwrap_or_default();753			Error::Revert(alloc::format!("No permission for key {}", key))754		})?;755	Ok(a)756}757758/// @title Unique extensions for ERC721.759#[solidity_interface(name = ERC721UniqueExtensions, enum(derive(PreDispatch)), enum_attr(weight))]760impl<T: Config> RefungibleHandle<T>761where762	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,763{764	/// @notice A descriptive name for a collection of NFTs in this contract765	fn name(&self) -> Result<String> {766		Ok(decode_utf16(self.name.iter().copied())767			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))768			.collect::<String>())769	}770771	/// @notice An abbreviated name for NFTs in this contract772	fn symbol(&self) -> Result<String> {773		Ok(String::from_utf8_lossy(&self.token_prefix).into())774	}775776	/// @notice A description for the collection.777	fn description(&self) -> Result<String> {778		Ok(decode_utf16(self.description.iter().copied())779			.map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))780			.collect::<String>())781	}782783	/// Returns the owner (in cross format) of the token.784	///785	/// @param tokenId Id for the token.786	#[solidity(hide)]787	fn cross_owner_of(&self, token_id: U256) -> Result<eth::CrossAddress> {788		Self::owner_of_cross(&self, token_id)789	}790791	/// Returns the owner (in cross format) of the token.792	///793	/// @param tokenId Id for the token.794	fn owner_of_cross(&self, token_id: U256) -> Result<eth::CrossAddress> {795		Self::token_owner(&self, token_id.try_into()?)796			.map(|o| eth::CrossAddress::from_sub_cross_account::<T>(&o))797			.or_else(|err| match err {798				TokenOwnerError::NotFound => Err(Error::Revert("token not found".into())),799				TokenOwnerError::MultipleOwners => Ok(eth::CrossAddress::from_eth(800					ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,801				)),802			})803	}804805	/// @notice Count all RFTs assigned to an owner806	/// @param owner An cross address for whom to query the balance807	/// @return The number of RFTs owned by `owner`, possibly zero808	fn balance_of_cross(&self, owner: eth::CrossAddress) -> Result<U256> {809		self.consume_store_reads(1)?;810		let balance = <AccountBalance<T>>::get((self.id, owner.into_sub_cross_account::<T>()?));811		Ok(balance.into())812	}813814	/// Returns the token properties.815	///816	/// @param tokenId Id for the token.817	/// @param keys Properties keys. Empty keys for all propertyes.818	/// @return Vector of properties key/value pairs.819	fn properties(&self, token_id: U256, keys: Vec<String>) -> Result<Vec<eth::Property>> {820		let keys = keys821			.into_iter()822			.map(|key| {823				<Vec<u8>>::from(key)824					.try_into()825					.map_err(|_| Error::Revert("key too large".into()))826			})827			.collect::<Result<Vec<_>>>()?;828829		<Self as CommonCollectionOperations<T>>::token_properties(830			&self,831			token_id.try_into()?,832			if keys.is_empty() { None } else { Some(keys) },833		)834		.into_iter()835		.map(eth::Property::try_from)836		.collect::<Result<Vec<_>>>()837	}838	/// @notice Transfer ownership of an RFT839	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`840	///  is the zero address. Throws if `tokenId` is not a valid RFT.841	///  Throws if RFT pieces have multiple owners.842	/// @param to The new owner843	/// @param tokenId The RFT to transfer844	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]845	fn transfer(&mut self, caller: Caller, to: Address, token_id: U256) -> Result<()> {846		let caller = T::CrossAccountId::from_eth(caller);847		let to = T::CrossAccountId::from_eth(to);848		let token = token_id.try_into()?;849		let budget = self850			.recorder851			.weight_calls_budget(<StructureWeight<T>>::find_parent());852853		let balance = balance(self, token, &caller)?;854		ensure_single_owner(self, token, balance)?;855856		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)857			.map_err(dispatch_to_evm::<T>)?;858		Ok(())859	}860861	/// @notice Transfer ownership of an RFT862	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`863	///  is the zero address. Throws if `tokenId` is not a valid RFT.864	///  Throws if RFT pieces have multiple owners.865	/// @param to The new owner866	/// @param tokenId The RFT to transfer867	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]868	fn transfer_cross(869		&mut self,870		caller: Caller,871		to: eth::CrossAddress,872		token_id: U256,873	) -> Result<()> {874		let caller = T::CrossAccountId::from_eth(caller);875		let to = to.into_sub_cross_account::<T>()?;876		let token = token_id.try_into()?;877		let budget = self878			.recorder879			.weight_calls_budget(<StructureWeight<T>>::find_parent());880881		let balance = balance(self, token, &caller)?;882		ensure_single_owner(self, token, balance)?;883884		<Pallet<T>>::transfer(self, &caller, &to, token, balance, &budget)885			.map_err(dispatch_to_evm::<T>)?;886		Ok(())887	}888889	/// @notice Transfer ownership of an RFT890	/// @dev Throws unless `msg.sender` is the current owner. Throws if `to`891	///  is the zero address. Throws if `tokenId` is not a valid RFT.892	///  Throws if RFT pieces have multiple owners.893	/// @param to The new owner894	/// @param tokenId The RFT to transfer895	#[weight(<SelfWeightOf<T>>::transfer_creating_removing())]896	fn transfer_from_cross(897		&mut self,898		caller: Caller,899		from: eth::CrossAddress,900		to: eth::CrossAddress,901		token_id: U256,902	) -> Result<()> {903		let caller = T::CrossAccountId::from_eth(caller);904		let from = from.into_sub_cross_account::<T>()?;905		let to = to.into_sub_cross_account::<T>()?;906		let token_id = token_id.try_into()?;907		let budget = self908			.recorder909			.weight_calls_budget(<StructureWeight<T>>::find_parent());910911		let balance = balance(self, token_id, &from)?;912		ensure_single_owner(self, token_id, balance)?;913914		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)915			.map_err(dispatch_to_evm::<T>)?;916		Ok(())917	}918919	/// @notice Burns a specific ERC721 token.920	/// @dev Throws unless `msg.sender` is the current owner or an authorized921	///  operator for this RFT. Throws if `from` is not the current owner. Throws922	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.923	///  Throws if RFT pieces have multiple owners.924	/// @param from The current owner of the RFT925	/// @param tokenId The RFT to transfer926	#[solidity(hide)]927	#[weight(<SelfWeightOf<T>>::burn_from())]928	fn burn_from(&mut self, caller: Caller, from: Address, token_id: U256) -> Result<()> {929		let caller = T::CrossAccountId::from_eth(caller);930		let from = T::CrossAccountId::from_eth(from);931		let token = token_id.try_into()?;932		let budget = self933			.recorder934			.weight_calls_budget(<StructureWeight<T>>::find_parent());935936		let balance = balance(self, token, &from)?;937		ensure_single_owner(self, token, balance)?;938939		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)940			.map_err(dispatch_to_evm::<T>)?;941		Ok(())942	}943944	/// @notice Burns a specific ERC721 token.945	/// @dev Throws unless `msg.sender` is the current owner or an authorized946	///  operator for this RFT. Throws if `from` is not the current owner. Throws947	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.948	///  Throws if RFT pieces have multiple owners.949	/// @param from The current owner of the RFT950	/// @param tokenId The RFT to transfer951	#[weight(<SelfWeightOf<T>>::burn_from())]952	fn burn_from_cross(953		&mut self,954		caller: Caller,955		from: eth::CrossAddress,956		token_id: U256,957	) -> Result<()> {958		let caller = T::CrossAccountId::from_eth(caller);959		let from = from.into_sub_cross_account::<T>()?;960		let token = token_id.try_into()?;961		let budget = self962			.recorder963			.weight_calls_budget(<StructureWeight<T>>::find_parent());964965		let balance = balance(self, token, &from)?;966		ensure_single_owner(self, token, balance)?;967968		<Pallet<T>>::burn_from(self, &caller, &from, token, balance, &budget)969			.map_err(dispatch_to_evm::<T>)?;970		Ok(())971	}972973	/// @notice Returns next free RFT ID.974	fn next_token_id(&self) -> Result<U256> {975		self.consume_store_reads(1)?;976		Ok(<TokensMinted<T>>::get(self.id)977			.checked_add(1)978			.ok_or("item id overflow")?979			.into())980	}981982	/// @notice Function to mint multiple tokens.983	/// @dev `tokenIds` should be an array of consecutive numbers and first number984	///  should be obtained with `nextTokenId` method985	/// @param to The new owner986	/// @param tokenIds IDs of the minted RFTs987	#[solidity(hide)]988	#[weight(<SelfWeightOf<T>>::create_multiple_items(token_ids.len() as u32))]989	fn mint_bulk(&mut self, caller: Caller, to: Address, token_ids: Vec<U256>) -> Result<bool> {990		let caller = T::CrossAccountId::from_eth(caller);991		let to = T::CrossAccountId::from_eth(to);992		let mut expected_index = <TokensMinted<T>>::get(self.id)993			.checked_add(1)994			.ok_or("item id overflow")?;995		let budget = self996			.recorder997			.weight_calls_budget(<StructureWeight<T>>::find_parent());998999		let total_tokens = token_ids.len();1000		for id in token_ids.into_iter() {1001			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1002			if id != expected_index {1003				return Err("item id should be next".into());1004			}1005			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;1006		}1007		let users = [(to.clone(), 1)]1008			.into_iter()1009			.collect::<BTreeMap<_, _>>()1010			.try_into()1011			.unwrap();1012		let create_item_data = CreateItemData::<T> {1013			users,1014			properties: CollectionPropertiesVec::default(),1015		};1016		let data = (0..total_tokens)1017			.map(|_| create_item_data.clone())1018			.collect();10191020		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1021			.map_err(dispatch_to_evm::<T>)?;1022		Ok(true)1023	}10241025	/// @notice Function to mint multiple tokens with the given tokenUris.1026	/// @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive1027	///  numbers and first number should be obtained with `nextTokenId` method1028	/// @param to The new owner1029	/// @param tokens array of pairs of token ID and token URI for minted tokens1030	#[solidity(hide, rename_selector = "mintBulkWithTokenURI")]1031	#[weight(<SelfWeightOf<T>>::create_multiple_items(tokens.len() as u32) + <SelfWeightOf<T>>::set_token_properties(tokens.len() as u32))]1032	fn mint_bulk_with_token_uri(1033		&mut self,1034		caller: Caller,1035		to: Address,1036		tokens: Vec<TokenUri>,1037	) -> Result<bool> {1038		let key = key::url();1039		let caller = T::CrossAccountId::from_eth(caller);1040		let to = T::CrossAccountId::from_eth(to);1041		let mut expected_index = <TokensMinted<T>>::get(self.id)1042			.checked_add(1)1043			.ok_or("item id overflow")?;1044		let budget = self1045			.recorder1046			.weight_calls_budget(<StructureWeight<T>>::find_parent());10471048		let mut data = Vec::with_capacity(tokens.len());1049		let users: BoundedBTreeMap<_, _, _> = [(to.clone(), 1)]1050			.into_iter()1051			.collect::<BTreeMap<_, _>>()1052			.try_into()1053			.unwrap();1054		for TokenUri { id, uri } in tokens {1055			let id: u32 = id.try_into().map_err(|_| "token id overflow")?;1056			if id != expected_index {1057				return Err("item id should be next".into());1058			}1059			expected_index = expected_index.checked_add(1).ok_or("item id overflow")?;10601061			let mut properties = CollectionPropertiesVec::default();1062			properties1063				.try_push(Property {1064					key: key.clone(),1065					value: uri1066						.into_bytes()1067						.try_into()1068						.map_err(|_| "token uri is too long")?,1069				})1070				.map_err(|e| Error::Revert(alloc::format!("Can't add property: {:?}", e)))?;10711072			let create_item_data = CreateItemData::<T> {1073				users: users.clone(),1074				properties,1075			};1076			data.push(create_item_data);1077		}10781079		<Pallet<T>>::create_multiple_items(self, &caller, data, &budget)1080			.map_err(dispatch_to_evm::<T>)?;1081		Ok(true)1082	}10831084	/// @notice Function to mint a token.1085	/// @param to The new owner crossAccountId1086	/// @param properties Properties of minted token1087	/// @return uint256 The id of the newly minted token1088	#[weight(<SelfWeightOf<T>>::create_item() + <SelfWeightOf<T>>::set_token_properties(properties.len() as u32))]1089	fn mint_cross(1090		&mut self,1091		caller: Caller,1092		to: eth::CrossAddress,1093		properties: Vec<eth::Property>,1094	) -> Result<U256> {1095		let token_id = <TokensMinted<T>>::get(self.id)1096			.checked_add(1)1097			.ok_or("item id overflow")?;10981099		let to = to.into_sub_cross_account::<T>()?;11001101		let properties = properties1102			.into_iter()1103			.map(eth::Property::try_into)1104			.collect::<Result<Vec<_>>>()?1105			.try_into()1106			.map_err(|_| Error::Revert(alloc::format!("too many properties")))?;11071108		let caller = T::CrossAccountId::from_eth(caller);11091110		let budget = self1111			.recorder1112			.weight_calls_budget(<StructureWeight<T>>::find_parent());11131114		let users = [(to, 1)]1115			.into_iter()1116			.collect::<BTreeMap<_, _>>()1117			.try_into()1118			.unwrap();1119		<Pallet<T>>::create_item(1120			self,1121			&caller,1122			CreateItemData::<T> { users, properties },1123			&budget,1124		)1125		.map_err(dispatch_to_evm::<T>)?;11261127		Ok(token_id.into())1128	}11291130	/// Returns EVM address for refungible token1131	///1132	/// @param token ID of the token1133	fn token_contract_address(&self, token: U256) -> Result<Address> {1134		Ok(T::EvmTokenAddressMapping::token_to_address(1135			self.id,1136			token.try_into().map_err(|_| "token id overflow")?,1137		))1138	}11391140	/// @notice Returns collection helper contract address1141	fn collection_helper_address(&self) -> Result<Address> {1142		Ok(T::ContractAddress::get())1143	}1144}11451146#[solidity_interface(1147	name = UniqueRefungible,1148	is(1149		ERC721,1150		ERC721Enumerable,1151		ERC721UniqueExtensions,1152		ERC721UniqueMintable,1153		ERC721Burnable,1154		ERC721Metadata(if(this.flags.erc721metadata)),1155		Collection(via(common_mut returns CollectionHandle<T>)),1156		TokenProperties,1157	),1158	enum(derive(PreDispatch)),1159)]1160impl<T: Config> RefungibleHandle<T> where T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]> {}11611162// Not a tests, but code generators1163generate_stubgen!(gen_impl, UniqueRefungibleCall<()>, true);1164generate_stubgen!(gen_iface, UniqueRefungibleCall<()>, false);11651166impl<T: Config> CommonEvmHandler for RefungibleHandle<T>1167where1168	T::AccountId: From<[u8; 32]> + AsRef<[u8; 32]>,1169{1170	const CODE: &'static [u8] = include_bytes!("./stubs/UniqueRefungible.raw");1171	fn call(1172		self,1173		handle: &mut impl PrecompileHandle,1174	) -> Option<pallet_common::erc::PrecompileResult> {1175		call::<T, UniqueRefungibleCall<T>, _, _>(handle, self)1176	}1177}
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
@@ -774,7 +774,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x9780edce
+/// @dev the ERC-165 identifier for this interface is 0x95c0f66c
 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,
@@ -803,12 +803,24 @@
 		return "";
 	}
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @param tokenId Id for the token.
+	// /// @dev EVM selector for this function is: 0x2b29dace,
+	// ///  or in textual repr: crossOwnerOf(uint256)
+	// function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	dummy;
+	// 	return CrossAddress(0x0000000000000000000000000000000000000000,0);
+	// }
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	/// @dev EVM selector for this function is: 0x2b29dace,
-	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) public view returns (CrossAddress memory) {
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) public view returns (CrossAddress memory) {
 		require(false, stub_error);
 		tokenId;
 		dummy;
@@ -816,13 +828,11 @@
 	}
 
 	/// @notice Count all RFTs assigned to an owner
-	/// @dev RFTs assigned to the zero address are considered invalid, and this
-	///  function throws for queries about the zero address.
 	/// @param owner An cross address for whom to query the balance
 	/// @return The number of RFTs owned by `owner`, possibly zero
-	/// @dev EVM selector for this function is: 0x24e52cea,
-	///  or in textual repr: crossBalanceOf((address,uint256))
-	function crossBalanceOf(CrossAddress memory owner) public view returns (uint256) {
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) public view returns (uint256) {
 		require(false, stub_error);
 		owner;
 		dummy;
modifiedruntime/common/ethereum/sponsoring/refungible.rsdiffbeforeafterboth
--- a/runtime/common/ethereum/sponsoring/refungible.rs
+++ b/runtime/common/ethereum/sponsoring/refungible.rs
@@ -227,7 +227,8 @@
 			| Symbol
 			| Description
 			| CrossOwnerOf { .. }
-			| CrossBalanceOf { .. }
+			| OwnerOfCross { .. }
+			| BalanceOfCross { .. }
 			| Properties { .. }
 			| NextTokenId
 			| TokenContractAddress { .. }
modifiedtests/src/eth/abi/nonFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/nonFungible.json
+++ b/tests/src/eth/abi/nonFungible.json
@@ -177,6 +177,23 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
     "name": "burn",
@@ -381,42 +398,6 @@
     "inputs": [],
     "name": "contractAddress",
     "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
-        ],
-        "internalType": "struct CrossAddress",
-        "name": "owner",
-        "type": "tuple"
-      }
-    ],
-    "name": "crossBalanceOf",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
-    ],
-    "name": "crossOwnerOf",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
-        ],
-        "internalType": "struct CrossAddress",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
     "stateMutability": "view",
     "type": "function"
   },
@@ -557,6 +538,25 @@
   },
   {
     "inputs": [
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "ownerOfCross",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
modifiedtests/src/eth/abi/reFungible.jsondiffbeforeafterboth
--- a/tests/src/eth/abi/reFungible.json
+++ b/tests/src/eth/abi/reFungible.json
@@ -159,6 +159,23 @@
   },
   {
     "inputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "owner",
+        "type": "tuple"
+      }
+    ],
+    "name": "balanceOfCross",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
     ],
     "name": "burn",
@@ -368,25 +385,6 @@
   },
   {
     "inputs": [
-      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
-    ],
-    "name": "crossOwnerOf",
-    "outputs": [
-      {
-        "components": [
-          { "internalType": "address", "name": "eth", "type": "address" },
-          { "internalType": "uint256", "name": "sub", "type": "uint256" }
-        ],
-        "internalType": "struct CrossAddress",
-        "name": "",
-        "type": "tuple"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
     "name": "deleteCollectionProperties",
@@ -522,6 +520,25 @@
   },
   {
     "inputs": [
+      { "internalType": "uint256", "name": "tokenId", "type": "uint256" }
+    ],
+    "name": "ownerOfCross",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "address", "name": "eth", "type": "address" },
+          { "internalType": "uint256", "name": "sub", "type": "uint256" }
+        ],
+        "internalType": "struct CrossAddress",
+        "name": "",
+        "type": "tuple"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
       { "internalType": "uint256", "name": "tokenId", "type": "uint256" },
       { "internalType": "string[]", "name": "keys", "type": "string[]" }
     ],
modifiedtests/src/eth/api/UniqueNFT.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -533,7 +533,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x323b1db8
+/// @dev the ERC-165 identifier for this interface is 0x307b061a
 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,
@@ -550,21 +550,26 @@
 	///  or in textual repr: description()
 	function description() external view returns (string memory);
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @param tokenId Id for the token.
+	// /// @dev EVM selector for this function is: 0x2b29dace,
+	// ///  or in textual repr: crossOwnerOf(uint256)
+	// function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	/// @dev EVM selector for this function is: 0x2b29dace,
-	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) external view returns (CrossAddress memory);
 
 	/// @notice Count all NFTs assigned to an owner
-	/// @dev NFTs assigned to the zero address are considered invalid, and this
-	///  function throws for queries about the zero address.
 	/// @param owner An cross address for whom to query the balance
 	/// @return The number of NFTs owned by `owner`, possibly zero
-	/// @dev EVM selector for this function is: 0x24e52cea,
-	///  or in textual repr: crossBalanceOf((address,uint256))
-	function crossBalanceOf(CrossAddress memory owner) external view returns (uint256);
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
 
 	/// Returns the token properties.
 	///
modifiedtests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth
--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -533,7 +533,7 @@
 }
 
 /// @title Unique extensions for ERC721.
-/// @dev the ERC-165 identifier for this interface is 0x9780edce
+/// @dev the ERC-165 identifier for this interface is 0x95c0f66c
 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,
@@ -550,21 +550,26 @@
 	///  or in textual repr: description()
 	function description() external view returns (string memory);
 
+	// /// Returns the owner (in cross format) of the token.
+	// ///
+	// /// @param tokenId Id for the token.
+	// /// @dev EVM selector for this function is: 0x2b29dace,
+	// ///  or in textual repr: crossOwnerOf(uint256)
+	// function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
+
 	/// Returns the owner (in cross format) of the token.
 	///
 	/// @param tokenId Id for the token.
-	/// @dev EVM selector for this function is: 0x2b29dace,
-	///  or in textual repr: crossOwnerOf(uint256)
-	function crossOwnerOf(uint256 tokenId) external view returns (CrossAddress memory);
+	/// @dev EVM selector for this function is: 0xcaa3a4d0,
+	///  or in textual repr: ownerOfCross(uint256)
+	function ownerOfCross(uint256 tokenId) external view returns (CrossAddress memory);
 
 	/// @notice Count all RFTs assigned to an owner
-	/// @dev RFTs assigned to the zero address are considered invalid, and this
-	///  function throws for queries about the zero address.
 	/// @param owner An cross address for whom to query the balance
 	/// @return The number of RFTs owned by `owner`, possibly zero
-	/// @dev EVM selector for this function is: 0x24e52cea,
-	///  or in textual repr: crossBalanceOf((address,uint256))
-	function crossBalanceOf(CrossAddress memory owner) external view returns (uint256);
+	/// @dev EVM selector for this function is: 0xec069398,
+	///  or in textual repr: balanceOfCross((address,uint256))
+	function balanceOfCross(CrossAddress memory owner) external view returns (uint256);
 
 	/// Returns the token properties.
 	///
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -663,21 +663,21 @@
     await expect(collectionEvm.methods[testCase](receiver, 999999).send({from: sender})).to.be.rejected;
   }));
 
-  itEth('Check crossBalanceOf()', async ({helper}) => {
+  itEth('Check balanceOfCross()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {});
     const owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
     const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
 
-    expect(BigInt(await collectionEvm.methods.crossBalanceOf(owner).call({from: owner.eth})) === 0n).to.be.true;
+    expect(BigInt(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})) === 0n).to.be.true;
 
     for (let i = 1n; i < 100n; i++) {
       await collection.mintToken(minter, {Ethereum: owner.eth});
-      expect(BigInt(await collectionEvm.methods.crossBalanceOf(owner).call({from: owner.eth})) === i).to.be.true;
+      expect(BigInt(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})) === i).to.be.true;
     }
   });
 
-  itEth('Check crossOwnerOf()', async ({helper}) => {
+  itEth('Check ownerOfCross()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {});
     let owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
@@ -685,7 +685,7 @@
     const {tokenId} = await collection.mintToken(minter, {Ethereum: owner.eth});
 
     for (let i = 1n; i < 100n; i++) {
-      const ownerCross = await collectionEvm.methods.crossOwnerOf(tokenId).call({from: owner.eth});
+      const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
       expect(ownerCross.eth).to.be.eq(owner.eth);
       expect(ownerCross.sub).to.be.eq(owner.sub);
 
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -591,15 +591,15 @@
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
     const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'nft', owner.eth);
 
-    expect(BigInt(await collectionEvm.methods.crossBalanceOf(owner).call({from: owner.eth})) === 0n).to.be.true;
+    expect(BigInt(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})) === 0n).to.be.true;
 
     for (let i = 1n; i < 100n; i++) {
       await collection.mintToken(minter, 100n, {Ethereum: owner.eth});
-      expect(BigInt(await collectionEvm.methods.crossBalanceOf(owner).call({from: owner.eth})) === i).to.be.true;
+      expect(BigInt(await collectionEvm.methods.balanceOfCross(owner).call({from: owner.eth})) === i).to.be.true;
     }
   });
 
-  itEth.only('Check crossOwnerOf()', async ({helper}) => {
+  itEth('Check ownerOfCross()', async ({helper}) => {
     const collection = await helper.rft.mintCollection(minter, {});
     let owner = await helper.ethCrossAccount.createAccountWithBalance(donor);
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
@@ -607,7 +607,7 @@
     const {tokenId} = await collection.mintToken(minter, 100n,{Ethereum: owner.eth});
 
     for (let i = 1n; i < 100n; i++) {
-      const ownerCross = await collectionEvm.methods.crossOwnerOf(tokenId).call({from: owner.eth});
+      const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
       expect(ownerCross.eth).to.be.eq(owner.eth);
       expect(ownerCross.sub).to.be.eq(owner.sub);
 
@@ -620,7 +620,7 @@
     const tokenContract = await helper.ethNativeContract.rftToken(tokenAddress, owner.eth, true);
     const newOwner = await helper.ethCrossAccount.createAccountWithBalance(donor);
     await tokenContract.methods.transferCross(newOwner, 50).send({from: owner.eth});
-    const ownerCross = await collectionEvm.methods.crossOwnerOf(tokenId).call({from: owner.eth});
+    const ownerCross = await collectionEvm.methods.ownerOfCross(tokenId).call({from: owner.eth});
     expect(ownerCross.eth.toUpperCase()).to.be.eq('0XFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF');
     expect(ownerCross.sub).to.be.eq('0');
   });
modifiedtests/src/eth/tokens/minting.test.tsdiffbeforeafterboth
--- a/tests/src/eth/tokens/minting.test.ts
+++ b/tests/src/eth/tokens/minting.test.ts
@@ -19,7 +19,7 @@
 import {expect, itEth, usingEthPlaygrounds} from '../util';
 
 
-describe('Minting tokens', () => {
+describe.only('Minting tokens', () => {
   let donor: IKeyringPair;
   let alice: IKeyringPair;
 
@@ -63,7 +63,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collection.collectionId)).to.eq(1);
-        expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await contract.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -97,7 +97,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collectionId)).to.eq(1);
-        expect(await collection.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await collection.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -131,7 +131,7 @@
         const tokenId = event.returnValues.tokenId;
         expect(tokenId).to.be.equal('1');
         expect(await helper.collection.getLastTokenId(collectionId)).to.eq(1);
-        expect(await collection.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+        expect(await collection.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       }
     });
   });
@@ -157,7 +157,7 @@
       expect(event.returnValues.to).to.be.equal(receiver);
 
       expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
-      expect(await contract.methods.crossOwnerOf(tokenId).call()).to.be.like([receiver, '0']);
+      expect(await contract.methods.ownerOfCross(tokenId).call()).to.be.like([receiver, '0']);
       // TODO: this wont work right now, need release 919000 first
       // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
       // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();