git.delta.rocks / unique-network / refs/commits / 32c79dfc15ed

difftreelog

Increase app-promotion periods for full node

Max Andreev2022-12-16parent: #4b5ba1b.patch.diff
in: master
It works fine on dev node but fails on regular

3 files changed

modifiedtests/src/app-promotion.test.tsdiffbeforeafterboth
--- a/tests/src/app-promotion.test.ts
+++ b/tests/src/app-promotion.test.ts
@@ -15,7 +15,9 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 import {IKeyringPair} from '@polkadot/types/types';
-import {itSub, usingPlaygrounds, Pallets, requirePalletsOrSkip} from './util';
+import {
+  itSub, usingPlaygrounds, Pallets, requirePalletsOrSkip, LOCKING_PERIOD, UNLOCKING_PERIOD,
+} from './util';
 import {DevUniqueHelper} from './util/playgrounds/unique.dev';
 import {itEth, expect, SponsoringMode} from './eth/util';
 
@@ -24,8 +26,9 @@
 let nominal: bigint;
 let palletAddress: string;
 let accounts: IKeyringPair[];
-const LOCKING_PERIOD = 8n; // 8 blocks of relay
-const UNLOCKING_PERIOD = 4n; // 4 blocks of parachain
+// App promotion periods:
+// LOCKING_PERIOD = 12n; // 8 blocks of relay
+// UNLOCKING_PERIOD = 6n; // 4 blocks of parachain
 
 describe('App promotion', () => {
   before(async function () {
@@ -192,7 +195,7 @@
       expect(await helper.staking.getTotalStaked({Substrate: staker.address})).to.be.equal(0n);
     });
   
-    itSub('should keep different unlocking block for each unlocking stake', async ({helper}) => {
+    itSub('should keep different unlocking block for each unlocking stake', async ({ helper }) => {
       const staker = accounts.pop()!;
       await helper.staking.stake(staker, 100n * nominal);
       await helper.staking.unstake(staker);
modifiedtests/src/util/globalSetup.tsdiffbeforeafterboth
before · tests/src/util/globalSetup.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND} from './index';5import * as path from 'path';6import {promises as fs} from 'fs';78// This function should be called before running test suites.9const globalSetup = async (): Promise<void> => {10  await usingPlaygrounds(async (helper, privateKey) => {11    try {12      // 1. Wait node producing blocks13      await helper.wait.newBlocks(1, 600_000);1415      // 2. Create donors for test files16      await fundFilenamesWithRetries(3)17        .then((result) => {18          if (!result) Promise.reject();19        });2021      // 3. Configure App Promotion 22      const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);23      if (missingPallets.length === 0) {24        // TODO: move to config file25        const LOCKING_PERIOD = 8n; // 8 blocks of relay26        const UNLOCKING_PERIOD = 4n; // 4 blocks of parachain2728        const superuser = await privateKey('//Alice');29        const palletAddress = helper.arrange.calculatePalletAddress('appstake');30        const palletAdmin = await privateKey('//PromotionAdmin');31        const api = helper.getApi();32        await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));33        const nominal = helper.balance.getOneTokenNominal();34        await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 1000n * nominal);35        await helper.balance.transferToSubstrate(superuser, palletAddress, 1000n * nominal);36        await helper.executeExtrinsic(superuser, 'api.tx.sudo.sudo', [api.tx.configuration37          .setAppPromotionConfigurationOverride({38            recalculationInterval: LOCKING_PERIOD,39            pendingInterval: UNLOCKING_PERIOD})], true);40      }41    } catch (error) {42      console.error(error);43      Promise.reject();44    }45  });46};4748async function getFiles(rootPath: string): Promise<string[]> {49  const files = await fs.readdir(rootPath, {withFileTypes: true});50  const filenames: string[] = [];51  for (const entry of files) {52    const res = path.resolve(rootPath, entry.name);53    if (entry.isDirectory()) {54      filenames.push(...await getFiles(res));55    } else {56      filenames.push(res);57    }58  }59  return filenames;60}6162const fundFilenames = async () => {63  await usingPlaygrounds(async (helper, privateKey) => {64    const oneToken = helper.balance.getOneTokenNominal();65    const alice = await privateKey('//Alice');66    const nonce = await helper.chain.getNonce(alice.address);67    const filenames = await getFiles(path.resolve(__dirname, '..'));6869    // batching is actually undesireable, it takes away the time while all the transactions actually succeed70    const batchSize = 300;71    let balanceGrantedCounter = 0;72    for (let b = 0; b < filenames.length; b += batchSize) {73      const tx = [];74      let batchBalanceGrantedCounter = 0;75      for (let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {76        const f = filenames[b + i];77        if (!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;78        const account = await privateKey({filename: f, ignoreFundsPresence: true});79        const aliceBalance = await helper.balance.getSubstrate(account.address);8081        if (aliceBalance < MINIMUM_DONOR_FUND * oneToken) {82          tx.push(helper.executeExtrinsic(83            alice, 84            'api.tx.balances.transfer',85            [account.address, DONOR_FUNDING * oneToken],86            true,87            {nonce: nonce + balanceGrantedCounter++},88          ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));89          batchBalanceGrantedCounter++;90        }91      }9293      if(tx.length > 0) {94        console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);95        const result = await Promise.all(tx);96        if (result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');97      }98    }99100    if (balanceGrantedCounter == 0) console.log('No account needs additional funding.');101  });102};103104const fundFilenamesWithRetries = (retriesLeft: number): Promise<boolean> => {105  if (retriesLeft <= 0) return Promise.resolve(false);106  return fundFilenames()107    .then(() => Promise.resolve(true))108    .catch(e => {109      console.error(e);110      console.error(`Some transactions might have failed. ${retriesLeft > 1 ? 'Retrying...' : 'Something is wrong.'}\n`);111      return fundFilenamesWithRetries(--retriesLeft);112    });113};114115globalSetup().catch(() => process.exit(1));
after · tests/src/util/globalSetup.ts
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {5  usingPlaygrounds, Pallets, DONOR_FUNDING, MINIMUM_DONOR_FUND, LOCKING_PERIOD, UNLOCKING_PERIOD,6} from './index';7import * as path from 'path';8import {promises as fs} from 'fs';910// This function should be called before running test suites.11const globalSetup = async (): Promise<void> => {12  await usingPlaygrounds(async (helper, privateKey) => {13    try {14      // 1. Wait node producing blocks15      await helper.wait.newBlocks(1, 600_000);1617      // 2. Create donors for test files18      await fundFilenamesWithRetries(3)19        .then((result) => {20          if (!result) Promise.reject();21        });2223      // 3. Configure App Promotion 24      const missingPallets = helper.fetchMissingPalletNames([Pallets.AppPromotion]);25      if (missingPallets.length === 0) {26        const superuser = await privateKey('//Alice');27        const palletAddress = helper.arrange.calculatePalletAddress('appstake');28        const palletAdmin = await privateKey('//PromotionAdmin');29        const api = helper.getApi();30        await helper.signTransaction(superuser, api.tx.sudo.sudo(api.tx.appPromotion.setAdminAddress({Substrate: palletAdmin.address})));31        const nominal = helper.balance.getOneTokenNominal();32        await helper.balance.transferToSubstrate(superuser, palletAdmin.address, 1000n * nominal);33        await helper.balance.transferToSubstrate(superuser, palletAddress, 1000n * nominal);34        await helper.executeExtrinsic(superuser, 'api.tx.sudo.sudo', [api.tx.configuration35          .setAppPromotionConfigurationOverride({36            recalculationInterval: LOCKING_PERIOD,37            pendingInterval: UNLOCKING_PERIOD})], true);38      }39    } catch (error) {40      console.error(error);41      Promise.reject();42    }43  });44};4546async function getFiles(rootPath: string): Promise<string[]> {47  const files = await fs.readdir(rootPath, {withFileTypes: true});48  const filenames: string[] = [];49  for (const entry of files) {50    const res = path.resolve(rootPath, entry.name);51    if (entry.isDirectory()) {52      filenames.push(...await getFiles(res));53    } else {54      filenames.push(res);55    }56  }57  return filenames;58}5960const fundFilenames = async () => {61  await usingPlaygrounds(async (helper, privateKey) => {62    const oneToken = helper.balance.getOneTokenNominal();63    const alice = await privateKey('//Alice');64    const nonce = await helper.chain.getNonce(alice.address);65    const filenames = await getFiles(path.resolve(__dirname, '..'));6667    // batching is actually undesireable, it takes away the time while all the transactions actually succeed68    const batchSize = 300;69    let balanceGrantedCounter = 0;70    for (let b = 0; b < filenames.length; b += batchSize) {71      const tx = [];72      let batchBalanceGrantedCounter = 0;73      for (let i = 0; batchBalanceGrantedCounter < batchSize && b + i < filenames.length; i++) {74        const f = filenames[b + i];75        if (!f.endsWith('.test.ts') && !f.endsWith('seqtest.ts') || f.includes('.outdated')) continue;76        const account = await privateKey({filename: f, ignoreFundsPresence: true});77        const aliceBalance = await helper.balance.getSubstrate(account.address);7879        if (aliceBalance < MINIMUM_DONOR_FUND * oneToken) {80          tx.push(helper.executeExtrinsic(81            alice, 82            'api.tx.balances.transfer',83            [account.address, DONOR_FUNDING * oneToken],84            true,85            {nonce: nonce + balanceGrantedCounter++},86          ).then(() => true).catch(() => {console.error(`Transaction to ${path.basename(f)} registered as failed. Strange.`); return false;}));87          batchBalanceGrantedCounter++;88        }89      }9091      if(tx.length > 0) {92        console.log(`Granting funds to ${batchBalanceGrantedCounter} filename accounts.`);93        const result = await Promise.all(tx);94        if (result && result.lastIndexOf(false) > -1) throw new Error('The transactions actually probably succeeded, should check the balances.');95      }96    }9798    if (balanceGrantedCounter == 0) console.log('No account needs additional funding.');99  });100};101102const fundFilenamesWithRetries = (retriesLeft: number): Promise<boolean> => {103  if (retriesLeft <= 0) return Promise.resolve(false);104  return fundFilenames()105    .then(() => Promise.resolve(true))106    .catch(e => {107      console.error(e);108      console.error(`Some transactions might have failed. ${retriesLeft > 1 ? 'Retrying...' : 'Something is wrong.'}\n`);109      return fundFilenamesWithRetries(--retriesLeft);110    });111};112113globalSetup().catch(() => process.exit(1));
modifiedtests/src/util/index.tsdiffbeforeafterboth
--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -86,6 +86,11 @@
 export const MINIMUM_DONOR_FUND = 100_000n;
 export const DONOR_FUNDING = 1_000_000n;
 
+// App-promotion periods:
+export const LOCKING_PERIOD = 12n; // 8 blocks of relay
+export const UNLOCKING_PERIOD = 6n; // 4 blocks of parachain
+
+
 export enum Pallets {
   Inflation = 'inflation',
   RmrkCore = 'rmrkcore',