git.delta.rocks / unique-network / refs/commits / 17cf7864d109

--- a/Makefile
+++ b/Makefile
@@ -7,23 +7,20 @@
 	@echo "  bench-unique"
 
 FUNGIBLE_EVM_STUBS=./pallets/fungible/src/stubs
-FUNGIBLE_EVM_ABI=./tests/src/eth/fungibleAbi.json
-
-REFUNGIBLE_EVM_STUBS=./pallets/refungible/src/stubs
-REFUNGIBLE_EVM_ABI=./tests/src/eth/refungibleAbi.json
+FUNGIBLE_EVM_ABI=./tests/src/eth/abi/fungible.json
 
 NONFUNGIBLE_EVM_STUBS=./pallets/nonfungible/src/stubs
-NONFUNGIBLE_EVM_ABI=./tests/src/eth/nonFungibleAbi.json
+NONFUNGIBLE_EVM_ABI=./tests/src/eth/abi/nonFungible.json
 
 REFUNGIBLE_EVM_STUBS=./pallets/refungible/src/stubs
-REFUNGIBLE_EVM_ABI=./tests/src/eth/reFungibleAbi.json
-REFUNGIBLE_TOKEN_EVM_ABI=./tests/src/eth/reFungibleTokenAbi.json
+REFUNGIBLE_EVM_ABI=./tests/src/eth/abi/reFungible.json
+REFUNGIBLE_TOKEN_EVM_ABI=./tests/src/eth/abi/reFungibleToken.json
 
 CONTRACT_HELPERS_STUBS=./pallets/evm-contract-helpers/src/stubs/
-CONTRACT_HELPERS_ABI=./tests/src/eth/util/contractHelpersAbi.json
+CONTRACT_HELPERS_ABI=./tests/src/eth/abi/contractHelpers.json
 
 COLLECTION_HELPER_STUBS=./pallets/unique/src/eth/stubs/
-COLLECTION_HELPER_ABI=./tests/src/eth/collectionHelpersAbi.json
+COLLECTION_HELPER_ABI=./tests/src/eth/abi/collectionHelpers.json
 
 TESTS_API=./tests/src/eth/api/
 

--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -153,6 +153,42 @@
 	}
 }
 
+impl sealed::CanBePlacedInVec for Property {}
+
+impl AbiType for Property {
+	const SIGNATURE: SignatureUnit = make_signature!(new fixed("(string,bytes)"));
+
+	fn is_dynamic() -> bool {
+		string::is_dynamic() || bytes::is_dynamic()
+	}
+
+	fn size() -> usize {
+		<string as AbiType>::size() + <bytes as AbiType>::size()
+	}
+}
+
+impl AbiRead for Property {
+	fn abi_read(reader: &mut AbiReader) -> Result<Property> {
+		let size = if !Property::is_dynamic() {
+			Some(<Property as AbiType>::size())
+		} else {
+			None
+		};
+		let mut subresult = reader.subresult(size)?;
+		let key = <string>::abi_read(&mut subresult)?;
+		let value = <bytes>::abi_read(&mut subresult)?;
+
+		Ok(Property { key, value })
+	}
+}
+
+impl AbiWrite for Property {
+	fn abi_write(&self, writer: &mut AbiWriter) {
+		self.key.abi_write(writer);
+		self.value.abi_write(writer);
+	}
+}
+
 macro_rules! impl_abi_writeable {
 	($ty:ty, $method:ident) => {
 		impl AbiWrite for $ty {

--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -253,6 +253,12 @@
 		let account_id = T::AccountId::from(new_admin_arr);
 		T::CrossAccountId::from_sub(account_id)
 	}
+
+	#[derive(Debug, Default)]
+	pub struct Property {
+		pub key: string,
+		pub value: bytes,
+	}
 }
 
 /// Parseable EVM call, this trait should be implemented with [`solidity_interface`] macro

--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -157,6 +157,7 @@
 impl sealed::CanBePlacedInVec for string {}
 impl sealed::CanBePlacedInVec for address {}
 impl sealed::CanBePlacedInVec for EthCrossAccount {}
+impl sealed::CanBePlacedInVec for Property {}
 
 impl<T: SolidityTypeName + sealed::CanBePlacedInVec> SolidityTypeName for Vec<T> {
 	fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
@@ -193,6 +194,7 @@
 		2
 	}
 }
+
 impl SolidityTypeName for EthCrossAccount {
 	fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
 		write!(writer, "{}", tc.collect_struct::<Self>())
@@ -227,6 +229,61 @@
 	}
 }
 
+impl StructCollect for Property {
+	fn name() -> String {
+		"Property".into()
+	}
+
+	fn declaration() -> String {
+		let mut str = String::new();
+		writeln!(str, "/// @dev Property struct").unwrap();
+		writeln!(str, "struct {} {{", Self::name()).unwrap();
+		writeln!(str, "\tstring key;").unwrap();
+		writeln!(str, "\tbytes value;").unwrap();
+		writeln!(str, "}}").unwrap();
+		str
+	}
+}
+
+impl SolidityTypeName for Property {
+	fn solidity_name(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
+		write!(writer, "{}", tc.collect_struct::<Self>())
+	}
+
+	fn is_simple() -> bool {
+		false
+	}
+
+	fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
+		write!(writer, "{}(", tc.collect_struct::<Self>())?;
+		address::solidity_default(writer, tc)?;
+		write!(writer, ",")?;
+		uint256::solidity_default(writer, tc)?;
+		write!(writer, ")")
+	}
+}
+
+impl SolidityTupleType for Property {
+	fn names(tc: &TypeCollector) -> Vec<string> {
+		let mut collected = Vec::with_capacity(Self::len());
+		{
+			let mut out = string::new();
+			string::solidity_name(&mut out, tc).expect("no fmt error");
+			collected.push(out);
+		}
+		{
+			let mut out = string::new();
+			bytes::solidity_name(&mut out, tc).expect("no fmt error");
+			collected.push(out);
+		}
+		collected
+	}
+
+	fn len() -> usize {
+		2
+	}
+}
+
 pub trait SolidityTupleType {
 	fn names(tc: &TypeCollector) -> Vec<String>;
 	fn len() -> usize;

--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -20,6 +20,7 @@
 	abi::AbiType,
 	solidity_interface, solidity, ToLog,
 	types::*,
+	types::Property as PropertyStruct,
 	execution::{Result, Error},
 	weight,
 };
@@ -78,6 +79,7 @@
 	///
 	/// @param key Property key.
 	/// @param value Propery value.
