git.delta.rocks / unique-network / refs/commits / 343d804c01f9

difftreelog

fix review

Max Andreev2022-09-15parent: #1a380ae.patch.diff
in: master

3 files changed

modifiedtests/src/app-promotion.test.tsdiffbeforeafterboth
--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -414,8 +414,8 @@
     const collection = await helper.nft.mintCollection(collectionOwner, {name: 'New', description: 'New Collection', tokenPrefix: 'Promotion'});
       
     await collection.burn(collectionOwner);
-    await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(collection.collectionId))).to.be.rejected;
-    await expect(helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.stopSponsoringCollection(999999999))).to.be.rejected;
+    await expect(helper.executeExtrinsic(palletAdmin, 'api.tx.appPromotion.stopSponsoringCollection', [collection.collectionId], true)).to.be.rejectedWith('common.CollectionNotFound');
+    await expect(helper.executeExtrinsic(palletAdmin, 'api.tx.appPromotion.stopSponsoringCollection', [999_999_999], true)).to.be.rejectedWith('common.CollectionNotFound');
   });
 });
 
@@ -459,8 +459,8 @@
 
     // new sponsor is pallet address
     expect(await contractHelper.methods.hasSponsor(flipper.options.address).call()).to.be.true;  
-    expect((await helper.api!.query.evmContractHelpers.owner(flipper.options.address)).toJSON()).to.be.equal(contractOwner);  
-    expect((await helper.api!.query.evmContractHelpers.sponsoring(flipper.options.address)).toJSON()).to.deep.equal({
+    expect((await helper.callRpc('api.query.evmContractHelpers.owner', [flipper.options.address])).toJSON()).to.be.equal(contractOwner);  
+    expect((await helper.callRpc('api.query.evmContractHelpers.sponsoring', [flipper.options.address])).toJSON()).to.deep.equal({
       confirmed: {
         substrate: palletAddress,
       },
@@ -602,7 +602,7 @@
 
   itSub('can not be called by non admin', async ({helper}) => {
     const nonAdmin = accounts.pop()!;
-    await expect(helper.signTransaction(nonAdmin, helper.api!.tx.appPromotion.payoutStakers(100))).to.be.rejected;
+    await expect(helper.admin.payoutStakers(nonAdmin, 100)).to.be.rejectedWith('appPromotion.NoPermission');
   });
 
   itSub('should increase total staked', async ({helper}) => {
@@ -613,7 +613,7 @@
     // Wait for rewards and pay
     const [stakedInBlock] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stakedInBlock.block));
-    const totalPayout = (await helper.sudo.payoutStakers(palletAdmin, 100)).reduce((prev, payout) => prev + payout.payout, 0n);
+    const totalPayout = (await helper.admin.payoutStakers(palletAdmin, 100)).reduce((prev, payout) => prev + payout.payout, 0n);
 
     const totalStakedAfter = await helper.staking.getTotalStaked();
     expect(totalStakedAfter).to.equal(totalStakedBefore + (100n * nominal) + totalPayout);
@@ -634,7 +634,7 @@
     const [_, stake2] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake2.block));
 
-    const payoutToStaker = (await helper.sudo.payoutStakers(palletAdmin, 100)).find((payout) => payout.staker === staker.address)?.payout;
+    const payoutToStaker = (await helper.admin.payoutStakers(palletAdmin, 100)).find((payout) => payout.staker === staker.address)?.payout;
     expect(payoutToStaker + 300n * nominal).to.equal(calculateIncome(300n * nominal, 10n));
 
     const totalStakedPerBlock = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
@@ -650,7 +650,7 @@
     let [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block) + LOCKING_PERIOD);
 
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     const frozenBalanceShouldBe = calculateIncome(100n * nominal, 10n, 2);
     expect(stake.amount).to.be.equal(frozenBalanceShouldBe);
@@ -670,7 +670,7 @@
       
     // so he did not receive any rewards
     const totalBalanceBefore = await helper.balance.getSubstrate(staker.address);
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     const totalBalanceAfter = await helper.balance.getSubstrate(staker.address);
 
     expect(totalBalanceBefore).to.be.equal(totalBalanceAfter);
@@ -684,12 +684,12 @@
     let [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block));
       
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     expect(stake.amount).to.equal(calculateIncome(100n * nominal, 10n));
       
     await helper.wait.forRelayBlockNumber(rewardAvailableInBlock(stake.block) + LOCKING_PERIOD);
