difftreelog
Merge pull request #744 from UniqueNetwork/tests/eth-helpers
in: master
Tests/eth helpers
5 files changed
tests/src/eth/allowlist.test.tsdiffbeforeafterboth--- a/tests/src/eth/allowlist.test.ts
+++ b/tests/src/eth/allowlist.test.ts
@@ -92,21 +92,47 @@
});
itEth('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {
- const owner = await helper.eth.createAccountWithBalance(donor);
- const user = donor;
+ const owner = (await helper.eth.createAccountWithBalance(donor)).toLowerCase();
+ const [userSub] = await helper.arrange.createAccounts([10n], donor);
+ const userEth = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- const userCross = helper.ethCrossAccount.fromKeyringPair(user);
+ const userCrossSub = helper.ethCrossAccount.fromKeyringPair(userSub);
+ const userCrossEth = helper.ethCrossAccount.fromAddress(userEth);
+ const ownerCrossEth = helper.ethCrossAccount.fromAddress(owner);
+
+ // Can addToCollectionAllowListCross:
+ expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.false;
+ await collectionEvm.methods.addToCollectionAllowListCross(userCrossSub).send({from: owner});
+ await collectionEvm.methods.addToCollectionAllowListCross(userCrossEth).send({from: owner});
+ await collectionEvm.methods.addToCollectionAllowListCross(ownerCrossEth).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.true;
+ expect(await helper.collection.allowed(collectionId, {Ethereum: userEth})).to.be.true;
+ expect(await collectionEvm.methods.allowlistedCross(userCrossSub).call({from: owner})).to.be.true;
+ expect(await collectionEvm.methods.allowlistedCross(userCrossEth).call({from: owner})).to.be.true;
+
+ await collectionEvm.methods.mint(userEth).send(); // token #1
+ await collectionEvm.methods.mint(userEth).send(); // token #2
+ await collectionEvm.methods.setCollectionAccess(1).send();
- expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
- expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;
- expect(await collectionEvm.methods.allowlistedCross(userCross).call({from: owner})).to.be.true;
+ // allowlisted account can transfer and transferCross:
+ await collectionEvm.methods.transfer(owner, 1).send({from: userEth});
+ await collectionEvm.methods.transferCross(userCrossSub, 2).send({from: userEth});
+ expect(await helper.nft.getTokenOwner(collectionId, 1)).to.deep.eq({Ethereum: owner});
+ expect(await helper.nft.getTokenOwner(collectionId, 2)).to.deep.eq({Substrate: userSub.address});
- await collectionEvm.methods.removeFromCollectionAllowListCross(userCross).send({from: owner});
- expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;
- expect(await collectionEvm.methods.allowlistedCross(userCross).call({from: owner})).to.be.false;
+ // can removeFromCollectionAllowListCross:
+ await collectionEvm.methods.removeFromCollectionAllowListCross(userCrossSub).send({from: owner});
+ await collectionEvm.methods.removeFromCollectionAllowListCross(userCrossEth).send({from: owner});
+ expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.false;
+ expect(await helper.collection.allowed(collectionId, {Ethereum: userEth})).to.be.false;
+ expect(await collectionEvm.methods.allowlistedCross(userCrossSub).call({from: owner})).to.be.false;
+ expect(await collectionEvm.methods.allowlistedCross(userCrossEth).call({from: owner})).to.be.false;
+
+ // cannot transfer anymore
+ await collectionEvm.methods.mint(userEth).send();
+ await expect(collectionEvm.methods.transfer(owner, 2).send({from: userEth})).to.be.rejectedWith(/Transaction has been reverted/);
});
// Soft-deprecated
tests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionAdmin.test.ts
+++ b/tests/src/eth/collectionAdmin.test.ts
@@ -39,80 +39,98 @@
});
});
- // Soft-deprecated
- itEth('Add admin by owner', async ({helper}) => {
+ itEth('can add account admin by owner', async ({helper, privateKey}) => {
+ // arrange
const owner = await helper.eth.createAccountWithBalance(donor);
+ const adminSub = await privateKey('//admin2');
+ const adminEth = helper.eth.createAccount().toLowerCase();
+
+ const adminDeprecated = helper.eth.createAccount().toLowerCase();
+ const adminCrossSub = helper.ethCrossAccount.fromKeyringPair(adminSub);
+ const adminCrossEth = helper.ethCrossAccount.fromAddress(adminEth);
+
const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
- const newAdmin = helper.eth.createAccount();
+ // Soft-deprecated: can addCollectionAdmin
+ await collectionEvm.methods.addCollectionAdmin(adminDeprecated).send();
+ // Can addCollectionAdminCross for substrate and ethereum address
+ await collectionEvm.methods.addCollectionAdminCross(adminCrossSub).send();
+ await collectionEvm.methods.addCollectionAdminCross(adminCrossEth).send();
- await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
- const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);
- expect(adminList[0].asEthereum.toString().toLocaleLowerCase())
- .to.be.eq(newAdmin.toLocaleLowerCase());
+ // 1. Expect api.rpc.unique.adminlist returns admins:
+ const adminListRpc = await helper.collection.getAdmins(collectionId);
+ expect(adminListRpc).to.has.length(3);
+ expect(adminListRpc).to.be.deep.contain.members([{Substrate: adminSub.address}, {Ethereum: adminEth}, {Ethereum: adminDeprecated}]);
+
+ // 2. Expect methods.collectionAdmins == api.rpc.unique.adminlist
+ let adminListEth = await collectionEvm.methods.collectionAdmins().call();
+ adminListEth = adminListEth.map((element: IEthCrossAccountId) => {
+ return helper.address.convertCrossAccountFromEthCrossAccount(element);
+ });
+ expect(adminListRpc).to.be.like(adminListEth);
});
- itEth('Add cross account admin by owner', async ({helper, privateKey}) => {
+ itEth('cross account admin can mint', async ({helper}) => {
+ // arrange: create collection and accounts
const owner = await helper.eth.createAccountWithBalance(donor);
-
- const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
+ const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, 'Mint collection', 'a', 'b', 'uri');
+ const adminEth = (await helper.eth.createAccountWithBalance(donor)).toLowerCase();
+ const adminCrossEth = helper.ethCrossAccount.fromAddress(adminEth);
+ const [adminSub] = await helper.arrange.createAccounts([100n], donor);
+ const adminCrossSub = helper.ethCrossAccount.fromKeyringPair(adminSub);
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
+
+ // cannot mint while not admin
+ await expect(collectionEvm.methods.mint(owner).send({from: adminEth})).to.be.rejected;
+ await expect(helper.nft.mintToken(adminSub, {collectionId, owner: {Ethereum: owner}})).to.be.rejectedWith(/common.PublicMintingNotAllowed/);
- const newAdmin = await privateKey('//Bob');
- const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
- await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
+ // admin (sub and eth) can mint token:
+ await collectionEvm.methods.addCollectionAdminCross(adminCrossEth).send();
+ await collectionEvm.methods.addCollectionAdminCross(adminCrossSub).send();
+ await collectionEvm.methods.mint(owner).send({from: adminEth});
+ await helper.nft.mintToken(adminSub, {collectionId, owner: {Ethereum: owner}});
- const adminList = await helper.collection.getAdmins(collectionId);
- expect(adminList).to.be.like([{Substrate: newAdmin.address}]);
+ expect(await helper.collection.getLastTokenId(collectionId)).to.eq(2);
});
- itEth('Check adminlist', async ({helper, privateKey}) => {
+ itEth('cannot add invalid cross account admin', async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
-
- const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
+ const [admin] = await helper.arrange.createAccounts([100n, 100n], donor);
- const admin1 = helper.eth.createAccount();
- const admin2 = await privateKey('admin');
- const admin2Cross = helper.ethCrossAccount.fromKeyringPair(admin2);
-
- // Soft-deprecated
- await collectionEvm.methods.addCollectionAdmin(admin1).send();
- await collectionEvm.methods.addCollectionAdminCross(admin2Cross).send();
+ const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+ const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
- const adminListRpc = await helper.collection.getAdmins(collectionId);
- let adminListEth = await collectionEvm.methods.collectionAdmins().call();
- adminListEth = adminListEth.map((element: IEthCrossAccountId) => {
- return helper.address.convertCrossAccountFromEthCrossAcoount(element);
- });
- expect(adminListRpc).to.be.like(adminListEth);
+ const adminCross = {
+ eth: helper.address.substrateToEth(admin.address),
+ sub: admin.addressRaw,
+ };
+ await expect(collectionEvm.methods.addCollectionAdminCross(adminCross).send()).to.be.rejected;
});
- // Soft-deprecated
- itEth('Verify owner or admin', async ({helper}) => {
+ itEth('can verify owner with methods.isOwnerOrAdmin[Cross]', async ({helper, privateKey}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- const newAdmin = helper.eth.createAccount();
+ const adminDeprecated = helper.eth.createAccount();
+ const admin1Cross = helper.ethCrossAccount.fromKeyringPair(await privateKey('admin'));
+ const admin2Cross = helper.ethCrossAccount.fromAddress(helper.address.substrateToEth((await privateKey('admin3')).address));
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);
- expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.false;
- await collectionEvm.methods.addCollectionAdmin(newAdmin).send();
- expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;
- });
+ // Soft-deprecated:
+ expect(await collectionEvm.methods.isOwnerOrAdmin(adminDeprecated).call()).to.be.false;
+ expect(await collectionEvm.methods.isOwnerOrAdminCross(admin1Cross).call()).to.be.false;
+ expect(await collectionEvm.methods.isOwnerOrAdminCross(admin2Cross).call()).to.be.false;
- itEth('Verify owner or admin cross', async ({helper, privateKey}) => {
- const owner = await helper.eth.createAccountWithBalance(donor);
- const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
+ await collectionEvm.methods.addCollectionAdmin(adminDeprecated).send();
+ await collectionEvm.methods.addCollectionAdminCross(admin1Cross).send();
+ await collectionEvm.methods.addCollectionAdminCross(admin2Cross).send();
- const newAdmin = await privateKey('admin');
- const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
-
- expect(await collectionEvm.methods.isOwnerOrAdminCross(newAdminCross).call()).to.be.false;
- await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();
- expect(await collectionEvm.methods.isOwnerOrAdminCross(newAdminCross).call()).to.be.true;
+ // Soft-deprecated: isOwnerOrAdmin returns true
+ expect(await collectionEvm.methods.isOwnerOrAdmin(adminDeprecated).call()).to.be.true;
+ // Expect isOwnerOrAdminCross return true
+ expect(await collectionEvm.methods.isOwnerOrAdminCross(admin1Cross).call()).to.be.true;
+ expect(await collectionEvm.methods.isOwnerOrAdminCross(admin2Cross).call()).to.be.true;
});
// Soft-deprecated
@@ -154,12 +172,11 @@
const owner = await helper.eth.createAccountWithBalance(donor);
const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');
- const [admin] = await helper.arrange.createAccounts([10n], donor);
+ const [admin, notAdmin] = await helper.arrange.createAccounts([10n, 10n], donor);
const adminCross = helper.ethCrossAccount.fromKeyringPair(admin);
const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);
await collectionEvm.methods.addCollectionAdminCross(adminCross).send();
- const [notAdmin] = await helper.arrange.createAccounts([10n], donor);
const notAdminCross = helper.ethCrossAccount.fromKeyringPair(notAdmin);
await expect(collectionEvm.methods.addCollectionAdminCross(notAdminCross).call({from: adminCross.eth}))
.to.be.rejectedWith('NoPermission');
tests/src/eth/fungible.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 {expect, itEth, usingEthPlaygrounds} from './util';18import {IKeyringPair} from '@polkadot/types/types';1920describe('Fungible: Information getting', () => {21 let donor: IKeyringPair;22 let alice: IKeyringPair;2324 before(async function() {25 await usingEthPlaygrounds(async (helper, privateKey) => {26 donor = await privateKey({filename: __filename});27 [alice] = await helper.arrange.createAccounts([20n], donor);28 });29 });3031 itEth('totalSupply', async ({helper}) => {32 const caller = await helper.eth.createAccountWithBalance(donor);33 const collection = await helper.ft.mintCollection(alice);34 await collection.mint(alice, 200n);3536 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);37 const totalSupply = await contract.methods.totalSupply().call();38 expect(totalSupply).to.equal('200');39 });4041 itEth('balanceOf', async ({helper}) => {42 const caller = await helper.eth.createAccountWithBalance(donor);43 const collection = await helper.ft.mintCollection(alice);44 await collection.mint(alice, 200n, {Ethereum: caller});4546 const contract = helper.ethNativeContract.collectionById(collection.collectionId, 'ft', caller);47 const balance = await contract.methods.balanceOf(caller).call();48 expect(balance).to.equal('200');49 });50});5152describe('Fungible: Plain calls', () => {53 let donor: IKeyringPair;54 let alice: IKeyringPair;55 let owner: IKeyringPair;5657 before(async function() {58 await usingEthPlaygrounds(async (helper, privateKey) => {59 donor = await privateKey({filename: __filename});60 [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);61 });62 });6364 itEth('Can perform mint()', async ({helper}) => {65 const owner = await helper.eth.createAccountWithBalance(donor);66 const receiver = helper.eth.createAccount();67 const collection = await helper.ft.mintCollection(alice);68 await collection.addAdmin(alice, {Ethereum: owner});6970 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);71 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);7273 const result = await contract.methods.mint(receiver, 100).send();74 75 const event = result.events.Transfer;76 expect(event.address).to.equal(collectionAddress);77 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');78 expect(event.returnValues.to).to.equal(receiver);79 expect(event.returnValues.value).to.equal('100');80 });8182 itEth('Can perform mintBulk()', async ({helper}) => {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const bulkSize = 3;85 const receivers = [...new Array(bulkSize)].map(() => helper.eth.createAccount());86 const collection = await helper.ft.mintCollection(alice);87 await collection.addAdmin(alice, {Ethereum: owner});8889 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);90 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);9192 const result = await contract.methods.mintBulk(Array.from({length: bulkSize}, (_, i) => (93 [receivers[i], (i + 1) * 10]94 ))).send();95 const events = result.events.Transfer.sort((a: any, b: any) => +a.returnValues.value - b.returnValues.value);96 for (let i = 0; i < bulkSize; i++) {97 const event = events[i];98 expect(event.address).to.equal(collectionAddress);99 expect(event.returnValues.from).to.equal('0x0000000000000000000000000000000000000000');100 expect(event.returnValues.to).to.equal(receivers[i]);101 expect(event.returnValues.value).to.equal(String(10 * (i + 1)));102 }103 });104105 // Soft-deprecated106 itEth('Can perform burn()', async ({helper}) => {107 const owner = await helper.eth.createAccountWithBalance(donor);108 const receiver = await helper.eth.createAccountWithBalance(donor);109 const collection = await helper.ft.mintCollection(alice);110 await collection.addAdmin(alice, {Ethereum: owner});111112 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);113 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);114 await contract.methods.mint(receiver, 100).send();115116 const result = await contract.methods.burnFrom(receiver, 49).send({from: receiver});117 118 const event = result.events.Transfer;119 expect(event.address).to.equal(collectionAddress);120 expect(event.returnValues.from).to.equal(receiver);121 expect(event.returnValues.to).to.equal('0x0000000000000000000000000000000000000000');122 expect(event.returnValues.value).to.equal('49');123124 const balance = await contract.methods.balanceOf(receiver).call();125 expect(balance).to.equal('51');126 });127128 itEth('Can perform approve()', async ({helper}) => {129 const owner = await helper.eth.createAccountWithBalance(donor);130 const spender = helper.eth.createAccount();131 const collection = await helper.ft.mintCollection(alice);132 await collection.mint(alice, 200n, {Ethereum: owner});133134 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);135 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);136137 {138 const result = await contract.methods.approve(spender, 100).send({from: owner});139140 const event = result.events.Approval;141 expect(event.address).to.be.equal(collectionAddress);142 expect(event.returnValues.owner).to.be.equal(owner);143 expect(event.returnValues.spender).to.be.equal(spender);144 expect(event.returnValues.value).to.be.equal('100');145 }146147 {148 const allowance = await contract.methods.allowance(owner, spender).call();149 expect(+allowance).to.equal(100);150 }151 });152153 itEth('Can perform burnFromCross()', async ({helper}) => {154 const sender = await helper.eth.createAccountWithBalance(donor, 100n);155156 const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);157158 await collection.mint(owner, 200n, {Substrate: owner.address});159 await collection.approveTokens(owner, {Ethereum: sender}, 100n);160161 const address = helper.ethAddress.fromCollectionId(collection.collectionId);162 const contract = helper.ethNativeContract.collection(address, 'ft');163164 const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});165 166 const ownerCross = helper.ethCrossAccount.fromKeyringPair(owner);167 const result = await contract.methods.burnFromCross(ownerCross, 49).send({from: sender});168 const events = result.events;169170 expect(events).to.be.like({171 Transfer: {172 address: helper.ethAddress.fromCollectionId(collection.collectionId),173 event: 'Transfer',174 returnValues: {175 from: helper.address.substrateToEth(owner.address),176 to: '0x0000000000000000000000000000000000000000',177 value: '49',178 },179 },180 Approval: {181 address: helper.ethAddress.fromCollectionId(collection.collectionId),182 returnValues: {183 owner: helper.address.substrateToEth(owner.address),184 spender: sender,185 value: '51',186 },187 event: 'Approval',188 },189 });190191 const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});192 expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(49n);193 });194195 itEth('Can perform transferFrom()', async ({helper}) => {196 const owner = await helper.eth.createAccountWithBalance(donor);197 const spender = await helper.eth.createAccountWithBalance(donor);198 const receiver = helper.eth.createAccount();199 const collection = await helper.ft.mintCollection(alice);200 await collection.mint(alice, 200n, {Ethereum: owner});201202 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);203 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);204205 await contract.methods.approve(spender, 100).send();206207 {208 const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});209 210 let event = result.events.Transfer;211 expect(event.address).to.be.equal(collectionAddress);212 expect(event.returnValues.from).to.be.equal(owner);213 expect(event.returnValues.to).to.be.equal(receiver);214 expect(event.returnValues.value).to.be.equal('49');215216 event = result.events.Approval;217 expect(event.address).to.be.equal(collectionAddress);218 expect(event.returnValues.owner).to.be.equal(owner);219 expect(event.returnValues.spender).to.be.equal(spender);220 expect(event.returnValues.value).to.be.equal('51');221 }222223 {224 const balance = await contract.methods.balanceOf(receiver).call();225 expect(+balance).to.equal(49);226 }227228 {229 const balance = await contract.methods.balanceOf(owner).call();230 expect(+balance).to.equal(151);231 }232 });233234 itEth('Can perform transferCross()', async ({helper}) => {235 const owner = await helper.eth.createAccountWithBalance(donor);236 const receiver = await helper.eth.createAccountWithBalance(donor);237 const to = helper.ethCrossAccount.fromAddress(receiver);238 const toSubstrate = helper.ethCrossAccount.fromKeyringPair(donor);239 const collection = await helper.ft.mintCollection(alice);240 await collection.mint(alice, 200n, {Ethereum: owner});241242 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);243 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);244245 {246 const result = await contract.methods.transferCross(to, 50).send({from: owner});247 248 const event = result.events.Transfer;249 expect(event.address).to.be.equal(collectionAddress);250 expect(event.returnValues.from).to.be.equal(owner);251 expect(event.returnValues.to).to.be.equal(receiver);252 expect(event.returnValues.value).to.be.equal('50');253 }254255 {256 const balance = await contract.methods.balanceOf(owner).call();257 expect(+balance).to.equal(150);258 }259260 {261 const balance = await contract.methods.balanceOf(receiver).call();262 expect(+balance).to.equal(50);263 }264 265 {266 const result = await contract.methods.transferCross(toSubstrate, 50).send({from: owner});267 268 const event = result.events.Transfer;269 expect(event.address).to.be.equal(collectionAddress);270 expect(event.returnValues.from).to.be.equal(owner);271 expect(event.returnValues.to).to.be.equal(helper.address.substrateToEth(donor.address));272 expect(event.returnValues.value).to.be.equal('50');273 }274275 {276 const balance = await collection.getBalance({Ethereum: owner});277 expect(balance).to.equal(100n);278 }279280 {281 const balance = await collection.getBalance({Substrate: donor.address});282 expect(balance).to.equal(50n);283 }284 285 });286 287 itEth('Can perform transfer()', async ({helper}) => {288 const owner = await helper.eth.createAccountWithBalance(donor);289 const receiver = await helper.eth.createAccountWithBalance(donor);290 const collection = await helper.ft.mintCollection(alice);291 await collection.mint(alice, 200n, {Ethereum: owner});292293 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);294 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);295296 {297 const result = await contract.methods.transfer(receiver, 50).send({from: owner});298 299 const event = result.events.Transfer;300 expect(event.address).to.be.equal(collectionAddress);301 expect(event.returnValues.from).to.be.equal(owner);302 expect(event.returnValues.to).to.be.equal(receiver);303 expect(event.returnValues.value).to.be.equal('50');304 }305306 {307 const balance = await contract.methods.balanceOf(owner).call();308 expect(+balance).to.equal(150);309 }310311 {312 const balance = await contract.methods.balanceOf(receiver).call();313 expect(+balance).to.equal(50);314 }315 });316317 itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {318 const sender = await helper.eth.createAccountWithBalance(donor, 100n);319320 const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);321322 const receiver = helper.eth.createAccount();323324 await collection.mint(owner, 200n, {Substrate: owner.address});325 await collection.approveTokens(owner, {Ethereum: sender}, 100n);326327 const address = helper.ethAddress.fromCollectionId(collection.collectionId);328 const contract = helper.ethNativeContract.collection(address, 'ft');329330 const from = helper.ethCrossAccount.fromKeyringPair(owner);331 const to = helper.ethCrossAccount.fromAddress(receiver);332333 const fromBalanceBefore = await collection.getBalance({Substrate: owner.address});334 const toBalanceBefore = await collection.getBalance({Ethereum: receiver});335 336 const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});337338 expect(result.events).to.be.like({339 Transfer: {340 address,341 event: 'Transfer',342 returnValues: {343 from: helper.address.substrateToEth(owner.address),344 to: receiver,345 value: '51',346 },347 },348 Approval: {349 address,350 event: 'Approval',351 returnValues: {352 owner: helper.address.substrateToEth(owner.address),353 spender: sender,354 value: '49',355 },356 }});357358 const fromBalanceAfter = await collection.getBalance({Substrate: owner.address});359 expect(fromBalanceBefore - fromBalanceAfter).to.be.eq(51n);360 const toBalanceAfter = await collection.getBalance({Ethereum: receiver});361 expect(toBalanceAfter - toBalanceBefore).to.be.eq(51n);362 });363});364365describe('Fungible: Fees', () => {366 let donor: IKeyringPair;367 let alice: IKeyringPair;368369 before(async function() {370 await usingEthPlaygrounds(async (helper, privateKey) => {371 donor = await privateKey({filename: __filename});372 [alice] = await helper.arrange.createAccounts([20n], donor);373 });374 });375 376 itEth('approve() call fee is less than 0.2UNQ', async ({helper}) => {377 const owner = await helper.eth.createAccountWithBalance(donor);378 const spender = helper.eth.createAccount();379 const collection = await helper.ft.mintCollection(alice);380 await collection.mint(alice, 200n, {Ethereum: owner});381382 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);383 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);384385 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.approve(spender, 100).send({from: owner}));386 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));387 });388389 itEth('transferFrom() call fee is less than 0.2UNQ', async ({helper}) => {390 const owner = await helper.eth.createAccountWithBalance(donor);391 const spender = await helper.eth.createAccountWithBalance(donor);392 const collection = await helper.ft.mintCollection(alice);393 await collection.mint(alice, 200n, {Ethereum: owner});394395 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);396 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);397398 await contract.methods.approve(spender, 100).send({from: owner});399400 const cost = await helper.eth.recordCallFee(spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));401 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));402 });403404 itEth('transfer() call fee is less than 0.2UNQ', async ({helper}) => {405 const owner = await helper.eth.createAccountWithBalance(donor);406 const receiver = helper.eth.createAccount();407 const collection = await helper.ft.mintCollection(alice);408 await collection.mint(alice, 200n, {Ethereum: owner});409410 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);411 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft', owner);412413 const cost = await helper.eth.recordCallFee(owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));414 expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));415 });416});417418describe('Fungible: Substrate calls', () => {419 let donor: IKeyringPair;420 let alice: IKeyringPair;421 let owner: IKeyringPair;422423 before(async function() {424 await usingEthPlaygrounds(async (helper, privateKey) => {425 donor = await privateKey({filename: __filename});426 [alice, owner] = await helper.arrange.createAccounts([20n, 20n], donor);427 });428 });429430 itEth('Events emitted for approve()', async ({helper}) => {431 const receiver = helper.eth.createAccount();432 const collection = await helper.ft.mintCollection(alice);433 await collection.mint(alice, 200n);434435 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);436 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');437438 const events: any = [];439 contract.events.allEvents((_: any, event: any) => {440 events.push(event);441 });442 443 await collection.approveTokens(alice, {Ethereum: receiver}, 100n);444 if (events.length == 0) await helper.wait.newBlocks(1);445 const event = events[0];446447 expect(event.event).to.be.equal('Approval');448 expect(event.address).to.be.equal(collectionAddress);449 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));450 expect(event.returnValues.spender).to.be.equal(receiver);451 expect(event.returnValues.value).to.be.equal('100');452 });453454 itEth('Events emitted for transferFrom()', async ({helper}) => {455 const [bob] = await helper.arrange.createAccounts([10n], donor);456 const receiver = helper.eth.createAccount();457 const collection = await helper.ft.mintCollection(alice);458 await collection.mint(alice, 200n);459 await collection.approveTokens(alice, {Substrate: bob.address}, 100n);460461 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);462 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');463464 const events: any = [];465 contract.events.allEvents((_: any, event: any) => {466 events.push(event);467 });468469 await collection.transferFrom(bob, {Substrate: alice.address}, {Ethereum: receiver}, 51n);470 if (events.length == 0) await helper.wait.newBlocks(1);471 let event = events[0];472473 expect(event.event).to.be.equal('Transfer');474 expect(event.address).to.be.equal(collectionAddress);475 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));476 expect(event.returnValues.to).to.be.equal(receiver);477 expect(event.returnValues.value).to.be.equal('51');478479 event = events[1];480 expect(event.event).to.be.equal('Approval');481 expect(event.address).to.be.equal(collectionAddress);482 expect(event.returnValues.owner).to.be.equal(helper.address.substrateToEth(alice.address));483 expect(event.returnValues.spender).to.be.equal(helper.address.substrateToEth(bob.address));484 expect(event.returnValues.value).to.be.equal('49');485 });486487 itEth('Events emitted for transfer()', async ({helper}) => {488 const receiver = helper.eth.createAccount();489 const collection = await helper.ft.mintCollection(alice);490 await collection.mint(alice, 200n);491492 const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);493 const contract = helper.ethNativeContract.collection(collectionAddress, 'ft');494495 const events: any = [];496 contract.events.allEvents((_: any, event: any) => {497 events.push(event);498 });499 500 await collection.transfer(alice, {Ethereum:receiver}, 51n);501 if (events.length == 0) await helper.wait.newBlocks(1);502 const event = events[0];503504 expect(event.event).to.be.equal('Transfer');505 expect(event.address).to.be.equal(collectionAddress);506 expect(event.returnValues.from).to.be.equal(helper.address.substrateToEth(alice.address));507 expect(event.returnValues.to).to.be.equal(receiver);508 expect(event.returnValues.value).to.be.equal('51');509 });510511 itEth('Events emitted for transferFromCross()', async ({helper, privateKey}) => {512 const sender = await helper.eth.createAccountWithBalance(donor, 100n);513514 const collection = await helper.ft.mintCollection(owner, {name: 'A', description: 'B', tokenPrefix: 'C'}, 0);515516 const receiver = helper.eth.createAccount();517518 await collection.mint(owner, 200n, {Substrate: owner.address});519 await collection.approveTokens(owner, {Ethereum: sender}, 100n);520521 const address = helper.ethAddress.fromCollectionId(collection.collectionId);522 const contract = helper.ethNativeContract.collection(address, 'ft');523524 const from = helper.ethCrossAccount.fromKeyringPair(owner);525 const to = helper.ethCrossAccount.fromAddress(receiver);526 527 const result = await contract.methods.transferFromCross(from, to, 51).send({from: sender});528529 expect(result.events).to.be.like({530 Transfer: {531 address,532 event: 'Transfer',533 returnValues: {534 from: helper.address.substrateToEth(owner.address),535 to: receiver,536 value: '51',537 },538 },539 Approval: {540 address,541 event: 'Approval',542 returnValues: {543 owner: helper.address.substrateToEth(owner.address),544 spender: sender,545 value: '49',546 },547 }});548 });549});tests/src/eth/nonFungible.test.tsdiffbeforeafterboth--- a/tests/src/eth/nonFungible.test.ts
+++ b/tests/src/eth/nonFungible.test.ts
@@ -17,7 +17,6 @@
import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
import {IKeyringPair} from '@polkadot/types/types';
import {Contract} from 'web3-eth-contract';
-import exp from 'constants';
describe('NFT: Information getting', () => {
@@ -280,30 +279,51 @@
});
itEth('Can perform approveCross()', async ({helper}) => {
+ // arrange: create accounts
+ const owner = await helper.eth.createAccountWithBalance(donor, 100n);
+ const ownerCross = helper.ethCrossAccount.fromAddress(owner);
+ const receiverSub = charlie;
+ const recieverCrossSub = helper.ethCrossAccount.fromKeyringPair(receiverSub);
+ const receiverEth = await helper.eth.createAccountWithBalance(donor, 100n);
+ const receiverCrossEth = helper.ethCrossAccount.fromAddress(receiverEth);
+
+ // arrange: create collection and tokens:
const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
+ const token1 = await collection.mintToken(minter, {Ethereum: owner});
+ const token2 = await collection.mintToken(minter, {Ethereum: owner});
- const owner = await helper.eth.createAccountWithBalance(donor, 100n);
- const receiver = charlie;
+ const collectionEvm = helper.ethNativeContract.collection(helper.ethAddress.fromCollectionId(collection.collectionId), 'nft');
- const token = await collection.mintToken(minter, {Ethereum: owner});
-
- const address = helper.ethAddress.fromCollectionId(collection.collectionId);
- const contract = helper.ethNativeContract.collection(address, 'nft');
+ // Can approveCross substrate and ethereum address:
+ const resultSub = await collectionEvm.methods.approveCross(recieverCrossSub, token1.tokenId).send({from: owner});
+ const resultEth = await collectionEvm.methods.approveCross(receiverCrossEth, token2.tokenId).send({from: owner});
+ const eventSub = resultSub.events.Approval;
+ const eventEth = resultEth.events.Approval;
+ expect(eventSub).to.be.like({
+ address: helper.ethAddress.fromCollectionId(collection.collectionId),
+ event: 'Approval',
+ returnValues: {
+ owner,
+ approved: helper.address.substrateToEth(receiverSub.address),
+ tokenId: token1.tokenId.toString(),
+ },
+ });
+ expect(eventEth).to.be.like({
+ address: helper.ethAddress.fromCollectionId(collection.collectionId),
+ event: 'Approval',
+ returnValues: {
+ owner,
+ approved: receiverEth,
+ tokenId: token2.tokenId.toString(),
+ },
+ });
- {
- const recieverCross = helper.ethCrossAccount.fromKeyringPair(receiver);
- const result = await contract.methods.approveCross(recieverCross, token.tokenId).send({from: owner});
- const event = result.events.Approval;
- expect(event).to.be.like({
- address: helper.ethAddress.fromCollectionId(collection.collectionId),
- event: 'Approval',
- returnValues: {
- owner,
- approved: helper.address.substrateToEth(receiver.address),
- tokenId: token.tokenId.toString(),
- },
- });
- }
+ // Substrate address can transferFrom approved tokens:
+ await helper.nft.transferTokenFrom(receiverSub, collection.collectionId, token1.tokenId, {Ethereum: owner}, {Substrate: receiverSub.address});
+ expect(await helper.nft.getTokenOwner(collection.collectionId, token1.tokenId)).to.deep.eq({Substrate: receiverSub.address});
+ // Ethereum address can transferFromCross approved tokens:
+ await collectionEvm.methods.transferFromCross(ownerCross, receiverCrossEth, token2.tokenId).send({from: receiverEth});
+ expect(await helper.nft.getTokenOwner(collection.collectionId, token2.tokenId)).to.deep.eq({Ethereum: receiverEth.toLowerCase()});
});
itEth('Can perform transferFrom()', async ({helper}) => {
@@ -340,13 +360,11 @@
}
});
- itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
- const minter = await privateKey('//Alice');
+ itEth('Can perform transferFromCross()', async ({helper}) => {
const collection = await helper.nft.mintCollection(minter, {name: 'A', description: 'B', tokenPrefix: 'C'});
- const owner = await privateKey('//Bob');
+ const [owner, receiver] = await helper.arrange.createAccounts([100n, 100n], donor);
const spender = await helper.eth.createAccountWithBalance(donor);
- const receiver = await privateKey('//Charlie');
const token = await collection.mintToken(minter, {Substrate: owner.address});
@@ -501,7 +519,7 @@
expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));
});
- itEth('Can perform transferFromCross()', async ({helper, privateKey}) => {
+ itEth('Can perform transferFromCross()', async ({helper}) => {
const collectionMinter = alice;
const owner = bob;
const receiver = charlie;
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2429,7 +2429,7 @@
* @param ethCrossAccount etherium cross account
* @returns substrate cross account id
*/
- convertCrossAccountFromEthCrossAcoount(ethCrossAccount: IEthCrossAccountId): ICrossAccountId {
+ convertCrossAccountFromEthCrossAccount(ethCrossAccount: IEthCrossAccountId): ICrossAccountId {
if (ethCrossAccount.sub === '0') {
return {Ethereum: ethCrossAccount.eth.toLocaleLowerCase()};
}