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

117  });117  });
118118
119  itEth('ERC721UniqueExtensions support', async ({helper}) => {119  itEth('ERC721UniqueExtensions support', async ({helper}) => {
120    await checkInterface(helper, '0xb76006ac', true, true);120    await checkInterface(helper, '0x244543ee', true, true);
121  });121  });
122122
123  itEth('ERC721Burnable - 0x42966c68 - support', async ({helper}) => {123  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();

--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -338,6 +338,40 @@
     }
   });
 
+  itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
+    const minter = await privateKey('//Alice');
+    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
+
+    const owner = await privateKey('//Bob');
+    const spender = await helper.eth.createAccountWithBalance(donor);
+    const receiver = await privateKey('//Charlie');
+
+    const token = await collection.mintToken(minter, {Substrate: owner.address});
+
+    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
+    const contract = helper.ethNativeContract.collection(address, 'nft');
+
+    await token.approve(owner, {Ethereum: spender});
+
+    {
+      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
+      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
+      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});
+      const event = result.events.Transfer;
+      expect(event).to.be.like({
+        address: helper.ethAddress.fromCollectionId(collection.collectionId),
+        event: 'Transfer',
+        returnValues: {
+          from: helper.address.substrateToEth(owner.address),
+          to: helper.address.substrateToEth(receiver.address),
+          tokenId: token.tokenId.toString(),
+        },
+      });
+    }
+
+    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});
+  });
+
   itEth('Can perform transfer()', async ({helper}) => {
     const collection = await helper.nft.mintCollection(alice, {});
     const owner = await helper.eth.createAccountWithBalance(donor);
@@ -407,40 +441,6 @@
 
     const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, tokenId).send({from: spender}));
     expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
-  });
-
-  itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
-    const minter = await privateKey('//Alice');
-    const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
-
-    const owner = await privateKey('//Bob');
-    const spender = await helper.eth.createAccountWithBalance(donor);
-    const receiver = await privateKey('//Charlie');
-
-    const token = await collection.mintToken(donor, {Substrate: owner.address});
-
-    const address = helper.ethAddress.fromCollectionId(collection.collectionId);
-    const contract = helper.ethNativeContract.collection(address, 'nft');
-
-    await token.approve(owner, {Ethereum: spender});
-
-    {
-      const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);
-      const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
-      const result = await contract.methods.transferFromCross(ownerCross, recieverCross, token.tokenId).send({from: spender});
-      const event = result.events.Transfer;
-      expect(event).to.be.like({
-        address: helper.ethAddress.fromCollectionId(collection.collectionId),
-        event: 'Transfer',
-        returnValues: {
-          from: helper.address.substrateToEth(owner.address),
-          to: helper.address.substrateToEth(receiver.address),
-          tokenId: token.tokenId.toString(),
-        },
-      });
-    }
-
-    expect(await token.getOwner()).to.be.like({Substrate: receiver.address});
   });
 
   itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {