git.delta.rocks / unique-network / refs/commits / 79ed02e181a1

difftreelog

CORE-346 Some changes for broken tests

Trubnikov Sergey2022-05-27parent: #4f3a569.patch.diff
in: master

5 files changed

modifiedtests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth
--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -29,11 +29,15 @@
   normalizeEvents,
   subToEth,
   executeEthTxOnSub,
+  evmCollectionHelper,
+  getCollectionAddressFromResult,
+  evmCollection,
 } from './util/helpers';
 import {
   addCollectionAdminExpectSuccess,
   createCollectionExpectSuccess,
   getCreateCollectionResult,
+  getDetailedCollectionInfo,
   transferBalanceTo,
 } from '../util/helpers';
 import nonFungibleAbi from './nonFungibleAbi.json';
@@ -42,6 +46,7 @@
 } from '../substrate/substrate-api';
 import getBalance from '../substrate/get-balance';
 import {alicesPublicKey} from '../accounts';
+import { evmToAddress } from '@polkadot/util-crypto';
 
 describe('Sponsoring EVM contracts', () => {
   itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3}) => {
@@ -222,84 +227,81 @@
   });
 
   itWeb3('Sponsoring evm address from substrate collection', async ({api, web3}) => {
-    const owner = privateKey('//Alice');
-    const userEth = createEthAccount(web3);
-    const collectionId = await createCollectionExpectSuccess();
+    const owner = await createEthAccountWithBalance(api, web3);
+    const collectionHelper = evmCollectionHelper(web3, owner);
+    let result = await collectionHelper.methods.create721Collection('Sponsor collection', '1', '1').send();
+    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
+    const sponsor = await createEthAccountWithBalance(api, web3);
+    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);
+    result = await collectionEvm.methods.ethSetSponsor(sponsor).send();
+    let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
+    expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;
+    expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
+    await expect(collectionEvm.methods.ethConfirmSponsorship().call()).to.be.rejectedWith('Caller is not set as sponsor');
 
-    {
-      const tx = api.tx.unique.setCollectionSponsor(collectionId, owner.address);
-      const events = await submitTransactionAsync(owner, tx);
-      const result = getCreateCollectionResult(events);
-      expect(result.success).to.be.true;
-    }
-    {
-      const tx = api.tx.unique.confirmSponsorship(collectionId);
-      const events = await submitTransactionAsync(owner, tx);
-      const result = getCreateCollectionResult(events);
-      expect(result.success).to.be.true;
-    }
+    const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);
+    await sponsorCollection.methods.ethConfirmSponsorship().send();
+    collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;
+    expect(collectionSub.sponsorship.isConfirmed).to.be.true;
+    expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));
 
-    const address = collectionIdToAddress(collectionId);
-    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: userEth, ...GAS_ARGS});
+    const user = createEthAccount(web3);
+    const userContract = evmCollection(web3, user, collectionIdAddress);
+    const nextTokenId = await userContract.methods.nextTokenId().call();
 
-    { // This part should fail, because user not in access list and user have no money
-      const nextTokenId = await contract.methods.nextTokenId().call();
-      expect(nextTokenId).to.be.equal('1');
-      await expect(contract.methods.mintWithTokenURI(
-        userEth,
-        nextTokenId,
-        'Test URI',
-      ).call({from: userEth})).to.be.rejectedWith(/PublicMintingNotAllowed/);
-    }
-
-    {
-      const tx = api.tx.unique.setPublicAccessMode(collectionId, 'AllowList');
-      const events = await submitTransactionAsync(owner, tx);
-      const result = getCreateCollectionResult(events);
-      expect(result.success).to.be.true;
-    }
-    {
-      const tx = api.tx.unique.addToAllowList(collectionId, {Ethereum: userEth});
-      const events = await submitTransactionAsync(owner, tx);
-      const result = getCreateCollectionResult(events);
-      expect(result.success).to.be.true;
-    }
-    {
-      const tx = api.tx.unique.setMintPermission(collectionId, true);
-      const events = await submitTransactionAsync(owner, tx);
-      const result = getCreateCollectionResult(events);
-      expect(result.success).to.be.true;
-    }
+    expect(nextTokenId).to.be.equal('1');
+    await expect(userContract.methods.mintWithTokenURI(
+      user,
+      nextTokenId,
+      'Test URI',
+    ).call()).to.be.rejectedWith('PublicMintingNotAllowed');
+    
+    // TODO: add this methods to eth
+    // {
+    //   const tx = api.tx.unique.setPublicAccessMode(collectionId, 'AllowList');
+    //   const events = await submitTransactionAsync(owner, tx);
+    //   const result = getCreateCollectionResult(events);
+    //   expect(result.success).to.be.true;
+    // }
+    // {
+    //   const tx = api.tx.unique.addToAllowList(collectionId, {Ethereum: userEth});
+    //   const events = await submitTransactionAsync(owner, tx);
+    //   const result = getCreateCollectionResult(events);
+    //   expect(result.success).to.be.true;
+    // }
+    // {
+    //   const tx = api.tx.unique.setMintPermission(collectionId, true);
+    //   const events = await submitTransactionAsync(owner, tx);
+    //   const result = getCreateCollectionResult(events);
+    //   expect(result.success).to.be.true;
+    // }
 
