git.delta.rocks / unique-network / refs/commits / 35094561612e

difftreelog

Add transferCross tests

Max Andreev2022-12-02parent: #8c823a6.patch.diff
in: master

3 files changed

modifiedtests/src/eth/fungible.test.tsdiffbeforeafterboth
before · tests/src/eth/fungible.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 {expect, itEth, usingEthPlaygrounds} from './util';18import {IKeyringPair} from '@polkadot/types/types';1920describe('Fungible: Information getting', () => {21  let donor: IKeyringPair;22  let alice: IKeyringPair;2324  before(async function() {25    await usingEthPlaygrounds(async (helper, privateKey) => {26      donor = await privateKey({filename: __filename});27      [alice] = await helper.arrange.createAccounts([20n], donor);28    });29  });3031  itEth('totalSupply', async ({helper}) => {32    const caller = await helper.eth.createAccountWithBalance(donor);33    const collection = await helper.ft.mintCollection(alice);34    await collection.mint(alice, 200n);3536    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);37    const totalSupply = await contract.methods.totalSupply().call();38    expect(totalSupply).to.equal('200');39  });4041  itEth('balanceOf', async ({helper}) => {42    const caller = await helper.eth.createAccountWithBalance(donor);43    const collection = await helper.ft.mintCollection(alice);44    await collection.mint(alice, 200n, {Ethereum: caller});4546    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);47    const balance = await contract.methods.balanceOf(caller).call();48    expect(balance).to.equal('200');49  });50});5152describe('Fungible: Plain calls', () => {53  let donor: IKeyringPair;54  let alice: IKeyringPair;55  let owner: IKeyringPair;5657  before(async function() {58    await usingEthPlaygrounds(async (helper, privateKey) => {59      donor = await privateKey({filename: __filename});60      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);61    });62  });6364  itEth('Can perform mint()', async ({helper}) => {65    const owner = await helper.eth.createAccountWithBalance(donor);66    const receiver = helper.eth.createAccount();67    const collection = await helper.ft.mintCollection(alice);68    await collection.addAdmin(alice, {Ethereum: owner});6970    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);71    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);7273    const result = await contract.methods.mint(receiver, 100).send();74    75    const event = result.events.Transfer;76    expect(event.address).to.equal(collectionAddress);77    expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');78    expect(event.returnValues.to).to.equal(receiver);79    expect(event.returnValues.value).to.equal('100');80  });8182  itEth('Can perform mintBulk()', async ({helper}) => {83    const owner = await helper.eth.createAccountWithBalance(donor);84    const bulkSize = 3;85    const receivers = [...new Array(bulkSize)].map(() => helper.eth.createAccount());86    const collection = await helper.ft.mintCollection(alice);87    await collection.addAdmin(alice, {Ethereum: owner});8889    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);90    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);9192    const result = await contract.methods.mintBulk(Array.from({length: bulkSize}, (_, i) => (93      [receivers[i], (i + 1) * 10]94    ))).send();95    const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.value - b.returnValues.value);96    for (let i = 0; i < bulkSize; i++) {97      const event = events[i];98      expect(event.address).to.equal(collectionAddress);99      expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');100      expect(event.returnValues.to).to.equal(receivers[i]);101      expect(event.returnValues.value).to.equal(String(10 * (i + 1)));102    }103  });104105  // Soft-deprecated106  itEth('Can perform burn()', async ({helper}) => {107    const owner = await helper.eth.createAccountWithBalance(donor);108    const receiver = await helper.eth.createAccountWithBalance(donor);109    const collection = await helper.ft.mintCollection(alice);110    await collection.addAdmin(alice, {Ethereum: owner});111112    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);113    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);114    await contract.methods.mint(receiver, 100).send();115116    const result = await contract.methods.burnFrom(receiver, 49).send({from: receiver});117    118    const event = result.events.Transfer;119    expect(event.address).to.equal(collectionAddress);120    expect(event.returnValues.from).to.equal(receiver);121    expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');122    expect(event.returnValues.value).to.equal('49');123124    const balance = await contract.methods.balanceOf(receiver).call();125    expect(balance).to.equal('51');126  });127128  itEth('Can perform approve()', async ({helper}) => {129    const owner = await helper.eth.createAccountWithBalance(donor);130    const spender = helper.eth.createAccount();131    const collection = await helper.ft.mintCollection(alice);132    await collection.mint(alice, 200n, {Ethereum: owner});133134    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);135    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);136137    {138      const result = await contract.methods.approve(spender, 100).send({from: owner});139140      const event = result.events.Approval;141      expect(event.address).to.be.equal(collectionAddress);142      expect(event.returnValues.owner).to.be.equal(owner);143      expect(event.returnValues.spender).to.be.equal(spender);144      expect(event.returnValues.value).to.be.equal('100');145    }146147    {148      const allowance = await contract.methods.allowance(owner, spender).call();149      expect(+allowance).to.equal(100);150    }151  });152153  itEth('Can perform burnFromCross()', async ({helper}) => {154    const sender = await helper.eth.createAccountWithBalance(donor, 100n);155156    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);157158    await collection.mint(owner, 200n, {Substrate: owner.address});159    await collection.approveTokens(owner, {Ethereum: sender}, 100n);160161    const address = helper.ethAddress.fromCollectionId(collection.collectionId);162    const contract = helper.ethNativeContract.collection(address, 'ft');163164    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});165    166    const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);167    const result = await contract.methods.burnFromCross(ownerCross, 49).send({from: sender});168    const events = result.events;169170    expect(events).to.be.like({171      Transfer: {172        address: helper.ethAddress.fromCollectionId(collection.collectionId),173        event: 'Transfer',174        returnValues: {175          from: helper.address.substrateToEth(owner.address),176          to: '0x0000000000000000000000000000000000000000',177          value: '49',178        },179      },180      Approval: {181        address: helper.ethAddress.fromCollectionId(collection.collectionId),182        returnValues: {183          owner: helper.address.substrateToEth(owner.address),184          spender: sender,185          value: '51',186        },187        event: 'Approval',188      },189    });190191    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});192    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(49n);193  });194195  itEth('Can perform transferFrom()', async ({helper}) => {196    const owner = await helper.eth.createAccountWithBalance(donor);197    const spender = await helper.eth.createAccountWithBalance(donor);198    const receiver = helper.eth.createAccount();199    const collection = await helper.ft.mintCollection(alice);200    await collection.mint(alice, 200n, {Ethereum: owner});201202    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);203    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);204205    await contract.methods.approve(spender, 100).send();206207    {208      const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});209      210      let event = result.events.Transfer;211      expect(event.address).to.be.equal(collectionAddress);212      expect(event.returnValues.from).to.be.equal(owner);213      expect(event.returnValues.to).to.be.equal(receiver);214      expect(event.returnValues.value).to.be.equal('49');215216      event = result.events.Approval;217      expect(event.address).to.be.equal(collectionAddress);218      expect(event.returnValues.owner).to.be.equal(owner);219      expect(event.returnValues.spender).to.be.equal(spender);220      expect(event.returnValues.value).to.be.equal('51');221    }222223    {224      const balance = await contract.methods.balanceOf(receiver).call();225      expect(+balance).to.equal(49);226    }227228    {229      const balance = await contract.methods.balanceOf(owner).call();230      expect(+balance).to.equal(151);231    }232  });233234  itEth('Can perform transferCross()', async ({helper}) => {235    const owner = await helper.eth.createAccountWithBalance(donor);236    const receiver = await helper.eth.createAccountWithBalance(donor);237    const to = helper.ethCrossAccount.fromAddress(receiver);238    const toSubstrate = helper.ethCrossAccount.fromKeyringPair(donor);239    const collection = await helper.ft.mintCollection(alice);240    await collection.mint(alice, 200n, {Ethereum: owner});241242    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);243    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);244245    {246      const result = await contract.methods.transferCross(to, 50).send({from: owner});247      248      const event = result.events.Transfer;249      expect(event.address).to.be.equal(collectionAddress);250      expect(event.returnValues.from).to.be.equal(owner);251      expect(event.returnValues.to).to.be.equal(receiver);252      expect(event.returnValues.value).to.be.equal('50');253    }254255    {256      const balance = await contract.methods.balanceOf(owner).call();257      expect(+balance).to.equal(150);258    }259260    {261      const balance = await contract.methods.balanceOf(receiver).call();262      expect(+balance).to.equal(50);263    }264    265    {266      const result = await contract.methods.transferCross(toSubstrate, 50).send({from: owner});267      268      const event = result.events.Transfer;269      expect(event.address).to.be.equal(collectionAddress);270      expect(event.returnValues.from).to.be.equal(owner);271      expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(donor.address));272      expect(event.returnValues.value).to.be.equal('50');273    }274275    {276      const balance = await collection.getBalance({Ethereum: owner});277      expect(balance).to.equal(100n);278    }279280    {281      const balance = await collection.getBalance({Substrate: donor.address});282      expect(balance).to.equal(50n);283    }284    285  });286  287  itEth('Can perform transfer()', async ({helper}) => {288    const owner = await helper.eth.createAccountWithBalance(donor);289    const receiver = await helper.eth.createAccountWithBalance(donor);290    const collection = await helper.ft.mintCollection(alice);291    await collection.mint(alice, 200n, {Ethereum: owner});292293    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);294    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);295296    {297      const result = await contract.methods.transfer(receiver, 50).send({from: owner});298      299      const event = result.events.Transfer;300      expect(event.address).to.be.equal(collectionAddress);301      expect(event.returnValues.from).to.be.equal(owner);302      expect(event.returnValues.to).to.be.equal(receiver);303      expect(event.returnValues.value).to.be.equal('50');304    }305306    {307      const balance = await contract.methods.balanceOf(owner).call();308      expect(+balance).to.equal(150);309    }310311    {312      const balance = await contract.methods.balanceOf(receiver).call();313      expect(+balance).to.equal(50);314    }315  });316317  itEth('Can perform transferFromCross()', async ({helper}) => {318    const sender = await helper.eth.createAccountWithBalance(donor, 100n);319320    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);321322    const receiver = helper.eth.createAccount();323324    await collection.mint(owner, 200n, {Substrate: owner.address});325    await collection.approveTokens(owner, {Ethereum: sender}, 100n);326327    const address = helper.ethAddress.fromCollectionId(collection.collectionId);328    const contract = helper.ethNativeContract.collection(address, 'ft');329330    const from = helper.ethCrossAccount.fromKeyringPair(owner);331    const to = helper.ethCrossAccount.fromAddress(receiver);332333    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});334    const toBalanceBefore = await collection.getBalance({Ethereum: receiver});335    336    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});337338    expect(result.events).to.be.like({339      Transfer: {340        address,341        event: 'Transfer',342        returnValues: {343          from: helper.address.substrateToEth(owner.address),344          to: receiver,345          value: '51',346        },347      },348      Approval: {349        address,350        event: 'Approval',351        returnValues: {352          owner: helper.address.substrateToEth(owner.address),353          spender: sender,354          value: '49',355        },356      }});357358    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});359    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(51n);360    const toBalanceAfter = await collection.getBalance({Ethereum: receiver});361    expect(toBalanceAfter - toBalanceBefore).to.be.eq(51n);362  });363});364365describe('Fungible: Fees', () => {366  let donor: IKeyringPair;367  let alice: IKeyringPair;368369  before(async function() {370    await usingEthPlaygrounds(async (helper, privateKey) => {371      donor = await privateKey({filename: __filename});372      [alice] = await helper.arrange.createAccounts([20n], donor);373    });374  });375  376  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {377    const owner = await helper.eth.createAccountWithBalance(donor);378    const spender = helper.eth.createAccount();379    const collection = await helper.ft.mintCollection(alice);380    await collection.mint(alice, 200n, {Ethereum: owner});381382    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);383    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);384385    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));386    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));387  });388389  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {390    const owner = await helper.eth.createAccountWithBalance(donor);391    const spender = await helper.eth.createAccountWithBalance(donor);392    const collection = await helper.ft.mintCollection(alice);393    await collection.mint(alice, 200n, {Ethereum: owner});394395    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);396    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);397398    await contract.methods.approve(spender, 100).send({from: owner});399400    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));401    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));402  });403404  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {405    const owner = await helper.eth.createAccountWithBalance(donor);406    const receiver = helper.eth.createAccount();407    const collection = await helper.ft.mintCollection(alice);408    await collection.mint(alice, 200n, {Ethereum: owner});409410    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);411    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);412413    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));414    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));415  });416});417418describe('Fungible: Substrate calls', () => {419  let donor: IKeyringPair;420  let alice: IKeyringPair;421  let owner: IKeyringPair;422423  before(async function() {424    await usingEthPlaygrounds(async (helper, privateKey) => {425      donor = await privateKey({filename: __filename});426      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);427    });428  });429430  itEth('Events emitted for approve()', async ({helper}) => {431    const receiver = helper.eth.createAccount();432    const collection = await helper.ft.mintCollection(alice);433    await collection.mint(alice, 200n);434435    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);436    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');437438    const events: any = [];439    contract.events.allEvents((_: any, event: any) => {440      events.push(event);441    });442    443    await collection.approveTokens(alice, {Ethereum: receiver}, 100n);444    if (events.length == 0) await helper.wait.newBlocks(1);445    const event = events[0];446447    expect(event.event).to.be.equal('Approval');448    expect(event.address).to.be.equal(collectionAddress);449    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));450    expect(event.returnValues.spender).to.be.equal(receiver);451    expect(event.returnValues.value).to.be.equal('100');452  });453454  itEth('Events emitted for transferFrom()', async ({helper}) => {455    const [bob] = await helper.arrange.createAccounts([10n], donor);456    const receiver = helper.eth.createAccount();457    const collection = await helper.ft.mintCollection(alice);458    await collection.mint(alice, 200n);459    await collection.approveTokens(alice, {Substrate: bob.address}, 100n);460461    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);462    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');463464    const events: any = [];465    contract.events.allEvents((_: any, event: any) => {466      events.push(event);467    });468469    await collection.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n);470    if (events.length == 0) await helper.wait.newBlocks(1);471    let event = events[0];472473    expect(event.event).to.be.equal('Transfer');474    expect(event.address).to.be.equal(collectionAddress);475    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));476    expect(event.returnValues.to).to.be.equal(receiver);477    expect(event.returnValues.value).to.be.equal('51');478479    event = events[1];480    expect(event.event).to.be.equal('Approval');481    expect(event.address).to.be.equal(collectionAddress);482    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));483    expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));484    expect(event.returnValues.value).to.be.equal('49');485  });486487  itEth('Events emitted for transfer()', async ({helper}) => {488    const receiver = helper.eth.createAccount();489    const collection = await helper.ft.mintCollection(alice);490    await collection.mint(alice, 200n);491492    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);493    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');494495    const events: any = [];496    contract.events.allEvents((_: any, event: any) => {497      events.push(event);498    });499    500    await collection.transfer(alice, {Ethereum:receiver}, 51n);501    if (events.length == 0) await helper.wait.newBlocks(1);502    const event = events[0];503504    expect(event.event).to.be.equal('Transfer');505    expect(event.address).to.be.equal(collectionAddress);506    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));507    expect(event.returnValues.to).to.be.equal(receiver);508    expect(event.returnValues.value).to.be.equal('51');509  });510511  itEth('Events emitted for transferFromCross()', async ({helper}) => {512    const sender = await helper.eth.createAccountWithBalance(donor, 100n);513514    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);515516    const receiver = helper.eth.createAccount();517518    await collection.mint(owner, 200n, {Substrate: owner.address});519    await collection.approveTokens(owner, {Ethereum: sender}, 100n);520521    const address = helper.ethAddress.fromCollectionId(collection.collectionId);522    const contract = helper.ethNativeContract.collection(address, 'ft');523524    const from = helper.ethCrossAccount.fromKeyringPair(owner);525    const to = helper.ethCrossAccount.fromAddress(receiver);526    527    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});528529    expect(result.events).to.be.like({530      Transfer: {531        address,532        event: 'Transfer',533        returnValues: {534          from: helper.address.substrateToEth(owner.address),535          to: receiver,536          value: '51',537        },538      },539      Approval: {540        address,541        event: 'Approval',542        returnValues: {543          owner: helper.address.substrateToEth(owner.address),544          spender: sender,545          value: '49',546        },547      }});548  });549});
after · tests/src/eth/fungible.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 {expect, itEth, usingEthPlaygrounds} from './util';18import {IKeyringPair} from '@polkadot/types/types';1920describe('Fungible: Information getting', () => {21  let donor: IKeyringPair;22  let alice: IKeyringPair;2324  before(async function() {25    await usingEthPlaygrounds(async (helper, privateKey) => {26      donor = await privateKey({filename: __filename});27      [alice] = await helper.arrange.createAccounts([20n], donor);28    });29  });3031  itEth('totalSupply', async ({helper}) => {32    const caller = await helper.eth.createAccountWithBalance(donor);33    const collection = await helper.ft.mintCollection(alice);34    await collection.mint(alice, 200n);3536    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);37    const totalSupply = await contract.methods.totalSupply().call();38    expect(totalSupply).to.equal('200');39  });4041  itEth('balanceOf', async ({helper}) => {42    const caller = await helper.eth.createAccountWithBalance(donor);43    const collection = await helper.ft.mintCollection(alice);44    await collection.mint(alice, 200n, {Ethereum: caller});4546    const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);47    const balance = await contract.methods.balanceOf(caller).call();48    expect(balance).to.equal('200');49  });50});5152describe('Fungible: Plain calls', () => {53  let donor: IKeyringPair;54  let alice: IKeyringPair;55  let owner: IKeyringPair;5657  before(async function() {58    await usingEthPlaygrounds(async (helper, privateKey) => {59      donor = await privateKey({filename: __filename});60      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);61    });62  });6364  itEth('Can perform mint()', async ({helper}) => {65    const owner = await helper.eth.createAccountWithBalance(donor);66    const receiver = helper.eth.createAccount();67    const collection = await helper.ft.mintCollection(alice);68    await collection.addAdmin(alice, {Ethereum: owner});6970    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);71    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);7273    const result = await contract.methods.mint(receiver, 100).send();74    75    const event = result.events.Transfer;76    expect(event.address).to.equal(collectionAddress);77    expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');78    expect(event.returnValues.to).to.equal(receiver);79    expect(event.returnValues.value).to.equal('100');80  });8182  itEth('Can perform mintBulk()', async ({helper}) => {83    const owner = await helper.eth.createAccountWithBalance(donor);84    const bulkSize = 3;85    const receivers = [...new Array(bulkSize)].map(() => helper.eth.createAccount());86    const collection = await helper.ft.mintCollection(alice);87    await collection.addAdmin(alice, {Ethereum: owner});8889    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);90    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);9192    const result = await contract.methods.mintBulk(Array.from({length: bulkSize}, (_, i) => (93      [receivers[i], (i + 1) * 10]94    ))).send();95    const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.value - b.returnValues.value);96    for (let i = 0; i < bulkSize; i++) {97      const event = events[i];98      expect(event.address).to.equal(collectionAddress);99      expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');100      expect(event.returnValues.to).to.equal(receivers[i]);101      expect(event.returnValues.value).to.equal(String(10 * (i + 1)));102    }103  });104105  // Soft-deprecated106  itEth('Can perform burn()', async ({helper}) => {107    const owner = await helper.eth.createAccountWithBalance(donor);108    const receiver = await helper.eth.createAccountWithBalance(donor);109    const collection = await helper.ft.mintCollection(alice);110    await collection.addAdmin(alice, {Ethereum: owner});111112    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);113    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);114    await contract.methods.mint(receiver, 100).send();115116    const result = await contract.methods.burnFrom(receiver, 49).send({from: receiver});117    118    const event = result.events.Transfer;119    expect(event.address).to.equal(collectionAddress);120    expect(event.returnValues.from).to.equal(receiver);121    expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');122    expect(event.returnValues.value).to.equal('49');123124    const balance = await contract.methods.balanceOf(receiver).call();125    expect(balance).to.equal('51');126  });127128  itEth('Can perform approve()', async ({helper}) => {129    const owner = await helper.eth.createAccountWithBalance(donor);130    const spender = helper.eth.createAccount();131    const collection = await helper.ft.mintCollection(alice);132    await collection.mint(alice, 200n, {Ethereum: owner});133134    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);135    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);136137    {138      const result = await contract.methods.approve(spender, 100).send({from: owner});139140      const event = result.events.Approval;141      expect(event.address).to.be.equal(collectionAddress);142      expect(event.returnValues.owner).to.be.equal(owner);143      expect(event.returnValues.spender).to.be.equal(spender);144      expect(event.returnValues.value).to.be.equal('100');145    }146147    {148      const allowance = await contract.methods.allowance(owner, spender).call();149      expect(+allowance).to.equal(100);150    }151  });152153  itEth('Can perform burnFromCross()', async ({helper}) => {154    const sender = await helper.eth.createAccountWithBalance(donor, 100n);155156    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);157158    await collection.mint(owner, 200n, {Substrate: owner.address});159    await collection.approveTokens(owner, {Ethereum: sender}, 100n);160161    const address = helper.ethAddress.fromCollectionId(collection.collectionId);162    const contract = helper.ethNativeContract.collection(address, 'ft');163164    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});165    166    const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);167    const result = await contract.methods.burnFromCross(ownerCross, 49).send({from: sender});168    const events = result.events;169170    expect(events).to.be.like({171      Transfer: {172        address: helper.ethAddress.fromCollectionId(collection.collectionId),173        event: 'Transfer',174        returnValues: {175          from: helper.address.substrateToEth(owner.address),176          to: '0x0000000000000000000000000000000000000000',177          value: '49',178        },179      },180      Approval: {181        address: helper.ethAddress.fromCollectionId(collection.collectionId),182        returnValues: {183          owner: helper.address.substrateToEth(owner.address),184          spender: sender,185          value: '51',186        },187        event: 'Approval',188      },189    });190191    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});192    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(49n);193  });194195  itEth('Can perform transferFrom()', async ({helper}) => {196    const owner = await helper.eth.createAccountWithBalance(donor);197    const spender = await helper.eth.createAccountWithBalance(donor);198    const receiver = helper.eth.createAccount();199    const collection = await helper.ft.mintCollection(alice);200    await collection.mint(alice, 200n, {Ethereum: owner});201202    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);203    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);204205    await contract.methods.approve(spender, 100).send();206207    {208      const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});209      210      let event = result.events.Transfer;211      expect(event.address).to.be.equal(collectionAddress);212      expect(event.returnValues.from).to.be.equal(owner);213      expect(event.returnValues.to).to.be.equal(receiver);214      expect(event.returnValues.value).to.be.equal('49');215216      event = result.events.Approval;217      expect(event.address).to.be.equal(collectionAddress);218      expect(event.returnValues.owner).to.be.equal(owner);219      expect(event.returnValues.spender).to.be.equal(spender);220      expect(event.returnValues.value).to.be.equal('51');221    }222223    {224      const balance = await contract.methods.balanceOf(receiver).call();225      expect(+balance).to.equal(49);226    }227228    {229      const balance = await contract.methods.balanceOf(owner).call();230      expect(+balance).to.equal(151);231    }232  });233234  itEth('Can perform transferCross()', async ({helper}) => {235    const sender = await helper.eth.createAccountWithBalance(donor);236    const receiverEth = await helper.eth.createAccountWithBalance(donor);237    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);238    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(donor);239    const collection = await helper.ft.mintCollection(alice);240    await collection.mint(alice, 200n, {Ethereum: sender});241242    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);243    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'ft', sender);244245    {246      // Can transferCross to ethereum address:247      const result = await collectionEvm.methods.transferCross(receiverCrossEth, 50).send({from: sender});248      // Check events:249      const event = result.events.Transfer;250      expect(event.address).to.be.equal(collectionAddress);251      expect(event.returnValues.from).to.be.equal(sender);252      expect(event.returnValues.to).to.be.equal(receiverEth);253      expect(event.returnValues.value).to.be.equal('50');254      // Sender's balance decreased:255      const ownerBalance = await collectionEvm.methods.balanceOf(sender).call();256      expect(+ownerBalance).to.equal(150);257      // Receiver's balance increased:258      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();259      expect(+receiverBalance).to.equal(50);260    }261    262    {263      // Can transferCross to substrate address:264      const result = await collectionEvm.methods.transferCross(receiverCrossSub, 50).send({from: sender});265      // Check events:266      const event = result.events.Transfer;267      expect(event.address).to.be.equal(collectionAddress);268      expect(event.returnValues.from).to.be.equal(sender);269      expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(donor.address));270      expect(event.returnValues.value).to.be.equal('50');271      // Sender's balance decreased:272      const senderBalance = await collection.getBalance({Ethereum: sender});273      expect(senderBalance).to.equal(100n);274      // Receiver's balance increased:275      const balance = await collection.getBalance({Substrate: donor.address});276      expect(balance).to.equal(50n);277    }278  });279  280  itEth('Can perform transfer()', async ({helper}) => {281    const owner = await helper.eth.createAccountWithBalance(donor);282    const receiver = await helper.eth.createAccountWithBalance(donor);283    const collection = await helper.ft.mintCollection(alice);284    await collection.mint(alice, 200n, {Ethereum: owner});285286    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);287    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);288289    {290      const result = await contract.methods.transfer(receiver, 50).send({from: owner});291      292      const event = result.events.Transfer;293      expect(event.address).to.be.equal(collectionAddress);294      expect(event.returnValues.from).to.be.equal(owner);295      expect(event.returnValues.to).to.be.equal(receiver);296      expect(event.returnValues.value).to.be.equal('50');297    }298299    {300      const balance = await contract.methods.balanceOf(owner).call();301      expect(+balance).to.equal(150);302    }303304    {305      const balance = await contract.methods.balanceOf(receiver).call();306      expect(+balance).to.equal(50);307    }308  });309310  itEth('Can perform transferFromCross()', async ({helper}) => {311    const sender = await helper.eth.createAccountWithBalance(donor, 100n);312313    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);314315    const receiver = helper.eth.createAccount();316317    await collection.mint(owner, 200n, {Substrate: owner.address});318    await collection.approveTokens(owner, {Ethereum: sender}, 100n);319320    const address = helper.ethAddress.fromCollectionId(collection.collectionId);321    const contract = helper.ethNativeContract.collection(address, 'ft');322323    const from = helper.ethCrossAccount.fromKeyringPair(owner);324    const to = helper.ethCrossAccount.fromAddress(receiver);325326    const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});327    const toBalanceBefore = await collection.getBalance({Ethereum: receiver});328    329    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});330331    expect(result.events).to.be.like({332      Transfer: {333        address,334        event: 'Transfer',335        returnValues: {336          from: helper.address.substrateToEth(owner.address),337          to: receiver,338          value: '51',339        },340      },341      Approval: {342        address,343        event: 'Approval',344        returnValues: {345          owner: helper.address.substrateToEth(owner.address),346          spender: sender,347          value: '49',348        },349      }});350351    const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});352    expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(51n);353    const toBalanceAfter = await collection.getBalance({Ethereum: receiver});354    expect(toBalanceAfter - toBalanceBefore).to.be.eq(51n);355  });356});357358describe('Fungible: Fees', () => {359  let donor: IKeyringPair;360  let alice: IKeyringPair;361362  before(async function() {363    await usingEthPlaygrounds(async (helper, privateKey) => {364      donor = await privateKey({filename: __filename});365      [alice] = await helper.arrange.createAccounts([20n], donor);366    });367  });368  369  itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {370    const owner = await helper.eth.createAccountWithBalance(donor);371    const spender = helper.eth.createAccount();372    const collection = await helper.ft.mintCollection(alice);373    await collection.mint(alice, 200n, {Ethereum: owner});374375    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);376    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);377378    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));379    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));380  });381382  itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {383    const owner = await helper.eth.createAccountWithBalance(donor);384    const spender = await helper.eth.createAccountWithBalance(donor);385    const collection = await helper.ft.mintCollection(alice);386    await collection.mint(alice, 200n, {Ethereum: owner});387388    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);389    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);390391    await contract.methods.approve(spender, 100).send({from: owner});392393    const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));394    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));395  });396397  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {398    const owner = await helper.eth.createAccountWithBalance(donor);399    const receiver = helper.eth.createAccount();400    const collection = await helper.ft.mintCollection(alice);401    await collection.mint(alice, 200n, {Ethereum: owner});402403    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);404    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);405406    const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));407    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));408  });409});410411describe('Fungible: Substrate calls', () => {412  let donor: IKeyringPair;413  let alice: IKeyringPair;414  let owner: IKeyringPair;415416  before(async function() {417    await usingEthPlaygrounds(async (helper, privateKey) => {418      donor = await privateKey({filename: __filename});419      [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);420    });421  });422423  itEth('Events emitted for approve()', async ({helper}) => {424    const receiver = helper.eth.createAccount();425    const collection = await helper.ft.mintCollection(alice);426    await collection.mint(alice, 200n);427428    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);429    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');430431    const events: any = [];432    contract.events.allEvents((_: any, event: any) => {433      events.push(event);434    });435    436    await collection.approveTokens(alice, {Ethereum: receiver}, 100n);437    if (events.length == 0) await helper.wait.newBlocks(1);438    const event = events[0];439440    expect(event.event).to.be.equal('Approval');441    expect(event.address).to.be.equal(collectionAddress);442    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));443    expect(event.returnValues.spender).to.be.equal(receiver);444    expect(event.returnValues.value).to.be.equal('100');445  });446447  itEth('Events emitted for transferFrom()', async ({helper}) => {448    const [bob] = await helper.arrange.createAccounts([10n], donor);449    const receiver = helper.eth.createAccount();450    const collection = await helper.ft.mintCollection(alice);451    await collection.mint(alice, 200n);452    await collection.approveTokens(alice, {Substrate: bob.address}, 100n);453454    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);455    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');456457    const events: any = [];458    contract.events.allEvents((_: any, event: any) => {459      events.push(event);460    });461462    await collection.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n);463    if (events.length == 0) await helper.wait.newBlocks(1);464    let event = events[0];465466    expect(event.event).to.be.equal('Transfer');467    expect(event.address).to.be.equal(collectionAddress);468    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));469    expect(event.returnValues.to).to.be.equal(receiver);470    expect(event.returnValues.value).to.be.equal('51');471472    event = events[1];473    expect(event.event).to.be.equal('Approval');474    expect(event.address).to.be.equal(collectionAddress);475    expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));476    expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));477    expect(event.returnValues.value).to.be.equal('49');478  });479480  itEth('Events emitted for transfer()', async ({helper}) => {481    const receiver = helper.eth.createAccount();482    const collection = await helper.ft.mintCollection(alice);483    await collection.mint(alice, 200n);484485    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);486    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');487488    const events: any = [];489    contract.events.allEvents((_: any, event: any) => {490      events.push(event);491    });492    493    await collection.transfer(alice, {Ethereum:receiver}, 51n);494    if (events.length == 0) await helper.wait.newBlocks(1);495    const event = events[0];496497    expect(event.event).to.be.equal('Transfer');498    expect(event.address).to.be.equal(collectionAddress);499    expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));500    expect(event.returnValues.to).to.be.equal(receiver);501    expect(event.returnValues.value).to.be.equal('51');502  });503504  itEth('Events emitted for transferFromCross()', async ({helper}) => {505    const sender = await helper.eth.createAccountWithBalance(donor, 100n);506507    const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);508509    const receiver = helper.eth.createAccount();510511    await collection.mint(owner, 200n, {Substrate: owner.address});512    await collection.approveTokens(owner, {Ethereum: sender}, 100n);513514    const address = helper.ethAddress.fromCollectionId(collection.collectionId);515    const contract = helper.ethNativeContract.collection(address, 'ft');516517    const from = helper.ethCrossAccount.fromKeyringPair(owner);518    const to = helper.ethCrossAccount.fromAddress(receiver);519    520    const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});521522    expect(result.events).to.be.like({523      Transfer: {524        address,525        event: 'Transfer',526        returnValues: {527          from: helper.address.substrateToEth(owner.address),528          to: receiver,529          value: '51',530        },531      },532      Approval: {533        address,534        event: 'Approval',535        returnValues: {536          owner: helper.address.substrateToEth(owner.address),537          spender: sender,538          value: '49',539        },540      }});541  });542});
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -252,8 +252,9 @@
   itEth('Can perform burnFromCross()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
     const ownerSub = bob;
-    const ownerCross = helper.ethCrossAccount.fromKeyringPair(ownerSub);
+    const ownerCrossSub = helper.ethCrossAccount.fromKeyringPair(ownerSub);
     const ownerEth = await helper.eth.createAccountWithBalance(donor, 100n);
+    const ownerCrossEth = helper.ethCrossAccount.fromAddress(ownerEth);
 
     const burnerEth = await helper.eth.createAccountWithBalance(donor, 100n);
     const burnerCrossEth = helper.ethCrossAccount.fromAddress(burnerEth);
@@ -269,20 +270,23 @@
     await collectionEvm.methods.approveCross(burnerCrossEth, token2.tokenId).send({from: ownerEth});
 
     // can burnFromCross:
-    const result1 = await collectionEvm.methods.burnFromCross(ownerCross, token1.tokenId).send({from: burnerEth});
-    // FIXME Error No Permission?:
-    const result2 = await collectionEvm.methods.burnFromCross(ownerCross, token2.tokenId).send({from: burnerEth});
+    const result1 = await collectionEvm.methods.burnFromCross(ownerCrossSub, token1.tokenId).send({from: burnerEth});
+    const result2 = await collectionEvm.methods.burnFromCross(ownerCrossEth, token2.tokenId).send({from: burnerEth});
     const events1 = result1.events.Transfer;
     const events2 = result2.events.Transfer;
 
-    [[events1, token1], [events2, token2]].map(burnEvents => {
-      expect(burnEvents[0]).to.be.like({
+    // Check events for burnFromCross (substrate and ethereum):
+    [
+      [events1, token1, helper.address.substrateToEth(ownerSub.address)], 
+      [events2, token2, ownerEth],
+    ].map(burnData => {
+      expect(burnData[0]).to.be.like({
         address: collectionAddress,
         event: 'Transfer',
         returnValues: {
-          from: helper.address.substrateToEth(ownerSub.address),
+          from: burnData[2],
           to: '0x0000000000000000000000000000000000000000',
-          tokenId: burnEvents[1].tokenId.toString(),
+          tokenId: burnData[1].tokenId.toString(),
         },
       });
     });
@@ -341,6 +345,7 @@
 
   itEth('Can reaffirm approved address', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor, 100n);
+    const ownerCrossEth = helper.ethCrossAccount.fromAddress(owner);
     const [receiver1, receiver2] = await helper.arrange.createAccounts([100n, 100n], donor);
     const receiver1Cross = helper.ethCrossAccount.fromKeyringPair(receiver1);
     const receiver2Cross = helper.ethCrossAccount.fromKeyringPair(receiver2);
@@ -358,12 +363,9 @@
     // receiver2 can transferFrom:
     await helper.nft.transferTokenFrom(receiver2, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver2.address});
 
-    // can set approved address to zero address:
+    // can set approved address to self address to remove approval:
     await collectionEvm.methods.approveCross(receiver1Cross, token2.tokenId).send({from: owner});
-
-    // FIXME how to remove approval?:
-    await collectionEvm.methods.approveCross({eth: '0x0000000000000000000000000000000000000000', sub: '0'}, token2.tokenId).call({from: owner});
-    await collectionEvm.methods.approve('0x0000000000000000000000000000000000000000', token2.tokenId).call({from: owner});
+    await collectionEvm.methods.approveCross(ownerCrossEth, token2.tokenId).send({from: owner});
 
     // receiver1 cannot transfer token anymore:
     await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token2.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;
@@ -469,54 +471,50 @@
   itEth('Can perform transferCross()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {});
     const owner = await helper.eth.createAccountWithBalance(donor);
-    const receiver = await helper.eth.createAccountWithBalance(donor);
-    const to = helper.ethCrossAccount.fromAddress(receiver);
-    const toSubstrate = helper.ethCrossAccount.fromKeyringPair(minter);
+    const receiverEth = await helper.eth.createAccountWithBalance(donor);
+    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);
+    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);
     
     const {tokenId} = await collection.mintToken(minter, {Ethereum: owner});
 
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
-    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
 
     {
-      const result = await contract.methods.transferCross(to, tokenId).send({from: owner});
-
+      // Can transferCross to ethereum address:
+      const result = await collectionEvm.methods.transferCross(receiverCrossEth, tokenId).send({from: owner});
+      // Check events:
       const event = result.events.Transfer;
       expect(event.address).to.be.equal(collectionAddress);
       expect(event.returnValues.from).to.be.equal(owner);
-      expect(event.returnValues.to).to.be.equal(receiver);
+      expect(event.returnValues.to).to.be.equal(receiverEth);
       expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(owner).call();
-      expect(+balance).to.equal(0);
+      
+      // owner has balance = 0:
+      const ownerBalance = await collectionEvm.methods.balanceOf(owner).call();
+      expect(+ownerBalance).to.equal(0);
+      // receiver owns token:
+      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();
+      expect(+receiverBalance).to.equal(1);
+      expect(await helper.nft.getTokenOwner(collection.collectionId, tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});
     }
-
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(1);
-    }
     
     {
-      const substrateResult = await contract.methods.transferCross(toSubstrate, tokenId).send({from: receiver});
-      
-
+      // Can transferCross to substrate address:
+      const substrateResult = await collectionEvm.methods.transferCross(receiverCrossSub, tokenId).send({from: receiverEth});
+      // Check events:
       const event = substrateResult.events.Transfer;
       expect(event.address).to.be.equal(collectionAddress);
-      expect(event.returnValues.from).to.be.equal(receiver);
+      expect(event.returnValues.from).to.be.equal(receiverEth);
       expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(minter.address));
       expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(0);
-    }
-
-    {
-      const balance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});
-      expect(balance).to.be.contain(tokenId);
+      
+      // owner has balance = 0:
+      const ownerBalance = await collectionEvm.methods.balanceOf(receiverEth).call();
+      expect(+ownerBalance).to.equal(0);
+      // receiver owns token:
+      const receiverBalance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});
+      expect(receiverBalance).to.contain(tokenId);
     }
   });
 });
