git.delta.rocks / unique-network / refs/commits / 846b9101586a

difftreelog

feat Using EthCrossAccount in appropriate functions

Trubnikov Sergey2022-10-25parent: #1fe3f60.patch.diff
in: master

11 files changed

modifiedcrates/evm-coder/src/abi.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/abi.rs
+++ b/crates/evm-coder/src/abi.rs
@@ -450,7 +450,7 @@
 	}
 }
 
-impl AbiWrite for &EthCrossAccount {
+impl AbiWrite for EthCrossAccount {
 	fn abi_write(&self, writer: &mut AbiWriter) {
 		self.eth.abi_write(writer);
 		self.sub.abi_write(writer);
modifiedcrates/evm-coder/src/lib.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/lib.rs
+++ b/crates/evm-coder/src/lib.rs
@@ -218,7 +218,7 @@
 		}
 	}
 
-	#[derive(Debug)]
+	#[derive(Debug, Default)]
 	pub struct EthCrossAccount {
 		pub(crate) eth: address,
 		pub(crate) sub: uint256,
modifiedcrates/evm-coder/src/solidity.rsdiffbeforeafterboth
--- a/crates/evm-coder/src/solidity.rs
+++ b/crates/evm-coder/src/solidity.rs
@@ -203,7 +203,7 @@
 	}
 
 	fn solidity_default(writer: &mut impl fmt::Write, tc: &TypeCollector) -> fmt::Result {
-		write!(writer, "{}(", tc.collect_tuple::<Self>())?;
+		write!(writer, "{}(", tc.collect_struct::<Self>())?;
 		address::solidity_default(writer, tc)?;
 		write!(writer, ",")?;
 		uint256::solidity_default(writer, tc)?;
modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -231,13 +231,13 @@
 	fn set_collection_sponsor_cross(
 		&mut self,
 		caller: caller,
-		sponsor: (address, uint256),
+		sponsor: EthCrossAccount,
 	) -> Result<void> {
 		self.consume_store_reads_and_writes(1, 1)?;
 
 		check_is_owner_or_admin(caller, self)?;
 
-		let sponsor = convert_tuple_to_cross_account::<T>(sponsor)?;
+		let sponsor = sponsor.into_sub_cross_account::<T>()?;
 		self.set_sponsor(sponsor.as_sub().clone())
 			.map_err(dispatch_to_evm::<T>)?;
 		save(self)
@@ -388,12 +388,12 @@
 	fn add_collection_admin_cross(
 		&mut self,
 		caller: caller,
-		new_admin: (address, uint256),
+		new_admin: EthCrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(2)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
-		let new_admin = convert_tuple_to_cross_account::<T>(new_admin)?;
+		let new_admin = new_admin.into_sub_cross_account::<T>()?;
 		<Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -403,12 +403,12 @@
 	fn remove_collection_admin_cross(
 		&mut self,
 		caller: caller,
-		admin: (address, uint256),
+		admin: EthCrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(2)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
-		let admin = convert_tuple_to_cross_account::<T>(admin)?;
+		let admin = admin.into_sub_cross_account::<T>()?;
 		<Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -566,12 +566,12 @@
 	fn add_to_collection_allow_list_cross(
 		&mut self,
 		caller: caller,
-		user: (address, uint256),
+		user: EthCrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
-		let user = convert_tuple_to_cross_account::<T>(user)?;
+		let user = user.into_sub_cross_account::<T>()?;
 		Pallet::<T>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -594,12 +594,12 @@
 	fn remove_from_collection_allow_list_cross(
 		&mut self,
 		caller: caller,
-		user: (address, uint256),
+		user: EthCrossAccount,
 	) -> Result<void> {
 		self.consume_store_writes(1)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
-		let user = convert_tuple_to_cross_account::<T>(user)?;
+		let user = user.into_sub_cross_account::<T>()?;
 		Pallet::<T>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
@@ -639,8 +639,8 @@
 	///
 	/// @param user User cross account to verify
 	/// @return "true" if account is the owner or admin
-	fn is_owner_or_admin_cross(&self, user: (address, uint256)) -> Result<bool> {
-		let user = convert_tuple_to_cross_account::<T>(user)?;
+	fn is_owner_or_admin_cross(&self, user: EthCrossAccount) -> Result<bool> {
+		let user = user.into_sub_cross_account::<T>()?;
 		Ok(self.is_owner_or_admin(&user))
 	}
 
@@ -660,8 +660,8 @@
 	///
 	/// @return Tuble with sponsor address and his substrate mirror.
 	/// If address is canonical then substrate mirror is zero and vice versa.
-	fn collection_owner(&self) -> Result<(address, uint256)> {
-		Ok(convert_cross_account_to_tuple::<T>(
+	fn collection_owner(&self) -> Result<EthCrossAccount> {
+		Ok(EthCrossAccount::from_sub_cross_account::<T>(
 			&T::CrossAccountId::from_sub(self.owner.clone()),
 		))
 	}
@@ -684,9 +684,9 @@
 	///
 	/// @return Vector of tuples with admins address and his substrate mirror.
 	/// If address is canonical then substrate mirror is zero and vice versa.
-	fn collection_admins(&self) -> Result<Vec<(address, uint256)>> {
+	fn collection_admins(&self) -> Result<Vec<EthCrossAccount>> {
 		let result = crate::IsAdmin::<T>::iter_prefix((self.id,))
-			.map(|(admin, _)| crate::eth::convert_cross_account_to_tuple::<T>(&admin))
+			.map(|(admin, _)| EthCrossAccount::from_sub_cross_account::<T>(&admin))
 			.collect();
 		Ok(result)
 	}
@@ -695,11 +695,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: (address, uint256)) -> Result<void> {
+	fn set_owner_cross(&mut self, caller: caller, new_owner: EthCrossAccount) -> Result<void> {
 		self.consume_store_writes(1)?;
 
 		let caller = T::CrossAccountId::from_eth(caller);
-		let new_owner = convert_tuple_to_cross_account::<T>(new_owner)?;
+		let new_owner = new_owner.into_sub_cross_account::<T>()?;
 		self.set_owner_internal(caller, new_owner)
 			.map_err(dispatch_to_evm::<T>)
 	}
modifiedpallets/fungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/fungible/src/erc.rs
+++ b/pallets/fungible/src/erc.rs
@@ -167,11 +167,11 @@
 	fn approve_cross(
 		&mut self,
 		caller: caller,
-		spender: (address, uint256),
+		spender: EthCrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let spender = convert_tuple_to_cross_account::<T>(spender)?;
+		let spender = spender.into_sub_cross_account::<T>()?;
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 
 		<Pallet<T>>::set_allowance(self, &caller, &spender, amount)
@@ -207,11 +207,11 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: (address, uint256),
+		from: EthCrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let from = convert_tuple_to_cross_account::<T>(from)?;
+		let from = from.into_sub_cross_account::<T>()?;
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 		let budget = self
 			.recorder
@@ -249,13 +249,13 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: (address, uint256),
-		to: (address, uint256),
+		from: EthCrossAccount,
+		to: EthCrossAccount,
 		amount: uint256,
 	) -> Result<bool> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let from = convert_tuple_to_cross_account::<T>(from)?;
-		let to = convert_tuple_to_cross_account::<T>(to)?;
+		let from = from.into_sub_cross_account::<T>()?;
+		let to = to.into_sub_cross_account::<T>()?;
 		let amount = amount.try_into().map_err(|_| "amount overflow")?;
 		let budget = self
 			.recorder
modifiedpallets/nonfungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -684,11 +684,11 @@
 	fn approve_cross(
 		&mut self,
 		caller: caller,
-		approved: (address, uint256),
+		approved: EthCrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let approved = convert_tuple_to_cross_account::<T>(approved)?;
+		let approved = approved.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
 
 		<Pallet<T>>::set_allowance(self, &caller, token, Some(&approved))
@@ -770,11 +770,11 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: (address, uint256),
+		from: EthCrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let from = convert_tuple_to_cross_account::<T>(from)?;
+		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
 		let budget = self
 			.recorder
modifiedpallets/refungible/src/erc.rsdiffbeforeafterboth
--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -734,23 +734,23 @@
 	fn transfer_from_cross(
 		&mut self,
 		caller: caller,
-		from: (address, uint256),
-		to: (address, uint256),
+		from: EthCrossAccount,
+		to: EthCrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		// let from = convert_tuple_to_cross_account::<T>(from)?;
-		// let to = convert_tuple_to_cross_account::<T>(to)?;
-		// let token_id = token_id.try_into()?;
-		// let budget = self
-		// 	.recorder
-		// 	.weight_calls_budget(<StructureWeight<T>>::find_parent());
+		let from = from.into_sub_cross_account::<T>()?;
+		let to = to.into_sub_cross_account::<T>()?;
+		let token_id = token_id.try_into()?;
+		let budget = self
+			.recorder
+			.weight_calls_budget(<StructureWeight<T>>::find_parent());
 
-		// let balance = balance(self, token_id, &from)?;
-		// ensure_single_owner(self, token_id, balance)?;
+		let balance = balance(self, token_id, &from)?;
+		ensure_single_owner(self, token_id, balance)?;
 
-		// Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)
-		// 	.map_err(dispatch_to_evm::<T>)?;
+		Pallet::<T>::transfer_from(self, &caller, &from, &to, token_id, balance, &budget)
+			.map_err(dispatch_to_evm::<T>)?;
 		Ok(())
 	}
 
@@ -789,11 +789,11 @@
 	fn burn_from_cross(
 		&mut self,
 		caller: caller,
-		from: (address, uint256),
+		from: EthCrossAccount,
 		token_id: uint256,
 	) -> Result<void> {
 		let caller = T::CrossAccountId::from_eth(caller);
-		let from = convert_tuple_to_cross_account::<T>(from)?;
+		let from = from.into_sub_cross_account::<T>()?;
 		let token = token_id.try_into()?;
 		let budget = self
 			.recorder
modifiedtests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -94,25 +94,6 @@
     await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
     expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;
   });
-  
-  itEth.skip('Check adminlist', async ({helper, privateKey}) => {
-    const owner = await helper.eth.createAccountWithBalance(donor);
-        
-    const {collectionAddress, collectionId} = await helper.eth.createNonfungibleCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
-
-    const admin1 = helper.eth.createAccount();
-    const admin2 = privateKey('admin');
-    await collectionEvm.methods.addCollectionAdmin(admin1).send();
-    await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send();
-
-    const adminListRpc = await helper.collection.getAdmins(collectionId);
-    let adminListEth = await collectionEvm.methods.collectionAdmins().call();
-    adminListEth = adminListEth.map((element: IEthCrossAccountId) => {
-      return helper.address.convertCrossAccountFromEthCrossAcoount(element);
-    });
-    expect(adminListRpc).to.be.like(adminListEth);
-  });  
     
   itEth('(!negative tests!) Add admin by ADMIN is not allowed', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
before · tests/src/eth/nonFungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23  let donor: IKeyringPair;24  let alice: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (helper, privateKey) => {28      donor = await privateKey({filename: __filename});29      [alice] = await helper.arrange.createAccounts([10n], donor);30    });31  });3233  itEth('totalSupply', async ({helper}) => {34    const collection = await helper.nft.mintCollection(alice, {});35    await collection.mintToken(alice);3637    const caller = await helper.eth.createAccountWithBalance(donor);3839    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40    const totalSupply = await contract.methods.totalSupply().call();4142    expect(totalSupply).to.equal('1');43  });4445  itEth('balanceOf', async ({helper}) => {46    const collection = await helper.nft.mintCollection(alice, {});47    const caller = await helper.eth.createAccountWithBalance(donor);4849    await collection.mintToken(alice, {Ethereum: caller});50    await collection.mintToken(alice, {Ethereum: caller});51    await collection.mintToken(alice, {Ethereum: caller});5253    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54    const balance = await contract.methods.balanceOf(caller).call();5556    expect(balance).to.equal('3');57  });5859  itEth('ownerOf', async ({helper}) => {60    const collection = await helper.nft.mintCollection(alice, {});61    const caller = await helper.eth.createAccountWithBalance(donor);6263    const token = await collection.mintToken(alice, {Ethereum: caller});6465    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667    const owner = await contract.methods.ownerOf(token.tokenId).call();6869    expect(owner).to.equal(caller);70  });7172  itEth('name/symbol is available regardless of ERC721Metadata support', async ({helper}) => {73    const collection = await helper.nft.mintCollection(alice, {name: 'test', tokenPrefix: 'TEST'});74    const caller = helper.eth.createAccount();7576    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);7778    expect(await contract.methods.name().call()).to.equal('test');79    expect(await contract.methods.symbol().call()).to.equal('TEST');80  });81});8283describe('Check ERC721 token URI for NFT', () => {84  let donor: IKeyringPair;8586  before(async function() {87    await usingEthPlaygrounds(async (_helper, privateKey) => {88      donor = await privateKey({filename: __filename});89    });90  });9192  async function setup(helper: EthUniqueHelper, baseUri: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {93    const owner = await helper.eth.createAccountWithBalance(donor);94    const receiver = helper.eth.createAccount();9596    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', baseUri);97    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);9899    const result = await contract.methods.mint(receiver).send();100    const tokenId = result.events.Transfer.returnValues.tokenId;101    expect(tokenId).to.be.equal('1');102103    if (propertyKey && propertyValue) {104      // Set URL or suffix105      await contract.methods.setProperty(tokenId, propertyKey, Buffer.from(propertyValue)).send();106    }107108    const event = result.events.Transfer;109    expect(event.address).to.be.equal(collectionAddress);110    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');111    expect(event.returnValues.to).to.be.equal(receiver);112    expect(event.returnValues.tokenId).to.be.equal(tokenId);113114    return {contract, nextTokenId: tokenId};115  }116117  itEth('Empty tokenURI', async ({helper}) => {118    const {contract, nextTokenId} = await setup(helper, '');119    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');120  });121122  itEth('TokenURI from url', async ({helper}) => {123    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URI', 'Token URI');124    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');125  });126127  itEth('TokenURI from baseURI', async ({helper}) => {128    const {contract, nextTokenId} = await setup(helper, 'BaseURI_');129    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_');130  });131132  itEth('TokenURI from baseURI + suffix', async ({helper}) => {133    const suffix = '/some/suffix';134    const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'URISuffix', suffix);135    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);136  });137});138139describe('NFT: Plain calls', () => {140  let donor: IKeyringPair;141  let alice: IKeyringPair;142143  before(async function() {144    await usingEthPlaygrounds(async (helper, privateKey) => {145      donor = await privateKey({filename: __filename});146      [alice] = await helper.arrange.createAccounts([10n], donor);147    });148  });149150  itEth('Can perform mint()', async ({helper}) => {151    const owner = await helper.eth.createAccountWithBalance(donor);152    const receiver = helper.eth.createAccount();153154    const {collectionAddress} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', '6', '6', '');155    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);156157    const result = await contract.methods.mintWithTokenURI(receiver, 'Test URI').send();158    const tokenId = result.events.Transfer.returnValues.tokenId;159    expect(tokenId).to.be.equal('1');160161    const event = result.events.Transfer;162    expect(event.address).to.be.equal(collectionAddress);163    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');164    expect(event.returnValues.to).to.be.equal(receiver);165166    expect(await contract.methods.tokenURI(tokenId).call()).to.be.equal('Test URI');167168    // TODO: this wont work right now, need release 919000 first169    // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();170    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();171    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);172  });173174  //TODO: CORE-302 add eth methods175  itEth.skip('Can perform mintBulk()', async ({helper}) => {176    const caller = await helper.eth.createAccountWithBalance(donor);177    const receiver = helper.eth.createAccount();178179    const collection = await helper.nft.mintCollection(alice);180    await collection.addAdmin(alice, {Ethereum: caller});181182    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);183    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);184    {185      const bulkSize = 3;186      const nextTokenId = await contract.methods.nextTokenId().call();187      expect(nextTokenId).to.be.equal('1');188      const result = await contract.methods.mintBulkWithTokenURI(189        receiver,190        Array.from({length: bulkSize}, (_, i) => (191          [+nextTokenId + i, `Test URI ${i}`]192        )),193      ).send({from: caller});194195      const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);196      for (let i = 0; i < bulkSize; i++) {197        const event = events[i];198        expect(event.address).to.equal(collectionAddress);199        expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');200        expect(event.returnValues.to).to.equal(receiver);201        expect(event.returnValues.tokenId).to.equal(`${+nextTokenId + i}`);202203        expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);204      }205    }206  });207208  itEth('Can perform burn()', async ({helper}) => {209    const caller = await helper.eth.createAccountWithBalance(donor);210211    const collection = await helper.nft.mintCollection(alice, {});212    const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});213214    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);215    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);216217    {218      const result = await contract.methods.burn(tokenId).send({from: caller});219220      const event = result.events.Transfer;221      expect(event.address).to.be.equal(collectionAddress);222      expect(event.returnValues.from).to.be.equal(caller);223      expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');224      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);225    }226  });227228  itEth('Can perform approve()', async ({helper}) => {229    const owner = await helper.eth.createAccountWithBalance(donor);230    const spender = helper.eth.createAccount();231232    const collection = await helper.nft.mintCollection(alice, {});233    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});234235    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);236    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);237238    {239      const result = await contract.methods.approve(spender, tokenId).send({from: owner});240241      const event = result.events.Approval;242      expect(event.address).to.be.equal(collectionAddress);243      expect(event.returnValues.owner).to.be.equal(owner);244      expect(event.returnValues.approved).to.be.equal(spender);245      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);246    }247  });248249  itEth('Can perform burnFromCross()', async ({helper, privateKey}) => {250    const alice = privateKey('//Alice');251    const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});252253    const owner = privateKey('//Bob');254    const spender = await helper.eth.createAccountWithBalance(alice, 100n);255256    const token = await collection.mintToken(alice, {Substrate: owner.address});257258    const address = helper.ethAddress.fromCollectionId(collection.collectionId);259    const contract = helper.ethNativeContract.collection(address, 'nft');260261    {262      await token.approve(owner, {Ethereum: spender});263      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);264      const result = await contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender});265      const events = result.events.Transfer;266267      expect(events).to.be.like({268        address,269        event: 'Transfer',270        returnValues: {271          from: helper.address.substrateToEth(owner.address),272          to: '0x0000000000000000000000000000000000000000',273          tokenId: token.tokenId.toString(),274        },275      });276    }277  });278279  itEth('Can perform approveCross()', async ({helper, privateKey}) => {280    const alice = privateKey('//Alice');281    const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});282283    const owner = await helper.eth.createAccountWithBalance(alice, 100n);284    const receiver = privateKey('//Charlie');285286    const token = await collection.mintToken(alice, {Ethereum: owner});287288    const address = helper.ethAddress.fromCollectionId(collection.collectionId);289    const contract = helper.ethNativeContract.collection(address, 'nft');290291    {292      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);293      const result = await contract.methods.approveCross(recieverCross, token.tokenId).send({from: owner});294      const event = result.events.Approval;295      expect(event).to.be.like({296        address: helper.ethAddress.fromCollectionId(collection.collectionId),297        event: 'Approval',298        returnValues: {299          owner,300          approved: helper.address.substrateToEth(receiver.address),301          tokenId: token.tokenId.toString(),302        },303      });304    }305  });306307  itEth('Can perform transferFrom()', async ({helper}) => {308    const owner = await helper.eth.createAccountWithBalance(donor);309    const spender = await helper.eth.createAccountWithBalance(donor);310    const receiver = helper.eth.createAccount();311312    const collection = await helper.nft.mintCollection(alice, {});313    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});314315    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);316    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);317318    await contract.methods.approve(spender, tokenId).send({from: owner});319320    {321      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});322323      const event = result.events.Transfer;324      expect(event.address).to.be.equal(collectionAddress);325      expect(event.returnValues.from).to.be.equal(owner);326      expect(event.returnValues.to).to.be.equal(receiver);327      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);328    }329330    {331      const balance = await contract.methods.balanceOf(receiver).call();332      expect(+balance).to.equal(1);333    }334335    {336      const balance = await contract.methods.balanceOf(owner).call();337      expect(+balance).to.equal(0);338    }339  });340341  itEth('Can perform transfer()', async ({helper}) => {342    const collection = await helper.nft.mintCollection(alice, {});343    const owner = await helper.eth.createAccountWithBalance(donor);344    const receiver = helper.eth.createAccount();345346    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});347348    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);349    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);350351    {352      const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});353354      const event = result.events.Transfer;355      expect(event.address).to.be.equal(collectionAddress);356      expect(event.returnValues.from).to.be.equal(owner);357      expect(event.returnValues.to).to.be.equal(receiver);358      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);359    }360361    {362      const balance = await contract.methods.balanceOf(owner).call();363      expect(+balance).to.equal(0);364    }365366    {367      const balance = await contract.methods.balanceOf(receiver).call();368      expect(+balance).to.equal(1);369    }370  });371});372373describe('NFT: Fees', () => {374  let donor: IKeyringPair;375  let alice: IKeyringPair;376377  before(async function() {378    await usingEthPlaygrounds(async (helper, privateKey) => {379      donor = await privateKey({filename: __filename});380      [alice] = await helper.arrange.createAccounts([10n], donor);381    });382  });383384  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {385    const owner = await helper.eth.createAccountWithBalance(donor);386    const spender = helper.eth.createAccount();387388    const collection = await helper.nft.mintCollection(alice, {});389    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});390391    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);392393    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));394    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));395  });396397  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {398    const owner = await helper.eth.createAccountWithBalance(donor);399    const spender = await helper.eth.createAccountWithBalance(donor);400401    const collection = await helper.nft.mintCollection(alice, {});402    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});403404    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);405406    await contract.methods.approve(spender, tokenId).send({from: owner});407408    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));409    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));410  });411412  itEth.only('Can perform transferFromCross()', async ({helper, privateKey}) => {413    const alice = privateKey('//Alice');414    const collection = await helper.nft.mintCollection(alice, {name: 'A', description: 'B', tokenPrefix: 'C'});415416    const owner = privateKey('//Bob');417    const spender = await helper.eth.createAccountWithBalance(alice, 100n);418    const receiver = privateKey('//Charlie');419420    const token = await collection.mintToken(alice, {Substrate: owner.address});421422    const address = helper.ethAddress.fromCollectionId(collection.collectionId);423    const contract = helper.ethNativeContract.collection(address, 'nft');424425    await token.approve(owner, {Ethereum: spender});426427    {428      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);429      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);430      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});431      const event = result.events.Transfer;432      expect(event).to.be.like({433        address: helper.ethAddress.fromCollectionId(collection.collectionId),434        event: 'Transfer',435        returnValues: {436          from: helper.address.substrateToEth(owner.address),437          to: helper.address.substrateToEth(receiver.address),438          tokenId: token.tokenId.toString(),439        },440      });441    }442443    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});444  });445446  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {447    const owner = await helper.eth.createAccountWithBalance(donor);448    const receiver = helper.eth.createAccount();449450    const collection = await helper.nft.mintCollection(alice, {});451    const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});452453    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);454455    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));456    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));457  });458});459460describe('NFT: Substrate calls', () => {461  let donor: IKeyringPair;462  let alice: IKeyringPair;463464  before(async function() {465    await usingEthPlaygrounds(async (helper, privateKey) => {466      donor = await privateKey({filename: __filename});467      [alice] = await helper.arrange.createAccounts([20n], donor);468    });469  });470471  itEth('Events emitted for mint()', async ({helper}) => {472    const collection = await helper.nft.mintCollection(alice, {});473    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);474    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');475476    const events: any = [];477    contract.events.allEvents((_: any, event: any) => {478      events.push(event);479    });480481    const {tokenId} = await collection.mintToken(alice);482    if (events.length == 0) await helper.wait.newBlocks(1);483    const event = events[0];484485    expect(event.event).to.be.equal('Transfer');486    expect(event.address).to.be.equal(collectionAddress);487    expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');488    expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));489    expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());490  });491492  itEth('Events emitted for burn()', async ({helper}) => {493    const collection = await helper.nft.mintCollection(alice, {});494    const token = await collection.mintToken(alice);495496    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);497    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');498499    const events: any = [];500    contract.events.allEvents((_: any, event: any) => {501      events.push(event);502    });503504    await token.burn(alice);505    if (events.length == 0) await helper.wait.newBlocks(1);506    const event = events[0];507508    expect(event.event).to.be.equal('Transfer');509    expect(event.address).to.be.equal(collectionAddress);510    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));511    expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');512    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());513  });514515  itEth('Events emitted for approve()', async ({helper}) => {516    const receiver = helper.eth.createAccount();517518    const collection = await helper.nft.mintCollection(alice, {});519    const token = await collection.mintToken(alice);520521    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);522    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');523524    const events: any = [];525    contract.events.allEvents((_: any, event: any) => {526      events.push(event);527    });528529    await token.approve(alice, {Ethereum: receiver});530    if (events.length == 0) await helper.wait.newBlocks(1);531    const event = events[0];532533    expect(event.event).to.be.equal('Approval');534    expect(event.address).to.be.equal(collectionAddress);535    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));536    expect(event.returnValues.approved).to.be.equal(receiver);537    expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());538  });539540  itEth('Events emitted for transferFrom()', async ({helper}) => {541    const [bob] = await helper.arrange.createAccounts([10n], donor);542    const receiver = helper.eth.createAccount();543544    const collection = await helper.nft.mintCollection(alice, {});545    const token = await collection.mintToken(alice);546    await token.approve(alice, {Substrate: bob.address});547548    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);549    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');550551    const events: any = [];552    contract.events.allEvents((_: any, event: any) => {553      events.push(event);554    });555556    await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});557558    if (events.length == 0) await helper.wait.newBlocks(1);559    const event = events[0];560561    expect(event.address).to.be.equal(collectionAddress);562    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));563    expect(event.returnValues.to).to.be.equal(receiver);564    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);565  });566567  itEth('Events emitted for transfer()', async ({helper}) => {568    const receiver = helper.eth.createAccount();569570    const collection = await helper.nft.mintCollection(alice, {});571    const token = await collection.mintToken(alice);572573    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);574    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');575576    const events: any = [];577    contract.events.allEvents((_: any, event: any) => {578      events.push(event);579    });580581    await token.transfer(alice, {Ethereum: receiver});582583    if (events.length == 0) await helper.wait.newBlocks(1);584    const event = events[0];585586    expect(event.address).to.be.equal(collectionAddress);587    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));588    expect(event.returnValues.to).to.be.equal(receiver);589    expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);590  });591});592593describe('Common metadata', () => {594  let donor: IKeyringPair;595  let alice: IKeyringPair;596597  before(async function() {598    await usingEthPlaygrounds(async (helper, privateKey) => {599      donor = await privateKey({filename: __filename});600      [alice] = await helper.arrange.createAccounts([20n], donor);601    });602  });603604  itEth('Returns collection name', async ({helper}) => {605    const caller = await helper.eth.createAccountWithBalance(donor);606    const tokenPropertyPermissions = [{607      key: 'URI',608      permission: {609        mutable: true,610        collectionAdmin: true,611        tokenOwner: false,612      },613    }];614    const collection = await helper.nft.mintCollection(615      alice,616      {617        name: 'oh River',618        tokenPrefix: 'CHANGE',619        properties: [{key: 'ERC721Metadata', value: '1'}],620        tokenPropertyPermissions,621      },622    );623624    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);625    const name = await contract.methods.name().call();626    expect(name).to.equal('oh River');627  });628629  itEth('Returns symbol name', async ({helper}) => {630    const caller = await helper.eth.createAccountWithBalance(donor);631    const tokenPropertyPermissions = [{632      key: 'URI',633      permission: {634        mutable: true,635        collectionAdmin: true,636        tokenOwner: false,637      },638    }];639    const collection = await helper.nft.mintCollection(640      alice,641      {642        name: 'oh River',643        tokenPrefix: 'CHANGE',644        properties: [{key: 'ERC721Metadata', value: '1'}],645        tokenPropertyPermissions,646      },647    );648649    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);650    const symbol = await contract.methods.symbol().call();651    expect(symbol).to.equal('CHANGE');652  });653});
modifiedtests/src/util/playgrounds/types.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/types.ts
+++ b/tests/src/util/playgrounds/types.ts
@@ -73,8 +73,8 @@
 export interface IEthCrossAccountId {
   0: TEthereumAccount;
   1: TSubstrateAccount;
-  field_0: TEthereumAccount;
-  field_1: TSubstrateAccount;
+  eth: TEthereumAccount;
+  sub: TSubstrateAccount;
 }
 
 export interface ICollectionLimits {
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2430,11 +2430,11 @@
    * @returns substrate cross account id
    */
   convertCrossAccountFromEthCrossAcoount(ethCrossAccount: IEthCrossAccountId): ICrossAccountId {
-    if (ethCrossAccount.field_1 === '0') {
-      return {Ethereum: ethCrossAccount.field_0.toLocaleLowerCase()};
+    if (ethCrossAccount.sub === '0') {
+      return {Ethereum: ethCrossAccount.eth.toLocaleLowerCase()};
     }
     
-    const ss58 = this.restoreCrossAccountFromBigInt(BigInt(ethCrossAccount.field_1));
+    const ss58 = this.restoreCrossAccountFromBigInt(BigInt(ethCrossAccount.sub));
     return {Substrate: ss58};
   }