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

difftreelog

Merge pull request #745 from UniqueNetwork/tests/eth-helpers

ut-akuznetsov2022-12-05parents: #bf1349a #fc6fcf2.patch.diff
in: master

9 files changed

modifiedtests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -239,19 +239,29 @@
     const owner = await helper.eth.createAccountWithBalance(donor);
     const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
 
-    const [newAdmin] = await helper.arrange.createAccounts([10n], donor);
-    const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
+    const [adminSub] = await helper.arrange.createAccounts([10n], donor);
+    const adminEth = (await helper.eth.createAccountWithBalance(donor)).toLowerCase();
+    const adminCrossSub = helper.ethCrossAccount.fromKeyringPair(adminSub);
+    const adminCrossEth = helper.ethCrossAccount.fromAddress(adminEth);
+
     const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
-    await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
+    await collectionEvm.methods.addCollectionAdminCross(adminCrossSub).send();
+    await collectionEvm.methods.addCollectionAdminCross(adminCrossEth).send();
+
     {
-      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);
-      expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())
-        .to.be.eq(newAdmin.address.toLocaleLowerCase());
+      const adminList = await helper.collection.getAdmins(collectionId);
+      expect(adminList).to.deep.include({Substrate: adminSub.address});
+      expect(adminList).to.deep.include({Ethereum: adminEth});
     }
 
-    await collectionEvm.methods.removeCollectionAdminCross(newAdminCross).send();
-    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);
+    await collectionEvm.methods.removeCollectionAdminCross(adminCrossSub).send();
+    await collectionEvm.methods.removeCollectionAdminCross(adminCrossEth).send();
+    const adminList = await helper.collection.getAdmins(collectionId);
     expect(adminList.length).to.be.eq(0);
+
+    // Non admin cannot mint:
+    await expect(helper.nft.mintToken(adminSub, {collectionId, owner: {Substrate: adminSub.address}})).to.be.rejectedWith(/common.PublicMintingNotAllowed/);
+    await expect(collectionEvm.methods.mint(adminEth).send({from: adminEth})).to.be.rejected;
   });
 
   // Soft-deprecated
@@ -395,16 +405,27 @@
 
   itEth('Change owner [cross]', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
-    const [newOwner] = await helper.arrange.createAccounts([10n], donor);
-    const newOwnerCross = helper.ethCrossAccount.fromKeyringPair(newOwner);
-    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
-    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+    const ownerEth = await helper.eth.createAccountWithBalance(donor);
+    const ownerCrossEth = helper.ethCrossAccount.fromAddress(ownerEth);
+    const [ownerSub] = await helper.arrange.createAccounts([10n], donor);
+    const ownerCrossSub = helper.ethCrossAccount.fromKeyringPair(ownerSub);
 
-    expect(await collectionEvm.methods.isOwnerOrAdminCross(newOwnerCross).call()).to.be.false;
+    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
 
-    await collectionEvm.methods.changeCollectionOwnerCross(newOwnerCross).send();
+    expect(await collectionEvm.methods.isOwnerOrAdminCross(ownerCrossSub).call()).to.be.false;
 
-    expect(await collectionEvm.methods.isOwnerOrAdminCross(newOwnerCross).call()).to.be.true;
+    // Can set ethereum owner:
+    await collectionEvm.methods.changeCollectionOwnerCross(ownerCrossEth).send({from: owner});
+    expect(await collectionEvm.methods.isOwnerOrAdminCross(ownerCrossEth).call()).to.be.true;
+    expect(await helper.collection.getData(collectionId))
+      .to.have.property('normalizedOwner').that.is.eq(helper.address.ethToSubstrate(ownerEth));
+    
+    // Can set Substrate owner:
+    await collectionEvm.methods.changeCollectionOwnerCross(ownerCrossSub).send({from: ownerEth});
+    expect(await collectionEvm.methods.isOwnerOrAdminCross(ownerCrossSub).call()).to.be.true;
+    expect(await helper.collection.getData(collectionId))
+      .to.have.property('normalizedOwner').that.is.eq(helper.address.normalizeSubstrate(ownerSub.address));
   });
 
   itEth.skip('change owner call fee', async ({helper}) => {
modifiedtests/src/eth/createFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -144,7 +144,7 @@
   
   itEth('destroyCollection', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
-    const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Exister', DECIMALS, 'absolutely anything', 'WIWT');
+    const {collectionAddress, collectionId} = await helper.eth.createFungibleCollection(owner, 'Exister', DECIMALS, 'absolutely anything', 'WIWT');
     const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
 
     const result = await collectionHelper.methods
@@ -166,6 +166,7 @@
     expect(await collectionHelper.methods
       .isCollectionExist(collectionAddress)
       .call()).to.be.false;
+    expect(await helper.collection.getData(collectionId)).to.be.null;
   });
 });
 
@@ -214,12 +215,15 @@
     }
   });
   