+	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::set_collection_properties(1))]
 	fn set_collection_property(
 		&mut self,
@@ -102,13 +104,13 @@
 	fn set_collection_properties(
 		&mut self,
 		caller: caller,
-		properties: Vec<(string, bytes)>,
+		properties: Vec<PropertyStruct>,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
 
 		let properties = properties
 			.into_iter()
-			.map(|(key, value)| {
+			.map(|PropertyStruct { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -126,6 +128,7 @@
 	/// Delete collection property.
 	///
 	/// @param key Property key.
+	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::delete_collection_properties(1))]
 	fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
@@ -208,6 +211,7 @@
 	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
 	///
 	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	#[solidity(hide)]
 	fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {
 		self.consume_store_reads_and_writes(1, 1)?;
 
@@ -411,6 +415,7 @@
 
 	/// Add collection admin.
 	/// @param newAdmin Address of the added administrator.
+	#[solidity(hide)]
 	fn add_collection_admin(&mut self, caller: caller, new_admin: address) -> Result<void> {
 		self.consume_store_writes(2)?;
 
@@ -423,6 +428,7 @@
 	/// Remove collection admin.
 	///
 	/// @param admin Address of the removed administrator.
+	#[solidity(hide)]
 	fn remove_collection_admin(&mut self, caller: caller, admin: address) -> Result<void> {
 		self.consume_store_writes(2)?;
 
@@ -547,6 +553,7 @@
 	/// Add the user to the allowed list.
 	///
 	/// @param user Address of a trusted user.
+	#[solidity(hide)]
 	fn add_to_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -575,6 +582,7 @@
 	/// Remove the user from the allowed list.
 	///
 	/// @param user Address of a removed user.
+	#[solidity(hide)]
 	fn remove_from_collection_allow_list(&mut self, caller: caller, user: address) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -625,7 +633,7 @@
 	///
 	/// @param user account to verify
 	/// @return "true" if account is the owner or admin
-	#[solidity(rename_selector = "isOwnerOrAdmin")]
+	#[solidity(hide, rename_selector = "isOwnerOrAdmin")]
 	fn is_owner_or_admin_eth(&self, user: address) -> Result<bool> {
 		let user = T::CrossAccountId::from_eth(user);
 		Ok(self.is_owner_or_admin(&user))
@@ -666,7 +674,7 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner account
-	#[solidity(rename_selector = "changeCollectionOwner")]
+	#[solidity(hide, rename_selector = "changeCollectionOwner")]
 	fn set_owner(&mut self, caller: caller, new_owner: address) -> Result<void> {
 		self.consume_store_writes(1)?;
 
@@ -691,7 +699,11 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	fn set_owner_cross(&mut self, caller: caller, new_owner: EthCrossAccount) -> Result<void> {
+	fn change_collection_owner_cross(
+		&mut self,
+		caller: caller,
+		new_owner: EthCrossAccount,
+	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);

binary blob — no preview

--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -20,7 +20,8 @@
 use core::char::{REPLACEMENT_CHARACTER, decode_utf16};
 use core::convert::TryInto;
 use evm_coder::{
-	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight,
+	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
+	weight,
 };
 use up_data_structs::CollectionMode;
 use pallet_common::erc::{CommonEvmHandler, PrecompileResult};
@@ -178,6 +179,7 @@
 	/// deducting from the sender's allowance for said account.
 	/// @param from The account whose tokens will be burnt.
 	/// @param amount The amount that will be burnt.
+	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
 	fn burn_from(&mut self, caller: caller, from: address, amount: uint256) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);

binary blob — no preview

--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -18,42 +18,42 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 contract Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) public {
-		require(false, stub_error);
-		key;
-		value;
-		dummy = 0;
-	}
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	value;
+	// 	dummy = 0;
+	// }
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple15[] memory properties) public {
+	function setCollectionProperties(Property[] memory properties) public {
 		require(false, stub_error);
 		properties;
 		dummy = 0;
 	}
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) public {
-		require(false, stub_error);
-		key;
-		dummy = 0;
-	}
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	dummy = 0;
+	// }
 
 	/// Delete collection properties.
 	///
@@ -87,25 +87,25 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) public view returns (Tuple15[] memory) {
+	function collectionProperties(string[] memory keys) public view returns (Tuple16[] memory) {
 		require(false, stub_error);
 		keys;
 		dummy;
-		return new Tuple15[](0);
+		return new Tuple16[](0);
 	}
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) public {
-		require(false, stub_error);
-		sponsor;
-		dummy = 0;
-	}
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) public {
+	// 	require(false, stub_error);
+	// 	sponsor;
+	// 	dummy = 0;
+	// }
 
 	/// Set the sponsor of the collection.
 	///
@@ -222,26 +222,26 @@
 		dummy = 0;
 	}
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) public {
-		require(false, stub_error);
-		newAdmin;
-		dummy = 0;
-	}
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) public {
+	// 	require(false, stub_error);
+	// 	newAdmin;
+	// 	dummy = 0;
+	// }
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) public {
-		require(false, stub_error);
-		admin;
-		dummy = 0;
-	}
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) public {
+	// 	require(false, stub_error);
+	// 	admin;
+	// 	dummy = 0;
+	// }
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -291,16 +291,16 @@
 		return false;
 	}
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Add user to allowed list.
 	///
@@ -313,16 +313,16 @@
 		dummy = 0;
 	}
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Remove user from allowed list.
 	///
@@ -346,18 +346,18 @@
 		dummy = 0;
 	}
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) public view returns (bool) {
-		require(false, stub_error);
-		user;
-		dummy;
-		return false;
-	}
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) public view returns (bool) {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy;
+	// 	return false;
+	// }
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -395,17 +395,17 @@
 		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) public {
-		require(false, stub_error);
-		newOwner;
-		dummy = 0;
-	}
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) public {
+	// 	require(false, stub_error);
+	// 	newOwner;
+	// 	dummy = 0;
+	// }
 
 	/// Get collection administrators
 	///
@@ -423,9 +423,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) public {
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -439,11 +439,17 @@
 }
 
 /// @dev anonymous struct
-struct Tuple15 {
+struct Tuple16 {
 	string field_0;
 	bytes field_1;
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
 contract ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
@@ -456,20 +462,20 @@
 		return false;
 	}
 
-	/// Burn tokens from account
-	/// @dev Function that burns an `amount` of the tokens of a given account,
-	/// deducting from the sender's allowance for said account.
-	/// @param from The account whose tokens will be burnt.
-	/// @param amount The amount that will be burnt.
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 amount) public returns (bool) {
-		require(false, stub_error);
-		from;
-		amount;
-		dummy = 0;
-		return false;
-	}
+	// /// Burn tokens from account
+	// /// @dev Function that burns an `amount` of the tokens of a given account,
+	// /// deducting from the sender's allowance for said account.
+	// /// @param from The account whose tokens will be burnt.
+	// /// @param amount The amount that will be burnt.
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 amount) public returns (bool) {
+	// 	require(false, stub_error);
+	// 	from;
+	// 	amount;
+	// 	dummy = 0;
+	// 	return false;
+	// }
 
 	/// Burn tokens from account
 	/// @dev Function that burns an `amount` of the tokens of a given account,

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -26,7 +26,7 @@
 };
 use evm_coder::{
 	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
-	weight,
+	types::Property as PropertyStruct, weight,
 };
 use frame_support::BoundedVec;
 use up_data_structs::{
@@ -88,6 +88,7 @@
 	/// @param tokenId ID of the token.
 	/// @param key Property key.
 	/// @param value Property value.
+	#[solidity(hide)]
 	fn set_property(
 		&mut self,
 		caller: caller,
@@ -125,7 +126,7 @@
 		&mut self,
 		caller: caller,
 		token_id: uint256,
-		properties: Vec<(string, bytes)>,
+		properties: Vec<PropertyStruct>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -136,7 +137,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|(key, value)| {
+			.map(|PropertyStruct { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -794,6 +795,7 @@
 	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
 	/// @param from The current owner of the NFT
 	/// @param tokenId The NFT to transfer
+	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
 	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);

binary blob — no preview

--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -42,24 +42,20 @@
 		dummy = 0;
 	}
 
-	/// @notice Set token property value.
-	/// @dev Throws error if `msg.sender` has no permission to edit the property.
-	/// @param tokenId ID of the token.
-	/// @param key Property key.
-	/// @param value Property value.
-	/// @dev EVM selector for this function is: 0x1752d67b,
-	///  or in textual repr: setProperty(uint256,string,bytes)
-	function setProperty(
-		uint256 tokenId,
-		string memory key,
-		bytes memory value
-	) public {
-		require(false, stub_error);
-		tokenId;
-		key;
-		value;
-		dummy = 0;
-	}
+	// /// @notice Set token property value.
+	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
+	// /// @param tokenId ID of the token.
+	// /// @param key Property key.
+	// /// @param value Property value.
+	// /// @dev EVM selector for this function is: 0x1752d67b,
+	// ///  or in textual repr: setProperty(uint256,string,bytes)
+	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	key;
+	// 	value;
+	// 	dummy = 0;
+	// }
 
 	/// @notice Set token properties value.
 	/// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -67,7 +63,7 @@
 	/// @param properties settable properties
 	/// @dev EVM selector for this function is: 0x14ed3a6e,
 	///  or in textual repr: setProperties(uint256,(string,bytes)[])
-	function setProperties(uint256 tokenId, Tuple22[] memory properties) public {
+	function setProperties(uint256 tokenId, Property[] memory properties) public {
 		require(false, stub_error);
 		tokenId;
 		properties;
@@ -116,43 +112,49 @@
 	}
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 contract Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) public {
-		require(false, stub_error);
-		key;
-		value;
-		dummy = 0;
-	}
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	value;
+	// 	dummy = 0;
+	// }
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple22[] memory properties) public {
+	function setCollectionProperties(Property[] memory properties) public {
 		require(false, stub_error);
 		properties;
 		dummy = 0;
 	}
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) public {
-		require(false, stub_error);
-		key;
-		dummy = 0;
-	}
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	dummy = 0;
+	// }
 
 	/// Delete collection properties.
 	///
@@ -186,25 +188,25 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
+	function collectionProperties(string[] memory keys) public view returns (Tuple23[] memory) {
 		require(false, stub_error);
 		keys;
 		dummy;
-		return new Tuple22[](0);
+		return new Tuple23[](0);
 	}
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) public {
-		require(false, stub_error);
-		sponsor;
-		dummy = 0;
-	}
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) public {
+	// 	require(false, stub_error);
+	// 	sponsor;
+	// 	dummy = 0;
+	// }
 
 	/// Set the sponsor of the collection.
 	///
@@ -251,10 +253,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple25 memory) {
+	function collectionSponsor() public view returns (Tuple26 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple25(0x0000000000000000000000000000000000000000, 0);
+		return Tuple26(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Set limits for the collection.
@@ -321,26 +323,26 @@
 		dummy = 0;
 	}
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) public {
-		require(false, stub_error);
-		newAdmin;
-		dummy = 0;
-	}
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) public {
+	// 	require(false, stub_error);
+	// 	newAdmin;
+	// 	dummy = 0;
+	// }
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) public {
-		require(false, stub_error);
-		admin;
-		dummy = 0;
-	}
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) public {
+	// 	require(false, stub_error);
+	// 	admin;
+	// 	dummy = 0;
+	// }
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -390,16 +392,16 @@
 		return false;
 	}
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Add user to allowed list.
 	///
@@ -412,16 +414,16 @@
 		dummy = 0;
 	}
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Remove user from allowed list.
 	///
