git.delta.rocks / unique-network / refs/commits / 6d40fa6f157c

difftreelog

fix after rebase

Trubnikov Sergey2022-10-24parent: #36fc5ab.patch.diff
in: master

3 files changed

modifiedtests/src/eth/collectionAdmin.test.tsdiffbeforeafterboth
before · tests/src/eth/collectionAdmin.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.3// Unique Network is free software: you can redistribute it and/or modify4// it under the terms of the GNU General Public License as published by5// the Free Software Foundation, either version 3 of the License, or6// (at your option) any later version.7//8// Unique Network is distributed in the hope that it will be useful,9// but WITHOUT ANY WARRANTY; without even the implied warranty of10// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the11// GNU General Public License for more details.1213// You should have received a copy of the GNU General Public License14// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1516import {IKeyringPair} from '@polkadot/types/types';17import {IEthCrossAccountId} from '../util/playgrounds/types';18import {usingEthPlaygrounds, itEth, expect, EthUniqueHelper} from './util';1920async function recordEthFee(helper: EthUniqueHelper, userAddress: string, call: () => Promise<any>) {21  const before = await helper.balance.getSubstrate(helper.address.ethToSubstrate(userAddress));22  await call();23  await helper.wait.newBlocks(1);24  const after = await helper.balance.getSubstrate(helper.address.ethToSubstrate(userAddress));2526  expect(after < before).to.be.true;2728  return before - after;29}3031describe('Add collection admins', () => {32  let donor: IKeyringPair;3334  before(async function() {35    await usingEthPlaygrounds(async (_helper, privateKey) => {36      donor = await privateKey({filename: __filename});37    });38  });3940  itEth('Add admin by owner', async ({helper}) => {41    const owner = await helper.eth.createAccountWithBalance(donor);42    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');43    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);4445    const newAdmin = helper.eth.createAccount();4647    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();48    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);49    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())50      .to.be.eq(newAdmin.toLocaleLowerCase());51  });5253  itEth('Add cross account admin by owner', async ({helper, privateKey}) => {54    const owner = await helper.eth.createAccountWithBalance(donor);55        56    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');57    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);58    59    const newAdmin = await privateKey('//Bob');60    const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);61    await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();6263    const adminList = await helper.collection.getAdmins(collectionId);64    expect(adminList).to.be.like([{Substrate: newAdmin.address}]);65  });6667  itEth('Verify owner or admin', async ({helper}) => {68    const owner = await helper.eth.createAccountWithBalance(donor);69    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');7071    const newAdmin = helper.eth.createAccount();72    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);73  74    expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.false;75    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();76    expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;77  });7879  itEth.skip('Check adminlist', async ({helper, privateKey}) => {80    const owner = await helper.eth.createAccountWithBalance(donor);81        82    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');83    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);8485    const admin1 = helper.eth.createAccount();86    const admin2 = await privateKey('admin');87    await collectionEvm.methods.addCollectionAdmin(admin1).send();88    await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send();8990    const adminListRpc = await helper.collection.getAdmins(collectionId);91    let adminListEth = await collectionEvm.methods.collectionAdmins().call();92    adminListEth = adminListEth.map((element: IEthCrossAccountId) => {93      return helper.address.convertCrossAccountFromEthCrossAcoount(element);94    });95    expect(adminListRpc).to.be.like(adminListEth);96  });97    98  itEth('(!negative tests!) Add admin by ADMIN is not allowed', async ({helper}) => {99    const owner = await helper.eth.createAccountWithBalance(donor);100    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');101102    const admin = await helper.eth.createAccountWithBalance(donor);103    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);104    await collectionEvm.methods.addCollectionAdmin(admin).send();105106    const user = helper.eth.createAccount();107    await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: admin}))108      .to.be.rejectedWith('NoPermission');109110    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);111    expect(adminList.length).to.be.eq(1);112    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())113      .to.be.eq(admin.toLocaleLowerCase());114  });115116  itEth('(!negative tests!) Add admin by USER is not allowed', async ({helper}) => {117    const owner = await helper.eth.createAccountWithBalance(donor);118    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');119120    const notAdmin = await helper.eth.createAccountWithBalance(donor);121    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);122123    const user = helper.eth.createAccount();124    await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: notAdmin}))125      .to.be.rejectedWith('NoPermission');126127    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);128    expect(adminList.length).to.be.eq(0);129  });130131  itEth.skip('(!negative tests!) Add substrate admin by ADMIN is not allowed', async ({helper}) => {132    const owner = await helper.eth.createAccountWithBalance(donor);133    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');134135    const admin = await helper.eth.createAccountWithBalance(donor);136    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);137    await collectionEvm.methods.addCollectionAdmin(admin).send();138139    const [notAdmin] = await helper.arrange.createAccounts([10n], donor);140    await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin.addressRaw).call({from: admin}))141      .to.be.rejectedWith('NoPermission');142143    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);144    expect(adminList.length).to.be.eq(1);145    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())146      .to.be.eq(admin.toLocaleLowerCase());147  });148149  itEth.skip('(!negative tests!) Add substrate admin by USER is not allowed', async ({helper}) => {150    const owner = await helper.eth.createAccountWithBalance(donor);151    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');152153    const notAdmin0 = await helper.eth.createAccountWithBalance(donor);154    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);155    const [notAdmin1] = await helper.arrange.createAccounts([10n], donor);156    await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin1.addressRaw).call({from: notAdmin0}))157      .to.be.rejectedWith('NoPermission');158159    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);160    expect(adminList.length).to.be.eq(0);161  });162});163164describe('Remove collection admins', () => {165  let donor: IKeyringPair;166167  before(async function() {168    await usingEthPlaygrounds(async (_helper, privateKey) => {169      donor = await privateKey({filename: __filename});170    });171  });172173  itEth('Remove admin by owner', async ({helper}) => {174    const owner = await helper.eth.createAccountWithBalance(donor);175    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');176177    const newAdmin = helper.eth.createAccount();178    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);179    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();180181    {182      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);183      expect(adminList.length).to.be.eq(1);184      expect(adminList[0].asEthereum.toString().toLocaleLowerCase())185        .to.be.eq(newAdmin.toLocaleLowerCase());186    }187188    await collectionEvm.methods.removeCollectionAdmin(newAdmin).send();189    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);190    expect(adminList.length).to.be.eq(0);191  });192193  itEth.skip('Remove substrate admin by owner', async ({helper}) => {194    const owner = await helper.eth.createAccountWithBalance(donor);195    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');196197    const [newAdmin] = await helper.arrange.createAccounts([10n], donor);198    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);199    await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();200    {201      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);202      expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())203        .to.be.eq(newAdmin.address.toLocaleLowerCase());204    }205206    await collectionEvm.methods.removeCollectionAdminSubstrate(newAdmin.addressRaw).send();207    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);208    expect(adminList.length).to.be.eq(0);209  });210211  itEth('(!negative tests!) Remove admin by ADMIN is not allowed', async ({helper}) => {212    const owner = await helper.eth.createAccountWithBalance(donor);213    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');214215    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);216217    const admin0 = await helper.eth.createAccountWithBalance(donor);218    await collectionEvm.methods.addCollectionAdmin(admin0).send();219    const admin1 = await helper.eth.createAccountWithBalance(donor);220    await collectionEvm.methods.addCollectionAdmin(admin1).send();221222    await expect(collectionEvm.methods.removeCollectionAdmin(admin1).call({from: admin0}))223      .to.be.rejectedWith('NoPermission');224    {225      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);226      expect(adminList.length).to.be.eq(2);227      expect(adminList.toString().toLocaleLowerCase())228        .to.be.deep.contains(admin0.toLocaleLowerCase())229        .to.be.deep.contains(admin1.toLocaleLowerCase());230    }231  });232233  itEth('(!negative tests!) Remove admin by USER is not allowed', async ({helper}) => {234    const owner = await helper.eth.createAccountWithBalance(donor);235    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');236237    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);238239    const admin = await helper.eth.createAccountWithBalance(donor);240    await collectionEvm.methods.addCollectionAdmin(admin).send();241    const notAdmin = helper.eth.createAccount();242243    await expect(collectionEvm.methods.removeCollectionAdmin(admin).call({from: notAdmin}))244      .to.be.rejectedWith('NoPermission');245    {246      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);247      expect(adminList[0].asEthereum.toString().toLocaleLowerCase())248        .to.be.eq(admin.toLocaleLowerCase());249      expect(adminList.length).to.be.eq(1);250    }251  });252253  itEth.skip('(!negative tests!) Remove substrate admin by ADMIN is not allowed', async ({helper}) => {254    const owner = await helper.eth.createAccountWithBalance(donor);255    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');256257    const [adminSub] = await helper.arrange.createAccounts([10n], donor);258    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);259    await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();260    const adminEth = await helper.eth.createAccountWithBalance(donor);261    await collectionEvm.methods.addCollectionAdmin(adminEth).send();262263    await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: adminEth}))264      .to.be.rejectedWith('NoPermission');265266    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);267    expect(adminList.length).to.be.eq(2);268    expect(adminList.toString().toLocaleLowerCase())269      .to.be.deep.contains(adminSub.address.toLocaleLowerCase())270      .to.be.deep.contains(adminEth.toLocaleLowerCase());271  });272273  itEth.skip('(!negative tests!) Remove substrate admin by USER is not allowed', async ({helper}) => {274    const owner = await helper.eth.createAccountWithBalance(donor);275    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');276277    const [adminSub] = await helper.arrange.createAccounts([10n], donor);278    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);279    await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();280    const notAdminEth = await helper.eth.createAccountWithBalance(donor);281282    await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: notAdminEth}))283      .to.be.rejectedWith('NoPermission');284285    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);286    expect(adminList.length).to.be.eq(1);287    expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())288      .to.be.eq(adminSub.address.toLocaleLowerCase());289  });290});291292describe('Change owner tests', () => {293  let donor: IKeyringPair;294295  before(async function() {296    await usingEthPlaygrounds(async (_helper, privateKey) => {297      donor = await privateKey({filename: __filename});298    });299  });300301  itEth('Change owner', async ({helper}) => {302    const owner = await helper.eth.createAccountWithBalance(donor);303    const newOwner = await helper.eth.createAccountWithBalance(donor);304    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');305    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);306307    await collectionEvm.methods.changeCollectionOwner(newOwner).send();308309    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;310    expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.true;311  });312313  itEth('change owner call fee', async ({helper}) => {314    const owner = await helper.eth.createAccountWithBalance(donor);315    const newOwner = await helper.eth.createAccountWithBalance(donor);316    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');317    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);318    const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.changeCollectionOwner(newOwner).send());319    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));320    expect(cost > 0);321  });322323  itEth('(!negative tests!) call setOwner by non owner', async ({helper}) => {324    const owner = await helper.eth.createAccountWithBalance(donor);325    const newOwner = await helper.eth.createAccountWithBalance(donor);326    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');327    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);328329    await expect(collectionEvm.methods.changeCollectionOwner(newOwner).send({from: newOwner})).to.be.rejected;330    expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.false;331  });332});333334describe('Change substrate owner tests', () => {335  let donor: IKeyringPair;336337  before(async function() {338    await usingEthPlaygrounds(async (_helper, privateKey) => {339      donor = await privateKey({filename: __filename});340    });341  });342343  itEth.skip('Change owner', async ({helper}) => {344    const owner = await helper.eth.createAccountWithBalance(donor);345    const [newOwner] = await helper.arrange.createAccounts([10n], donor);346    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');347    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);348349    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.true;350    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;351352    await collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send();353354    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;355    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.true;356  });357358  itEth.skip('change owner call fee', async ({helper}) => {359    const owner = await helper.eth.createAccountWithBalance(donor);360    const [newOwner] = await helper.arrange.createAccounts([10n], donor);361    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');362    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);363364    const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send());365    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));366    expect(cost > 0);367  });368369  itEth.skip('(!negative tests!) call setOwner by non owner', async ({helper}) => {370    const owner = await helper.eth.createAccountWithBalance(donor);371    const otherReceiver = await helper.eth.createAccountWithBalance(donor);372    const [newOwner] = await helper.arrange.createAccounts([10n], donor);373    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');374    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);375376    await expect(collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send({from: otherReceiver})).to.be.rejected;377    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;378  });379});
after · tests/src/eth/collectionAdmin.test.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.3// Unique Network is free software: you can redistribute it and/or modify4// it under the terms of the GNU General Public License as published by5// the Free Software Foundation, either version 3 of the License, or6// (at your option) any later version.7//8// Unique Network is distributed in the hope that it will be useful,9// but WITHOUT ANY WARRANTY; without even the implied warranty of10// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the11// GNU General Public License for more details.1213// You should have received a copy of the GNU General Public License14// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1516import {IKeyringPair} from '@polkadot/types/types';17import {IEthCrossAccountId} from '../util/playgrounds/types';18import {usingEthPlaygrounds, itEth, expect, EthUniqueHelper} from './util';1920async function recordEthFee(helper: EthUniqueHelper, userAddress: string, call: () => Promise<any>) {21  const before = await helper.balance.getSubstrate(helper.address.ethToSubstrate(userAddress));22  await call();23  await helper.wait.newBlocks(1);24  const after = await helper.balance.getSubstrate(helper.address.ethToSubstrate(userAddress));2526  expect(after < before).to.be.true;2728  return before - after;29}3031describe('Add collection admins', () => {32  let donor: IKeyringPair;3334  before(async function() {35    await usingEthPlaygrounds(async (_helper, privateKey) => {36      donor = await privateKey({filename: __filename});37    });38  });3940  itEth('Add admin by owner', async ({helper}) => {41    const owner = await helper.eth.createAccountWithBalance(donor);42    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');43    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);4445    const newAdmin = helper.eth.createAccount();4647    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();48    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);49    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())50      .to.be.eq(newAdmin.toLocaleLowerCase());51  });5253  itEth('Add cross account admin by owner', async ({helper, privateKey}) => {54    const owner = await helper.eth.createAccountWithBalance(donor);55        56    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');57    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);58    59    const newAdmin = await privateKey('//Bob');60    const newAdminCross = helper.ethCrossAccount.fromKeyringPair(newAdmin);61    await collectionEvm.methods.addCollectionAdminCross(newAdminCross).send();6263    const adminList = await helper.collection.getAdmins(collectionId);64    expect(adminList).to.be.like([{Substrate: newAdmin.address}]);65  });6667  itEth('Check adminlist', async ({helper, privateKey}) => {68    const owner = await helper.eth.createAccountWithBalance(donor);69        70    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');71    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);7273    const admin1 = helper.eth.createAccount();74    const admin2 = await privateKey('admin');75    await collectionEvm.methods.addCollectionAdmin(admin1).send();76    await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send();7778    const adminListRpc = await helper.collection.getAdmins(collectionId);79    let adminListEth = await collectionEvm.methods.collectionAdmins().call();80    adminListEth = adminListEth.map((element: IEthCrossAccountId) => {81      return helper.address.convertCrossAccountFromEthCrossAcoount(element);82    });83    expect(adminListRpc).to.be.like(adminListEth);84  });8586  itEth('Verify owner or admin', async ({helper}) => {87    const owner = await helper.eth.createAccountWithBalance(donor);88    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');8990    const newAdmin = helper.eth.createAccount();91    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);92  93    expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.false;94    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();95    expect(await collectionEvm.methods.isOwnerOrAdmin(newAdmin).call()).to.be.true;96  });9798  itEth.skip('Check adminlist', async ({helper, privateKey}) => {99    const owner = await helper.eth.createAccountWithBalance(donor);100        101    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');102    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);103104    const admin1 = helper.eth.createAccount();105    const admin2 = await privateKey('admin');106    await collectionEvm.methods.addCollectionAdmin(admin1).send();107    await collectionEvm.methods.addCollectionAdminSubstrate(admin2.addressRaw).send();108109    const adminListRpc = await helper.collection.getAdmins(collectionId);110    let adminListEth = await collectionEvm.methods.collectionAdmins().call();111    adminListEth = adminListEth.map((element: IEthCrossAccountId) => {112      return helper.address.convertCrossAccountFromEthCrossAcoount(element);113    });114    expect(adminListRpc).to.be.like(adminListEth);115  });116    117  itEth('(!negative tests!) Add admin by ADMIN is not allowed', async ({helper}) => {118    const owner = await helper.eth.createAccountWithBalance(donor);119    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');120121    const admin = await helper.eth.createAccountWithBalance(donor);122    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);123    await collectionEvm.methods.addCollectionAdmin(admin).send();124125    const user = helper.eth.createAccount();126    await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: admin}))127      .to.be.rejectedWith('NoPermission');128129    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);130    expect(adminList.length).to.be.eq(1);131    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())132      .to.be.eq(admin.toLocaleLowerCase());133  });134135  itEth('(!negative tests!) Add admin by USER is not allowed', async ({helper}) => {136    const owner = await helper.eth.createAccountWithBalance(donor);137    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');138139    const notAdmin = await helper.eth.createAccountWithBalance(donor);140    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);141142    const user = helper.eth.createAccount();143    await expect(collectionEvm.methods.addCollectionAdmin(user).call({from: notAdmin}))144      .to.be.rejectedWith('NoPermission');145146    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);147    expect(adminList.length).to.be.eq(0);148  });149150  itEth.skip('(!negative tests!) Add substrate admin by ADMIN is not allowed', async ({helper}) => {151    const owner = await helper.eth.createAccountWithBalance(donor);152    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');153154    const admin = await helper.eth.createAccountWithBalance(donor);155    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);156    await collectionEvm.methods.addCollectionAdmin(admin).send();157158    const [notAdmin] = await helper.arrange.createAccounts([10n], donor);159    await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin.addressRaw).call({from: admin}))160      .to.be.rejectedWith('NoPermission');161162    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);163    expect(adminList.length).to.be.eq(1);164    expect(adminList[0].asEthereum.toString().toLocaleLowerCase())165      .to.be.eq(admin.toLocaleLowerCase());166  });167168  itEth.skip('(!negative tests!) Add substrate admin by USER is not allowed', async ({helper}) => {169    const owner = await helper.eth.createAccountWithBalance(donor);170    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');171172    const notAdmin0 = await helper.eth.createAccountWithBalance(donor);173    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);174    const [notAdmin1] = await helper.arrange.createAccounts([10n], donor);175    await expect(collectionEvm.methods.addCollectionAdminSubstrate(notAdmin1.addressRaw).call({from: notAdmin0}))176      .to.be.rejectedWith('NoPermission');177178    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);179    expect(adminList.length).to.be.eq(0);180  });181});182183describe('Remove collection admins', () => {184  let donor: IKeyringPair;185186  before(async function() {187    await usingEthPlaygrounds(async (_helper, privateKey) => {188      donor = await privateKey({filename: __filename});189    });190  });191192  itEth('Remove admin by owner', async ({helper}) => {193    const owner = await helper.eth.createAccountWithBalance(donor);194    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');195196    const newAdmin = helper.eth.createAccount();197    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);198    await collectionEvm.methods.addCollectionAdmin(newAdmin).send();199200    {201      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);202      expect(adminList.length).to.be.eq(1);203      expect(adminList[0].asEthereum.toString().toLocaleLowerCase())204        .to.be.eq(newAdmin.toLocaleLowerCase());205    }206207    await collectionEvm.methods.removeCollectionAdmin(newAdmin).send();208    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);209    expect(adminList.length).to.be.eq(0);210  });211212  itEth.skip('Remove substrate admin by owner', async ({helper}) => {213    const owner = await helper.eth.createAccountWithBalance(donor);214    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');215216    const [newAdmin] = await helper.arrange.createAccounts([10n], donor);217    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);218    await collectionEvm.methods.addCollectionAdminSubstrate(newAdmin.addressRaw).send();219    {220      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);221      expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())222        .to.be.eq(newAdmin.address.toLocaleLowerCase());223    }224225    await collectionEvm.methods.removeCollectionAdminSubstrate(newAdmin.addressRaw).send();226    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);227    expect(adminList.length).to.be.eq(0);228  });229230  itEth('(!negative tests!) Remove admin by ADMIN is not allowed', async ({helper}) => {231    const owner = await helper.eth.createAccountWithBalance(donor);232    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');233234    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);235236    const admin0 = await helper.eth.createAccountWithBalance(donor);237    await collectionEvm.methods.addCollectionAdmin(admin0).send();238    const admin1 = await helper.eth.createAccountWithBalance(donor);239    await collectionEvm.methods.addCollectionAdmin(admin1).send();240241    await expect(collectionEvm.methods.removeCollectionAdmin(admin1).call({from: admin0}))242      .to.be.rejectedWith('NoPermission');243    {244      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);245      expect(adminList.length).to.be.eq(2);246      expect(adminList.toString().toLocaleLowerCase())247        .to.be.deep.contains(admin0.toLocaleLowerCase())248        .to.be.deep.contains(admin1.toLocaleLowerCase());249    }250  });251252  itEth('(!negative tests!) Remove admin by USER is not allowed', async ({helper}) => {253    const owner = await helper.eth.createAccountWithBalance(donor);254    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');255256    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);257258    const admin = await helper.eth.createAccountWithBalance(donor);259    await collectionEvm.methods.addCollectionAdmin(admin).send();260    const notAdmin = helper.eth.createAccount();261262    await expect(collectionEvm.methods.removeCollectionAdmin(admin).call({from: notAdmin}))263      .to.be.rejectedWith('NoPermission');264    {265      const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);266      expect(adminList[0].asEthereum.toString().toLocaleLowerCase())267        .to.be.eq(admin.toLocaleLowerCase());268      expect(adminList.length).to.be.eq(1);269    }270  });271272  itEth.skip('(!negative tests!) Remove substrate admin by ADMIN is not allowed', async ({helper}) => {273    const owner = await helper.eth.createAccountWithBalance(donor);274    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');275276    const [adminSub] = await helper.arrange.createAccounts([10n], donor);277    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);278    await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();279    const adminEth = await helper.eth.createAccountWithBalance(donor);280    await collectionEvm.methods.addCollectionAdmin(adminEth).send();281282    await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: adminEth}))283      .to.be.rejectedWith('NoPermission');284285    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);286    expect(adminList.length).to.be.eq(2);287    expect(adminList.toString().toLocaleLowerCase())288      .to.be.deep.contains(adminSub.address.toLocaleLowerCase())289      .to.be.deep.contains(adminEth.toLocaleLowerCase());290  });291292  itEth.skip('(!negative tests!) Remove substrate admin by USER is not allowed', async ({helper}) => {293    const owner = await helper.eth.createAccountWithBalance(donor);294    const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');295296    const [adminSub] = await helper.arrange.createAccounts([10n], donor);297    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);298    await collectionEvm.methods.addCollectionAdminSubstrate(adminSub.addressRaw).send();299    const notAdminEth = await helper.eth.createAccountWithBalance(donor);300301    await expect(collectionEvm.methods.removeCollectionAdminSubstrate(adminSub.addressRaw).call({from: notAdminEth}))302      .to.be.rejectedWith('NoPermission');303304    const adminList = await helper.callRpc('api.rpc.unique.adminlist', [collectionId]);305    expect(adminList.length).to.be.eq(1);306    expect(adminList[0].asSubstrate.toString().toLocaleLowerCase())307      .to.be.eq(adminSub.address.toLocaleLowerCase());308  });309});310311describe('Change owner tests', () => {312  let donor: IKeyringPair;313314  before(async function() {315    await usingEthPlaygrounds(async (_helper, privateKey) => {316      donor = await privateKey({filename: __filename});317    });318  });319320  itEth('Change owner', async ({helper}) => {321    const owner = await helper.eth.createAccountWithBalance(donor);322    const newOwner = await helper.eth.createAccountWithBalance(donor);323    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');324    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);325326    await collectionEvm.methods.changeCollectionOwner(newOwner).send();327328    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;329    expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.true;330  });331332  itEth('change owner call fee', async ({helper}) => {333    const owner = await helper.eth.createAccountWithBalance(donor);334    const newOwner = await helper.eth.createAccountWithBalance(donor);335    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');336    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);337    const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.changeCollectionOwner(newOwner).send());338    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));339    expect(cost > 0);340  });341342  itEth('(!negative tests!) call setOwner by non owner', async ({helper}) => {343    const owner = await helper.eth.createAccountWithBalance(donor);344    const newOwner = await helper.eth.createAccountWithBalance(donor);345    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');346    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);347348    await expect(collectionEvm.methods.changeCollectionOwner(newOwner).send({from: newOwner})).to.be.rejected;349    expect(await collectionEvm.methods.isOwnerOrAdmin(newOwner).call()).to.be.false;350  });351});352353describe('Change substrate owner tests', () => {354  let donor: IKeyringPair;355356  before(async function() {357    await usingEthPlaygrounds(async (_helper, privateKey) => {358      donor = await privateKey({filename: __filename});359    });360  });361362  itEth.skip('Change owner', async ({helper}) => {363    const owner = await helper.eth.createAccountWithBalance(donor);364    const [newOwner] = await helper.arrange.createAccounts([10n], donor);365    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');366    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);367368    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.true;369    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;370371    await collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send();372373    expect(await collectionEvm.methods.isOwnerOrAdmin(owner).call()).to.be.false;374    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.true;375  });376377  itEth.skip('change owner call fee', async ({helper}) => {378    const owner = await helper.eth.createAccountWithBalance(donor);379    const [newOwner] = await helper.arrange.createAccounts([10n], donor);380    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');381    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);382383    const cost = await recordEthFee(helper, owner, () => collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send());384    expect(cost < BigInt(0.2 * Number(helper.balance.getOneTokenNominal())));385    expect(cost > 0);386  });387388  itEth.skip('(!negative tests!) call setOwner by non owner', async ({helper}) => {389    const owner = await helper.eth.createAccountWithBalance(donor);390    const otherReceiver = await helper.eth.createAccountWithBalance(donor);391    const [newOwner] = await helper.arrange.createAccounts([10n], donor);392    const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'A', 'B', 'C');393    const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);394395    await expect(collectionEvm.methods.setOwnerSubstrate(newOwner.addressRaw).send({from: otherReceiver})).to.be.rejected;396    expect(await collectionEvm.methods.isOwnerOrAdminSubstrate(newOwner.addressRaw).call()).to.be.false;397  });398});
modifiedtests/src/eth/collectionProperties.test.tsdiffbeforeafterboth
--- a/tests/src/eth/collectionProperties.test.ts
+++ b/tests/src/eth/collectionProperties.test.ts
@@ -14,10 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper} from './util';
+import {itEth, usingEthPlaygrounds, expect, EthUniqueHelper, EthUniqueHelper} from './util';
 import {Pallets} from '../util';
 import {IProperty, ITokenPropertyPermission, TCollectionMode} from '../util/playgrounds/types';
 import {IKeyringPair} from '@polkadot/types/types';
