difftreelog
tests(parallelization): fix createAccounts failing to catch up on dev node + evm events
in: master
6 files changed
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -378,7 +378,7 @@
// Balance should be taken from flipper instead of caller
// FIXME the comment is wrong! What check should be here?
const balanceAfter = await helper.balance.getEthereum(flipper.options.address);
- expect(balanceAfter).to.be.equals(originalFlipperBalance);
+ expect(balanceAfter).to.be.equal(originalFlipperBalance);
});
itEth('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({helper}) => {
@@ -406,7 +406,7 @@
const sponsorBalanceAfter = await helper.balance.getSubstrate(await helper.address.ethToSubstrate(sponsor));
const callerBalanceAfter = await helper.balance.getSubstrate(await helper.address.ethToSubstrate(caller));
expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;
- expect(callerBalanceAfter).to.be.equals(callerBalanceBefore);
+ expect(callerBalanceAfter).to.be.equal(callerBalanceBefore);
});
itEth('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({helper}) => {
@@ -431,23 +431,24 @@
await flipper.methods.flip().send({from: caller});
expect(await flipper.methods.getValue().call()).to.be.true;
- expect(await helper.balance.getEthereum(caller)).to.be.equals(originalCallerBalance);
+ expect(await helper.balance.getEthereum(caller)).to.be.equal(originalCallerBalance);
const newFlipperBalance = await helper.balance.getEthereum(sponsor);
- expect(newFlipperBalance).to.be.not.equals(originalFlipperBalance);
+ expect(newFlipperBalance).to.be.not.equal(originalFlipperBalance);
await flipper.methods.flip().send({from: caller});
+ // todo:playgrounds fails rarely (expected 99893341659775672580n to equal 99912598679356033129n) (again, 99893341659775672580n)
expect(await helper.balance.getEthereum(sponsor)).to.be.equal(newFlipperBalance);
- expect(await helper.balance.getEthereum(caller)).to.be.not.equals(originalCallerBalance);
+ expect(await helper.balance.getEthereum(caller)).to.be.not.equal(originalCallerBalance);
});
// TODO: Find a way to calculate default rate limit
- itEth('Default rate limit equals 7200', async ({helper}) => {
+ itEth('Default rate limit equal 7200', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const helpers = helper.ethNativeContract.contractHelpers(owner);
const flipper = await helper.eth.deployFlipper(owner);
- expect(await helpers.methods.sponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');
+ expect(await helpers.methods.sponsoringRateLimit(flipper.options.address).call()).to.be.equal('7200');
});
});
@@ -501,7 +502,7 @@
const helpers = helper.ethNativeContract.contractHelpers(owner);
const flipper = await helper.eth.deployFlipper(owner);
- expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equals('115792089237316195423570985008687907853269984665640564039457584007913129639935');
+ expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equal('115792089237316195423570985008687907853269984665640564039457584007913129639935');
});
itEth('Set fee limit', async ({helper}) => {
@@ -510,7 +511,7 @@
const flipper = await helper.eth.deployFlipper(owner);
await helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send();
- expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equals('100');
+ expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equal('100');
});
itEth('Negative test - set fee limit by non-owner', async ({helper}) => {
tests/src/eth/fungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/fungible.test.ts
+++ b/tests/src/eth/fungible.test.ts
@@ -294,9 +294,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
+
await collection.approveTokens(alice, {Ethereum: receiver}, 100n);
+ if (events.length == 0) await helper.wait.newBlocks(1);
+ const event = events[0];
- const event = events[0];
expect(event.event).to.be.equal('Approval');
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));
@@ -318,9 +320,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
+
await collection.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n);
+ if (events.length == 0) await helper.wait.newBlocks(1);
+ let event = events[0];
- let event = events[0];
expect(event.event).to.be.equal('Transfer');
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));
@@ -347,9 +351,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
+
await collection.transfer(alice, {Ethereum:receiver}, 51n);
-
+ if (events.length == 0) await helper.wait.newBlocks(1);
const event = events[0];
+
expect(event.event).to.be.equal('Transfer');
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));
tests/src/eth/nonFungible.test.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23 let donor: IKeyringPair;24 let alice: IKeyringPair;2526 before(async function() {27 await usingEthPlaygrounds(async (helper, privateKey) => {28 donor = await privateKey({filename: __filename});29 [alice] = await helper.arrange.createAccounts([10n], donor);30 });31 });32 33 itEth('totalSupply', async ({helper}) => {34 const collection = await helper.nft.mintCollection(alice, {});35 await collection.mintToken(alice);3637 const caller = await helper.eth.createAccountWithBalance(donor);3839 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40 const totalSupply = await contract.methods.totalSupply().call();4142 expect(totalSupply).to.equal('1');43 });4445 itEth('balanceOf', async ({helper}) => {46 const collection = await helper.nft.mintCollection(alice, {});47 const caller = await helper.eth.createAccountWithBalance(donor);4849 await collection.mintToken(alice, {Ethereum: caller});50 await collection.mintToken(alice, {Ethereum: caller});51 await collection.mintToken(alice, {Ethereum: caller});5253 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54 const balance = await contract.methods.balanceOf(caller).call();5556 expect(balance).to.equal('3');57 });5859 itEth('ownerOf', async ({helper}) => {60 const collection = await helper.nft.mintCollection(alice, {});61 const caller = await helper.eth.createAccountWithBalance(donor);6263 const token = await collection.mintToken(alice, {Ethereum: caller});6465 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667 const owner = await contract.methods.ownerOf(token.tokenId).call();6869 expect(owner).to.equal(caller);70 });71});7273describe('Check ERC721 token URI for NFT', () => {74 let donor: IKeyringPair;7576 before(async function() {77 await usingEthPlaygrounds(async (_helper, privateKey) => {78 donor = await privateKey({filename: __filename});79 });80 });8182 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const receiver = helper.eth.createAccount();8586 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);87 let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});88 const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);89 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);90 91 const nextTokenId = await contract.methods.nextTokenId().call();92 expect(nextTokenId).to.be.equal('1');93 result = await contract.methods.mint(94 receiver,95 nextTokenId,96 ).send();9798 if (propertyKey && propertyValue) {99 // Set URL or suffix100 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();101 }102103 const event = result.events.Transfer;104 expect(event.address).to.be.equal(collectionAddress);105 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');106 expect(event.returnValues.to).to.be.equal(receiver);107 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);108109 return {contract, nextTokenId};110 }111112 itEth('Empty tokenURI', async ({helper}) => {113 const {contract, nextTokenId} = await setup(helper, '');114 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');115 });116117 itEth('TokenURI from url', async ({helper}) => {118 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');119 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');120 });121122 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {123 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');124 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);125 });126127 itEth('TokenURI from baseURI + suffix', async ({helper}) => {128 const suffix = '/some/suffix';129 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);130 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);131 });132});133134describe('NFT: Plain calls', () => {135 let donor: IKeyringPair;136 let alice: IKeyringPair;137138 before(async function() {139 await usingEthPlaygrounds(async (helper, privateKey) => {140 donor = await privateKey({filename: __filename});141 [alice] = await helper.arrange.createAccounts([10n], donor);142 });143 });144145 itEth('Can perform mint()', async ({helper}) => {146 const owner = await helper.eth.createAccountWithBalance(donor);147 const receiver = helper.eth.createAccount();148149 const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Minty', '6', '6');150 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);151 const nextTokenId = await contract.methods.nextTokenId().call();152153 expect(nextTokenId).to.be.equal('1');154 const result = await contract.methods.mintWithTokenURI(155 receiver,156 nextTokenId,157 'Test URI',158 ).send();159160 const event = result.events.Transfer;161 expect(event.address).to.be.equal(collectionAddress);162 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');163 expect(event.returnValues.to).to.be.equal(receiver);164 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);165166 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');167168 // TODO: this wont work right now, need release 919000 first169 // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();170 // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();171 // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);172 });173174 //TODO: CORE-302 add eth methods175 itEth.skip('Can perform mintBulk()', async ({helper}) => {176 const caller = await helper.eth.createAccountWithBalance(donor);177 const receiver = helper.eth.createAccount();178179 const collection = await helper.nft.mintCollection(alice);180 await collection.addAdmin(alice, {Ethereum: caller});181182 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);183 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);184 {185 const bulkSize = 3;186 const nextTokenId = await contract.methods.nextTokenId().call();187 expect(nextTokenId).to.be.equal('1');188 const result = await contract.methods.mintBulkWithTokenURI(189 receiver,190 Array.from({length: bulkSize}, (_, i) => (191 [+nextTokenId + i, `Test URI ${i}`]192 )),193 ).send({from: caller});194195 const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);196 for (let i = 0; i < bulkSize; i++) {197 const event = events[i];198 expect(event.address).to.equal(collectionAddress);199 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');200 expect(event.returnValues.to).to.equal(receiver);201 expect(event.returnValues.tokenId).to.equal(`${+nextTokenId+i}`);202203 expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);204 }205 }206 });207208 itEth('Can perform burn()', async ({helper}) => {209 const caller = await helper.eth.createAccountWithBalance(donor);210211 const collection = await helper.nft.mintCollection(alice, {});212 const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});213214 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);215 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);216217 {218 const result = await contract.methods.burn(tokenId).send({from: caller});219 220 const event = result.events.Transfer;221 expect(event.address).to.be.equal(collectionAddress);222 expect(event.returnValues.from).to.be.equal(caller);223 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');224 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);225 }226 });227228 itEth('Can perform approve()', async ({helper}) => {229 const owner = await helper.eth.createAccountWithBalance(donor);230 const spender = helper.eth.createAccount();231232 const collection = await helper.nft.mintCollection(alice, {});233 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});234235 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);236 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);237238 {239 const result = await contract.methods.approve(spender, tokenId).send({from: owner});240241 const event = result.events.Approval;242 expect(event.address).to.be.equal(collectionAddress);243 expect(event.returnValues.owner).to.be.equal(owner);244 expect(event.returnValues.approved).to.be.equal(spender);245 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);246 }247 });248249 itEth('Can perform transferFrom()', async ({helper}) => {250 const owner = await helper.eth.createAccountWithBalance(donor);251 const spender = await helper.eth.createAccountWithBalance(donor);252 const receiver = helper.eth.createAccount();253254 const collection = await helper.nft.mintCollection(alice, {});255 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});256257 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);258 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);259260 await contract.methods.approve(spender, tokenId).send({from: owner});261262 {263 const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});264265 const event = result.events.Transfer;266 expect(event.address).to.be.equal(collectionAddress);267 expect(event.returnValues.from).to.be.equal(owner);268 expect(event.returnValues.to).to.be.equal(receiver);269 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);270 }271272 {273 const balance = await contract.methods.balanceOf(receiver).call();274 expect(+balance).to.equal(1);275 }276277 {278 const balance = await contract.methods.balanceOf(owner).call();279 expect(+balance).to.equal(0);280 }281 });282283 itEth('Can perform transfer()', async ({helper}) => {284 const collection = await helper.nft.mintCollection(alice, {});285 const owner = await helper.eth.createAccountWithBalance(donor);286 const receiver = helper.eth.createAccount();287288 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});289290 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);291 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);292293 {294 const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});295296 const event = result.events.Transfer;297 expect(event.address).to.be.equal(collectionAddress);298 expect(event.returnValues.from).to.be.equal(owner);299 expect(event.returnValues.to).to.be.equal(receiver);300 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);301 }302303 {304 const balance = await contract.methods.balanceOf(owner).call();305 expect(+balance).to.equal(0);306 }307308 {309 const balance = await contract.methods.balanceOf(receiver).call();310 expect(+balance).to.equal(1);311 }312 });313});314315describe('NFT: Fees', () => {316 let donor: IKeyringPair;317 let alice: IKeyringPair;318319 before(async function() {320 await usingEthPlaygrounds(async (helper, privateKey) => {321 donor = await privateKey({filename: __filename});322 [alice] = await helper.arrange.createAccounts([10n], donor);323 });324 });325 326 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {327 const owner = await helper.eth.createAccountWithBalance(donor);328 const spender = helper.eth.createAccount();329330 const collection = await helper.nft.mintCollection(alice, {});331 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});332333 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);334335 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));336 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));337 });338339 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {340 const owner = await helper.eth.createAccountWithBalance(donor);341 const spender = await helper.eth.createAccountWithBalance(donor);342343 const collection = await helper.nft.mintCollection(alice, {});344 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});345346 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);347348 await contract.methods.approve(spender, tokenId).send({from: owner});349350 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));351 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));352 });353354 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {355 const owner = await helper.eth.createAccountWithBalance(donor);356 const receiver = helper.eth.createAccount();357358 const collection = await helper.nft.mintCollection(alice, {});359 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});360361 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);362363 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));364 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));365 });366});367368describe('NFT: Substrate calls', () => {369 let donor: IKeyringPair;370 let alice: IKeyringPair;371372 before(async function() {373 await usingEthPlaygrounds(async (helper, privateKey) => {374 donor = await privateKey({filename: __filename});375 [alice] = await helper.arrange.createAccounts([20n], donor);376 });377 });378379 itEth('Events emitted for mint()', async ({helper}) => {380 const collection = await helper.nft.mintCollection(alice, {});381 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);382 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');383384 const events: any = [];385 contract.events.allEvents((_: any, event: any) => {386 events.push(event);387 });388 const {tokenId} = await collection.mintToken(alice);389390 const event = events[0];391 expect(event.event).to.be.equal('Transfer');392 expect(event.address).to.be.equal(collectionAddress);393 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');394 expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));395 expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());396 });397398 itEth('Events emitted for burn()', async ({helper}) => {399 const collection = await helper.nft.mintCollection(alice, {});400 const token = await collection.mintToken(alice);401402 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);403 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');404 405 const events: any = [];406 contract.events.allEvents((_: any, event: any) => {407 events.push(event);408 });409410 await token.burn(alice);411412 const event = events[0];413 expect(event.event).to.be.equal('Transfer');414 expect(event.address).to.be.equal(collectionAddress);415 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));416 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');417 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());418 });419420 itEth('Events emitted for approve()', async ({helper}) => {421 const receiver = helper.eth.createAccount();422423 const collection = await helper.nft.mintCollection(alice, {});424 const token = await collection.mintToken(alice);425426 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);427 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');428 429 const events: any = [];430 contract.events.allEvents((_: any, event: any) => {431 events.push(event);432 });433434 await token.approve(alice, {Ethereum: receiver});435436 const event = events[0];437 expect(event.event).to.be.equal('Approval');438 expect(event.address).to.be.equal(collectionAddress);439 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));440 expect(event.returnValues.approved).to.be.equal(receiver);441 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());442 });443444 itEth('Events emitted for transferFrom()', async ({helper}) => {445 const [bob] = await helper.arrange.createAccounts([10n], donor);446 const receiver = helper.eth.createAccount();447448 const collection = await helper.nft.mintCollection(alice, {});449 const token = await collection.mintToken(alice);450 await token.approve(alice, {Substrate: bob.address});451452 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);453 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');454 455 const events: any = [];456 contract.events.allEvents((_: any, event: any) => {457 events.push(event);458 });459460 await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});461 462 const event = events[0];463 expect(event.address).to.be.equal(collectionAddress);464 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));465 expect(event.returnValues.to).to.be.equal(receiver);466 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);467 });468469 itEth('Events emitted for transfer()', async ({helper}) => {470 const receiver = helper.eth.createAccount();471472 const collection = await helper.nft.mintCollection(alice, {});473 const token = await collection.mintToken(alice);474475 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);476 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');477 478 const events: any = [];479 contract.events.allEvents((_: any, event: any) => {480 events.push(event);481 });482483 await token.transfer(alice, {Ethereum: receiver});484 485 const event = events[0];486 expect(event.address).to.be.equal(collectionAddress);487 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));488 expect(event.returnValues.to).to.be.equal(receiver);489 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);490 });491});492493describe('Common metadata', () => {494 let donor: IKeyringPair;495 let alice: IKeyringPair;496497 before(async function() {498 await usingEthPlaygrounds(async (helper, privateKey) => {499 donor = await privateKey({filename: __filename});500 [alice] = await helper.arrange.createAccounts([20n], donor);501 });502 });503504 itEth('Returns collection name', async ({helper}) => {505 const caller = await helper.eth.createAccountWithBalance(donor);506 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});507508 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);509 const name = await contract.methods.name().call();510 expect(name).to.equal('oh River');511 });512513 itEth('Returns symbol name', async ({helper}) => {514 const caller = await helper.eth.createAccountWithBalance(donor);515 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});516517 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);518 const symbol = await contract.methods.symbol().call();519 expect(symbol).to.equal('CHANGE');520 });521});1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';18import {IKeyringPair} from '@polkadot/types/types';19import {Contract} from 'web3-eth-contract';202122describe('NFT: Information getting', () => {23 let donor: IKeyringPair;24 let alice: IKeyringPair;2526 before(async function() {27 await usingEthPlaygrounds(async (helper, privateKey) => {28 donor = await privateKey({filename: __filename});29 [alice] = await helper.arrange.createAccounts([10n], donor);30 });31 });32 33 itEth('totalSupply', async ({helper}) => {34 const collection = await helper.nft.mintCollection(alice, {});35 await collection.mintToken(alice);3637 const caller = await helper.eth.createAccountWithBalance(donor);3839 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);40 const totalSupply = await contract.methods.totalSupply().call();4142 expect(totalSupply).to.equal('1');43 });4445 itEth('balanceOf', async ({helper}) => {46 const collection = await helper.nft.mintCollection(alice, {});47 const caller = await helper.eth.createAccountWithBalance(donor);4849 await collection.mintToken(alice, {Ethereum: caller});50 await collection.mintToken(alice, {Ethereum: caller});51 await collection.mintToken(alice, {Ethereum: caller});5253 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);54 const balance = await contract.methods.balanceOf(caller).call();5556 expect(balance).to.equal('3');57 });5859 itEth('ownerOf', async ({helper}) => {60 const collection = await helper.nft.mintCollection(alice, {});61 const caller = await helper.eth.createAccountWithBalance(donor);6263 const token = await collection.mintToken(alice, {Ethereum: caller});6465 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);6667 const owner = await contract.methods.ownerOf(token.tokenId).call();6869 expect(owner).to.equal(caller);70 });71});7273describe('Check ERC721 token URI for NFT', () => {74 let donor: IKeyringPair;7576 before(async function() {77 await usingEthPlaygrounds(async (_helper, privateKey) => {78 donor = await privateKey({filename: __filename});79 });80 });8182 async function setup(helper: EthUniqueHelper, tokenPrefix: string, propertyKey?: string, propertyValue?: string): Promise<{contract: Contract, nextTokenId: string}> {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const receiver = helper.eth.createAccount();8586 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);87 let result = await collectionHelper.methods.createERC721MetadataCompatibleCollection('Mint collection', 'a', 'b', tokenPrefix).send({value: Number(2n * helper.balance.getOneTokenNominal())});88 const collectionAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);89 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);90 91 const nextTokenId = await contract.methods.nextTokenId().call();92 expect(nextTokenId).to.be.equal('1');93 result = await contract.methods.mint(94 receiver,95 nextTokenId,96 ).send();9798 if (propertyKey && propertyValue) {99 // Set URL or suffix100 await contract.methods.setProperty(nextTokenId, propertyKey, Buffer.from(propertyValue)).send();101 }102103 const event = result.events.Transfer;104 expect(event.address).to.be.equal(collectionAddress);105 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');106 expect(event.returnValues.to).to.be.equal(receiver);107 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);108109 return {contract, nextTokenId};110 }111112 itEth('Empty tokenURI', async ({helper}) => {113 const {contract, nextTokenId} = await setup(helper, '');114 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');115 });116117 itEth('TokenURI from url', async ({helper}) => {118 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'url', 'Token URI');119 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');120 });121122 itEth('TokenURI from baseURI + tokenId', async ({helper}) => {123 const {contract, nextTokenId} = await setup(helper, 'BaseURI_');124 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);125 });126127 itEth('TokenURI from baseURI + suffix', async ({helper}) => {128 const suffix = '/some/suffix';129 const {contract, nextTokenId} = await setup(helper, 'BaseURI_', 'suffix', suffix);130 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);131 });132});133134describe('NFT: Plain calls', () => {135 let donor: IKeyringPair;136 let alice: IKeyringPair;137138 before(async function() {139 await usingEthPlaygrounds(async (helper, privateKey) => {140 donor = await privateKey({filename: __filename});141 [alice] = await helper.arrange.createAccounts([10n], donor);142 });143 });144145 itEth('Can perform mint()', async ({helper}) => {146 const owner = await helper.eth.createAccountWithBalance(donor);147 const receiver = helper.eth.createAccount();148149 const {collectionAddress} = await helper.eth.createNonfungibleCollection(owner, 'Minty', '6', '6');150 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);151 const nextTokenId = await contract.methods.nextTokenId().call();152153 expect(nextTokenId).to.be.equal('1');154 const result = await contract.methods.mintWithTokenURI(155 receiver,156 nextTokenId,157 'Test URI',158 ).send();159160 const event = result.events.Transfer;161 expect(event.address).to.be.equal(collectionAddress);162 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');163 expect(event.returnValues.to).to.be.equal(receiver);164 expect(event.returnValues.tokenId).to.be.equal(nextTokenId);165166 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');167168 // TODO: this wont work right now, need release 919000 first169 // await helper.methods.setOffchainSchema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();170 // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();171 // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);172 });173174 //TODO: CORE-302 add eth methods175 itEth.skip('Can perform mintBulk()', async ({helper}) => {176 const caller = await helper.eth.createAccountWithBalance(donor);177 const receiver = helper.eth.createAccount();178179 const collection = await helper.nft.mintCollection(alice);180 await collection.addAdmin(alice, {Ethereum: caller});181182 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);183 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);184 {185 const bulkSize = 3;186 const nextTokenId = await contract.methods.nextTokenId().call();187 expect(nextTokenId).to.be.equal('1');188 const result = await contract.methods.mintBulkWithTokenURI(189 receiver,190 Array.from({length: bulkSize}, (_, i) => (191 [+nextTokenId + i, `Test URI ${i}`]192 )),193 ).send({from: caller});194195 const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.tokenId - b.returnValues.tokenId);196 for (let i = 0; i < bulkSize; i++) {197 const event = events[i];198 expect(event.address).to.equal(collectionAddress);199 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');200 expect(event.returnValues.to).to.equal(receiver);201 expect(event.returnValues.tokenId).to.equal(`${+nextTokenId+i}`);202203 expect(await contract.methods.tokenURI(+nextTokenId + i).call()).to.be.equal(`Test URI ${i}`);204 }205 }206 });207208 itEth('Can perform burn()', async ({helper}) => {209 const caller = await helper.eth.createAccountWithBalance(donor);210211 const collection = await helper.nft.mintCollection(alice, {});212 const {tokenId} = await collection.mintToken(alice, {Ethereum: caller});213214 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);215 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', caller);216217 {218 const result = await contract.methods.burn(tokenId).send({from: caller});219 220 const event = result.events.Transfer;221 expect(event.address).to.be.equal(collectionAddress);222 expect(event.returnValues.from).to.be.equal(caller);223 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');224 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);225 }226 });227228 itEth('Can perform approve()', async ({helper}) => {229 const owner = await helper.eth.createAccountWithBalance(donor);230 const spender = helper.eth.createAccount();231232 const collection = await helper.nft.mintCollection(alice, {});233 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});234235 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);236 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);237238 {239 const result = await contract.methods.approve(spender, tokenId).send({from: owner});240241 const event = result.events.Approval;242 expect(event.address).to.be.equal(collectionAddress);243 expect(event.returnValues.owner).to.be.equal(owner);244 expect(event.returnValues.approved).to.be.equal(spender);245 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);246 }247 });248249 itEth('Can perform transferFrom()', async ({helper}) => {250 const owner = await helper.eth.createAccountWithBalance(donor);251 const spender = await helper.eth.createAccountWithBalance(donor);252 const receiver = helper.eth.createAccount();253254 const collection = await helper.nft.mintCollection(alice, {});255 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});256257 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);258 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);259260 await contract.methods.approve(spender, tokenId).send({from: owner});261262 {263 const result = await contract.methods.transferFrom(owner, receiver, tokenId).send({from: spender});264265 const event = result.events.Transfer;266 expect(event.address).to.be.equal(collectionAddress);267 expect(event.returnValues.from).to.be.equal(owner);268 expect(event.returnValues.to).to.be.equal(receiver);269 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);270 }271272 {273 const balance = await contract.methods.balanceOf(receiver).call();274 expect(+balance).to.equal(1);275 }276277 {278 const balance = await contract.methods.balanceOf(owner).call();279 expect(+balance).to.equal(0);280 }281 });282283 itEth('Can perform transfer()', async ({helper}) => {284 const collection = await helper.nft.mintCollection(alice, {});285 const owner = await helper.eth.createAccountWithBalance(donor);286 const receiver = helper.eth.createAccount();287288 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});289290 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);291 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);292293 {294 const result = await contract.methods.transfer(receiver, tokenId).send({from: owner});295296 const event = result.events.Transfer;297 expect(event.address).to.be.equal(collectionAddress);298 expect(event.returnValues.from).to.be.equal(owner);299 expect(event.returnValues.to).to.be.equal(receiver);300 expect(event.returnValues.tokenId).to.be.equal(`${tokenId}`);301 }302303 {304 const balance = await contract.methods.balanceOf(owner).call();305 expect(+balance).to.equal(0);306 }307308 {309 const balance = await contract.methods.balanceOf(receiver).call();310 expect(+balance).to.equal(1);311 }312 });313});314315describe('NFT: Fees', () => {316 let donor: IKeyringPair;317 let alice: IKeyringPair;318319 before(async function() {320 await usingEthPlaygrounds(async (helper, privateKey) => {321 donor = await privateKey({filename: __filename});322 [alice] = await helper.arrange.createAccounts([10n], donor);323 });324 });325 326 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {327 const owner = await helper.eth.createAccountWithBalance(donor);328 const spender = helper.eth.createAccount();329330 const collection = await helper.nft.mintCollection(alice, {});331 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});332333 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);334335 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, tokenId).send({from: owner}));336 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));337 });338339 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {340 const owner = await helper.eth.createAccountWithBalance(donor);341 const spender = await helper.eth.createAccountWithBalance(donor);342343 const collection = await helper.nft.mintCollection(alice, {});344 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});345346 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);347348 await contract.methods.approve(spender, tokenId).send({from: owner});349350 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));351 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));352 });353354 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {355 const owner = await helper.eth.createAccountWithBalance(donor);356 const receiver = helper.eth.createAccount();357358 const collection = await helper.nft.mintCollection(alice, {});359 const {tokenId} = await collection.mintToken(alice, {Ethereum: owner});360361 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', owner);362363 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, tokenId).send({from: owner}));364 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));365 });366});367368describe('NFT: Substrate calls', () => {369 let donor: IKeyringPair;370 let alice: IKeyringPair;371372 before(async function() {373 await usingEthPlaygrounds(async (helper, privateKey) => {374 donor = await privateKey({filename: __filename});375 [alice] = await helper.arrange.createAccounts([20n], donor);376 });377 });378379 itEth('Events emitted for mint()', async ({helper}) => {380 const collection = await helper.nft.mintCollection(alice, {});381 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);382 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');383384 const events: any = [];385 contract.events.allEvents((_: any, event: any) => {386 events.push(event);387 });388389 const {tokenId} = await collection.mintToken(alice);390 if (events.length == 0) await helper.wait.newBlocks(1);391 const event = events[0];392393 expect(event.event).to.be.equal('Transfer');394 expect(event.address).to.be.equal(collectionAddress);395 expect(event.returnValues.from).to.be.equal('0x0000000000000000000000000000000000000000');396 expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(alice.address));397 expect(event.returnValues.tokenId).to.be.equal(tokenId.toString());398 });399400 itEth('Events emitted for burn()', async ({helper}) => {401 const collection = await helper.nft.mintCollection(alice, {});402 const token = await collection.mintToken(alice);403404 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);405 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');406 407 const events: any = [];408 contract.events.allEvents((_: any, event: any) => {409 events.push(event);410 });411412 await token.burn(alice);413 if (events.length == 0) await helper.wait.newBlocks(1);414 const event = events[0];415416 expect(event.event).to.be.equal('Transfer');417 expect(event.address).to.be.equal(collectionAddress);418 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));419 expect(event.returnValues.to).to.be.equal('0x0000000000000000000000000000000000000000');420 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());421 });422423 itEth('Events emitted for approve()', async ({helper}) => {424 const receiver = helper.eth.createAccount();425426 const collection = await helper.nft.mintCollection(alice, {});427 const token = await collection.mintToken(alice);428429 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);430 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');431 432 const events: any = [];433 contract.events.allEvents((_: any, event: any) => {434 events.push(event);435 });436437 await token.approve(alice, {Ethereum: receiver});438 if (events.length == 0) await helper.wait.newBlocks(1);439 const event = events[0];440441 expect(event.event).to.be.equal('Approval');442 expect(event.address).to.be.equal(collectionAddress);443 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));444 expect(event.returnValues.approved).to.be.equal(receiver);445 expect(event.returnValues.tokenId).to.be.equal(token.tokenId.toString());446 });447448 itEth('Events emitted for transferFrom()', async ({helper}) => {449 const [bob] = await helper.arrange.createAccounts([10n], donor);450 const receiver = helper.eth.createAccount();451452 const collection = await helper.nft.mintCollection(alice, {});453 const token = await collection.mintToken(alice);454 await token.approve(alice, {Substrate: bob.address});455456 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);457 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');458 459 const events: any = [];460 contract.events.allEvents((_: any, event: any) => {461 events.push(event);462 });463464 await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver});465 if (events.length == 0) await helper.wait.newBlocks(1);466 const event = events[0];467468 expect(event.address).to.be.equal(collectionAddress);469 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));470 expect(event.returnValues.to).to.be.equal(receiver);471 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);472 });473474 itEth('Events emitted for transfer()', async ({helper}) => {475 const receiver = helper.eth.createAccount();476477 const collection = await helper.nft.mintCollection(alice, {});478 const token = await collection.mintToken(alice);479480 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);481 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');482 483 const events: any = [];484 contract.events.allEvents((_: any, event: any) => {485 events.push(event);486 });487488 await token.transfer(alice, {Ethereum: receiver});489 if (events.length == 0) await helper.wait.newBlocks(1);490 const event = events[0];491492 expect(event.address).to.be.equal(collectionAddress);493 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));494 expect(event.returnValues.to).to.be.equal(receiver);495 expect(event.returnValues.tokenId).to.be.equal(`${token.tokenId}`);496 });497});498499describe('Common metadata', () => {500 let donor: IKeyringPair;501 let alice: IKeyringPair;502503 before(async function() {504 await usingEthPlaygrounds(async (helper, privateKey) => {505 donor = await privateKey({filename: __filename});506 [alice] = await helper.arrange.createAccounts([20n], donor);507 });508 });509510 itEth('Returns collection name', async ({helper}) => {511 const caller = await helper.eth.createAccountWithBalance(donor);512 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});513514 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);515 const name = await contract.methods.name().call();516 expect(name).to.equal('oh River');517 });518519 itEth('Returns symbol name', async ({helper}) => {520 const caller = await helper.eth.createAccountWithBalance(donor);521 const collection = await helper.nft.mintCollection(alice, {name: 'oh River', tokenPrefix: 'CHANGE'});522523 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'nft', caller);524 const symbol = await contract.methods.symbol().call();525 expect(symbol).to.equal('CHANGE');526 });527});tests/src/eth/reFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungible.test.ts
+++ b/tests/src/eth/reFungible.test.ts
@@ -286,9 +286,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
+
await tokenContract.methods.transfer(receiver, 1).send();
+ if (events.length == 0) await helper.wait.newBlocks(1);
+ const event = events[0];
- const event = events[0];
expect(event.address).to.equal(collectionAddress);
expect(event.returnValues.from).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');
expect(event.returnValues.to).to.equal(receiver);
@@ -312,9 +314,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
+
await tokenContract.methods.transfer(receiver, 1).send();
+ if (events.length == 0) await helper.wait.newBlocks(1);
+ const event = events[0];
- const event = events[0];
expect(event.address).to.equal(collectionAddress);
expect(event.returnValues.from).to.equal(caller);
expect(event.returnValues.to).to.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -311,6 +311,7 @@
});
await tokenContract.methods.burnFrom(caller, 1).send();
+ if (events.length == 0) await helper.wait.newBlocks(1);
const event = events[0];
expect(event.address).to.be.equal(collectionAddress);
expect(event.returnValues.from).to.be.equal('0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF');
@@ -399,9 +400,11 @@
contract.events.allEvents((_: any, event: any) => {
events.push(event);
});
- expect(await token.approve(alice, {Ethereum: receiver}, 100n)).to.be.true;
+ expect(await token.approve(alice, {Ethereum: receiver}, 100n)).to.be.true;
+ if (events.length == 0) await helper.wait.newBlocks(1);
const event = events[0];
+
expect(event.event).to.be.equal('Approval');
expect(event.address).to.be.equal(tokenAddress);
expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));
@@ -425,6 +428,7 @@
});
expect(await token.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n)).to.be.true;
+ if (events.length == 0) await helper.wait.newBlocks(1);
let event = events[0];
expect(event.event).to.be.equal('Transfer');
@@ -455,8 +459,9 @@
});
expect(await token.transfer(alice, {Ethereum: receiver}, 51n)).to.be.true;
+ if (events.length == 0) await helper.wait.newBlocks(1);
+ const event = events[0];
- const event = events[0];
expect(event.event).to.be.equal('Transfer');
expect(event.address).to.be.equal(tokenAddress);
expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.dev.ts
+++ b/tests/src/util/playgrounds/unique.dev.ts
@@ -156,8 +156,9 @@
};
let accountsCreated = false;
- // checkBalances retry up to 5 blocks
- for (let index = 0; index < 5; index++) {
+ const maxBlocksChecked = await this.helper.arrange.isDevNode() ? 50 : 5;
+ // checkBalances retry up to 5-50 blocks
+ for (let index = 0; index < maxBlocksChecked; index++) {
accountsCreated = await checkBalances();
if(accountsCreated) break;
await wait.newBlocks(1);