@@ -445,18 +447,18 @@
 		dummy = 0;
 	}
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) public view returns (bool) {
-		require(false, stub_error);
-		user;
-		dummy;
-		return false;
-	}
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) public view returns (bool) {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy;
+	// 	return false;
+	// }
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -494,17 +496,17 @@
 		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) public {
-		require(false, stub_error);
-		newOwner;
-		dummy = 0;
-	}
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) public {
+	// 	require(false, stub_error);
+	// 	newOwner;
+	// 	dummy = 0;
+	// }
 
 	/// Get collection administrators
 	///
@@ -522,9 +524,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) public {
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -538,13 +540,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple25 {
+struct Tuple26 {
 	address field_0;
 	uint256 field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple22 {
+struct Tuple23 {
 	string field_0;
 	bytes field_1;
 }
@@ -776,20 +778,20 @@
 		dummy = 0;
 	}
 
-	/// @notice Burns a specific ERC721 token.
-	/// @dev Throws unless `msg.sender` is the current owner or an authorized
-	///  operator for this NFT. Throws if `from` is not the current owner. Throws
-	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
-	/// @param from The current owner of the NFT
-	/// @param tokenId The NFT to transfer
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 tokenId) public {
-		require(false, stub_error);
-		from;
-		tokenId;
-		dummy = 0;
-	}
+	// /// @notice Burns a specific ERC721 token.
+	// /// @dev Throws unless `msg.sender` is the current owner or an authorized
+	// ///  operator for this NFT. Throws if `from` is not the current owner. Throws
+	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
+	// /// @param from The current owner of the NFT
+	// /// @param tokenId The NFT to transfer
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 tokenId) public {
+	// 	require(false, stub_error);
+	// 	from;
+	// 	tokenId;
+	// 	dummy = 0;
+	// }
 
 	/// @notice Burns a specific ERC721 token.
 	/// @dev Throws unless `msg.sender` is the current owner or an authorized

--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -27,7 +27,7 @@
 };
 use evm_coder::{
 	abi::AbiType, ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*,
-	weight,
+	types::Property as PropertyStruct, weight,
 };
 use frame_support::{BoundedBTreeMap, BoundedVec};
 use pallet_common::{
@@ -91,6 +91,7 @@
 	/// @param tokenId ID of the token.
 	/// @param key Property key.
 	/// @param value Property value.
+	#[solidity(hide)]
 	fn set_property(
 		&mut self,
 		caller: caller,
@@ -127,7 +128,7 @@
 		&mut self,
 		caller: caller,
 		token_id: uint256,
-		properties: Vec<(string, bytes)>,
+		properties: Vec<PropertyStruct>,
 	) -> Result<()> {
 		let caller = T::CrossAccountId::from_eth(caller);
 		let token_id: u32 = token_id.try_into().map_err(|_| "token id overflow")?;
@@ -138,7 +139,7 @@
 
 		let properties = properties
 			.into_iter()
-			.map(|(key, value)| {
+			.map(|PropertyStruct { key, value }| {
 				let key = <Vec<u8>>::from(key)
 					.try_into()
 					.map_err(|_| "key too large")?;
@@ -814,6 +815,7 @@
 	///  Throws if RFT pieces have multiple owners.
 	/// @param from The current owner of the RFT
 	/// @param tokenId The RFT to transfer
+	#[solidity(hide)]
 	#[weight(<SelfWeightOf<T>>::burn_from())]
 	fn burn_from(&mut self, caller: caller, from: address, token_id: uint256) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);

binary blob — no preview

--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -42,24 +42,20 @@
 		dummy = 0;
 	}
 
-	/// @notice Set token property value.
-	/// @dev Throws error if `msg.sender` has no permission to edit the property.
-	/// @param tokenId ID of the token.
-	/// @param key Property key.
-	/// @param value Property value.
-	/// @dev EVM selector for this function is: 0x1752d67b,
-	///  or in textual repr: setProperty(uint256,string,bytes)
-	function setProperty(
-		uint256 tokenId,
-		string memory key,
-		bytes memory value
-	) public {
-		require(false, stub_error);
-		tokenId;
-		key;
-		value;
-		dummy = 0;
-	}
+	// /// @notice Set token property value.
+	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
+	// /// @param tokenId ID of the token.
+	// /// @param key Property key.
+	// /// @param value Property value.
+	// /// @dev EVM selector for this function is: 0x1752d67b,
+	// ///  or in textual repr: setProperty(uint256,string,bytes)
+	// function setProperty(uint256 tokenId, string memory key, bytes memory value) public {
+	// 	require(false, stub_error);
+	// 	tokenId;
+	// 	key;
+	// 	value;
+	// 	dummy = 0;
+	// }
 
 	/// @notice Set token properties value.
 	/// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -67,7 +63,7 @@
 	/// @param properties settable properties
 	/// @dev EVM selector for this function is: 0x14ed3a6e,
 	///  or in textual repr: setProperties(uint256,(string,bytes)[])
-	function setProperties(uint256 tokenId, Tuple21[] memory properties) public {
+	function setProperties(uint256 tokenId, Property[] memory properties) public {
 		require(false, stub_error);
 		tokenId;
 		properties;
@@ -116,43 +112,49 @@
 	}
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 contract Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) public {
-		require(false, stub_error);
-		key;
-		value;
-		dummy = 0;
-	}
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	value;
+	// 	dummy = 0;
+	// }
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple21[] memory properties) public {
+	function setCollectionProperties(Property[] memory properties) public {
 		require(false, stub_error);
 		properties;
 		dummy = 0;
 	}
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) public {
-		require(false, stub_error);
-		key;
-		dummy = 0;
-	}
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) public {
+	// 	require(false, stub_error);
+	// 	key;
+	// 	dummy = 0;
+	// }
 
 	/// Delete collection properties.
 	///
@@ -186,25 +188,25 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) public view returns (Tuple21[] memory) {
+	function collectionProperties(string[] memory keys) public view returns (Tuple22[] memory) {
 		require(false, stub_error);
 		keys;
 		dummy;
-		return new Tuple21[](0);
+		return new Tuple22[](0);
 	}
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) public {
-		require(false, stub_error);
-		sponsor;
-		dummy = 0;
-	}
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) public {
+	// 	require(false, stub_error);
+	// 	sponsor;
+	// 	dummy = 0;
+	// }
 
 	/// Set the sponsor of the collection.
 	///
@@ -251,10 +253,10 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() public view returns (Tuple24 memory) {
+	function collectionSponsor() public view returns (Tuple25 memory) {
 		require(false, stub_error);
 		dummy;
-		return Tuple24(0x0000000000000000000000000000000000000000, 0);
+		return Tuple25(0x0000000000000000000000000000000000000000, 0);
 	}
 
 	/// Set limits for the collection.
@@ -321,26 +323,26 @@
 		dummy = 0;
 	}
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) public {
-		require(false, stub_error);
-		newAdmin;
-		dummy = 0;
-	}
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) public {
+	// 	require(false, stub_error);
+	// 	newAdmin;
+	// 	dummy = 0;
+	// }
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) public {
-		require(false, stub_error);
-		admin;
-		dummy = 0;
-	}
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) public {
+	// 	require(false, stub_error);
+	// 	admin;
+	// 	dummy = 0;
+	// }
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -390,16 +392,16 @@
 		return false;
 	}
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Add user to allowed list.
 	///
@@ -412,16 +414,16 @@
 		dummy = 0;
 	}
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) public {
-		require(false, stub_error);
-		user;
-		dummy = 0;
-	}
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) public {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy = 0;
+	// }
 
 	/// Remove user from allowed list.
 	///
@@ -445,18 +447,18 @@
 		dummy = 0;
 	}
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) public view returns (bool) {
-		require(false, stub_error);
-		user;
-		dummy;
-		return false;
-	}
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) public view returns (bool) {
+	// 	require(false, stub_error);
+	// 	user;
+	// 	dummy;
+	// 	return false;
+	// }
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -494,17 +496,17 @@
 		return EthCrossAccount(0x0000000000000000000000000000000000000000, 0);
 	}
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) public {
-		require(false, stub_error);
-		newOwner;
-		dummy = 0;
-	}
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) public {
+	// 	require(false, stub_error);
+	// 	newOwner;
+	// 	dummy = 0;
+	// }
 
 	/// Get collection administrators
 	///
@@ -522,9 +524,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) public {
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) public {
 		require(false, stub_error);
 		newOwner;
 		dummy = 0;
@@ -538,13 +540,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple24 {
+struct Tuple25 {
 	address field_0;
 	uint256 field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple21 {
+struct Tuple22 {
 	string field_0;
 	bytes field_1;
 }
@@ -761,21 +763,21 @@
 		dummy = 0;
 	}
 
-	/// @notice Burns a specific ERC721 token.
-	/// @dev Throws unless `msg.sender` is the current owner or an authorized
-	///  operator for this RFT. Throws if `from` is not the current owner. Throws
-	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
-	///  Throws if RFT pieces have multiple owners.
-	/// @param from The current owner of the RFT
-	/// @param tokenId The RFT to transfer
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 tokenId) public {
-		require(false, stub_error);
-		from;
-		tokenId;
-		dummy = 0;
-	}
+	// /// @notice Burns a specific ERC721 token.
+	// /// @dev Throws unless `msg.sender` is the current owner or an authorized
+	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws
+	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+	// ///  Throws if RFT pieces have multiple owners.
+	// /// @param from The current owner of the RFT
+	// /// @param tokenId The RFT to transfer
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 tokenId) public {
+	// 	require(false, stub_error);
+	// 	from;
+	// 	tokenId;
+	// 	dummy = 0;
+	// }
 
 	/// @notice Burns a specific ERC721 token.
 	/// @dev Throws unless `msg.sender` is the current owner or an authorized

binary blob — no preview

binary blob — no preview

--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -74,12 +74,13 @@
     });
   });
 
+  // Soft-deprecated
   itEth('Collection allowlist can be added and removed by [eth] address', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const user = helper.eth.createAccount();
 
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
     await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});
@@ -105,13 +106,14 @@
     expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
   });
 