-  itEth('(!negative test!) Create collection (no funds)', async ({helper}) => {
+  itEth('(!negative test!) cannot create collection if value !== 2', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
-    await expect(collectionHelper.methods
-      .createFTCollection('Peasantry', DECIMALS, 'absolutely anything', 'TWIW')
-      .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
+    const expects = [0n, 1n, 30n].map(async value => {
+      await expect(collectionHelper.methods
+        .createFTCollection('Peasantry', DECIMALS, 'absolutely anything', 'TWIW')
+        .call({value: Number(value * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');
+    });
+    await Promise.all(expects);
   });
 
   // Soft-deprecated
modifiedtests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -308,7 +308,7 @@
 
   itEth('destroyCollection', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
-    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
+    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
     const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);
 
 
@@ -331,5 +331,6 @@
     expect(await collectionHelper.methods
       .isCollectionExist(collectionAddress)
       .call()).to.be.false;
+    expect(await helper.collection.getData(collectionId)).to.be.null;
   });
 });
\ No newline at end of file
modifiedtests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth
before · tests/src/eth/createRFTCollection.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.8//9// 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 {evmToAddress} from '@polkadot/util-crypto';18import {IKeyringPair} from '@polkadot/types/types';19import {Pallets, requirePalletsOrSkip} from '../util';20import {expect, itEth, usingEthPlaygrounds} from './util';212223describe('Create RFT collection from EVM', () => {24  let donor: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (helper, privateKey) => {28      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);29      donor = await privateKey({filename: __filename});30    });31  });3233  itEth('Create collection', async ({helper}) => {34    const owner = await helper.eth.createAccountWithBalance(donor);35    36    const name = 'CollectionEVM';37    const description = 'Some description';38    const prefix = 'token prefix';39  40    const {collectionId} = await helper.eth.createRFTCollection(owner, name, description, prefix);41    const data = (await helper.rft.getData(collectionId))!;42    const collection = helper.rft.getCollectionObject(collectionId);4344    expect(data.name).to.be.eq(name);45    expect(data.description).to.be.eq(description);46    expect(data.raw.tokenPrefix).to.be.eq(prefix);47    expect(data.raw.mode).to.be.eq('ReFungible');4849    const options = await collection.getOptions();5051    expect(options.tokenPropertyPermissions).to.be.empty;52  });5354  5556  itEth('Create collection with properties & get description', async ({helper}) => {57    const owner = await helper.eth.createAccountWithBalance(donor);5859    const name = 'CollectionEVM';60    const description = 'Some description';61    const prefix = 'token prefix';62    const baseUri = 'BaseURI';6364    const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, name, description, prefix, baseUri);65    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');6667    const collection = helper.rft.getCollectionObject(collectionId);68    const data = (await collection.getData())!;69    70    expect(data.name).to.be.eq(name);71    expect(data.description).to.be.eq(description);72    expect(data.raw.tokenPrefix).to.be.eq(prefix);73    expect(data.raw.mode).to.be.eq('ReFungible');7475    expect(await contract.methods.description().call()).to.deep.equal(description);7677    const options = await collection.getOptions();78    expect(options.tokenPropertyPermissions).to.be.deep.equal([79      {80        key: 'URI',81        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},82      },83      {84        key: 'URISuffix',85        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},86      },87    ]);88  });89  90  // this test will occasionally fail when in async environment.91  itEth.skip('Check collection address exist', async ({helper}) => {92    const owner = await helper.eth.createAccountWithBalance(donor);9394    const expectedCollectionId = +(await helper.callRpc('api.rpc.unique.collectionStats')).created + 1;95    const expectedCollectionAddress = helper.ethAddress.fromCollectionId(expectedCollectionId);96    const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);9798    expect(await collectionHelpers.methods99      .isCollectionExist(expectedCollectionAddress)100      .call()).to.be.false;101102    await collectionHelpers.methods103      .createRFTCollection('A', 'A', 'A')104      .send({value: Number(2n * helper.balance.getOneTokenNominal())});105    106    expect(await collectionHelpers.methods107      .isCollectionExist(expectedCollectionAddress)108      .call()).to.be.true;109  });110  111  // Soft-deprecated112  itEth('[eth] Set sponsorship', async ({helper}) => {113    const owner = await helper.eth.createAccountWithBalance(donor);114    const sponsor = await helper.eth.createAccountWithBalance(donor);115    const ss58Format = helper.chain.getChainProperties().ss58Format;116    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');117118    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, true);119    await collection.methods.setCollectionSponsor(sponsor).send();120121    let data = (await helper.rft.getData(collectionId))!;122    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));123124    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');125126    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);127    await sponsorCollection.methods.confirmCollectionSponsorship().send();128129    data = (await helper.rft.getData(collectionId))!;130    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));131  });132133  itEth('[cross] Set sponsorship', async ({helper}) => {134    const owner = await helper.eth.createAccountWithBalance(donor);135    const sponsor = await helper.eth.createAccountWithBalance(donor);136    const ss58Format = helper.chain.getChainProperties().ss58Format;137    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');138139    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);140    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);141    await collection.methods.setCollectionSponsorCross(sponsorCross).send();142143    let data = (await helper.rft.getData(collectionId))!;144    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));145146    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');147148    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);149    await sponsorCollection.methods.confirmCollectionSponsorship().send();150151    data = (await helper.rft.getData(collectionId))!;152    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));153  });154155  itEth('Set limits', async ({helper}) => {156    const owner = await helper.eth.createAccountWithBalance(donor);157    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'INSI');158    const limits = {159      accountTokenOwnershipLimit: 1000,160      sponsoredDataSize: 1024,161      sponsoredDataRateLimit: 30,162      tokenLimit: 1000000,163      sponsorTransferTimeout: 6,164      sponsorApproveTimeout: 6,165      ownerCanTransfer: 0,166      ownerCanDestroy: 0,167      transfersEnabled: 0,168    };169    170    const expectedLimits = {171      accountTokenOwnershipLimit: 1000,172      sponsoredDataSize: 1024,173      sponsoredDataRateLimit: 30,174      tokenLimit: 1000000,175      sponsorTransferTimeout: 6,176      sponsorApproveTimeout: 6,177      ownerCanTransfer: false,178      ownerCanDestroy: false,179      transfersEnabled: false,180    };181    182    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);183    await collection.methods.setCollectionLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();184    await collection.methods.setCollectionLimit('sponsoredDataSize', limits.sponsoredDataSize).send();185    await collection.methods.setCollectionLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();186    await collection.methods.setCollectionLimit('tokenLimit', limits.tokenLimit).send();187    await collection.methods.setCollectionLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();188    await collection.methods.setCollectionLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();189    await collection.methods.setCollectionLimit('ownerCanTransfer', limits.ownerCanTransfer).send();190    await collection.methods.setCollectionLimit('ownerCanDestroy', limits.ownerCanDestroy).send();191    await collection.methods.setCollectionLimit('transfersEnabled', limits.transfersEnabled).send();192    193    const data = (await helper.rft.getData(collectionId))!;194    expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(expectedLimits.accountTokenOwnershipLimit);195    expect(data.raw.limits.sponsoredDataSize).to.be.eq(expectedLimits.sponsoredDataSize);196    expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(expectedLimits.sponsoredDataRateLimit);197    expect(data.raw.limits.tokenLimit).to.be.eq(expectedLimits.tokenLimit);198    expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(expectedLimits.sponsorTransferTimeout);199    expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(expectedLimits.sponsorApproveTimeout);200    expect(data.raw.limits.ownerCanTransfer).to.be.eq(expectedLimits.ownerCanTransfer);201    expect(data.raw.limits.ownerCanDestroy).to.be.eq(expectedLimits.ownerCanDestroy);202    expect(data.raw.limits.transfersEnabled).to.be.eq(expectedLimits.transfersEnabled);203  });204205  itEth('Collection address exist', async ({helper}) => {206    const owner = await helper.eth.createAccountWithBalance(donor);207    const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';208    expect(await helper.ethNativeContract.collectionHelpers(collectionAddressForNonexistentCollection)209      .methods.isCollectionExist(collectionAddressForNonexistentCollection).call())210      .to.be.false;211    212    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Exister', 'absolutely anything', 'WIWT');213    expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)214      .methods.isCollectionExist(collectionAddress).call())215      .to.be.true;216  });217});218219describe('(!negative tests!) Create RFT collection from EVM', () => {220  let donor: IKeyringPair;221  let nominal: bigint;222223  before(async function() {224    await usingEthPlaygrounds(async (helper, privateKey) => {225      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);226      donor = await privateKey({filename: __filename});227      nominal = helper.balance.getOneTokenNominal();228    });229  });230231  itEth('(!negative test!) Create collection (bad lengths)', async ({helper}) => {232    const owner = await helper.eth.createAccountWithBalance(donor);233    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);234    {235      const MAX_NAME_LENGTH = 64;236      const collectionName = 'A'.repeat(MAX_NAME_LENGTH + 1);237      const description = 'A';238      const tokenPrefix = 'A';239240      await expect(collectionHelper.methods241        .createRFTCollection(collectionName, description, tokenPrefix)242        .call({value: Number(2n * nominal)})).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGTH);243    }244    {245      const MAX_DESCRIPTION_LENGTH = 256;246      const collectionName = 'A';247      const description = 'A'.repeat(MAX_DESCRIPTION_LENGTH + 1);248      const tokenPrefix = 'A';249      await expect(collectionHelper.methods250        .createRFTCollection(collectionName, description, tokenPrefix)251        .call({value: Number(2n * nominal)})).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGTH);252    }253    {254      const MAX_TOKEN_PREFIX_LENGTH = 16;255      const collectionName = 'A';256      const description = 'A';257      const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGTH + 1);258      await expect(collectionHelper.methods259        .createRFTCollection(collectionName, description, tokenPrefix)260        .call({value: Number(2n * nominal)})).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGTH);261    }262  });263  264  itEth('(!negative test!) Create collection (no funds)', async ({helper}) => {265    const owner = await helper.eth.createAccountWithBalance(donor);266    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);267    await expect(collectionHelper.methods268      .createRFTCollection('Peasantry', 'absolutely anything', 'TWIW')269      .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');270  });271272  // Soft-deprecated273  itEth('(!negative test!) [eth] Check owner', async ({helper}) => {274    const owner = await helper.eth.createAccountWithBalance(donor);275    const peasant = helper.eth.createAccount();276    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');277    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant, true);278    const EXPECTED_ERROR = 'NoPermission';279    {280      const sponsor = await helper.eth.createAccountWithBalance(donor);281      await expect(peasantCollection.methods282        .setCollectionSponsor(sponsor)283        .call()).to.be.rejectedWith(EXPECTED_ERROR);284      285      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);286      await expect(sponsorCollection.methods287        .confirmCollectionSponsorship()288        .call()).to.be.rejectedWith('caller is not set as sponsor');289    }290    {291      await expect(peasantCollection.methods292        .setCollectionLimit('account_token_ownership_limit', '1000')293        .call()).to.be.rejectedWith(EXPECTED_ERROR);294    }295  });296297  itEth('(!negative test!) [cross] Check owner', async ({helper}) => {298    const owner = await helper.eth.createAccountWithBalance(donor);299    const peasant = helper.eth.createAccount();300    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');301    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant);302    const EXPECTED_ERROR = 'NoPermission';303    {304      const sponsor = await helper.eth.createAccountWithBalance(donor);305      const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);306      await expect(peasantCollection.methods307        .setCollectionSponsorCross(sponsorCross)308        .call()).to.be.rejectedWith(EXPECTED_ERROR);309      310      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);311      await expect(sponsorCollection.methods312        .confirmCollectionSponsorship()313        .call()).to.be.rejectedWith('caller is not set as sponsor');314    }315    {316      await expect(peasantCollection.methods317        .setCollectionLimit('account_token_ownership_limit', '1000')318        .call()).to.be.rejectedWith(EXPECTED_ERROR);319    }320  });321322  itEth('(!negative test!) Set limits', async ({helper}) => {323    const invalidLimits = {324      accountTokenOwnershipLimit: BigInt(Number.MAX_SAFE_INTEGER),325      transfersEnabled: 3,326    };327328    const owner = await helper.eth.createAccountWithBalance(donor);329    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'ISNI');330    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);331    332    await expect(collectionEvm.methods333      .setCollectionLimit(Object.keys(invalidLimits)[0], invalidLimits.accountTokenOwnershipLimit)334      .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);335    336    await expect(collectionEvm.methods337      .setCollectionLimit(Object.keys(invalidLimits)[1], invalidLimits.transfersEnabled)338      .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);339  });340  341  itEth('destroyCollection', async ({helper}) => {342    const owner = await helper.eth.createAccountWithBalance(donor);343    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');344    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);345    346    await expect(collectionHelper.methods347      .destroyCollection(collectionAddress)348      .send({from: owner})).to.be.fulfilled;349    350    expect(await collectionHelper.methods351      .isCollectionExist(collectionAddress)352      .call()).to.be.false;  353  });354});
after · tests/src/eth/createRFTCollection.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.8//9// 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 {evmToAddress} from '@polkadot/util-crypto';18import {IKeyringPair} from '@polkadot/types/types';19import {Pallets, requirePalletsOrSkip} from '../util';20import {expect, itEth, usingEthPlaygrounds} from './util';212223describe('Create RFT collection from EVM', () => {24  let donor: IKeyringPair;2526  before(async function() {27    await usingEthPlaygrounds(async (helper, privateKey) => {28      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);29      donor = await privateKey({filename: __filename});30    });31  });3233  itEth('Create collection', async ({helper}) => {34    const owner = await helper.eth.createAccountWithBalance(donor);35    36    const name = 'CollectionEVM';37    const description = 'Some description';38    const prefix = 'token prefix';39  40    const {collectionId} = await helper.eth.createRFTCollection(owner, name, description, prefix);41    const data = (await helper.rft.getData(collectionId))!;42    const collection = helper.rft.getCollectionObject(collectionId);4344    expect(data.name).to.be.eq(name);45    expect(data.description).to.be.eq(description);46    expect(data.raw.tokenPrefix).to.be.eq(prefix);47    expect(data.raw.mode).to.be.eq('ReFungible');4849    const options = await collection.getOptions();5051    expect(options.tokenPropertyPermissions).to.be.empty;52  });5354  5556  itEth('Create collection with properties & get description', async ({helper}) => {57    const owner = await helper.eth.createAccountWithBalance(donor);5859    const name = 'CollectionEVM';60    const description = 'Some description';61    const prefix = 'token prefix';62    const baseUri = 'BaseURI';6364    const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, name, description, prefix, baseUri);65    const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');6667    const collection = helper.rft.getCollectionObject(collectionId);68    const data = (await collection.getData())!;69    70    expect(data.name).to.be.eq(name);71    expect(data.description).to.be.eq(description);72    expect(data.raw.tokenPrefix).to.be.eq(prefix);73    expect(data.raw.mode).to.be.eq('ReFungible');7475    expect(await contract.methods.description().call()).to.deep.equal(description);7677    const options = await collection.getOptions();78    expect(options.tokenPropertyPermissions).to.be.deep.equal([79      {80        key: 'URI',81        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},82      },83      {84        key: 'URISuffix',85        permission: {mutable: true, collectionAdmin: true, tokenOwner: false},86      },87    ]);88  });89  90  // this test will occasionally fail when in async environment.91  itEth.skip('Check collection address exist', async ({helper}) => {92    const owner = await helper.eth.createAccountWithBalance(donor);9394    const expectedCollectionId = +(await helper.callRpc('api.rpc.unique.collectionStats')).created + 1;95    const expectedCollectionAddress = helper.ethAddress.fromCollectionId(expectedCollectionId);96    const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);9798    expect(await collectionHelpers.methods99      .isCollectionExist(expectedCollectionAddress)100      .call()).to.be.false;101102    await collectionHelpers.methods103      .createRFTCollection('A', 'A', 'A')104      .send({value: Number(2n * helper.balance.getOneTokenNominal())});105    106    expect(await collectionHelpers.methods107      .isCollectionExist(expectedCollectionAddress)108      .call()).to.be.true;109  });110  111  // Soft-deprecated112  itEth('[eth] Set sponsorship', async ({helper}) => {113    const owner = await helper.eth.createAccountWithBalance(donor);114    const sponsor = await helper.eth.createAccountWithBalance(donor);115    const ss58Format = helper.chain.getChainProperties().ss58Format;116    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');117118    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, true);119    await collection.methods.setCollectionSponsor(sponsor).send();120121    let data = (await helper.rft.getData(collectionId))!;122    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));123124    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');125126    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);127    await sponsorCollection.methods.confirmCollectionSponsorship().send();128129    data = (await helper.rft.getData(collectionId))!;130    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));131  });132133  itEth('[cross] Set sponsorship', async ({helper}) => {134    const owner = await helper.eth.createAccountWithBalance(donor);135    const sponsor = await helper.eth.createAccountWithBalance(donor);136    const ss58Format = helper.chain.getChainProperties().ss58Format;137    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Sponsor', 'absolutely anything', 'ENVY');138139    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);140    const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);141    await collection.methods.setCollectionSponsorCross(sponsorCross).send();142143    let data = (await helper.rft.getData(collectionId))!;144    expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));145146    await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');147148    const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);149    await sponsorCollection.methods.confirmCollectionSponsorship().send();150151    data = (await helper.rft.getData(collectionId))!;152    expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));153  });154155  itEth('Set limits', async ({helper}) => {156    const owner = await helper.eth.createAccountWithBalance(donor);157    const {collectionId, collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'INSI');158    const limits = {159      accountTokenOwnershipLimit: 1000,160      sponsoredDataSize: 1024,161      sponsoredDataRateLimit: 30,162      tokenLimit: 1000000,163      sponsorTransferTimeout: 6,164      sponsorApproveTimeout: 6,165      ownerCanTransfer: 0,166      ownerCanDestroy: 0,167      transfersEnabled: 0,168    };169    170    const expectedLimits = {171      accountTokenOwnershipLimit: 1000,172      sponsoredDataSize: 1024,173      sponsoredDataRateLimit: 30,174      tokenLimit: 1000000,175      sponsorTransferTimeout: 6,176      sponsorApproveTimeout: 6,177      ownerCanTransfer: false,178      ownerCanDestroy: false,179      transfersEnabled: false,180    };181    182    const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);183    await collection.methods.setCollectionLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit).send();184    await collection.methods.setCollectionLimit('sponsoredDataSize', limits.sponsoredDataSize).send();185    await collection.methods.setCollectionLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit).send();186    await collection.methods.setCollectionLimit('tokenLimit', limits.tokenLimit).send();187    await collection.methods.setCollectionLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout).send();188    await collection.methods.setCollectionLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout).send();189    await collection.methods.setCollectionLimit('ownerCanTransfer', limits.ownerCanTransfer).send();190    await collection.methods.setCollectionLimit('ownerCanDestroy', limits.ownerCanDestroy).send();191    await collection.methods.setCollectionLimit('transfersEnabled', limits.transfersEnabled).send();192    193    const data = (await helper.rft.getData(collectionId))!;194    expect(data.raw.limits.accountTokenOwnershipLimit).to.be.eq(expectedLimits.accountTokenOwnershipLimit);195    expect(data.raw.limits.sponsoredDataSize).to.be.eq(expectedLimits.sponsoredDataSize);196    expect(data.raw.limits.sponsoredDataRateLimit.blocks).to.be.eq(expectedLimits.sponsoredDataRateLimit);197    expect(data.raw.limits.tokenLimit).to.be.eq(expectedLimits.tokenLimit);198    expect(data.raw.limits.sponsorTransferTimeout).to.be.eq(expectedLimits.sponsorTransferTimeout);199    expect(data.raw.limits.sponsorApproveTimeout).to.be.eq(expectedLimits.sponsorApproveTimeout);200    expect(data.raw.limits.ownerCanTransfer).to.be.eq(expectedLimits.ownerCanTransfer);201    expect(data.raw.limits.ownerCanDestroy).to.be.eq(expectedLimits.ownerCanDestroy);202    expect(data.raw.limits.transfersEnabled).to.be.eq(expectedLimits.transfersEnabled);203  });204205  itEth('Collection address exist', async ({helper}) => {206    const owner = await helper.eth.createAccountWithBalance(donor);207    const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';208    expect(await helper.ethNativeContract.collectionHelpers(collectionAddressForNonexistentCollection)209      .methods.isCollectionExist(collectionAddressForNonexistentCollection).call())210      .to.be.false;211    212    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Exister', 'absolutely anything', 'WIWT');213    expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)214      .methods.isCollectionExist(collectionAddress).call())215      .to.be.true;216  });217});218219describe('(!negative tests!) Create RFT collection from EVM', () => {220  let donor: IKeyringPair;221  let nominal: bigint;222223  before(async function() {224    await usingEthPlaygrounds(async (helper, privateKey) => {225      requirePalletsOrSkip(this, helper, [Pallets.ReFungible]);226      donor = await privateKey({filename: __filename});227      nominal = helper.balance.getOneTokenNominal();228    });229  });230231  itEth('(!negative test!) Create collection (bad lengths)', async ({helper}) => {232    const owner = await helper.eth.createAccountWithBalance(donor);233    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);234    {235      const MAX_NAME_LENGTH = 64;236      const collectionName = 'A'.repeat(MAX_NAME_LENGTH + 1);237      const description = 'A';238      const tokenPrefix = 'A';239240      await expect(collectionHelper.methods241        .createRFTCollection(collectionName, description, tokenPrefix)242        .call({value: Number(2n * nominal)})).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGTH);243    }244    {245      const MAX_DESCRIPTION_LENGTH = 256;246      const collectionName = 'A';247      const description = 'A'.repeat(MAX_DESCRIPTION_LENGTH + 1);248      const tokenPrefix = 'A';249      await expect(collectionHelper.methods250        .createRFTCollection(collectionName, description, tokenPrefix)251        .call({value: Number(2n * nominal)})).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGTH);252    }253    {254      const MAX_TOKEN_PREFIX_LENGTH = 16;255      const collectionName = 'A';256      const description = 'A';257      const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGTH + 1);258      await expect(collectionHelper.methods259        .createRFTCollection(collectionName, description, tokenPrefix)260        .call({value: Number(2n * nominal)})).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGTH);261    }262  });263  264  itEth('(!negative test!) Create collection (no funds)', async ({helper}) => {265    const owner = await helper.eth.createAccountWithBalance(donor);266    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);267    await expect(collectionHelper.methods268      .createRFTCollection('Peasantry', 'absolutely anything', 'TWIW')269      .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');270  });271272  // Soft-deprecated273  itEth('(!negative test!) [eth] Check owner', async ({helper}) => {274    const owner = await helper.eth.createAccountWithBalance(donor);275    const peasant = helper.eth.createAccount();276    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');277    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant, true);278    const EXPECTED_ERROR = 'NoPermission';279    {280      const sponsor = await helper.eth.createAccountWithBalance(donor);281      await expect(peasantCollection.methods282        .setCollectionSponsor(sponsor)283        .call()).to.be.rejectedWith(EXPECTED_ERROR);284      285      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);286      await expect(sponsorCollection.methods287        .confirmCollectionSponsorship()288        .call()).to.be.rejectedWith('caller is not set as sponsor');289    }290    {291      await expect(peasantCollection.methods292        .setCollectionLimit('account_token_ownership_limit', '1000')293        .call()).to.be.rejectedWith(EXPECTED_ERROR);294    }295  });296297  itEth('(!negative test!) [cross] Check owner', async ({helper}) => {298    const owner = await helper.eth.createAccountWithBalance(donor);299    const peasant = helper.eth.createAccount();300    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Transgressed', 'absolutely anything', 'YVNE');301    const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', peasant);302    const EXPECTED_ERROR = 'NoPermission';303    {304      const sponsor = await helper.eth.createAccountWithBalance(donor);305      const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);306      await expect(peasantCollection.methods307        .setCollectionSponsorCross(sponsorCross)308        .call()).to.be.rejectedWith(EXPECTED_ERROR);309      310      const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);311      await expect(sponsorCollection.methods312        .confirmCollectionSponsorship()313        .call()).to.be.rejectedWith('caller is not set as sponsor');314    }315    {316      await expect(peasantCollection.methods317        .setCollectionLimit('account_token_ownership_limit', '1000')318        .call()).to.be.rejectedWith(EXPECTED_ERROR);319    }320  });321322  itEth('(!negative test!) Set limits', async ({helper}) => {323    const invalidLimits = {324      accountTokenOwnershipLimit: BigInt(Number.MAX_SAFE_INTEGER),325      transfersEnabled: 3,326    };327328    const owner = await helper.eth.createAccountWithBalance(donor);329    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'ISNI');330    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);331    332    await expect(collectionEvm.methods333      .setCollectionLimit(Object.keys(invalidLimits)[0], invalidLimits.accountTokenOwnershipLimit)334      .call()).to.be.rejectedWith(`can't convert value to u32 "${invalidLimits.accountTokenOwnershipLimit}"`);335    336    await expect(collectionEvm.methods337      .setCollectionLimit(Object.keys(invalidLimits)[1], invalidLimits.transfersEnabled)338      .call()).to.be.rejectedWith(`can't convert value to boolean "${invalidLimits.transfersEnabled}"`);339  });340  341  itEth('destroyCollection', async ({helper}) => {342    const owner = await helper.eth.createAccountWithBalance(donor);343    const {collectionAddress, collectionId} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');344    const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);345    346    await expect(collectionHelper.methods347      .destroyCollection(collectionAddress)348      .send({from: owner})).to.be.fulfilled;349    350    expect(await collectionHelper.methods351      .isCollectionExist(collectionAddress)352      .call()).to.be.false;353    expect(await helper.collection.getData(collectionId)).to.be.null;354  });355});
modifiedtests/src/eth/destroyCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/destroyCollection.test.ts
+++ b/tests/src/eth/destroyCollection.test.ts
@@ -15,62 +15,48 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {Pallets, requirePalletsOrSkip} from '../util';
+import {Pallets} from '../util';
 import {expect, itEth, usingEthPlaygrounds} from './util';
 
-
-describe('Destroy Collection from EVM', () => {
+describe('Destroy Collection from EVM', function() {
   let donor: IKeyringPair;
+  const testCases = [
+    {method: 'createRFTCollection' as const, params: ['Limits', 'absolutely anything', 'OLF'], requiredPallets: [Pallets.ReFungible]},
+    {method: 'createNFTCollection' as const, params: ['Limits', 'absolutely anything', 'OLF'], requiredPallets: [Pallets.NFT]},
+    {method: 'createFTCollection' as const, params: ['Limits', 'absolutely anything', 'OLF', 18], requiredPallets: [Pallets.Fungible]},
+  ];
 
   before(async function() {
-    await usingEthPlaygrounds(async (helper, privateKey) => {
-      requirePalletsOrSkip(this, helper, [Pallets.ReFungible, Pallets.NFT]);
+    await usingEthPlaygrounds(async (_, privateKey) => {
       donor = await privateKey({filename: __filename});
     });
   });
 
-  
-  itEth('(!negative test!) RFT', async ({helper}) => {
-    const owner = await helper.eth.createAccountWithBalance(donor);
-    const signer = await helper.eth.createAccountWithBalance(donor);
-    
-    const unexistedCollection = helper.ethAddress.fromCollectionId(1000000);
-    
-    const {collectionAddress} = await helper.eth.createRFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
-    const collectionHelper = helper.ethNativeContract.collectionHelpers(signer);
-    
-    await expect(collectionHelper.methods
-      .destroyCollection(collectionAddress)
-      .send({from: signer})).to.be.rejected;
-    
-    await expect(collectionHelper.methods
-      .destroyCollection(unexistedCollection)
-      .send({from: signer})).to.be.rejected;
-    
-    expect(await collectionHelper.methods
-      .isCollectionExist(unexistedCollection)
-      .call()).to.be.false;
-  });
-  
-  itEth('(!negative test!) NFT', async ({helper}) => {
-    const owner = await helper.eth.createAccountWithBalance(donor);
-    const signer = await helper.eth.createAccountWithBalance(donor);
-    
-    const unexistedCollection = helper.ethAddress.fromCollectionId(1000000);
-    
-    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');
-    const collectionHelper = helper.ethNativeContract.collectionHelpers(signer);
-    
-    await expect(collectionHelper.methods
-      .destroyCollection(collectionAddress)
-      .send({from: signer})).to.be.rejected;
-    
-    await expect(collectionHelper.methods
-      .destroyCollection(unexistedCollection)
-      .send({from: signer})).to.be.rejected;
-    
-    expect(await collectionHelper.methods
-      .isCollectionExist(unexistedCollection)
-      .call()).to.be.false;
-  });
+  testCases.map((testCase) => 
+    itEth.ifWithPallets(`Cannot burn non-owned or non-existing collection ${testCase.method}`, testCase.requiredPallets, async ({helper}) => {
+      const owner = await helper.eth.createAccountWithBalance(donor);
+      const signer = await helper.eth.createAccountWithBalance(donor);
+      
+      const unexistedCollection = helper.ethAddress.fromCollectionId(1000000);
+      
+      const collectionHelpers = helper.ethNativeContract.collectionHelpers(signer);
+      const {collectionAddress} = await helper.eth.createCollecion(testCase.method, owner, ...testCase.params as [string, string, string, number?]);
+
+      // cannot burn collec
+      await expect(collectionHelpers.methods
+        .destroyCollection(collectionAddress)
+        .send({from: signer})).to.be.rejected;
+      
+      await expect(collectionHelpers.methods
+        .destroyCollection(unexistedCollection)
+        .send({from: signer})).to.be.rejected;
+      
+      expect(await collectionHelpers.methods
+        .isCollectionExist(unexistedCollection)
+        .call()).to.be.false;
+      
+      expect(await collectionHelpers.methods
+        .isCollectionExist(collectionAddress)
+        .call()).to.be.true;
+    }));
 });
modifiedtests/src/eth/fungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -232,56 +232,64 @@
   });
 
   itEth('Can perform transferCross()', async ({helper}) => {
-    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(donor);
+    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(donor);
     const collection = await helper.ft.mintCollection(alice);
-    await collection.mint(alice, 200n, {Ethereum: owner});
+    await collection.mint(alice, 200n, {Ethereum: sender});
 
     const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
-    const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'ft', sender);
 
     {
-      const result = await contract.methods.transferCross(to, 50).send({from: owner});
-      
+      // Can transferCross to ethereum address:
+      const result = await collectionEvm.methods.transferCross(receiverCrossEth, 50).send({from: sender});
+      // 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.from).to.be.equal(sender);
+      expect(event.returnValues.to).to.be.equal(receiverEth);
       expect(event.returnValues.value).to.be.equal('50');
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(owner).call();
-      expect(+balance).to.equal(150);
-    }
-
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(50);
+      // Sender's balance decreased:
+      const ownerBalance = await collectionEvm.methods.balanceOf(sender).call();
+      expect(+ownerBalance).to.equal(150);
+      // Receiver's balance increased:
+      const receiverBalance = await collectionEvm.methods.balanceOf(receiverEth).call();
+      expect(+receiverBalance).to.equal(50);
     }
     
     {
-      const result = await contract.methods.transferCross(toSubstrate, 50).send({from: owner});
-      
+      // Can transferCross to substrate address:
+      const result = await collectionEvm.methods.transferCross(receiverCrossSub, 50).send({from: sender});
+      // 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.from).to.be.equal(sender);
       expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(donor.address));
       expect(event.returnValues.value).to.be.equal('50');
+      // Sender's balance decreased:
+      const senderBalance = await collection.getBalance({Ethereum: sender});
+      expect(senderBalance).to.equal(100n);
+      // Receiver's balance increased:
+      const balance = await collection.getBalance({Substrate: donor.address});
+      expect(balance).to.equal(50n);
     }
+  });
+
+  itEth('Cannot transferCross() more than have', async ({helper}) => {
+    const sender = await helper.eth.createAccountWithBalance(donor);
+    const receiverEth = await helper.eth.createAccountWithBalance(donor);
+    const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);
+    const BALANCE = 200n;
+    const BALANCE_TO_TRANSFER = BALANCE + 100n;
 
-    {
-      const balance = await collection.getBalance({Ethereum: owner});
-      expect(balance).to.equal(100n);
-    }
+    const collection = await helper.ft.mintCollection(alice);
+    await collection.mint(alice, BALANCE, {Ethereum: sender});
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'ft', sender);
 
-    {
-      const balance = await collection.getBalance({Substrate: donor.address});
-      expect(balance).to.equal(50n);
-    }
-    
+    await expect(collectionEvm.methods.transferCross(receiverCrossEth, BALANCE_TO_TRANSFER).send({from: sender})).to.be.rejected;
   });
   
   itEth('Can perform transfer()', async ({helper}) => {
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -251,31 +251,48 @@
 
   itEth('Can perform burnFromCross()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
+    const ownerSub = bob;
+    const ownerCrossSub = helper.ethCrossAccount.fromKeyringPair(ownerSub);
+    const ownerEth = await helper.eth.createAccountWithBalance(donor, 100n);
+    const ownerCrossEth = helper.ethCrossAccount.fromAddress(ownerEth);
 
-    const owner = bob;
-    const spender = await helper.eth.createAccountWithBalance(donor, 100n);
+    const burnerEth = await helper.eth.createAccountWithBalance(donor, 100n);
+    const burnerCrossEth = helper.ethCrossAccount.fromAddress(burnerEth);
 
-    const token = await collection.mintToken(minter, {Substrate: owner.address});
+    const token1 = await collection.mintToken(minter, {Substrate: ownerSub.address});
+    const token2 = await collection.mintToken(minter, {Ethereum: ownerEth});
+
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft');
 
-    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
-    const contract = helper.ethNativeContract.collection(address, 'nft');
+    // Approve tokens from substrate and ethereum:
+    await token1.approve(ownerSub, {Ethereum: burnerEth});
+    await collectionEvm.methods.approveCross(burnerCrossEth, token2.tokenId).send({from: ownerEth});
 
-    {
-      await token.approve(owner, {Ethereum: spender});
-      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
-      const result = await contract.methods.burnFromCross(ownerCross, token.tokenId).send({from: spender});
-      const events = result.events.Transfer;
+    // can burnFromCross:
+    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;
 
-      expect(events).to.be.like({
-        address,
+    // 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(owner.address),
+          from: burnData[2],
           to: '0x0000000000000000000000000000000000000000',
-          tokenId: token.tokenId.toString(),
+          tokenId: burnData[1].tokenId.toString(),
         },
       });
-    }
+    });
+
+    expect(await token1.doesExist()).to.be.false;
+    expect(await token2.doesExist()).to.be.false;
   });
 
   itEth('Can perform approveCross()', async ({helper}) => {
@@ -326,6 +343,34 @@
     expect(await helper.nft.getTokenOwner(collection.collectionId, token2.tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});
   });
 