-    const [alicesBalanceBefore] = await getBalance(api, [alicesPublicKey]);
+    // const [alicesBalanceBefore] = await getBalance(api, [alicesPublicKey]);
 
     {
-      const nextTokenId = await contract.methods.nextTokenId().call();
+      const nextTokenId = await userContract.methods.nextTokenId().call();
       expect(nextTokenId).to.be.equal('1');
-      const result = await contract.methods.mintWithTokenURI(
-        userEth,
+      const result = await userContract.methods.mintWithTokenURI(
+        user,
         nextTokenId,
         'Test URI',
-      ).send({from: userEth});
+      ).send();
       const events = normalizeEvents(result.events);
 
       expect(events).to.be.deep.equal([
         {
-          address,
+          collectionIdAddress,
           event: 'Transfer',
           args: {
             from: '0x0000000000000000000000000000000000000000',
-            to: userEth,
+            to: user,
             tokenId: nextTokenId,
           },
         },
       ]);
 
-      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
+      expect(await userContract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
     }
-
-    const [alicesBalanceAfter] = await getBalance(api, [alicesPublicKey]);
-    expect(alicesBalanceAfter < alicesBalanceBefore).to.be.true;
   });
 
 
modifiedtests/src/eth/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -14,30 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-import nonFungibleAbi from './nonFungibleAbi.json';
-import {ApiPromise} from '@polkadot/api';
 import {evmToAddress} from '@polkadot/util-crypto';
 import {expect} from 'chai';
 import {getCreatedCollectionCount, getDetailedCollectionInfo} from '../util/helpers';
 import {
   evmCollectionHelper,
-  collectionIdFromAddress,
   collectionIdToAddress,
   createEthAccount,
   createEthAccountWithBalance,
   evmCollection,
-  GAS_ARGS,
   itWeb3,
-  normalizeAddress,
-  normalizeEvents,
+  getCollectionAddressFromResult,
 } from './util/helpers';