+  // Soft-deprecated
   itEth('Collection allowlist can not be add and remove [eth] address by not owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const notOwner = await helper.eth.createAccountWithBalance(donor);
     const user = helper.eth.createAccount();
 
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     expect(await collectionEvm.methods.allowed(user).call({from: owner})).to.be.false;
     await expect(collectionEvm.methods.addToCollectionAllowList(user).call({from: notOwner})).to.be.rejectedWith('NoPermission');

--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -13,29 +13,29 @@
 }
 
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 interface Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) external;
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) external;
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple15[] memory properties) external;
+	function setCollectionProperties(Property[] memory properties) external;
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) external;
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) external;
 
 	/// Delete collection properties.
 	///
@@ -60,16 +60,16 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) external view returns (Tuple15[] memory);
+	function collectionProperties(string[] memory keys) external view returns (Tuple16[] memory);
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) external;
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) external;
 
 	/// Set the sponsor of the collection.
 	///
@@ -146,18 +146,18 @@
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) external;
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) external;
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) external;
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) external;
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -189,12 +189,12 @@
 	///  or in textual repr: allowed(address)
 	function allowed(address user) external view returns (bool);
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) external;
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) external;
 
 	/// Add user to allowed list.
 	///
@@ -203,12 +203,12 @@
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) external;
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) external;
 
 	/// Remove user from allowed list.
 	///
@@ -224,13 +224,13 @@
 	///  or in textual repr: setCollectionMintMode(bool)
 	function setCollectionMintMode(bool mode) external;
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) external view returns (bool);
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) external view returns (bool);
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -255,13 +255,13 @@
 	///  or in textual repr: collectionOwner()
 	function collectionOwner() external view returns (EthCrossAccount memory);
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) external;
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) external;
 
 	/// Get collection administrators
 	///
@@ -275,9 +275,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) external;
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
@@ -287,25 +287,31 @@
 }
 
 /// @dev anonymous struct
-struct Tuple15 {
+struct Tuple16 {
 	string field_0;
 	bytes field_1;
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @dev the ERC-165 identifier for this interface is 0x29f4dcd9
 interface ERC20UniqueExtensions is Dummy, ERC165 {
 	/// @dev EVM selector for this function is: 0x0ecd0ab0,
 	///  or in textual repr: approveCross((address,uint256),uint256)
 	function approveCross(EthCrossAccount memory spender, uint256 amount) external returns (bool);
 
-	/// Burn tokens from account
-	/// @dev Function that burns an `amount` of the tokens of a given account,
-	/// deducting from the sender's allowance for said account.
-	/// @param from The account whose tokens will be burnt.
-	/// @param amount The amount that will be burnt.
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 amount) external returns (bool);
+	// /// Burn tokens from account
+	// /// @dev Function that burns an `amount` of the tokens of a given account,
+	// /// deducting from the sender's allowance for said account.
+	// /// @param from The account whose tokens will be burnt.
+	// /// @param amount The amount that will be burnt.
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 amount) external returns (bool);
 
 	/// Burn tokens from account
 	/// @dev Function that burns an `amount` of the tokens of a given account,

--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -30,18 +30,14 @@
 		bool tokenOwner
 	) external;
 
-	/// @notice Set token property value.
-	/// @dev Throws error if `msg.sender` has no permission to edit the property.
-	/// @param tokenId ID of the token.
-	/// @param key Property key.
-	/// @param value Property value.
-	/// @dev EVM selector for this function is: 0x1752d67b,
-	///  or in textual repr: setProperty(uint256,string,bytes)
-	function setProperty(
-		uint256 tokenId,
-		string memory key,
-		bytes memory value
-	) external;
+	// /// @notice Set token property value.
+	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
+	// /// @param tokenId ID of the token.
+	// /// @param key Property key.
+	// /// @param value Property value.
+	// /// @dev EVM selector for this function is: 0x1752d67b,
+	// ///  or in textual repr: setProperty(uint256,string,bytes)
+	// function setProperty(uint256 tokenId, string memory key, bytes memory value) external;
 
 	/// @notice Set token properties value.
 	/// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -49,7 +45,7 @@
 	/// @param properties settable properties
 	/// @dev EVM selector for this function is: 0x14ed3a6e,
 	///  or in textual repr: setProperties(uint256,(string,bytes)[])
-	function setProperties(uint256 tokenId, Tuple22[] memory properties) external;
+	function setProperties(uint256 tokenId, Property[] memory properties) external;
 
 	// /// @notice Delete token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -77,30 +73,36 @@
 	function property(uint256 tokenId, string memory key) external view returns (bytes memory);
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 interface Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) external;
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) external;
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple22[] memory properties) external;
+	function setCollectionProperties(Property[] memory properties) external;
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) external;
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) external;
 
 	/// Delete collection properties.
 	///
@@ -125,16 +127,16 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);
+	function collectionProperties(string[] memory keys) external view returns (Tuple23[] memory);
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) external;
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) external;
 
 	/// Set the sponsor of the collection.
 	///
@@ -167,7 +169,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple25 memory);
+	function collectionSponsor() external view returns (Tuple26 memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -211,18 +213,18 @@
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) external;
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) external;
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) external;
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) external;
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -254,12 +256,12 @@
 	///  or in textual repr: allowed(address)
 	function allowed(address user) external view returns (bool);
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) external;
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) external;
 
 	/// Add user to allowed list.
 	///
@@ -268,12 +270,12 @@
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) external;
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) external;
 
 	/// Remove user from allowed list.
 	///
@@ -289,13 +291,13 @@
 	///  or in textual repr: setCollectionMintMode(bool)
 	function setCollectionMintMode(bool mode) external;
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) external view returns (bool);
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) external view returns (bool);
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -320,13 +322,13 @@
 	///  or in textual repr: collectionOwner()
 	function collectionOwner() external view returns (EthCrossAccount memory);
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) external;
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) external;
 
 	/// Get collection administrators
 	///
@@ -340,9 +342,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) external;
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
@@ -352,13 +354,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple25 {
+struct Tuple26 {
 	address field_0;
 	uint256 field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple22 {
+struct Tuple23 {
 	string field_0;
 	bytes field_1;
 }
@@ -512,15 +514,15 @@
 		uint256 tokenId
 	) external;
 
-	/// @notice Burns a specific ERC721 token.
-	/// @dev Throws unless `msg.sender` is the current owner or an authorized
-	///  operator for this NFT. Throws if `from` is not the current owner. Throws
-	///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
-	/// @param from The current owner of the NFT
-	/// @param tokenId The NFT to transfer
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 tokenId) external;
+	// /// @notice Burns a specific ERC721 token.
+	// /// @dev Throws unless `msg.sender` is the current owner or an authorized
+	// ///  operator for this NFT. Throws if `from` is not the current owner. Throws
+	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid NFT.
+	// /// @param from The current owner of the NFT
+	// /// @param tokenId The NFT to transfer
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 tokenId) external;
 
 	/// @notice Burns a specific ERC721 token.
 	/// @dev Throws unless `msg.sender` is the current owner or an authorized

--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -30,18 +30,14 @@
 		bool tokenOwner
 	) external;
 
-	/// @notice Set token property value.
-	/// @dev Throws error if `msg.sender` has no permission to edit the property.
-	/// @param tokenId ID of the token.
-	/// @param key Property key.
-	/// @param value Property value.
-	/// @dev EVM selector for this function is: 0x1752d67b,
-	///  or in textual repr: setProperty(uint256,string,bytes)
-	function setProperty(
-		uint256 tokenId,
-		string memory key,
-		bytes memory value
-	) external;
+	// /// @notice Set token property value.
+	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
+	// /// @param tokenId ID of the token.
+	// /// @param key Property key.
+	// /// @param value Property value.
+	// /// @dev EVM selector for this function is: 0x1752d67b,
+	// ///  or in textual repr: setProperty(uint256,string,bytes)
+	// function setProperty(uint256 tokenId, string memory key, bytes memory value) external;
 
 	/// @notice Set token properties value.
 	/// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -49,7 +45,7 @@
 	/// @param properties settable properties
 	/// @dev EVM selector for this function is: 0x14ed3a6e,
 	///  or in textual repr: setProperties(uint256,(string,bytes)[])
-	function setProperties(uint256 tokenId, Tuple21[] memory properties) external;
+	function setProperties(uint256 tokenId, Property[] memory properties) external;
 
 	// /// @notice Delete token property value.
 	// /// @dev Throws error if `msg.sender` has no permission to edit the property.
@@ -77,30 +73,36 @@
 	function property(uint256 tokenId, string memory key) external view returns (bytes memory);
 }
 
+/// @dev Property struct
+struct Property {
+	string key;
+	bytes value;
+}
+
 /// @title A contract that allows you to work with collections.