+  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);
+    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
+    const token1 = await collection.mintToken(minter, {Ethereum: owner});
+    const token2 = await collection.mintToken(minter, {Ethereum: owner});
+    const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');
+
+    // Can approve and reaffirm approved address:
+    await collectionEvm.methods.approveCross(receiver1Cross, token1.tokenId).send({from: owner});
+    await collectionEvm.methods.approveCross(receiver2Cross, token1.tokenId).send({from: owner});
+
+    // receiver1 cannot transferFrom:
+    await expect(helper.nft.transferTokenFrom(receiver1, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver1.address})).to.be.rejected;
+    // receiver2 can transferFrom:
+    await helper.nft.transferTokenFrom(receiver2, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiver2.address});
+
+    // can set approved address to self address to remove approval:
+    await collectionEvm.methods.approveCross(receiver1Cross, token2.tokenId).send({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;
+  });
+
   itEth('Can perform transferFrom()', async ({helper}) => {
     const owner = await helper.eth.createAccountWithBalance(donor);
     const spender = await helper.eth.createAccountWithBalance(donor);
@@ -426,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,71 @@
   });
   
   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);
     }
+  });
+
+  itEth.skip('Cannot transferCross with invalid params', async ({helper}) => {
+    const sender = await helper.eth.createAccountWithBalance(donor);
+    const tokenOwner = await helper.eth.createAccountWithBalance(donor);
+    const receiverCrossSub = helper.ethCrossAccount.fromKeyringPair(minter);
 
-    {
-      const balance = await contract.methods.balanceOf(receiver).call();
-      expect(+balance).to.equal(0);
-    }
+    const collection = await helper.rft.mintCollection(minter, {});
+    const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', sender);
 
-    {
-      const balance = await helper.nft.getTokensByAddress(collection.collectionId, {Substrate: minter.address});
-      expect(balance).to.be.contain(tokenId);
-    }
+    await collection.mintToken(minter, 50n, {Ethereum: sender});
+    const notSendersToken = await collection.mintToken(minter, 50n, {Ethereum: tokenOwner});
+    // Cannot transferCross someone else's token:
+    await expect(collectionEvm.methods.transferCross(receiverCrossSub, notSendersToken.tokenId).send({from: sender})).to.be.rejected;
+    // FIXME: (transaction successful): Cannot transfer token if it does not exist:
+    await expect(collectionEvm.methods.transferCross(receiverCrossSub, 999999).send({from: sender})).to.be.rejected;
   });
 
   itEth('transfer event on transfer from partial ownership to full ownership', async ({helper}) => {
modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -186,11 +186,12 @@
     return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);
   }
 