-    await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
     [stake] = await helper.staking.getTotalStakedPerBlock({Substrate: staker.address});
     expect(stake.amount).to.equal(calculateIncome(100n * nominal, 10n, 2));
   });
@@ -703,7 +703,7 @@
       await Promise.all(oneHundredStakers.map(staker => helper.staking.stake(staker, 100n * nominal)));
     }
     await helper.wait.newBlocks(40);
-    const result = await helper.signTransaction(palletAdmin, helper.api!.tx.appPromotion.payoutStakers(100));
+    await helper.admin.payoutStakers(palletAdmin, 100);
   });
 
   itSub.skip('can handle 40.000 rewards', async ({helper}) => {
modifiedtests/src/eth/util/playgrounds/unique.dev.tsdiffbeforeafterboth
--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -201,6 +201,9 @@
 
   async deployFlipper(signer: string): Promise<Contract> {
     return await this.helper.ethContract.deployByCode(signer, 'Flipper', `
+    // SPDX-License-Identifier: UNLICENSED
+    pragma solidity ^0.8.6;
+
     contract Flipper {
       bool value = false;
       function flip() public {
modifiedtests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth
before · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {mnemonicGenerate} from '@polkadot/util-crypto';5import {UniqueHelper} from './unique';6import {ApiPromise, WsProvider} from '@polkadot/api';7import * as defs from '../../interfaces/definitions';8import {IKeyringPair} from '@polkadot/types/types';91011export class SilentLogger {12  log(_msg: any, _level: any): void { }13  level = {14    ERROR: 'ERROR' as const,15    WARNING: 'WARNING' as const,16    INFO: 'INFO' as const,17  };18}1920export class SilentConsole {21  // TODO: Remove, this is temporary: Filter unneeded API output22  // (Jaco promised it will be removed in the next version)23  consoleErr: any;24  consoleLog: any;25  consoleWarn: any;2627  constructor() {28    this.consoleErr = console.error;29    this.consoleLog = console.log;30    this.consoleWarn = console.warn;31  }3233  enable() {  34    const outFn = (printer: any) => (...args: any[]) => {35      for (const arg of args) {36        if (typeof arg !== 'string')37          continue;38        if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')39          return;40      }41      printer(...args);42    };43  44    console.error = outFn(this.consoleErr.bind(console));45    console.log = outFn(this.consoleLog.bind(console));46    console.warn = outFn(this.consoleWarn.bind(console));47  }4849  disable() {50    console.error = this.consoleErr;51    console.log = this.consoleLog;52    console.warn = this.consoleWarn;53  }54}555657export class DevUniqueHelper extends UniqueHelper {58  /**59   * Arrange methods for tests60   */61  arrange: ArrangeGroup;62  wait: WaitGroup;63  sudo: SudoGroup;6465  constructor(logger: { log: (msg: any, level: any) => void, level: any }) {66    super(logger);67    this.arrange = new ArrangeGroup(this);68    this.wait = new WaitGroup(this);69    this.sudo = new SudoGroup(this);70  }7172  async connect(wsEndpoint: string, _listeners?: any): Promise<void> {73    const wsProvider = new WsProvider(wsEndpoint);74    this.api = new ApiPromise({75      provider: wsProvider,76      signedExtensions: {77        ContractHelpers: {78          extrinsic: {},79          payload: {},80        },81        FakeTransactionFinalizer: {82          extrinsic: {},83          payload: {},84        },85      },86      rpc: {87        unique: defs.unique.rpc,88        appPromotion: defs.appPromotion.rpc,89        rmrk: defs.rmrk.rpc,90        eth: {91          feeHistory: {92            description: 'Dummy',93            params: [],94            type: 'u8',95          },96          maxPriorityFeePerGas: {97            description: 'Dummy',98            params: [],99            type: 'u8',100          },101        },102      },103    });104    await this.api.isReadyOrError;105    this.network = await UniqueHelper.detectNetwork(this.api);106  }107}108109class ArrangeGroup {110  helper: UniqueHelper;111112  constructor(helper: UniqueHelper) {113    this.helper = helper;114  }115116  /**117   * Generates accounts with the specified UNQ token balance 118   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.119   * @param donor donor account for balances120   * @returns array of newly created accounts121   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 122   */123  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {124    let nonce = await this.helper.chain.getNonce(donor.address);125    const ss58Format = this.helper.chain.getChainProperties().ss58Format;126    const tokenNominal = this.helper.balance.getOneTokenNominal();127    const transactions = [];128    const accounts: IKeyringPair[] = [];129    for (const balance of balances) {130      const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);131      accounts.push(recipient);132      if (balance !== 0n) {133        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);134        transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));135        nonce++;136      }137    }138139    await Promise.all(transactions).catch(_e => {});140    141    //#region TODO remove this region, when nonce problem will be solved142    const checkBalances = async () => {143      let isSuccess = true;144      for (let i = 0; i < balances.length; i++) {145        const balance = await this.helper.balance.getSubstrate(accounts[i].address);146        if (balance !== balances[i] * tokenNominal) {147          isSuccess = false;148          break;149        }150      }151      return isSuccess;152    };153154    let accountsCreated = false;155    // checkBalances retry up to 5 blocks156    for (let index = 0; index < 5; index++) {157      accountsCreated = await checkBalances();158      if(accountsCreated) break;159      160    }161162    if (!accountsCreated) throw Error('Accounts generation failed');163    //#endregion164165    return accounts;166  };167168  // TODO combine this method and createAccounts into one169  createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => {  170    const createAsManyAsCan = async () => {171      let transactions: any = [];172      const accounts: IKeyringPair[] = [];173      let nonce = await this.helper.chain.getNonce(donor.address);174      const tokenNominal = this.helper.balance.getOneTokenNominal();175      for (let i = 0; i < accountsToCreate; i++) {176        if (i === 500) { // if there are too many accounts to create177          await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 178          transactions = []; //179          nonce = await this.helper.chain.getNonce(donor.address); // update nonce 180        }181        const recepient = this.helper.util.fromSeed(mnemonicGenerate());182        accounts.push(recepient);183        if (withBalance !== 0n) {184          const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);185          transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));186          nonce++;187        }188      }189      190      const fullfilledAccounts = [];191      await Promise.allSettled(transactions);192      for (const account of accounts) {193        const accountBalance = await this.helper.balance.getSubstrate(account.address);194        if (accountBalance === withBalance * tokenNominal) {195          fullfilledAccounts.push(account);196        }197      }198      return fullfilledAccounts;199    };200201    202    const crowd: IKeyringPair[] = [];203    // do up to 5 retries204    for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {205      const asManyAsCan = await createAsManyAsCan();206      crowd.push(...asManyAsCan);207      accountsToCreate -= asManyAsCan.length;208    }209210    if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);211212    return crowd;213  };214215  isDevNode = async () => {216    const block1 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(1));217    const block2 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(2));218    const findCreationDate = async (block: any) => {219      const humanBlock = block.toHuman();220      let date;221      humanBlock.block.extrinsics.forEach((ext: any) => {222        if(ext.method.section === 'timestamp') {223          date = Number(ext.method.args.now.replaceAll(',', ''));224        }225      });226      return date;227    };228    const block1date = await findCreationDate(block1);229    const block2date = await findCreationDate(block2);230    if(block2date! - block1date! < 9000) return true;231  };232}233234class WaitGroup {235  helper: UniqueHelper;236237  constructor(helper: UniqueHelper) {238    this.helper = helper;239  }240241  /**242   * Wait for specified bnumber of blocks243   * @param blocksCount number of blocks to wait244   * @returns 245   */246  async newBlocks(blocksCount = 1): Promise<void> {247    // eslint-disable-next-line no-async-promise-executor248    const promise = new Promise<void>(async (resolve) => {249      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {250        if (blocksCount > 0) {251          blocksCount--;252        } else {253          unsubscribe();254          resolve();255        }256      });257    });258    return promise;259  }260261  async forParachainBlockNumber(blockNumber: bigint) {262    // eslint-disable-next-line no-async-promise-executor263    return new Promise<void>(async (resolve) => {264      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(async (data: any) => {265        if (data.number.toNumber() >= blockNumber) {266          unsubscribe();267          resolve();268        }269      });270    });271  }272  273  async forRelayBlockNumber(blockNumber: bigint) {274    // eslint-disable-next-line no-async-promise-executor275    return new Promise<void>(async (resolve) => {276      const unsubscribe = await this.helper.api!.query.parachainSystem.validationData(async (data: any) => {277        if (data.value.relayParentNumber.toNumber() >= blockNumber) {278          // @ts-ignore279          unsubscribe();280          resolve();281        }282      });283    });284  }285}286287class SudoGroup {288  helper: UniqueHelper;289290  constructor(helper: UniqueHelper) {291    this.helper = helper;292  }293294  async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {295    const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);296    return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {297      return {298        staker: e.event.data[0].toString(),299        stake: e.event.data[1].toBigInt(),300        payout: e.event.data[2].toBigInt(),301      };302    });303  }304}
after · tests/src/util/playgrounds/unique.dev.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {mnemonicGenerate} from '@polkadot/util-crypto';5import {UniqueHelper} from './unique';6import {ApiPromise, WsProvider} from '@polkadot/api';7import * as defs from '../../interfaces/definitions';8import {IKeyringPair} from '@polkadot/types/types';91011export class SilentLogger {12  log(_msg: any, _level: any): void { }13  level = {14    ERROR: 'ERROR' as const,15    WARNING: 'WARNING' as const,16    INFO: 'INFO' as const,17  };18}1920export class SilentConsole {21  // TODO: Remove, this is temporary: Filter unneeded API output22  // (Jaco promised it will be removed in the next version)23  consoleErr: any;24  consoleLog: any;25  consoleWarn: any;2627  constructor() {28    this.consoleErr = console.error;29    this.consoleLog = console.log;30    this.consoleWarn = console.warn;31  }3233  enable() {  34    const outFn = (printer: any) => (...args: any[]) => {35      for (const arg of args) {36        if (typeof arg !== 'string')37          continue;38        if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')39          return;40      }41      printer(...args);42    };43  44    console.error = outFn(this.consoleErr.bind(console));45    console.log = outFn(this.consoleLog.bind(console));46    console.warn = outFn(this.consoleWarn.bind(console));47  }4849  disable() {50    console.error = this.consoleErr;51    console.log = this.consoleLog;52    console.warn = this.consoleWarn;53  }54}555657export class DevUniqueHelper extends UniqueHelper {58  /**59   * Arrange methods for tests60   */61  arrange: ArrangeGroup;62  wait: WaitGroup;63  admin: AdminGroup;6465  constructor(logger: { log: (msg: any, level: any) => void, level: any }) {66    super(logger);67    this.arrange = new ArrangeGroup(this);68    this.wait = new WaitGroup(this);69    this.admin = new AdminGroup(this);70  }7172  async connect(wsEndpoint: string, _listeners?: any): Promise<void> {73    const wsProvider = new WsProvider(wsEndpoint);74    this.api = new ApiPromise({75      provider: wsProvider,76      signedExtensions: {77        ContractHelpers: {78          extrinsic: {},79          payload: {},80        },81        FakeTransactionFinalizer: {82          extrinsic: {},83          payload: {},84        },85      },86      rpc: {87        unique: defs.unique.rpc,88        appPromotion: defs.appPromotion.rpc,89        rmrk: defs.rmrk.rpc,90        eth: {91          feeHistory: {92            description: 'Dummy',93            params: [],94            type: 'u8',95          },96          maxPriorityFeePerGas: {97            description: 'Dummy',98            params: [],99            type: 'u8',100          },101        },102      },103    });104    await this.api.isReadyOrError;105    this.network = await UniqueHelper.detectNetwork(this.api);106  }107}108109class ArrangeGroup {110  helper: UniqueHelper;111112  constructor(helper: UniqueHelper) {113    this.helper = helper;114  }115116  /**117   * Generates accounts with the specified UNQ token balance 118   * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.119   * @param donor donor account for balances120   * @returns array of newly created accounts121   * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 122   */123  createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {124    let nonce = await this.helper.chain.getNonce(donor.address);125    const ss58Format = this.helper.chain.getChainProperties().ss58Format;126    const tokenNominal = this.helper.balance.getOneTokenNominal();127    const transactions = [];128    const accounts: IKeyringPair[] = [];129    for (const balance of balances) {130      const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);131      accounts.push(recipient);132      if (balance !== 0n) {133        const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);134        transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));135        nonce++;136      }137    }138139    await Promise.all(transactions).catch(_e => {});140    141    //#region TODO remove this region, when nonce problem will be solved142    const checkBalances = async () => {143      let isSuccess = true;144      for (let i = 0; i < balances.length; i++) {145        const balance = await this.helper.balance.getSubstrate(accounts[i].address);146        if (balance !== balances[i] * tokenNominal) {147          isSuccess = false;148          break;149        }150      }151      return isSuccess;152    };153154    let accountsCreated = false;155    // checkBalances retry up to 5 blocks156    for (let index = 0; index < 5; index++) {157      accountsCreated = await checkBalances();158      if(accountsCreated) break;159      160    }161162    if (!accountsCreated) throw Error('Accounts generation failed');163    //#endregion164165    return accounts;166  };167168  // TODO combine this method and createAccounts into one169  createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => {  170    const createAsManyAsCan = async () => {171      let transactions: any = [];172      const accounts: IKeyringPair[] = [];173      let nonce = await this.helper.chain.getNonce(donor.address);174      const tokenNominal = this.helper.balance.getOneTokenNominal();175      for (let i = 0; i < accountsToCreate; i++) {176        if (i === 500) { // if there are too many accounts to create177          await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 178          transactions = []; //179          nonce = await this.helper.chain.getNonce(donor.address); // update nonce 180        }181        const recepient = this.helper.util.fromSeed(mnemonicGenerate());182        accounts.push(recepient);183        if (withBalance !== 0n) {184          const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);185          transactions.push(this.helper.signTransaction(donor, tx, 'account generation', {nonce}));186          nonce++;187        }188      }189      190      const fullfilledAccounts = [];191      await Promise.allSettled(transactions);192      for (const account of accounts) {193        const accountBalance = await this.helper.balance.getSubstrate(account.address);194        if (accountBalance === withBalance * tokenNominal) {195          fullfilledAccounts.push(account);196        }197      }198      return fullfilledAccounts;199    };200201    202    const crowd: IKeyringPair[] = [];203    // do up to 5 retries204    for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {205      const asManyAsCan = await createAsManyAsCan();206      crowd.push(...asManyAsCan);207      accountsToCreate -= asManyAsCan.length;208    }209210    if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);211212    return crowd;213  };214215  isDevNode = async () => {216    const block1 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(1));217    const block2 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(2));218    const findCreationDate = async (block: any) => {219      const humanBlock = block.toHuman();220      let date;221      humanBlock.block.extrinsics.forEach((ext: any) => {222        if(ext.method.section === 'timestamp') {223          date = Number(ext.method.args.now.replaceAll(',', ''));224        }225      });226      return date;227    };228    const block1date = await findCreationDate(block1);229    const block2date = await findCreationDate(block2);230    if(block2date! - block1date! < 9000) return true;231  };232}233234class WaitGroup {235  helper: UniqueHelper;236237  constructor(helper: UniqueHelper) {238    this.helper = helper;239  }240241  /**242   * Wait for specified bnumber of blocks243   * @param blocksCount number of blocks to wait244   * @returns 245   */246  async newBlocks(blocksCount = 1): Promise<void> {247    // eslint-disable-next-line no-async-promise-executor248    const promise = new Promise<void>(async (resolve) => {249      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {250        if (blocksCount > 0) {251          blocksCount--;252        } else {253          unsubscribe();254          resolve();255        }256      });257    });258    return promise;259  }260261  async forParachainBlockNumber(blockNumber: bigint) {262    // eslint-disable-next-line no-async-promise-executor263    return new Promise<void>(async (resolve) => {264      const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(async (data: any) => {265        if (data.number.toNumber() >= blockNumber) {266          unsubscribe();267          resolve();268        }269      });270    });271  }272  273  async forRelayBlockNumber(blockNumber: bigint) {274    // eslint-disable-next-line no-async-promise-executor275    return new Promise<void>(async (resolve) => {276      const unsubscribe = await this.helper.api!.query.parachainSystem.validationData(async (data: any) => {277        if (data.value.relayParentNumber.toNumber() >= blockNumber) {278          // @ts-ignore279          unsubscribe();280          resolve();281        }282      });283    });284  }285}286287class AdminGroup {288  helper: UniqueHelper;289290  constructor(helper: UniqueHelper) {291    this.helper = helper;292  }293294  async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {295    const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);296    return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {297      return {298        staker: e.event.data[0].toString(),299        stake: e.event.data[1].toBigInt(),300        payout: e.event.data[2].toBigInt(),301      };302    });303  }304}