-/// @dev the ERC-165 identifier for this interface is 0xb3152af3
+/// @dev the ERC-165 identifier for this interface is 0x324a7f5b
 interface Collection is Dummy, ERC165 {
-	/// Set collection property.
-	///
-	/// @param key Property key.
-	/// @param value Propery value.
-	/// @dev EVM selector for this function is: 0x2f073f66,
-	///  or in textual repr: setCollectionProperty(string,bytes)
-	function setCollectionProperty(string memory key, bytes memory value) external;
+	// /// Set collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @param value Propery value.
+	// /// @dev EVM selector for this function is: 0x2f073f66,
+	// ///  or in textual repr: setCollectionProperty(string,bytes)
+	// function setCollectionProperty(string memory key, bytes memory value) external;
 
 	/// Set collection properties.
 	///
 	/// @param properties Vector of properties key/value pair.
 	/// @dev EVM selector for this function is: 0x50b26b2a,
 	///  or in textual repr: setCollectionProperties((string,bytes)[])
-	function setCollectionProperties(Tuple21[] memory properties) external;
+	function setCollectionProperties(Property[] memory properties) external;
 
-	/// Delete collection property.
-	///
-	/// @param key Property key.
-	/// @dev EVM selector for this function is: 0x7b7debce,
-	///  or in textual repr: deleteCollectionProperty(string)
-	function deleteCollectionProperty(string memory key) external;
+	// /// Delete collection property.
+	// ///
+	// /// @param key Property key.
+	// /// @dev EVM selector for this function is: 0x7b7debce,
+	// ///  or in textual repr: deleteCollectionProperty(string)
+	// function deleteCollectionProperty(string memory key) external;
 
 	/// Delete collection properties.
 	///
@@ -125,16 +127,16 @@
 	/// @return Vector of properties key/value pairs.
 	/// @dev EVM selector for this function is: 0x285fb8e6,
 	///  or in textual repr: collectionProperties(string[])
-	function collectionProperties(string[] memory keys) external view returns (Tuple21[] memory);
+	function collectionProperties(string[] memory keys) external view returns (Tuple22[] memory);
 
-	/// Set the sponsor of the collection.
-	///
-	/// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
-	///
-	/// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
-	/// @dev EVM selector for this function is: 0x7623402e,
-	///  or in textual repr: setCollectionSponsor(address)
-	function setCollectionSponsor(address sponsor) external;
+	// /// Set the sponsor of the collection.
+	// ///
+	// /// @dev In order for sponsorship to work, it must be confirmed on behalf of the sponsor.
+	// ///
+	// /// @param sponsor Address of the sponsor from whose account funds will be debited for operations with the contract.
+	// /// @dev EVM selector for this function is: 0x7623402e,
+	// ///  or in textual repr: setCollectionSponsor(address)
+	// function setCollectionSponsor(address sponsor) external;
 
 	/// Set the sponsor of the collection.
 	///
@@ -167,7 +169,7 @@
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	/// @dev EVM selector for this function is: 0x6ec0a9f1,
 	///  or in textual repr: collectionSponsor()
-	function collectionSponsor() external view returns (Tuple24 memory);
+	function collectionSponsor() external view returns (Tuple25 memory);
 
 	/// Set limits for the collection.
 	/// @dev Throws error if limit not found.
@@ -211,18 +213,18 @@
 	///  or in textual repr: removeCollectionAdminCross((address,uint256))
 	function removeCollectionAdminCross(EthCrossAccount memory admin) external;
 
-	/// Add collection admin.
-	/// @param newAdmin Address of the added administrator.
-	/// @dev EVM selector for this function is: 0x92e462c7,
-	///  or in textual repr: addCollectionAdmin(address)
-	function addCollectionAdmin(address newAdmin) external;
+	// /// Add collection admin.
+	// /// @param newAdmin Address of the added administrator.
+	// /// @dev EVM selector for this function is: 0x92e462c7,
+	// ///  or in textual repr: addCollectionAdmin(address)
+	// function addCollectionAdmin(address newAdmin) external;
 
-	/// Remove collection admin.
-	///
-	/// @param admin Address of the removed administrator.
-	/// @dev EVM selector for this function is: 0xfafd7b42,
-	///  or in textual repr: removeCollectionAdmin(address)
-	function removeCollectionAdmin(address admin) external;
+	// /// Remove collection admin.
+	// ///
+	// /// @param admin Address of the removed administrator.
+	// /// @dev EVM selector for this function is: 0xfafd7b42,
+	// ///  or in textual repr: removeCollectionAdmin(address)
+	// function removeCollectionAdmin(address admin) external;
 
 	/// Toggle accessibility of collection nesting.
 	///
@@ -254,12 +256,12 @@
 	///  or in textual repr: allowed(address)
 	function allowed(address user) external view returns (bool);
 
-	/// Add the user to the allowed list.
-	///
-	/// @param user Address of a trusted user.
-	/// @dev EVM selector for this function is: 0x67844fe6,
-	///  or in textual repr: addToCollectionAllowList(address)
-	function addToCollectionAllowList(address user) external;
+	// /// Add the user to the allowed list.
+	// ///
+	// /// @param user Address of a trusted user.
+	// /// @dev EVM selector for this function is: 0x67844fe6,
+	// ///  or in textual repr: addToCollectionAllowList(address)
+	// function addToCollectionAllowList(address user) external;
 
 	/// Add user to allowed list.
 	///
@@ -268,12 +270,12 @@
 	///  or in textual repr: addToCollectionAllowListCross((address,uint256))
 	function addToCollectionAllowListCross(EthCrossAccount memory user) external;
 
-	/// Remove the user from the allowed list.
-	///
-	/// @param user Address of a removed user.
-	/// @dev EVM selector for this function is: 0x85c51acb,
-	///  or in textual repr: removeFromCollectionAllowList(address)
-	function removeFromCollectionAllowList(address user) external;
+	// /// Remove the user from the allowed list.
+	// ///
+	// /// @param user Address of a removed user.
+	// /// @dev EVM selector for this function is: 0x85c51acb,
+	// ///  or in textual repr: removeFromCollectionAllowList(address)
+	// function removeFromCollectionAllowList(address user) external;
 
 	/// Remove user from allowed list.
 	///
@@ -289,13 +291,13 @@
 	///  or in textual repr: setCollectionMintMode(bool)
 	function setCollectionMintMode(bool mode) external;
 
-	/// Check that account is the owner or admin of the collection
-	///
-	/// @param user account to verify
-	/// @return "true" if account is the owner or admin
-	/// @dev EVM selector for this function is: 0x9811b0c7,
-	///  or in textual repr: isOwnerOrAdmin(address)
-	function isOwnerOrAdmin(address user) external view returns (bool);
+	// /// Check that account is the owner or admin of the collection
+	// ///
+	// /// @param user account to verify
+	// /// @return "true" if account is the owner or admin
+	// /// @dev EVM selector for this function is: 0x9811b0c7,
+	// ///  or in textual repr: isOwnerOrAdmin(address)
+	// function isOwnerOrAdmin(address user) external view returns (bool);
 
 	/// Check that account is the owner or admin of the collection
 	///
@@ -320,13 +322,13 @@
 	///  or in textual repr: collectionOwner()
 	function collectionOwner() external view returns (EthCrossAccount memory);
 
-	/// Changes collection owner to another account
-	///
-	/// @dev Owner can be changed only by current owner
-	/// @param newOwner new owner account
-	/// @dev EVM selector for this function is: 0x4f53e226,
-	///  or in textual repr: changeCollectionOwner(address)
-	function changeCollectionOwner(address newOwner) external;
+	// /// Changes collection owner to another account
+	// ///
+	// /// @dev Owner can be changed only by current owner
+	// /// @param newOwner new owner account
+	// /// @dev EVM selector for this function is: 0x4f53e226,
+	// ///  or in textual repr: changeCollectionOwner(address)
+	// function changeCollectionOwner(address newOwner) external;
 
 	/// Get collection administrators
 	///
@@ -340,9 +342,9 @@
 	///
 	/// @dev Owner can be changed only by current owner
 	/// @param newOwner new owner cross account
-	/// @dev EVM selector for this function is: 0xe5c9913f,
-	///  or in textual repr: setOwnerCross((address,uint256))
-	function setOwnerCross(EthCrossAccount memory newOwner) external;
+	/// @dev EVM selector for this function is: 0x6496c497,
+	///  or in textual repr: changeCollectionOwnerCross((address,uint256))
+	function changeCollectionOwnerCross(EthCrossAccount memory newOwner) external;
 }
 
 /// @dev Cross account struct
@@ -352,13 +354,13 @@
 }
 
 /// @dev anonymous struct
-struct Tuple24 {
+struct Tuple25 {
 	address field_0;
 	uint256 field_1;
 }
 
 /// @dev anonymous struct
-struct Tuple21 {
+struct Tuple22 {
 	string field_0;
 	bytes field_1;
 }
@@ -502,16 +504,16 @@
 		uint256 tokenId
 	) external;
 
-	/// @notice Burns a specific ERC721 token.
-	/// @dev Throws unless `msg.sender` is the current owner or an authorized
-	///  operator for this RFT. Throws if `from` is not the current owner. Throws
-	///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
-	///  Throws if RFT pieces have multiple owners.
-	/// @param from The current owner of the RFT
-	/// @param tokenId The RFT to transfer
-	/// @dev EVM selector for this function is: 0x79cc6790,
-	///  or in textual repr: burnFrom(address,uint256)
-	function burnFrom(address from, uint256 tokenId) external;
+	// /// @notice Burns a specific ERC721 token.
+	// /// @dev Throws unless `msg.sender` is the current owner or an authorized
+	// ///  operator for this RFT. Throws if `from` is not the current owner. Throws
+	// ///  if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+	// ///  Throws if RFT pieces have multiple owners.
+	// /// @param from The current owner of the RFT
+	// /// @param tokenId The RFT to transfer
+	// /// @dev EVM selector for this function is: 0x79cc6790,
+	// ///  or in textual repr: burnFrom(address,uint256)
+	// function burnFrom(address from, uint256 tokenId) external;
 
 	/// @notice Burns a specific ERC721 token.
 	/// @dev Throws unless `msg.sender` is the current owner or an authorized

--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -39,10 +39,11 @@
     });
   });
 