+import {TCollectionMode} from '../util/playgrounds/types';
 
 describe('EVM collection properties', () => {
   let donor: IKeyringPair;
modifiedtests/src/util/playgrounds/unique.tsdiffbeforeafterboth
--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -2341,73 +2341,6 @@
 
     return siblingPrefix + encodedParaId + suffix;
   }
-
-  /**
-   * Encode key to substrate address
-   * @param key key for encoding address
-   * @param ss58Format prefix for encoding to the address of the corresponding network
-   * @returns encoded substrate address
-   */
-  encodeSubstrateAddress (key: Uint8Array | string | bigint, ss58Format = 42): string {
-    const u8a :Uint8Array = typeof key === 'string'
-      ? hexToU8a(key)
-      : typeof key === 'bigint'
-        ? hexToU8a(key.toString(16))
-        : key;
-  
-    if (ss58Format < 0 || ss58Format > 16383 || [46, 47].includes(ss58Format)) {
-      throw new Error(`ss58Format is not valid, received ${typeof ss58Format} "${ss58Format}"`);
-    }
-  
-    const allowedDecodedLengths = [1, 2, 4, 8, 32, 33];
-    if (!allowedDecodedLengths.includes(u8a.length)) {
-      throw new Error(`key length is not valid, received ${u8a.length}, valid values are ${allowedDecodedLengths.join(', ')}`);
-    }
-  
-    const u8aPrefix = ss58Format < 64
-      ? new Uint8Array([ss58Format])
-      : new Uint8Array([
-        ((ss58Format & 0xfc) >> 2) | 0x40,
-        (ss58Format >> 8) | ((ss58Format & 0x03) << 6),
-      ]);
-
-    const input = u8aConcat(u8aPrefix, u8a);
-  
-    return base58Encode(u8aConcat(
-      input,
-      blake2AsU8a(input).subarray(0, [32, 33].includes(u8a.length) ? 2 : 1),
-    ));
-  }
-
-  /**
-   * Restore substrate address from bigint representation
-   * @param number decimal representation of substrate address
-   * @returns substrate address
-   */
-  restoreCrossAccountFromBigInt(number: bigint): TSubstrateAccount {
-    if (this.helper.api === null) {
-      throw 'Not connected';
-    }
-    const res = this.helper.api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();
-    if (res === undefined || res === null) {
-      throw 'Restore address error';
-    }
-    return res.toString();
-  }
-
-  /**
-   * Convert etherium cross account id to substrate cross account id
-   * @param ethCrossAccount etherium cross account
-   * @returns substrate cross account id
-   */
-  convertCrossAccountFromEthCrossAcoount(ethCrossAccount: IEthCrossAccountId): ICrossAccountId {
-    if (ethCrossAccount.field_1 === '0') {
-      return {Ethereum: ethCrossAccount.field_0.toLocaleLowerCase()};
-    }
-    
-    const ss58 = this.restoreCrossAccountFromBigInt(BigInt(ethCrossAccount.field_1));
-    return {Substrate: ss58};
-  }
 }
 
 class StakingGroup extends HelperGroup<UniqueHelper> {