-
-async function getCollectionAddressFromResult(api: ApiPromise, result: any) {
-  const collectionIdAddress = normalizeAddress(result.events[0].raw.topics[2]);
-  const collectionId = collectionIdFromAddress(collectionIdAddress);  
-  const collection = (await getDetailedCollectionInfo(api, collectionId))!;
-  return {collectionIdAddress, collectionId, collection};
-}
 
 describe('Create collection from EVM', () => {
   itWeb3('Create collection', async ({api, web3}) => {
@@ -138,45 +126,6 @@
     expect(collectionSub.limits.ownerCanTransfer.toHuman()).to.be.eq(limits.ownerCanTransfer);
     expect(collectionSub.limits.ownerCanDestroy.toHuman()).to.be.eq(limits.ownerCanDestroy);
     expect(collectionSub.limits.transfersEnabled.toHuman()).to.be.eq(limits.transfersEnabled);
-  });
-
-  itWeb3('Check tokenURI', async ({web3, api}) => {
-    const owner = await createEthAccountWithBalance(api, web3);
-    const helper = evmCollectionHelper(web3, owner);
-    let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();
-    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);
-    const receiver = createEthAccount(web3);
-    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdAddress, {from: owner, ...GAS_ARGS});
-    const nextTokenId = await contract.methods.nextTokenId().call();
-
-    expect(nextTokenId).to.be.equal('1');
-    result = await contract.methods.mintWithTokenURI(
-      receiver,
-      nextTokenId,
-      'Test URI',
-    ).send();
-
-    const events = normalizeEvents(result.events);
-    const address = collectionIdToAddress(collectionId);
-
-    expect(events).to.be.deep.equal([
-      {
-        address,
-        event: 'Transfer',
-        args: {
-          from: '0x0000000000000000000000000000000000000000',
-          to: receiver,
-          tokenId: nextTokenId,
-        },
-      },
-    ]);
-
-    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
-
-    // TODO: this wont work right now, need release 919000 first
-    // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();
-    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();
-    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);
   });
 
   itWeb3('Collection address exist', async ({api, web3}) => {
modifiedtests/src/eth/nonFungible.test.tsdiffbeforeafterboth
before · tests/src/eth/nonFungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import privateKey from '../substrate/privateKey';18import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';19import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, GAS_ARGS, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';20import nonFungibleAbi from './nonFungibleAbi.json';21import {expect} from 'chai';22import {submitTransactionAsync} from '../substrate/substrate-api';2324describe('NFT: Information getting', () => {25  itWeb3('totalSupply', async ({api, web3}) => {26    const collection = await createCollectionExpectSuccess({27      mode: {type: 'NFT'},28    });29    const alice = privateKey('//Alice');30    const caller = await createEthAccountWithBalance(api, web3);3132    await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});3334    const address = collectionIdToAddress(collection);35    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});36    const totalSupply = await contract.methods.totalSupply().call();3738    expect(totalSupply).to.equal('1');39  });4041  itWeb3('balanceOf', async ({api, web3}) => {42    const collection = await createCollectionExpectSuccess({43      mode: {type: 'NFT'},44    });45    const alice = privateKey('//Alice');4647    const caller = await createEthAccountWithBalance(api, web3);48    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum:caller});49    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});50    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});5152    const address = collectionIdToAddress(collection);53    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});54    const balance = await contract.methods.balanceOf(caller).call();5556    expect(balance).to.equal('3');57  });5859  itWeb3('ownerOf', async ({api, web3}) => {60    const collection = await createCollectionExpectSuccess({61      mode: {type: 'NFT'},62    });63    const alice = privateKey('//Alice');6465    const caller = await createEthAccountWithBalance(api, web3);66    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});6768    const address = collectionIdToAddress(collection);69    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});70    const owner = await contract.methods.ownerOf(tokenId).call();7172    expect(owner).to.equal(caller);73  });74});7576describe('NFT: Plain calls', () => {77  itWeb3('Can perform mint()', async ({web3, api}) => {78    const collection = await createCollectionExpectSuccess({79      mode: {type: 'NFT'},80    });81    const alice = privateKey('//Alice');8283    const caller = await createEthAccountWithBalance(api, web3);84    const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});85    await submitTransactionAsync(alice, changeAdminTx);86    const receiver = createEthAccount(web3);8788    const address = collectionIdToAddress(collection);89    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});9091    {92      const nextTokenId = await contract.methods.nextTokenId().call();93      expect(nextTokenId).to.be.equal('1');94      const result = await contract.methods.mintWithTokenURI(95        receiver,96        nextTokenId,97        'Test URI',98      ).send({from: caller});99      const events = normalizeEvents(result.events);100101      expect(events).to.be.deep.equal([102        {103          address,104          event: 'Transfer',105          args: {106            from: '0x0000000000000000000000000000000000000000',107            to: receiver,108            tokenId: nextTokenId,109          },110        },111      ]);112113      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');114    }115  });116  itWeb3('Can perform mintBulk()', async ({web3, api}) => {117    const collection = await createCollectionExpectSuccess({118      mode: {type: 'NFT'},119    });120    const alice = privateKey('//Alice');121122    const caller = await createEthAccountWithBalance(api, web3);123    const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});124    await submitTransactionAsync(alice, changeAdminTx);125    const receiver = createEthAccount(web3);126127    const address = collectionIdToAddress(collection);128    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});129130    {131      const nextTokenId = await contract.methods.nextTokenId().call();132      expect(nextTokenId).to.be.equal('1');133      const result = await contract.methods.mintBulkWithTokenURI(134        receiver,135        [136          [nextTokenId, 'Test URI 0'],137          [+nextTokenId + 1, 'Test URI 1'],138          [+nextTokenId + 2, 'Test URI 2'],139        ],140      ).send({from: caller});141      const events = normalizeEvents(result.events);142143      expect(events).to.be.deep.equal([144        {145          address,146          event: 'Transfer',147          args: {148            from: '0x0000000000000000000000000000000000000000',149            to: receiver,150            tokenId: nextTokenId,151          },152        },153        {154          address,155          event: 'Transfer',156          args: {157            from: '0x0000000000000000000000000000000000000000',158            to: receiver,159            tokenId: String(+nextTokenId + 1),160          },161        },162        {163          address,164          event: 'Transfer',165          args: {166            from: '0x0000000000000000000000000000000000000000',167            to: receiver,168            tokenId: String(+nextTokenId + 2),169          },170        },171      ]);172173      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');174      expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');175      expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');176    }177  });178179  itWeb3('Can perform burn()', async ({web3, api}) => {180    const collection = await createCollectionExpectSuccess({181      mode: {type: 'NFT'},182    });183    const alice = privateKey('//Alice');184185    const owner = await createEthAccountWithBalance(api, web3);186187    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});188189    const address = collectionIdToAddress(collection);190    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});191192    {193      const result = await contract.methods.burn(tokenId).send({from: owner});194      const events = normalizeEvents(result.events);195196      expect(events).to.be.deep.equal([197        {198          address,199          event: 'Transfer',200          args: {201            from: owner,202            to: '0x0000000000000000000000000000000000000000',203            tokenId: tokenId.toString(),204          },205        },206      ]);207    }208  });209210  itWeb3('Can perform approve()', async ({web3, api}) => {211    const collection = await createCollectionExpectSuccess({212      mode: {type: 'NFT'},213    });214    const alice = privateKey('//Alice');215216    const owner = createEthAccount(web3);217    await transferBalanceToEth(api, alice, owner);218219    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});220221    const spender = createEthAccount(web3);222223    const address = collectionIdToAddress(collection);224    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);225226    {227      const result = await contract.methods.approve(spender, tokenId).send({from: owner, ...GAS_ARGS});228      const events = normalizeEvents(result.events);229230      expect(events).to.be.deep.equal([231        {232          address,233          event: 'Approval',234          args: {235            owner,236            approved: spender,237            tokenId: tokenId.toString(),238          },239        },240      ]);241    }242  });243244  itWeb3('Can perform transferFrom()', async ({web3, api}) => {245    const collection = await createCollectionExpectSuccess({246      mode: {type: 'NFT'},247    });248    const alice = privateKey('//Alice');249250    const owner = createEthAccount(web3);251    await transferBalanceToEth(api, alice, owner);252253    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});254255    const spender = createEthAccount(web3);256    await transferBalanceToEth(api, alice, spender);257258    const receiver = createEthAccount(web3);259260    const address = collectionIdToAddress(collection);261    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});262263    await contract.methods.approve(spender, tokenId).send({from: owner});264265    {266      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});267      const events = normalizeEvents(result.events);268      expect(events).to.be.deep.equal([269        {270          address,271          event: 'Transfer',272          args: {273            from: owner,274            to: receiver,275            tokenId: tokenId.toString(),276          },277        },278      ]);279    }280281    {282      const balance = await contract.methods.balanceOf(receiver).call();283      expect(+balance).to.equal(1);284    }285286    {287      const balance = await contract.methods.balanceOf(owner).call();288      expect(+balance).to.equal(0);289    }290  });291292  itWeb3('Can perform transfer()', async ({web3, api}) => {293    const collection = await createCollectionExpectSuccess({294      mode: {type: 'NFT'},295    });296    const alice = privateKey('//Alice');297298    const owner = createEthAccount(web3);299    await transferBalanceToEth(api, alice, owner);300301    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});302303    const receiver = createEthAccount(web3);304    await transferBalanceToEth(api, alice, receiver);305306    const address = collectionIdToAddress(collection);307    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});308309    {310      const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});311      const events = normalizeEvents(result.events);312      expect(events).to.be.deep.equal([313        {314          address,315          event: 'Transfer',316          args: {317            from: owner,318            to: receiver,319            tokenId: tokenId.toString(),320          },321        },322      ]);323    }324325    {326      const balance = await contract.methods.balanceOf(owner).call();327      expect(+balance).to.equal(0);328    }329330    {331      const balance = await contract.methods.balanceOf(receiver).call();332      expect(+balance).to.equal(1);333    }334  });335});336337describe('NFT: Fees', () => {338  itWeb3('approve() call fee is less than 0.2UNQ', async ({web3, api}) => {339    const collection = await createCollectionExpectSuccess({340      mode: {type: 'NFT'},341    });342    const alice = privateKey('//Alice');343344    const owner = await createEthAccountWithBalance(api, web3);345    const spender = createEthAccount(web3);346347    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});348349    const address = collectionIdToAddress(collection);350    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});351352    const cost = await recordEthFee(api, owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));353    expect(cost < BigInt(0.2 * Number(UNIQUE)));354  });355356  itWeb3('transferFrom() call fee is less than 0.2UNQ', async ({web3, api}) => {357    const collection = await createCollectionExpectSuccess({358      mode: {type: 'NFT'},359    });360    const alice = privateKey('//Alice');361362    const owner = await createEthAccountWithBalance(api, web3);363    const spender = await createEthAccountWithBalance(api, web3);364365    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});366367    const address = collectionIdToAddress(collection);368    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});369370    await contract.methods.approve(spender, tokenId).send({from: owner});371372    const cost = await recordEthFee(api, spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));373    expect(cost < BigInt(0.2 * Number(UNIQUE)));374  });375376  itWeb3('transfer() call fee is less than 0.2UNQ', async ({web3, api}) => {377    const collection = await createCollectionExpectSuccess({378      mode: {type: 'NFT'},379    });380    const alice = privateKey('//Alice');381382    const owner = await createEthAccountWithBalance(api, web3);383    const receiver = createEthAccount(web3);384385    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});386387    const address = collectionIdToAddress(collection);388    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});389390    const cost = await recordEthFee(api, owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));391    expect(cost < BigInt(0.2 * Number(UNIQUE)));392  });393});394395describe('NFT: Substrate calls', () => {396  itWeb3('Events emitted for mint()', async ({web3}) => {397    const collection = await createCollectionExpectSuccess({398      mode: {type: 'NFT'},399    });400    const alice = privateKey('//Alice');401402    const address = collectionIdToAddress(collection);403    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);404405    let tokenId: number;406    const events = await recordEvents(contract, async () => {407      tokenId = await createItemExpectSuccess(alice, collection, 'NFT');408    });409410    expect(events).to.be.deep.equal([411      {412        address,413        event: 'Transfer',414        args: {415          from: '0x0000000000000000000000000000000000000000',416          to: subToEth(alice.address),417          tokenId: tokenId!.toString(),418        },419      },420    ]);421  });422423  itWeb3('Events emitted for burn()', async ({web3}) => {424    const collection = await createCollectionExpectSuccess({425      mode: {type: 'NFT'},426    });427    const alice = privateKey('//Alice');428429    const address = collectionIdToAddress(collection);430    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);431432    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');433    const events = await recordEvents(contract, async () => {434      await burnItemExpectSuccess(alice, collection, tokenId);435    });436437    expect(events).to.be.deep.equal([438      {439        address,440        event: 'Transfer',441        args: {442          from: subToEth(alice.address),443          to: '0x0000000000000000000000000000000000000000',444          tokenId: tokenId.toString(),445        },446      },447    ]);448  });449450  itWeb3('Events emitted for approve()', async ({web3}) => {451    const collection = await createCollectionExpectSuccess({452      mode: {type: 'NFT'},453    });454    const alice = privateKey('//Alice');455456    const receiver = createEthAccount(web3);457458    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');459460    const address = collectionIdToAddress(collection);461    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);462463    const events = await recordEvents(contract, async () => {464      await approveExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1);465    });466467    expect(events).to.be.deep.equal([468      {469        address,470        event: 'Approval',471        args: {472          owner: subToEth(alice.address),473          approved: receiver,474          tokenId: tokenId.toString(),475        },476      },477    ]);478  });479480  itWeb3('Events emitted for transferFrom()', async ({web3}) => {481    const collection = await createCollectionExpectSuccess({482      mode: {type: 'NFT'},483    });484    const alice = privateKey('//Alice');485    const bob = privateKey('//Bob');486487    const receiver = createEthAccount(web3);488489    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');490    await approveExpectSuccess(collection, tokenId, alice, bob.address, 1);491492    const address = collectionIdToAddress(collection);493    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);494495    const events = await recordEvents(contract, async () => {496      await transferFromExpectSuccess(collection, tokenId, bob, alice, {Ethereum: receiver}, 1, 'NFT');497    });498499    expect(events).to.be.deep.equal([500      {501        address,502        event: 'Transfer',503        args: {504          from: subToEth(alice.address),505          to: receiver,506          tokenId: tokenId.toString(),507        },508      },509    ]);510  });511512  itWeb3('Events emitted for transfer()', async ({web3}) => {513    const collection = await createCollectionExpectSuccess({514      mode: {type: 'NFT'},515    });516    const alice = privateKey('//Alice');517518    const receiver = createEthAccount(web3);519520    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');521522    const address = collectionIdToAddress(collection);523    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);524525    const events = await recordEvents(contract, async () => {526      await transferExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1, 'NFT');527    });528529    expect(events).to.be.deep.equal([530      {531        address,532        event: 'Transfer',533        args: {534          from: subToEth(alice.address),535          to: receiver,536          tokenId: tokenId.toString(),537        },538      },539    ]);540  });541});542543describe('Common metadata', () => {544  itWeb3('Returns collection name', async ({api, web3}) => {545    const collection = await createCollectionExpectSuccess({546      name: 'token name',547      mode: {type: 'NFT'},548    });549    const caller = await createEthAccountWithBalance(api, web3);550551    const address = collectionIdToAddress(collection);552    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});553    const name = await contract.methods.name().call();554555    expect(name).to.equal('token name');556  });557558  itWeb3('Returns symbol name', async ({api, web3}) => {559    const collection = await createCollectionExpectSuccess({560      tokenPrefix: 'TOK',561      mode: {type: 'NFT'},562    });563    const caller = await createEthAccountWithBalance(api, web3);564565    const address = collectionIdToAddress(collection);566    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});567    const symbol = await contract.methods.symbol().call();568569    expect(symbol).to.equal('TOK');570  });571});
after · tests/src/eth/nonFungible.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import privateKey from '../substrate/privateKey';18import {approveExpectSuccess, burnItemExpectSuccess, createCollectionExpectSuccess, createItemExpectSuccess, transferExpectSuccess, transferFromExpectSuccess, UNIQUE} from '../util/helpers';19import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, evmCollection, evmCollectionHelper, GAS_ARGS, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, transferBalanceToEth} from './util/helpers';20import nonFungibleAbi from './nonFungibleAbi.json';21import {expect} from 'chai';22import {submitTransactionAsync} from '../substrate/substrate-api';2324describe('NFT: Information getting', () => {25  itWeb3('totalSupply', async ({api, web3}) => {26    const collection = await createCollectionExpectSuccess({27      mode: {type: 'NFT'},28    });29    const alice = privateKey('//Alice');30    const caller = await createEthAccountWithBalance(api, web3);3132    await createItemExpectSuccess(alice, collection, 'NFT', {Substrate: alice.address});3334    const address = collectionIdToAddress(collection);35    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});36    const totalSupply = await contract.methods.totalSupply().call();3738    expect(totalSupply).to.equal('1');39  });4041  itWeb3('balanceOf', async ({api, web3}) => {42    const collection = await createCollectionExpectSuccess({43      mode: {type: 'NFT'},44    });45    const alice = privateKey('//Alice');4647    const caller = await createEthAccountWithBalance(api, web3);48    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum:caller});49    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});50    await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});5152    const address = collectionIdToAddress(collection);53    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});54    const balance = await contract.methods.balanceOf(caller).call();5556    expect(balance).to.equal('3');57  });5859  itWeb3('ownerOf', async ({api, web3}) => {60    const collection = await createCollectionExpectSuccess({61      mode: {type: 'NFT'},62    });63    const alice = privateKey('//Alice');6465    const caller = await createEthAccountWithBalance(api, web3);66    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: caller});6768    const address = collectionIdToAddress(collection);69    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});70    const owner = await contract.methods.ownerOf(tokenId).call();7172    expect(owner).to.equal(caller);73  });74});7576describe('NFT: Plain calls', () => {77  itWeb3('Can perform mint()', async ({web3, api}) => {78    const owner = await createEthAccountWithBalance(api, web3);79    const helper = evmCollectionHelper(web3, owner);80    let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();81    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);82    const receiver = createEthAccount(web3);83    const contract = evmCollection(web3, owner, collectionIdAddress);84    const nextTokenId = await contract.methods.nextTokenId().call();8586    expect(nextTokenId).to.be.equal('1');87    result = await contract.methods.mintWithTokenURI(88      receiver,89      nextTokenId,90      'Test URI',91    ).send();9293    const events = normalizeEvents(result.events);94    const address = collectionIdToAddress(collectionId);9596    expect(events).to.be.deep.equal([97      {98        address,99        event: 'Transfer',100        args: {101          from: '0x0000000000000000000000000000000000000000',102          to: receiver,103          tokenId: nextTokenId,104        },105      },106    ]);107108    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');109110    // TODO: this wont work right now, need release 919000 first111    // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();112    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();113    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);114  });115  itWeb3('Can perform mintBulk()', async ({web3, api}) => {116    const collection = await createCollectionExpectSuccess({117      mode: {type: 'NFT'},118    });119    const alice = privateKey('//Alice');120121    const caller = await createEthAccountWithBalance(api, web3);122    const changeAdminTx = api.tx.unique.addCollectionAdmin(collection, {Ethereum: caller});123    await submitTransactionAsync(alice, changeAdminTx);124    const receiver = createEthAccount(web3);125126    const address = collectionIdToAddress(collection);127    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});128129    {130      const nextTokenId = await contract.methods.nextTokenId().call();131      expect(nextTokenId).to.be.equal('1');132      const result = await contract.methods.mintBulkWithTokenURI(133        receiver,134        [135          [nextTokenId, 'Test URI 0'],136          [+nextTokenId + 1, 'Test URI 1'],137          [+nextTokenId + 2, 'Test URI 2'],138        ],139      ).send({from: caller});140      const events = normalizeEvents(result.events);141142      expect(events).to.be.deep.equal([143        {144          address,145          event: 'Transfer',146          args: {147            from: '0x0000000000000000000000000000000000000000',148            to: receiver,149            tokenId: nextTokenId,150          },151        },152        {153          address,154          event: 'Transfer',155          args: {156            from: '0x0000000000000000000000000000000000000000',157            to: receiver,158            tokenId: String(+nextTokenId + 1),159          },160        },161        {162          address,163          event: 'Transfer',164          args: {165            from: '0x0000000000000000000000000000000000000000',166            to: receiver,167            tokenId: String(+nextTokenId + 2),168          },169        },170      ]);171172      expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI 0');173      expect(await contract.methods.tokenURI(+nextTokenId + 1).call()).to.be.equal('Test URI 1');174      expect(await contract.methods.tokenURI(+nextTokenId + 2).call()).to.be.equal('Test URI 2');175    }176  });177178  itWeb3('Can perform burn()', async ({web3, api}) => {179    const collection = await createCollectionExpectSuccess({180      mode: {type: 'NFT'},181    });182    const alice = privateKey('//Alice');183184    const owner = await createEthAccountWithBalance(api, web3);185186    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});187188    const address = collectionIdToAddress(collection);189    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});190191    {192      const result = await contract.methods.burn(tokenId).send({from: owner});193      const events = normalizeEvents(result.events);194195      expect(events).to.be.deep.equal([196        {197          address,198          event: 'Transfer',199          args: {200            from: owner,201            to: '0x0000000000000000000000000000000000000000',202            tokenId: tokenId.toString(),203          },204        },205      ]);206    }207  });208209  itWeb3('Can perform approve()', async ({web3, api}) => {210    const collection = await createCollectionExpectSuccess({211      mode: {type: 'NFT'},212    });213    const alice = privateKey('//Alice');214215    const owner = createEthAccount(web3);216    await transferBalanceToEth(api, alice, owner);217218    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});219220    const spender = createEthAccount(web3);221222    const address = collectionIdToAddress(collection);223    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);224225    {226      const result = await contract.methods.approve(spender, tokenId).send({from: owner, ...GAS_ARGS});227      const events = normalizeEvents(result.events);228229      expect(events).to.be.deep.equal([230        {231          address,232          event: 'Approval',233          args: {234            owner,235            approved: spender,236            tokenId: tokenId.toString(),237          },238        },239      ]);240    }241  });242243  itWeb3('Can perform transferFrom()', async ({web3, api}) => {244    const collection = await createCollectionExpectSuccess({245      mode: {type: 'NFT'},246    });247    const alice = privateKey('//Alice');248249    const owner = createEthAccount(web3);250    await transferBalanceToEth(api, alice, owner);251252    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});253254    const spender = createEthAccount(web3);255    await transferBalanceToEth(api, alice, spender);256257    const receiver = createEthAccount(web3);258259    const address = collectionIdToAddress(collection);260    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});261262    await contract.methods.approve(spender, tokenId).send({from: owner});263264    {265      const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});266      const events = normalizeEvents(result.events);267      expect(events).to.be.deep.equal([268        {269          address,270          event: 'Transfer',271          args: {272            from: owner,273            to: receiver,274            tokenId: tokenId.toString(),275          },276        },277      ]);278    }279280    {281      const balance = await contract.methods.balanceOf(receiver).call();282      expect(+balance).to.equal(1);283    }284285    {286      const balance = await contract.methods.balanceOf(owner).call();287      expect(+balance).to.equal(0);288    }289  });290291  itWeb3('Can perform transfer()', async ({web3, api}) => {292    const collection = await createCollectionExpectSuccess({293      mode: {type: 'NFT'},294    });295    const alice = privateKey('//Alice');296297    const owner = createEthAccount(web3);298    await transferBalanceToEth(api, alice, owner);299300    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});301302    const receiver = createEthAccount(web3);303    await transferBalanceToEth(api, alice, receiver);304305    const address = collectionIdToAddress(collection);306    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});307308    {309      const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});310      const events = normalizeEvents(result.events);311      expect(events).to.be.deep.equal([312        {313          address,314          event: 'Transfer',315          args: {316            from: owner,317            to: receiver,318            tokenId: tokenId.toString(),319          },320        },321      ]);322    }323324    {325      const balance = await contract.methods.balanceOf(owner).call();326      expect(+balance).to.equal(0);327    }328329    {330      const balance = await contract.methods.balanceOf(receiver).call();331      expect(+balance).to.equal(1);332    }333  });334});335336describe('NFT: Fees', () => {337  itWeb3('approve() call fee is less than 0.2UNQ', async ({web3, api}) => {338    const collection = await createCollectionExpectSuccess({339      mode: {type: 'NFT'},340    });341    const alice = privateKey('//Alice');342343    const owner = await createEthAccountWithBalance(api, web3);344    const spender = createEthAccount(web3);345346    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});347348    const address = collectionIdToAddress(collection);349    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});350351    const cost = await recordEthFee(api, owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));352    expect(cost < BigInt(0.2 * Number(UNIQUE)));353  });354355  itWeb3('transferFrom() call fee is less than 0.2UNQ', async ({web3, api}) => {356    const collection = await createCollectionExpectSuccess({357      mode: {type: 'NFT'},358    });359    const alice = privateKey('//Alice');360361    const owner = await createEthAccountWithBalance(api, web3);362    const spender = await createEthAccountWithBalance(api, web3);363364    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});365366    const address = collectionIdToAddress(collection);367    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});368369    await contract.methods.approve(spender, tokenId).send({from: owner});370371    const cost = await recordEthFee(api, spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));372    expect(cost < BigInt(0.2 * Number(UNIQUE)));373  });374375  itWeb3('transfer() call fee is less than 0.2UNQ', async ({web3, api}) => {376    const collection = await createCollectionExpectSuccess({377      mode: {type: 'NFT'},378    });379    const alice = privateKey('//Alice');380381    const owner = await createEthAccountWithBalance(api, web3);382    const receiver = createEthAccount(web3);383384    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: owner});385386    const address = collectionIdToAddress(collection);387    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: owner, ...GAS_ARGS});388389    const cost = await recordEthFee(api, owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));390    expect(cost < BigInt(0.2 * Number(UNIQUE)));391  });392});393394describe('NFT: Substrate calls', () => {395  itWeb3('Events emitted for mint()', async ({web3}) => {396    const collection = await createCollectionExpectSuccess({397      mode: {type: 'NFT'},398    });399    const alice = privateKey('//Alice');400401    const address = collectionIdToAddress(collection);402    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);403404    let tokenId: number;405    const events = await recordEvents(contract, async () => {406      tokenId = await createItemExpectSuccess(alice, collection, 'NFT');407    });408409    expect(events).to.be.deep.equal([410      {411        address,412        event: 'Transfer',413        args: {414          from: '0x0000000000000000000000000000000000000000',415          to: subToEth(alice.address),416          tokenId: tokenId!.toString(),417        },418      },419    ]);420  });421422  itWeb3('Events emitted for burn()', async ({web3}) => {423    const collection = await createCollectionExpectSuccess({424      mode: {type: 'NFT'},425    });426    const alice = privateKey('//Alice');427428    const address = collectionIdToAddress(collection);429    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);430431    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');432    const events = await recordEvents(contract, async () => {433      await burnItemExpectSuccess(alice, collection, tokenId);434    });435436    expect(events).to.be.deep.equal([437      {438        address,439        event: 'Transfer',440        args: {441          from: subToEth(alice.address),442          to: '0x0000000000000000000000000000000000000000',443          tokenId: tokenId.toString(),444        },445      },446    ]);447  });448449  itWeb3('Events emitted for approve()', async ({web3}) => {450    const collection = await createCollectionExpectSuccess({451      mode: {type: 'NFT'},452    });453    const alice = privateKey('//Alice');454455    const receiver = createEthAccount(web3);456457    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');458459    const address = collectionIdToAddress(collection);460    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);461462    const events = await recordEvents(contract, async () => {463      await approveExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1);464    });465466    expect(events).to.be.deep.equal([467      {468        address,469        event: 'Approval',470        args: {471          owner: subToEth(alice.address),472          approved: receiver,473          tokenId: tokenId.toString(),474        },475      },476    ]);477  });478479  itWeb3('Events emitted for transferFrom()', async ({web3}) => {480    const collection = await createCollectionExpectSuccess({481      mode: {type: 'NFT'},482    });483    const alice = privateKey('//Alice');484    const bob = privateKey('//Bob');485486    const receiver = createEthAccount(web3);487488    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');489    await approveExpectSuccess(collection, tokenId, alice, bob.address, 1);490491    const address = collectionIdToAddress(collection);492    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);493494    const events = await recordEvents(contract, async () => {495      await transferFromExpectSuccess(collection, tokenId, bob, alice, {Ethereum: receiver}, 1, 'NFT');496    });497498    expect(events).to.be.deep.equal([499      {500        address,501        event: 'Transfer',502        args: {503          from: subToEth(alice.address),504          to: receiver,505          tokenId: tokenId.toString(),506        },507      },508    ]);509  });510511  itWeb3('Events emitted for transfer()', async ({web3}) => {512    const collection = await createCollectionExpectSuccess({513      mode: {type: 'NFT'},514    });515    const alice = privateKey('//Alice');516517    const receiver = createEthAccount(web3);518519    const tokenId = await createItemExpectSuccess(alice, collection, 'NFT');520521    const address = collectionIdToAddress(collection);522    const contract = new web3.eth.Contract(nonFungibleAbi as any, address);523524    const events = await recordEvents(contract, async () => {525      await transferExpectSuccess(collection, tokenId, alice, {Ethereum: receiver}, 1, 'NFT');526    });527528    expect(events).to.be.deep.equal([529      {530        address,531        event: 'Transfer',532        args: {533          from: subToEth(alice.address),534          to: receiver,535          tokenId: tokenId.toString(),536        },537      },538    ]);539  });540});541542describe('Common metadata', () => {543  itWeb3('Returns collection name', async ({api, web3}) => {544    const collection = await createCollectionExpectSuccess({545      name: 'token name',546      mode: {type: 'NFT'},547    });548    const caller = await createEthAccountWithBalance(api, web3);549550    const address = collectionIdToAddress(collection);551    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});552    const name = await contract.methods.name().call();553554    expect(name).to.equal('token name');555  });556557  itWeb3('Returns symbol name', async ({api, web3}) => {558    const collection = await createCollectionExpectSuccess({559      tokenPrefix: 'TOK',560      mode: {type: 'NFT'},561    });562    const caller = await createEthAccountWithBalance(api, web3);563564    const address = collectionIdToAddress(collection);565    const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: caller, ...GAS_ARGS});566    const symbol = await contract.methods.symbol().call();567568    expect(symbol).to.equal('TOK');569  });570});
modifiedtests/src/eth/proxy/nonFungibleProxy.test.tsdiffbeforeafterboth
--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -127,6 +127,7 @@
       expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
     }
   });