+  // Soft-deprecated
   itEth('Add admin by owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     const newAdmin = helper.eth.createAccount();
 
@@ -70,11 +71,13 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
         
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     const admin1 = helper.eth.createAccount();
     const admin2 = await privateKey('admin');
     const admin2Cross = helper.ethCrossAccount.fromKeyringPair(admin2);
+    
+    // Soft-deprecated
     await collectionEvm.methods.addCollectionAdmin(admin1).send();
     await collectionEvm.methods.addCollectionAdminCross(admin2Cross).send();
 
@@ -86,24 +89,39 @@
     expect(adminListRpc).to.be.like(adminListEth);
   });
 
+  // Soft-deprecated
   itEth('Verify owner or admin', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
     const newAdmin = helper.eth.createAccount();
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
   
     expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.false;
     await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
     expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;
   });
-    
+
+  itEth('Verify owner or admin cross', async ({helper, privateKey}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+
+    const newAdmin = await privateKey('admin');
+    const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+  
+    expect(await collectionEvm.methods.isOwnerOrAdminCross(newAdminCross).call()).to.be.false;
+    await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
+    expect(await collectionEvm.methods.isOwnerOrAdminCross(newAdminCross).call()).to.be.true;
+  });
+
+  // Soft-deprecated
   itEth('(!negative tests!) Add admin by ADMIN is not allowed', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
     const admin = await helper.eth.createAccountWithBalance(donor);
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
     await collectionEvm.methods.addCollectionAdmin(admin).send();
 
     const user = helper.eth.createAccount();
@@ -116,12 +134,13 @@
       .to.be.eq(admin.toLocaleLowerCase());
   });
 
+  // Soft-deprecated
   itEth('(!negative tests!) Add admin by USER is not allowed', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
     const notAdmin = await helper.eth.createAccountWithBalance(donor);
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     const user = helper.eth.createAccount();
     await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: notAdmin}))
@@ -135,19 +154,22 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
-    const admin = await helper.eth.createAccountWithBalance(donor);
+    const [admin] = await helper.arrange.createAccounts([10n], donor);
+    const adminCross = helper.ethCrossAccount.fromKeyringPair(admin);
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
-    await collectionEvm.methods.addCollectionAdmin(admin).send();
+    await collectionEvm.methods.addCollectionAdminCross(adminCross).send();
 
     const [notAdmin] = await helper.arrange.createAccounts([10n], donor);
     const notAdminCross = helper.ethCrossAccount.fromKeyringPair(notAdmin);
-    await expect(collectionEvm.methods.addCollectionAdminCross(notAdminCross).call({from: admin}))
+    await expect(collectionEvm.methods.addCollectionAdminCross(notAdminCross).call({from: adminCross.eth}))
       .to.be.rejectedWith('NoPermission');
 
     const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);
     expect(adminList.length).to.be.eq(1);
-    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
-      .to.be.eq(admin.toLocaleLowerCase());
+    
+    const admin0Cross = helper.ethCrossAccount.fromKeyringPair(adminList[0]);
+    expect(admin0Cross.eth.toLocaleLowerCase())
+      .to.be.eq(adminCross.eth.toLocaleLowerCase());
   });
 
   itEth('(!negative tests!) Add [cross] admin by USER is not allowed', async ({helper}) => {
@@ -175,12 +197,13 @@
     });
   });
 
+  // Soft-deprecated
   itEth('Remove admin by owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
     const newAdmin = helper.eth.createAccount();
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
     await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
 
     {
@@ -214,11 +237,12 @@
     expect(adminList.length).to.be.eq(0);
   });
 
+  // Soft-deprecated
   itEth('(!negative tests!) Remove admin by ADMIN is not allowed', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     const admin0 = await helper.eth.createAccountWithBalance(donor);
     await collectionEvm.methods.addCollectionAdmin(admin0).send();
@@ -236,11 +260,12 @@
     }
   });
 
+  // Soft-deprecated
   itEth('(!negative tests!) Remove admin by USER is not allowed', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     const admin = await helper.eth.createAccountWithBalance(donor);
     await collectionEvm.methods.addCollectionAdmin(admin).send();
@@ -260,21 +285,23 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
-    const [adminSub] = await helper.arrange.createAccounts([10n], donor);
-    const adminSubCross = helper.ethCrossAccount.fromKeyringPair(adminSub);
+    const [admin1] = await helper.arrange.createAccounts([10n], donor);
+    const admin1Cross = helper.ethCrossAccount.fromKeyringPair(admin1);
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
-    await collectionEvm.methods.addCollectionAdminCross(adminSubCross).send();
-    const adminEth = await helper.eth.createAccountWithBalance(donor);
-    await collectionEvm.methods.addCollectionAdmin(adminEth).send();
+    await collectionEvm.methods.addCollectionAdminCross(admin1Cross).send();
+    
+    const [admin2] = await helper.arrange.createAccounts([10n], donor);
+    const admin2Cross = helper.ethCrossAccount.fromKeyringPair(admin2);
+    await collectionEvm.methods.addCollectionAdminCross(admin2Cross).send();
 
-    await expect(collectionEvm.methods.removeCollectionAdminCross(adminSubCross).call({from: adminEth}))
+    await expect(collectionEvm.methods.removeCollectionAdminCross(admin1Cross).call({from: admin2Cross.eth}))
       .to.be.rejectedWith('NoPermission');
 
     const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);
     expect(adminList.length).to.be.eq(2);
     expect(adminList.toString().toLocaleLowerCase())
-      .to.be.deep.contains(adminSub.address.toLocaleLowerCase())
-      .to.be.deep.contains(adminEth.toLocaleLowerCase());
+      .to.be.deep.contains(admin1.address.toLocaleLowerCase())
+      .to.be.deep.contains(admin2.address.toLocaleLowerCase());
   });
 
   itEth('(!negative tests!) Remove [cross] admin by USER is not allowed', async ({helper}) => {
@@ -297,6 +324,7 @@
   });
 });
 
+// Soft-deprecated
 describe('Change owner tests', () => {
   let donor: IKeyringPair;
 
@@ -310,7 +338,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const newOwner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     await collectionEvm.methods.changeCollectionOwner(newOwner).send();
 
@@ -322,7 +350,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const newOwner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
     const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.changeCollectionOwner(newOwner).send());
     expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
     expect(cost > 0);
@@ -332,7 +360,7 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const newOwner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     await expect(collectionEvm.methods.changeCollectionOwner(newOwner).send({from: newOwner})).to.be.rejected;
     expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.false;
@@ -355,12 +383,10 @@
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
 
-    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.true;
     expect(await collectionEvm.methods.isOwnerOrAdminCross(newOwnerCross).call()).to.be.false;
 
-    await collectionEvm.methods.setOwnerCross(newOwnerCross).send();
+    await collectionEvm.methods.changeCollectionOwnerCross(newOwnerCross).send();
 
-    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;
     expect(await collectionEvm.methods.isOwnerOrAdminCross(newOwnerCross).call()).to.be.true;
   });
 
@@ -383,7 +409,7 @@
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
 
-    await expect(collectionEvm.methods.setOwnerCross(newOwnerCross).send({from: otherReceiver})).to.be.rejected;
+    await expect(collectionEvm.methods.changeCollectionOwnerCross(newOwnerCross).send({from: otherReceiver})).to.be.rejected;
     expect(await collectionEvm.methods.isOwnerOrAdminCross(newOwnerCross).call()).to.be.false;
   });
 });

--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -27,7 +27,7 @@
   before(async function() {
     await usingEthPlaygrounds(async (_helper, privateKey) => {
       donor = await privateKey({filename: __filename});
-      [alice] = await _helper.arrange.createAccounts([10n], donor);
+      [alice] = await _helper.arrange.createAccounts([20n], donor);
     });
   });
 
@@ -39,7 +39,7 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'nft', caller);
 
-    await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send({from: caller});
+    await contract.methods.setCollectionProperties([{key: 'testKey', value: Buffer.from('testValue')}]).send({from: caller});
 
     const raw = (await collection.getData())?.raw;
 
@@ -55,7 +55,7 @@
     const address = helper.ethAddress.fromCollectionId(collection.collectionId);
     const contract = helper.ethNativeContract.collection(address, 'nft', caller);
 
-    await contract.methods.deleteCollectionProperty('testKey').send({from: caller});
+    await contract.methods.deleteCollectionProperties(['testKey']).send({from: caller});
 
     const raw = (await collection.getData())?.raw;
 
@@ -72,6 +72,39 @@
     const value = await contract.methods.collectionProperty('testKey').call();
     expect(value).to.equal(helper.getWeb3().utils.toHex('testValue'));
   });