modifiedtests/src/eth/reFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -363,56 +363,67 @@
   });
   
   itEth('Can perform transferCross()', async ({helper}) => {
-    const caller = await helper.eth.createAccountWithBalance(donor);
-    const receiver = await helper.eth.createAccountWithBalance(donor);
-    const to = helper.ethCrossAccount.fromAddress(receiver);
-    const toSubstrate = helper.ethCrossAccount.fromKeyringPair(minter);
+    const sender = await helper.eth.createAccountWithBalance(donor);
+    const receiverEth = await helper.eth.createAccountWithBalance(donor);
+    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);
+    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);
+
     const collection = await helper.rft.mintCollection(minter, {});
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
-    const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', caller);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', sender);
 
-    const {tokenId} = await collection.mintToken(minter, 1n, {Ethereum: caller});
+    const token = await collection.mintToken(minter, 50n, {Ethereum: sender});
 
     {
-      const result = await contract.methods.transferCross(to, tokenId).send({from: caller});
-
+      // Can transferCross to ethereum address:
+      const result = await collectionEvm.methods.transferCross(receiverCrossEth, token.tokenId).send({from: sender});
+      // Check events:
       const event = result.events.Transfer;
       expect(event.address).to.equal(collectionAddress);
-      expect(event.returnValues.from).to.equal(caller);
-      expect(event.returnValues.to).to.equal(receiver);
-      expect(event.returnValues.tokenId).to.equal(tokenId.toString());
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(caller).call();
-      expect(+balance).to.equal(0);
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(1);
+      expect(event.returnValues.from).to.equal(sender);
+      expect(event.returnValues.to).to.equal(receiverEth);
+      expect(event.returnValues.tokenId).to.equal(token.tokenId.toString());
+      // Sender's balance decreased:
+      const senderBalance = await collectionEvm.methods.balanceOf(sender).call();
+      expect(+senderBalance).to.equal(0);
+      expect(await token.getBalance({Ethereum: sender})).to.eq(0n);
+      // Receiver's balance increased:
+      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();
+      expect(+receiverBalance).to.equal(1);
+      expect(await token.getBalance({Ethereum: receiverEth})).to.eq(50n);
     }
     
     {
-      const substrateResult = await contract.methods.transferCross(toSubstrate, tokenId).send({from: receiver});
-      
-
+      // Can transferCross to substrate address:
+      const substrateResult = await collectionEvm.methods.transferCross(receiverCrossSub, token.tokenId).send({from: receiverEth});
+      // Check events:
       const event = substrateResult.events.Transfer;
       expect(event.address).to.be.equal(collectionAddress);
-      expect(event.returnValues.from).to.be.equal(receiver);
+      expect(event.returnValues.from).to.be.equal(receiverEth);
       expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(minter.address));
-      expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);
+      expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);
+      // Sender's balance decreased:
+      const senderBalance = await collectionEvm.methods.balanceOf(receiverEth).call();
+      expect(+senderBalance).to.equal(0);
+      expect(await token.getBalance({Ethereum: receiverEth})).to.eq(0n);
+      // Receiver's balance increased:
+      const receiverBalance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});
+      expect(receiverBalance).to.contain(token.tokenId);
+      expect(await token.getBalance({Substrate: minter.address})).to.eq(50n);
     }
+  });
 
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(0);
-    }
+  itEth('Cannot transferCross with invalid params', async ({helper}) => {
+    const sender = await helper.eth.createAccountWithBalance(donor);
+    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);
 
-    {
-      const balance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});
-      expect(balance).to.be.contain(tokenId);
-    }
+    const collection = await helper.rft.mintCollection(minter, {});
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', sender);
+
+    const {tokenId} = await collection.mintToken(minter, 50n, {Ethereum: sender});
+    // FIXME (transaction successful): Cannot transfer token if it does not exist:
+    await expect(collectionEvm.methods.transferCross(receiverCrossSub, tokenId + 1).send({from: sender})).to.be.rejected;
   });
 
   itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {