git.delta.rocks / unique-network / refs/commits / 085263ef21aa

--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -117,7 +117,7 @@
   });
 
   itEth('ERC721UniqueExtensions support', async ({helper}) => {
-    await checkInterface(helper, '0xb76006ac', true, true);
+    await checkInterface(helper, '0x244543ee', true, true);
   });
 
   itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {

--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -74,8 +74,9 @@
 
     const admin1 = helper.eth.createAccount();
     const admin2 = await privateKey('admin');
+    const admin2Cross = helper.ethCrossAccount.fromKeyringPair(admin2);
     await collectionEvm.methods.addCollectionAdmin(admin1).send();
-    await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send();
+    await collectionEvm.methods.addCollectionAdminCross(admin2Cross).send();
 
     const adminListRpc = await helper.collection.getAdmins(collectionId);
     let adminListEth = await collectionEvm.methods.collectionAdmins().call();

338    }338    }
339  });339  });
340
341  itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
342    const minter = await privateKey('//Alice');
343    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
344
345    const owner = await privateKey('//Bob');
346    const spender = await helper.eth.createAccountWithBalance(donor);
347    const receiver = await privateKey('//Charlie');
348
349    const token = await collection.mintToken(minter, {Substrate: owner.address});
350
351    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
352    const contract = helper.ethNativeContract.collection(address, 'nft');
353
354    await token.approve(owner, {Ethereum: spender});
355
356    {
357      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
358      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
359      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});
360      const event = result.events.Transfer;
361      expect(event).to.be.like({
362        address: helper.ethAddress.fromCollectionId(collection.collectionId),
363        event: 'Transfer',
364        returnValues: {
365          from: helper.address.substrateToEth(owner.address),
366          to: helper.address.substrateToEth(receiver.address),
367          tokenId: token.tokenId.toString(),
368        },
369      });
370    }
371
372    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});
373  });
340374
341  itEth('Can perform transfer()', async ({helper}) => {375  itEth('Can perform transfer()', async ({helper}) => {
342    const collection = await helper.nft.mintCollection(alice, {});376    const collection = await helper.nft.mintCollection(alice, {});
409    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));443    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
410  });444  });
411
412  itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
413    const minter = await privateKey('//Alice');
414    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
415
416    const owner = await privateKey('//Bob');
417    const spender = await helper.eth.createAccountWithBalance(donor);
418    const receiver = await privateKey('//Charlie');
419
420    const token = await collection.mintToken(donor, {Substrate: owner.address});
421
422    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
423    const contract = helper.ethNativeContract.collection(address, 'nft');
424
425    await token.approve(owner, {Ethereum: spender});
426
427    {
428      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
429      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
430      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});
431      const event = result.events.Transfer;
432      expect(event).to.be.like({
433        address: helper.ethAddress.fromCollectionId(collection.collectionId),
434        event: 'Transfer',
435        returnValues: {
436          from: helper.address.substrateToEth(owner.address),
437          to: helper.address.substrateToEth(receiver.address),
438          tokenId: token.tokenId.toString(),
439        },
440      });
441    }
442
443    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});
444  });
445445
446  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {446  itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {
447    const owner = await helper.eth.createAccountWithBalance(donor);447    const owner = await helper.eth.createAccountWithBalance(donor);