+
+  // Soft-deprecated
+  itEth('Collection property can be set', async({helper}) => {
+    const caller = await helper.eth.createAccountWithBalance(donor);
+    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: []});
+    await collection.addAdmin(alice, {Ethereum: caller});
+
+    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const contract = helper.ethNativeContract.collection(address, 'nft', caller, true);
+
+    await contract.methods.setCollectionProperty('testKey', Buffer.from('testValue')).send();
+
+    const raw = (await collection.getData())?.raw;
+
+    expect(raw.properties[0].value).to.equal('testValue');
+  });
+
+  // Soft-deprecated
+  itEth('Collection property can be deleted', async({helper}) => {
+    const caller = await helper.eth.createAccountWithBalance(donor);
+    const collection = await helper.nft.mintCollection(alice, {name: 'name', description: 'test', tokenPrefix: 'test', properties: [{key: 'testKey', value: 'testValue'}]});
+
+    await collection.addAdmin(alice, {Ethereum: caller});
+
+    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const contract = helper.ethNativeContract.collection(address, 'nft', caller, true);
+
+    await contract.methods.deleteCollectionProperty('testKey').send({from: caller});
+
+    const raw = (await collection.getData())?.raw;
+
+    expect(raw.properties.length).to.equal(0);
+  });
 });
 
 describe('Supports ERC721Metadata', () => {
@@ -95,9 +128,10 @@
     const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection';
 
     const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p');
+    const bruhCross = helper.ethCrossAccount.fromAddress(bruh);
 
     const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);
-    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too
+    await contract.methods.addCollectionAdminCross(bruhCross).send(); // to check that admin will work too
 
     const collection1 = helper.nft.getCollectionObject(collectionId);
     const data1 = await collection1.getData();
@@ -133,10 +167,10 @@
 
     expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);
 
-    await contract.methods.setProperty(tokenId1, 'URISuffix', Buffer.from(SUFFIX)).send();
+    await contract.methods.setProperties(tokenId1, [{key: 'URISuffix', value: Buffer.from(SUFFIX)}]).send();
     expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);
 
-    await contract.methods.setProperty(tokenId1, 'URI', Buffer.from(URI)).send();
+    await contract.methods.setProperties(tokenId1, [{key: 'URI', value: Buffer.from(URI)}]).send();
     expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);
 
     await contract.methods.deleteProperties(tokenId1, ['URI']).send();
@@ -150,7 +184,7 @@
     await contract.methods.deleteProperties(tokenId2, ['URI']).send();
     expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);
 
-    await contract.methods.setProperty(tokenId2, 'URISuffix', Buffer.from(SUFFIX)).send();
+    await contract.methods.setProperties(tokenId2, [{key: 'URISuffix', value: Buffer.from(SUFFIX)}]).send();
     expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);
   };
 

--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -81,17 +81,41 @@
   //   expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);
   // });
 
-  itEth('Remove sponsor', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Remove sponsor', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
+
+    let result = await collectionHelpers.methods.createNFTCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
+    const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const collectionEvm = helper.ethNativeContract.collection(collectionIdAddress, 'nft', owner, true);
+
+    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});
+    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;
+
+    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
+    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
+
+    await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
+
+    const sponsorTuple = await collectionEvm.methods.collectionSponsor().call({from: owner});
+    expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
+  });
+
+  itEth('[cross] Remove sponsor', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
 
     let result = await collectionHelpers.methods.createNFTCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
     const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
     const collectionEvm = helper.ethNativeContract.collection(collectionIdAddress, 'nft', owner);
 
     expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
-    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});
+    result = await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send({from: owner});
     expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;
 
     await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
@@ -103,14 +127,15 @@
     expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');
   });
 
-  itEth('Sponsoring collection from evm address via access list', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Sponsoring collection from evm address via access list', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
 
     const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Sponsor collection', '1', '1', '');
 
     const collection = helper.nft.getCollectionObject(collectionId);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
 
     await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});
     let collectionData = (await collection.getData())!;
@@ -165,6 +190,70 @@
     }
   });
 
+  itEth('[cross] Sponsoring collection from evm address via access list', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+
+    const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Sponsor collection', '1', '1', '');
+
+    const collection = helper.nft.getCollectionObject(collectionId);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+
+    await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send({from: owner});
+    let collectionData = (await collection.getData())!;
+    expect(collectionData.raw.sponsorship.Unconfirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
+    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
+
+    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
+    collectionData = (await collection.getData())!;
+    expect(collectionData.raw.sponsorship.Confirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
+
+    const user = helper.eth.createAccount();
+    const userCross = helper.ethCrossAccount.fromAddress(user);
+    const nextTokenId = await collectionEvm.methods.nextTokenId().call();
+    expect(nextTokenId).to.be.equal('1');
+
+    const oldPermissions = (await collection.getData())!.raw.permissions; // (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();
+    expect(oldPermissions.mintMode).to.be.false;
+    expect(oldPermissions.access).to.be.equal('Normal');
+
+    await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
+    await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
+    await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
+
+    const newPermissions = (await collection.getData())!.raw.permissions; // (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();
+    expect(newPermissions.mintMode).to.be.true;
+    expect(newPermissions.access).to.be.equal('AllowList');
+
+    const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
+    const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
+
+    {
+      const result = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
+      const events = helper.eth.normalizeEvents(result.events);
+
+      expect(events).to.be.deep.equal([
+        {
+          address: collectionAddress,
+          event: 'Transfer',
+          args: {
+            from: '0x0000000000000000000000000000000000000000',
+            to: user,
+            tokenId: '1',
+          },
+        },
+      ]);
+
+      const ownerBalanceAfter = await helper.balance.getSubstrate(await helper.address.ethToSubstrate(owner));
+      const sponsorBalanceAfter = await helper.balance.getSubstrate(await helper.address.ethToSubstrate(sponsor));
+
+      expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+      expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);
+      expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;
+    }
+  });
+
   // TODO: Temprorary off. Need refactor
   // itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {
   //   const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -221,15 +310,68 @@
   //   }
   // });
 
-  itEth('Check that transaction via EVM spend money from sponsor address', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Check that transaction via EVM spend money from sponsor address', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+
+    const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner,'Sponsor collection', '1', '1', '');
+    const collection = helper.nft.getCollectionObject(collectionId);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
+
+    await collectionEvm.methods.setCollectionSponsor(sponsor).send();
+    let collectionData = (await collection.getData())!;
+    expect(collectionData.raw.sponsorship.Unconfirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
+    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
+
+    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor, true);
+    await sponsorCollection.methods.confirmCollectionSponsorship().send();
+    collectionData = (await collection.getData())!;
+    expect(collectionData.raw.sponsorship.Confirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
+
+    const user = helper.eth.createAccount();
+    await collectionEvm.methods.addCollectionAdmin(user).send();
+
+    const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
+    const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
+
+    const userCollectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', user, true);
+
+    const result = await userCollectionEvm.methods.mintWithTokenURI(user, 'Test URI').send();
+    const tokenId = result.events.Transfer.returnValues.tokenId;
+
+    const events = helper.eth.normalizeEvents(result.events);
+    const address = helper.ethAddress.fromCollectionId(collectionId);
+
+    expect(events).to.be.deep.equal([
+      {
+        address,
+        event: 'Transfer',
+        args: {
+          from: '0x0000000000000000000000000000000000000000',
+          to: user,
+          tokenId: '1',
+        },
+      },
+    ]);
+    expect(await userCollectionEvm.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');
+
+    const ownerBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
+    expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);
+    const sponsorBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
+    expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;
+  });
+
+  itEth('[cross] Check that transaction via EVM spend money from sponsor address', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
 
     const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner,'Sponsor collection', '1', '1', '');
     const collection = helper.nft.getCollectionObject(collectionId);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
 
-    await collectionEvm.methods.setCollectionSponsor(sponsor).send();
+    await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send();
     let collectionData = (await collection.getData())!;
     expect(collectionData.raw.sponsorship.Unconfirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
     await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
@@ -240,7 +382,8 @@
     expect(collectionData.raw.sponsorship.Confirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
 
     const user = helper.eth.createAccount();
-    await collectionEvm.methods.addCollectionAdmin(user).send();
+    const userCross = helper.ethCrossAccount.fromAddress(user);
+    await collectionEvm.methods.addCollectionAdminCross(userCross).send();
 
     const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
     const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));

--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -31,13 +31,14 @@
     });
   });
   
-  itEth('Set sponsorship', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Set sponsorship', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
     const ss58Format = helper.chain.getChainProperties().ss58Format;
     const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, 'absolutely anything', 'ENVY');
 
-    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, true);
     await collection.methods.setCollectionSponsor(sponsor).send();
 
     let data = (await helper.rft.getData(collectionId))!;
@@ -45,6 +46,28 @@
 
     await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
 
+    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);
+    await sponsorCollection.methods.confirmCollectionSponsorship().send();
+
+    data = (await helper.rft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+  });
+
+  itEth('[cross] Set sponsorship', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const ss58Format = helper.chain.getChainProperties().ss58Format;
+    const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, 'absolutely anything', 'ENVY');
+
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
+    await collection.methods.setCollectionSponsorCross(sponsorCross).send();
+
+    let data = (await helper.rft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+
+    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
+
     const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);
     await sponsorCollection.methods.confirmCollectionSponsorship().send();
 
@@ -183,7 +206,32 @@
       .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
   });
 