+  
   itWeb3('Can perform mintBulk()', async ({web3, api}) => {
     const collection = await createCollectionExpectSuccess({
       mode: {type: 'NFT'},
modifiedtests/src/eth/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -23,12 +23,12 @@
 import usingApi, {submitTransactionAsync} from '../../substrate/substrate-api';
 import {IKeyringPair} from '@polkadot/types/types';
 import {expect} from 'chai';
-import {CrossAccountId, getGenericResult, UNIQUE} from '../../util/helpers';
+import {CrossAccountId, getDetailedCollectionInfo, getGenericResult, UNIQUE} from '../../util/helpers';
 import * as solc from 'solc';
 import config from '../../config';
 import privateKey from '../../substrate/privateKey';
 import contractHelpersAbi from './contractHelpersAbi.json';
-import collectionAbi from '../nonFungibleAbi.json';
+import nonFungibleAbi from '../nonFungibleAbi.json';
 import collectionHelperAbi from '../collectionHelperAbi.json';
 import getBalance from '../../substrate/get-balance';
 import waitNewBlocks from '../../substrate/wait-new-blocks';
@@ -68,6 +68,13 @@
   ];
 }
 
+export async function getCollectionAddressFromResult(api: ApiPromise, result: any) {
+  const collectionIdAddress = normalizeAddress(result.events[0].raw.topics[2]);
+  const collectionId = collectionIdFromAddress(collectionIdAddress);  
+  const collection = (await getDetailedCollectionInfo(api, collectionId))!;
+  return {collectionIdAddress, collectionId, collection};
+}
+
 export function collectionIdToAddress(collection: number): string {
   const buf = Buffer.from([0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,
     ...encodeIntBE(collection),
@@ -301,7 +308,7 @@
  * @returns 
  */
 export function evmCollection(web3: Web3, caller: string, collection: string) {
-  return new web3.eth.Contract(collectionAbi as any, collection, {from: caller, ...GAS_ARGS});
+  return new web3.eth.Contract(nonFungibleAbi as any, collection, {from: caller, ...GAS_ARGS});
 }
 
 /**