difftreelog
Add approveCross and trasferFromCross checks
in: master
2 files changed
tests/src/eth/allowlist.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 {IKeyringPair} from '@polkadot/types/types';18import {itEth, usingEthPlaygrounds, expect} from './util';1920describe('EVM contract allowlist', () => {21 let donor: IKeyringPair;2223 before(async function() {24 await usingEthPlaygrounds(async (_helper, privateKey) => {25 donor = await privateKey({filename: __filename});26 });27 });2829 itEth('Contract allowlist can be toggled', async ({helper}) => {30 const owner = await helper.eth.createAccountWithBalance(donor);31 const flipper = await helper.eth.deployFlipper(owner);32 const helpers = helper.ethNativeContract.contractHelpers(owner);3334 // Any user is allowed by default35 expect(await helpers.methods.allowlistEnabled(flipper.options.address).call()).to.be.false;3637 // Enable38 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});39 expect(await helpers.methods.allowlistEnabled(flipper.options.address).call()).to.be.true;4041 // Disable42 await helpers.methods.toggleAllowlist(flipper.options.address, false).send({from: owner});43 expect(await helpers.methods.allowlistEnabled(flipper.options.address).call()).to.be.false;44 });4546 itEth('Non-allowlisted user can\'t call contract with allowlist enabled', async ({helper}) => {47 const owner = await helper.eth.createAccountWithBalance(donor);48 const caller = await helper.eth.createAccountWithBalance(donor);49 const flipper = await helper.eth.deployFlipper(owner);50 const helpers = helper.ethNativeContract.contractHelpers(owner);5152 // User can flip with allowlist disabled53 await flipper.methods.flip().send({from: caller});54 expect(await flipper.methods.getValue().call()).to.be.true;5556 // Tx will be reverted if user is not in allowlist57 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});58 await expect(flipper.methods.flip().send({from: caller})).to.rejected;59 expect(await flipper.methods.getValue().call()).to.be.true;6061 // Adding caller to allowlist will make contract callable again62 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});63 await flipper.methods.flip().send({from: caller});64 expect(await flipper.methods.getValue().call()).to.be.false;65 });66});6768describe('EVM collection allowlist', () => {69 let donor: IKeyringPair;7071 before(async function() {72 await usingEthPlaygrounds(async (_helper, privateKey) => {73 donor = await privateKey({filename: __filename});74 });75 });7677 // Soft-deprecated78 itEth('Collection allowlist can be added and removed by [eth] address', async ({helper}) => {79 const owner = await helper.eth.createAccountWithBalance(donor);80 const user = helper.eth.createAccount();81 const crossUser = helper.ethCrossAccount.fromAddress(user);82 83 const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');84 const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);8586 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.false;87 await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});88 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.true;8990 await collectionEvm.methods.removeFromCollectionAllowList(user).send({from: owner});91 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.false;92 });9394 itEth.only('Collection allowlist can be added and removed by [cross] address', async ({helper}) => {95 const owner = (await helper.eth.createAccountWithBalance(donor)).toLowerCase();96 const [userSub] = await helper.arrange.createAccounts([10n], donor);97 const userEth = await helper.eth.createAccountWithBalance(donor);98 99 const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');100 const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);101 const userCrossSub = helper.ethCrossAccount.fromKeyringPair(userSub);102 const userCrossEth = helper.ethCrossAccount.fromAddress(userEth);103 104 // Can addToCollectionAllowListCross:105 expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.false;106 await collectionEvm.methods.addToCollectionAllowListCross(userCrossSub).send({from: owner});107 await collectionEvm.methods.addToCollectionAllowListCross(userCrossEth).send({from: owner});108 expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.true;109 expect(await helper.collection.allowed(collectionId, {Ethereum: userEth})).to.be.true;110 expect(await collectionEvm.methods.allowlistedCross(userCrossSub).call({from: owner})).to.be.true;111 expect(await collectionEvm.methods.allowlistedCross(userCrossEth).call({from: owner})).to.be.true;112113 // allowlisted account can transfer tokens:114 await collectionEvm.methods.mint(userEth).send();115 await collectionEvm.methods.setCollectionAccess(1).send();116 await collectionEvm.methods.transfer(owner, 1).send({from: userEth}); // FIXME: why not?117 expect(await helper.nft.getTokenOwner(collectionId, 1)).to.eq({Ethereum: owner});118 119 // can removeFromCollectionAllowListCross120 await collectionEvm.methods.removeFromCollectionAllowListCross(userCrossSub).send({from: owner});121 await collectionEvm.methods.removeFromCollectionAllowListCross(userCrossEth).send({from: owner});122 expect(await helper.collection.allowed(collectionId, {Substrate: userSub.address})).to.be.false;123 expect(await helper.collection.allowed(collectionId, {Substrate: userEth})).to.be.false;124 expect(await collectionEvm.methods.allowlistedCross(userCrossEth).call({from: owner})).to.be.false;125126 // cannot transfer anymore127 await collectionEvm.methods.mint(userEth).send();128 await expect(collectionEvm.methods.transfer(owner, 2).send({from: userEth})).to.be.rejected;129 });130131 // Soft-deprecated132 itEth('Collection allowlist can not be add and remove [eth] address by not owner', async ({helper}) => {133 const owner = await helper.eth.createAccountWithBalance(donor);134 const notOwner = await helper.eth.createAccountWithBalance(donor);135 const user = helper.eth.createAccount();136 const crossUser = helper.ethCrossAccount.fromAddress(user);137138 const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');139 const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);140141 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.false;142 await expect(collectionEvm.methods.addToCollectionAllowList(user).call({from: notOwner})).to.be.rejectedWith('NoPermission');143 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.false;144 await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});145 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.true;146 await expect(collectionEvm.methods.removeFromCollectionAllowList(user).call({from: notOwner})).to.be.rejectedWith('NoPermission');147 expect(await collectionEvm.methods.allowlistedCross(crossUser).call({from: owner})).to.be.true;148 });149150 itEth('Collection allowlist can not be add and remove [cross] address by not owner', async ({helper}) => {151 const owner = await helper.eth.createAccountWithBalance(donor);152 const notOwner = await helper.eth.createAccountWithBalance(donor);153 const user = donor;154 155 const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');156 const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);157 158 expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;159 const userCross = helper.ethCrossAccount.fromKeyringPair(user);160 await expect(collectionEvm.methods.addToCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');161 expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.false;162 await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});163 164 expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;165 await expect(collectionEvm.methods.removeFromCollectionAllowListCross(userCross).call({from: notOwner})).to.be.rejectedWith('NoPermission');166 expect(await helper.collection.allowed(collectionId, {Substrate: user.address})).to.be.true;167 });168});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});
+ // 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 address = helper.ethAddress.fromCollectionId(collection.collectionId);
- const contract = helper.ethNativeContract.collection(address, 'nft');
-
- {
- 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}) => {
@@ -501,7 +521,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;