-  itEth('(!negative test!) Check owner', async ({helper}) => {
+  // Soft-deprecated
+  itEth('(!negative test!) [eth] Check owner', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const peasant = helper.eth.createAccount();
+    const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Transgressed', DECIMALS, 'absolutely anything', 'YVNE');
+    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', peasant, true);
+    const EXPECTED_ERROR = 'NoPermission';
+    {
+      const sponsor = await helper.eth.createAccountWithBalance(donor);
+      await expect(peasantCollection.methods
+        .setCollectionSponsor(sponsor)
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+      
+      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', sponsor, true);
+      await expect(sponsorCollection.methods
+        .confirmCollectionSponsorship()
+        .call()).to.be.rejectedWith('caller is not set as sponsor');
+    }
+    {
+      await expect(peasantCollection.methods
+        .setCollectionLimit('account_token_ownership_limit', '1000')
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+    }
+  });
+
+  itEth('(!negative test!) [cross] Check owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const peasant = helper.eth.createAccount();
     const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Transgressed', DECIMALS, 'absolutely anything', 'YVNE');
@@ -191,8 +239,9 @@
     const EXPECTED_ERROR = 'NoPermission';
     {
       const sponsor = await helper.eth.createAccountWithBalance(donor);
+      const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
       await expect(peasantCollection.methods
-        .setCollectionSponsor(sponsor)
+        .setCollectionSponsorCross(sponsorCross)
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
       
       const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', sponsor);

--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -70,13 +70,14 @@
     ]);
   });
 
-  itEth('Set sponsorship', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Set sponsorship', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
     const ss58Format = helper.chain.getChainProperties().ss58Format;
     const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
 
-    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
     await collection.methods.setCollectionSponsor(sponsor).send();
 
     let data = (await helper.nft.getData(collectionId))!;
@@ -84,6 +85,28 @@
 
     await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
 
+    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor, true);
+    await sponsorCollection.methods.confirmCollectionSponsorship().send();
+
+    data = (await helper.nft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+  });
+
+  itEth('[cross] Set sponsorship', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const ss58Format = helper.chain.getChainProperties().ss58Format;
+    const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');
+
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
+    await collection.methods.setCollectionSponsorCross(sponsorCross).send();
+
+    let data = (await helper.nft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+
+    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
+
     const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor);
     await sponsorCollection.methods.confirmCollectionSponsorship().send();
 
@@ -196,7 +219,32 @@
       .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
   });
 
-  itEth('(!negative test!) Check owner', async ({helper}) => {
+  // Soft-deprecated
+  itEth('(!negative test!) [eth] Check owner', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const malfeasant = helper.eth.createAccount();
+    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Transgressed', 'absolutely anything', 'COR');
+    const malfeasantCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', malfeasant, true);
+    const EXPECTED_ERROR = 'NoPermission';
+    {
+      const sponsor = await helper.eth.createAccountWithBalance(donor);
+      await expect(malfeasantCollection.methods
+        .setCollectionSponsor(sponsor)
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+
+      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor, true);
+      await expect(sponsorCollection.methods
+        .confirmCollectionSponsorship()
+        .call()).to.be.rejectedWith('caller is not set as sponsor');
+    }
+    {
+      await expect(malfeasantCollection.methods
+        .setCollectionLimit('account_token_ownership_limit', '1000')
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+    }
+  });
+
+  itEth('(!negative test!) [cross] Check owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const malfeasant = helper.eth.createAccount();
     const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Transgressed', 'absolutely anything', 'COR');
@@ -204,8 +252,9 @@
     const EXPECTED_ERROR = 'NoPermission';
     {
       const sponsor = await helper.eth.createAccountWithBalance(donor);
+      const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
       await expect(malfeasantCollection.methods
-        .setCollectionSponsor(sponsor)
+        .setCollectionSponsorCross(sponsorCross)
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
 
       const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor);

--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -105,13 +105,14 @@
       .call()).to.be.true;
   });
   
-  itEth('Set sponsorship', async ({helper}) => {
+  // Soft-deprecated
+  itEth('[eth] Set sponsorship', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const sponsor = await helper.eth.createAccountWithBalance(donor);
     const ss58Format = helper.chain.getChainProperties().ss58Format;
     const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');
 
-    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, true);
     await collection.methods.setCollectionSponsor(sponsor).send();
 
     let data = (await helper.rft.getData(collectionId))!;
@@ -119,6 +120,28 @@
 
     await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
 
+    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);
+    await sponsorCollection.methods.confirmCollectionSponsorship().send();
+
+    data = (await helper.rft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+  });
+
+  itEth('[cross] Set sponsorship', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const sponsor = await helper.eth.createAccountWithBalance(donor);
+    const ss58Format = helper.chain.getChainProperties().ss58Format;
+    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');
+
+    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
+    await collection.methods.setCollectionSponsorCross(sponsorCross).send();
+
+    let data = (await helper.rft.getData(collectionId))!;
+    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));
+
+    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');
+
     const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);
     await sponsorCollection.methods.confirmCollectionSponsorship().send();
 
@@ -231,7 +254,32 @@
       .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
   });
 
-  itEth('(!negative test!) Check owner', async ({helper}) => {
+  // Soft-deprecated
+  itEth('(!negative test!) [eth] Check owner', async ({helper}) => {
+    const owner = await helper.eth.createAccountWithBalance(donor);
+    const peasant = helper.eth.createAccount();
+    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');
+    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant, true);
+    const EXPECTED_ERROR = 'NoPermission';
+    {
+      const sponsor = await helper.eth.createAccountWithBalance(donor);
+      await expect(peasantCollection.methods
+        .setCollectionSponsor(sponsor)
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+      
+      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);
+      await expect(sponsorCollection.methods
+        .confirmCollectionSponsorship()
+        .call()).to.be.rejectedWith('caller is not set as sponsor');
+    }
+    {
+      await expect(peasantCollection.methods
+        .setCollectionLimit('account_token_ownership_limit', '1000')
+        .call()).to.be.rejectedWith(EXPECTED_ERROR);
+    }
+  });
+
+  itEth('(!negative test!) [cross] Check owner', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const peasant = helper.eth.createAccount();
     const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');
@@ -239,8 +287,9 @@
     const EXPECTED_ERROR = 'NoPermission';
     {
       const sponsor = await helper.eth.createAccountWithBalance(donor);
+      const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
       await expect(peasantCollection.methods
-        .setCollectionSponsor(sponsor)
+        .setCollectionSponsorCross(sponsorCross)
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
       
       const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);

--- a/tests/src/eth/fractionalizer/Fractionalizer.sol
+++ b/tests/src/eth/fractionalizer/Fractionalizer.sol
@@ -3,7 +3,7 @@
 import {CollectionHelpers} from "../api/CollectionHelpers.sol";
 import {ContractHelpers} from "../api/ContractHelpers.sol";
 import {UniqueRefungibleToken} from "../api/UniqueRefungibleToken.sol";
-import {UniqueRefungible} from "../api/UniqueRefungible.sol";
+import {UniqueRefungible, EthCrossAccount} from "../api/UniqueRefungible.sol";
 import {UniqueNFT} from "../api/UniqueNFT.sol";
 
 /// @dev Fractionalization contract. It stores mappings between NFT and RFT tokens,
@@ -63,7 +63,7 @@
 			"Wrong collection type. Collection is not refungible."
 		);
 		require(
-			refungibleContract.isOwnerOrAdmin(address(this)),
+			refungibleContract.isOwnerOrAdminCross(EthCrossAccount({eth: address(this), sub: uint256(0)})),
 			"Fractionalizer contract should be an admin of the collection"
 		);
 		rftCollection = _collection;

--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -95,7 +95,8 @@
     const rftCollection = await helper.eth.createRFTCollection(owner, 'rft', 'RFT collection', 'RFT');
     const rftContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
 
-    await rftContract.methods.addCollectionAdmin(fractionalizer.options.address).send({from: owner});
+    const fractionalizerAddressCross = helper.ethCrossAccount.fromAddress(fractionalizer.options.address);
+    await rftContract.methods.addCollectionAdminCross(fractionalizerAddressCross).send({from: owner});
     const result = await fractionalizer.methods.setRFTCollection(rftCollection.collectionAddress).send({from: owner});
     expect(result.events).to.be.like({
       RFTCollectionSet: {
@@ -235,7 +236,8 @@
     const refungibleContract = helper.ethNativeContract.collection(rftCollection.collectionAddress, 'rft', owner);
 
     const fractionalizer = await deployContract(helper, owner);
-    await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send({from: owner});
+    const fractionalizerAddressCross = helper.ethCrossAccount.fromAddress(fractionalizer.options.address);
+    await refungibleContract.methods.addCollectionAdminCross(fractionalizerAddressCross).send({from: owner});
     await fractionalizer.methods.setRFTCollection(rftCollection.collectionAddress).send({from: owner});
 
     await expect(fractionalizer.methods.setRFTCollection(rftCollection.collectionAddress).call())
@@ -248,7 +250,8 @@
     const nftContract = helper.ethNativeContract.collection(nftCollection.collectionAddress, 'nft', owner);
 
     const fractionalizer = await deployContract(helper, owner);
-    await nftContract.methods.addCollectionAdmin(fractionalizer.options.address).send({from: owner});
+    const fractionalizerAddressCross = helper.ethCrossAccount.fromAddress(fractionalizer.options.address);
+    await nftContract.methods.addCollectionAdminCross(fractionalizerAddressCross).send({from: owner});
 
     await expect(fractionalizer.methods.setRFTCollection(nftCollection.collectionAddress).call())
       .to.be.rejectedWith(/Wrong collection type. Collection is not refungible.$/g);
@@ -370,7 +373,8 @@
 
     const fractionalizer = await deployContract(helper, owner);
 
-    await refungibleContract.methods.addCollectionAdmin(fractionalizer.options.address).send({from: owner});
+    const fractionalizerAddressCross = helper.ethCrossAccount.fromAddress(fractionalizer.options.address);
+    await refungibleContract.methods.addCollectionAdminCross(fractionalizerAddressCross).send({from: owner});
     await fractionalizer.methods.setRFTCollection(rftCollection.collectionAddress).send({from: owner});
 
     const mintResult = await refungibleContract.methods.mint(owner).send({from: owner});