-  async createCollecion(functionName: string, signer: string, name: string, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {
+  async createCollecion(functionName: 'createNFTCollection' | 'createRFTCollection' | 'createFTCollection', signer: string, name: string, description: string, tokenPrefix: string, decimals?: number): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {
     const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
     const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
 
-    const result = await collectionHelper.methods[functionName](name, description, tokenPrefix).send({value: Number(collectionCreationPrice)});
+    const functionParams = functionName === 'createFTCollection' ? [name, decimals, description, tokenPrefix] : [name, description, tokenPrefix];
+    const result = await collectionHelper.methods[functionName](...functionParams).send({value: Number(collectionCreationPrice)});
 
     const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
     const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
@@ -217,17 +218,8 @@
     return this.createCollecion('createRFTCollection', signer, name, description, tokenPrefix);
   }
 
-  async createFungibleCollection(signer: string, name: string, decimals: number, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {
-    const collectionCreationPrice = this.helper.balance.getCollectionCreationPrice();
-    const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
-
-    const result = await collectionHelper.methods.createFTCollection(name, decimals, description, tokenPrefix).send({value: Number(collectionCreationPrice)});
-    const collectionAddress = this.helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
-    const collectionId = this.helper.ethAddress.extractCollectionId(collectionAddress);
-
-    const events = this.helper.eth.normalizeEvents(result.events);
-
-    return {collectionId, collectionAddress, events};
+  createFungibleCollection(signer: string, name: string, decimals: number, description: string, tokenPrefix: string): Promise<{ collectionId: number, collectionAddress: string, events: NormalizedEvent[]}> {
+    return this.createCollecion('createFTCollection', signer, name, description, tokenPrefix, decimals);
   }
 
   async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string, events: NormalizedEvent[] }> {