difftreelog
Merge pull request #615 from UniqueNetwork/feature/playground-helpers
in: master
Add calculateFee method to playgrounds
3 files changed
tests/src/eth/payable.test.tsdiffbeforeafterboth--- a/tests/src/eth/payable.test.ts
+++ b/tests/src/eth/payable.test.ts
@@ -50,7 +50,7 @@
await helper.eth.transferBalanceFromSubstrate(alice, helper.address.substrateToEth(alice.address), 5n);
- await helper.eth.callEVM(alice, contract.options.address, contract.methods.giveMoney().encodeABI(), weiCount);
+ await helper.eth.sendEVM(alice, contract.options.address, contract.methods.giveMoney().encodeABI(), weiCount);
expect(await contract.methods.getCollected().call()).to.be.equal(weiCount);
});
tests/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
@@ -27,6 +27,7 @@
import refungibleAbi from '../../reFungibleAbi.json';
import refungibleTokenAbi from '../../reFungibleTokenAbi.json';
import contractHelpersAbi from './../contractHelpersAbi.json';
+import {TEthereumAccount} from '../../../util/playgrounds/types';
class EthGroupBase {
helper: EthUniqueHelper;
@@ -43,13 +44,13 @@
return {error: `File not found: ${path}`};
};
- const knownImports = {} as any;
+ const knownImports = {} as {[key: string]: string};
for(const imp of imports) {
knownImports[imp.solPath] = (await readFile(imp.fsPath)).toString();
}
return function(path: string) {
- if(knownImports.hasOwnPropertyDescriptor(path)) return {contents: knownImports[path]};
+ if(path in knownImports) return {contents: knownImports[path]};
return {error: `File not found: ${path}`};
};
}
@@ -148,7 +149,7 @@
return await this.helper.balance.transferToSubstrate(donor, evmToAddress(recepient), amount * (inTokens ? this.helper.balance.getOneTokenNominal() : 1n));
}
- async callEVM(signer: IKeyringPair, contractAddress: string, abi: any, value: string, gasLimit?: number) {
+ async sendEVM(signer: IKeyringPair, contractAddress: string, abi: string, value: string, gasLimit?: number) {
if(!gasLimit) gasLimit = this.DEFAULT_GAS;
const web3 = this.helper.getWeb3();
const gasPrice = await web3.eth.getGasPrice();
@@ -159,6 +160,10 @@
true,
);
}
+
+ async callEVM(signer: TEthereumAccount, contractAddress: string, abi: string) {
+ return await this.helper.callRpc('api.rpc.eth.call', [{from: signer, to: contractAddress, data: abi}]);
+ }
async createNonfungibleCollection(signer: string, name: string, description: string, tokenPrefix: string): Promise<{collectionId: number, collectionAddress: string}> {
const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth1// 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 wait = new WaitGroup(this.helper);126 const ss58Format = this.helper.chain.getChainProperties().ss58Format;127 const tokenNominal = this.helper.balance.getOneTokenNominal();128 const transactions = [];129 const accounts: IKeyringPair[] = [];130 for (const balance of balances) {131 const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);132 accounts.push(recipient);133 if (balance !== 0n) {134 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);135 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));136 nonce++;137 }138 }139140 await Promise.all(transactions).catch(_e => {});141 142 //#region TODO remove this region, when nonce problem will be solved143 const checkBalances = async () => {144 let isSuccess = true;145 for (let i = 0; i < balances.length; i++) {146 const balance = await this.helper.balance.getSubstrate(accounts[i].address);147 if (balance !== balances[i] * tokenNominal) {148 isSuccess = false;149 break;150 }151 }152 return isSuccess;153 };154155 let accountsCreated = false;156 // checkBalances retry up to 5 blocks157 for (let index = 0; index < 5; index++) {158 accountsCreated = await checkBalances();159 if(accountsCreated) break;160 await wait.newBlocks(1);161 }162163 if (!accountsCreated) throw Error('Accounts generation failed');164 //#endregion165166 return accounts;167 };168169 // TODO combine this method and createAccounts into one170 createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => { 171 const createAsManyAsCan = async () => {172 let transactions: any = [];173 const accounts: IKeyringPair[] = [];174 let nonce = await this.helper.chain.getNonce(donor.address);175 const tokenNominal = this.helper.balance.getOneTokenNominal();176 for (let i = 0; i < accountsToCreate; i++) {177 if (i === 500) { // if there are too many accounts to create178 await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 179 transactions = []; //180 nonce = await this.helper.chain.getNonce(donor.address); // update nonce 181 }182 const recepient = this.helper.util.fromSeed(mnemonicGenerate());183 accounts.push(recepient);184 if (withBalance !== 0n) {185 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);186 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));187 nonce++;188 }189 }190 191 const fullfilledAccounts = [];192 await Promise.allSettled(transactions);193 for (const account of accounts) {194 const accountBalance = await this.helper.balance.getSubstrate(account.address);195 if (accountBalance === withBalance * tokenNominal) {196 fullfilledAccounts.push(account);197 }198 }199 return fullfilledAccounts;200 };201202 203 const crowd: IKeyringPair[] = [];204 // do up to 5 retries205 for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {206 const asManyAsCan = await createAsManyAsCan();207 crowd.push(...asManyAsCan);208 accountsToCreate -= asManyAsCan.length;209 }210211 if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);212213 return crowd;214 };215216 isDevNode = async () => {217 const block1 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(1));218 const block2 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(2));219 const findCreationDate = async (block: any) => {220 const humanBlock = block.toHuman();221 let date;222 humanBlock.block.extrinsics.forEach((ext: any) => {223 if(ext.method.section === 'timestamp') {224 date = Number(ext.method.args.now.replaceAll(',', ''));225 }226 });227 return date;228 };229 const block1date = await findCreationDate(block1);230 const block2date = await findCreationDate(block2);231 if(block2date! - block1date! < 9000) return true;232 };233}234235class WaitGroup {236 helper: UniqueHelper;237238 constructor(helper: UniqueHelper) {239 this.helper = helper;240 }241242 /**243 * Wait for specified bnumber of blocks244 * @param blocksCount number of blocks to wait245 * @returns 246 */247 async newBlocks(blocksCount = 1): Promise<void> {248 // eslint-disable-next-line no-async-promise-executor249 const promise = new Promise<void>(async (resolve) => {250 const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {251 if (blocksCount > 0) {252 blocksCount--;253 } else {254 unsubscribe();255 resolve();256 }257 });258 });259 return promise;260 }261262 async forParachainBlockNumber(blockNumber: bigint) {263 // eslint-disable-next-line no-async-promise-executor264 return new Promise<void>(async (resolve) => {265 const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(async (data: any) => {266 if (data.number.toNumber() >= blockNumber) {267 unsubscribe();268 resolve();269 }270 });271 });272 }273 274 async forRelayBlockNumber(blockNumber: bigint) {275 // eslint-disable-next-line no-async-promise-executor276 return new Promise<void>(async (resolve) => {277 const unsubscribe = await this.helper.api!.query.parachainSystem.validationData(async (data: any) => {278 if (data.value.relayParentNumber.toNumber() >= blockNumber) {279 // @ts-ignore280 unsubscribe();281 resolve();282 }283 });284 });285 }286}287288class AdminGroup {289 helper: UniqueHelper;290291 constructor(helper: UniqueHelper) {292 this.helper = helper;293 }294295 async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {296 const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);297 return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {298 return {299 staker: e.event.data[0].toString(),300 stake: e.event.data[1].toBigInt(),301 payout: e.event.data[2].toBigInt(),302 };303 });304 }305}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';9import {ICrossAccountId} from './types';101112export class SilentLogger {13 log(_msg: any, _level: any): void { }14 level = {15 ERROR: 'ERROR' as const,16 WARNING: 'WARNING' as const,17 INFO: 'INFO' as const,18 };19}2021export class SilentConsole {22 // TODO: Remove, this is temporary: Filter unneeded API output23 // (Jaco promised it will be removed in the next version)24 consoleErr: any;25 consoleLog: any;26 consoleWarn: any;2728 constructor() {29 this.consoleErr = console.error;30 this.consoleLog = console.log;31 this.consoleWarn = console.warn;32 }3334 enable() { 35 const outFn = (printer: any) => (...args: any[]) => {36 for (const arg of args) {37 if (typeof arg !== 'string')38 continue;39 if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')40 return;41 }42 printer(...args);43 };44 45 console.error = outFn(this.consoleErr.bind(console));46 console.log = outFn(this.consoleLog.bind(console));47 console.warn = outFn(this.consoleWarn.bind(console));48 }4950 disable() {51 console.error = this.consoleErr;52 console.log = this.consoleLog;53 console.warn = this.consoleWarn;54 }55}565758export class DevUniqueHelper extends UniqueHelper {59 /**60 * Arrange methods for tests61 */62 arrange: ArrangeGroup;63 wait: WaitGroup;64 admin: AdminGroup;6566 constructor(logger: { log: (msg: any, level: any) => void, level: any }) {67 super(logger);68 this.arrange = new ArrangeGroup(this);69 this.wait = new WaitGroup(this);70 this.admin = new AdminGroup(this);71 }7273 async connect(wsEndpoint: string, _listeners?: any): Promise<void> {74 const wsProvider = new WsProvider(wsEndpoint);75 this.api = new ApiPromise({76 provider: wsProvider,77 signedExtensions: {78 ContractHelpers: {79 extrinsic: {},80 payload: {},81 },82 FakeTransactionFinalizer: {83 extrinsic: {},84 payload: {},85 },86 },87 rpc: {88 unique: defs.unique.rpc,89 appPromotion: defs.appPromotion.rpc,90 rmrk: defs.rmrk.rpc,91 eth: {92 feeHistory: {93 description: 'Dummy',94 params: [],95 type: 'u8',96 },97 maxPriorityFeePerGas: {98 description: 'Dummy',99 params: [],100 type: 'u8',101 },102 },103 },104 });105 await this.api.isReadyOrError;106 this.network = await UniqueHelper.detectNetwork(this.api);107 }108}109110class ArrangeGroup {111 helper: UniqueHelper;112113 constructor(helper: UniqueHelper) {114 this.helper = helper;115 }116117 /**118 * Generates accounts with the specified UNQ token balance 119 * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.120 * @param donor donor account for balances121 * @returns array of newly created accounts122 * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor); 123 */124 createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {125 let nonce = await this.helper.chain.getNonce(donor.address);126 const wait = new WaitGroup(this.helper);127 const ss58Format = this.helper.chain.getChainProperties().ss58Format;128 const tokenNominal = this.helper.balance.getOneTokenNominal();129 const transactions = [];130 const accounts: IKeyringPair[] = [];131 for (const balance of balances) {132 const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);133 accounts.push(recipient);134 if (balance !== 0n) {135 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);136 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));137 nonce++;138 }139 }140141 await Promise.all(transactions).catch(_e => {});142 143 //#region TODO remove this region, when nonce problem will be solved144 const checkBalances = async () => {145 let isSuccess = true;146 for (let i = 0; i < balances.length; i++) {147 const balance = await this.helper.balance.getSubstrate(accounts[i].address);148 if (balance !== balances[i] * tokenNominal) {149 isSuccess = false;150 break;151 }152 }153 return isSuccess;154 };155156 let accountsCreated = false;157 // checkBalances retry up to 5 blocks158 for (let index = 0; index < 5; index++) {159 accountsCreated = await checkBalances();160 if(accountsCreated) break;161 await wait.newBlocks(1);162 }163164 if (!accountsCreated) throw Error('Accounts generation failed');165 //#endregion166167 return accounts;168 };169170 // TODO combine this method and createAccounts into one171 createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => { 172 const createAsManyAsCan = async () => {173 let transactions: any = [];174 const accounts: IKeyringPair[] = [];175 let nonce = await this.helper.chain.getNonce(donor.address);176 const tokenNominal = this.helper.balance.getOneTokenNominal();177 for (let i = 0; i < accountsToCreate; i++) {178 if (i === 500) { // if there are too many accounts to create179 await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled 180 transactions = []; //181 nonce = await this.helper.chain.getNonce(donor.address); // update nonce 182 }183 const recepient = this.helper.util.fromSeed(mnemonicGenerate());184 accounts.push(recepient);185 if (withBalance !== 0n) {186 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recepient.address}, withBalance * tokenNominal]);187 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));188 nonce++;189 }190 }191 192 const fullfilledAccounts = [];193 await Promise.allSettled(transactions);194 for (const account of accounts) {195 const accountBalance = await this.helper.balance.getSubstrate(account.address);196 if (accountBalance === withBalance * tokenNominal) {197 fullfilledAccounts.push(account);198 }199 }200 return fullfilledAccounts;201 };202203 204 const crowd: IKeyringPair[] = [];205 // do up to 5 retries206 for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {207 const asManyAsCan = await createAsManyAsCan();208 crowd.push(...asManyAsCan);209 accountsToCreate -= asManyAsCan.length;210 }211212 if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);213214 return crowd;215 };216217 isDevNode = async () => {218 const block1 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(1));219 const block2 = await this.helper.api?.rpc.chain.getBlock(await this.helper.api?.rpc.chain.getBlockHash(2));220 const findCreationDate = async (block: any) => {221 const humanBlock = block.toHuman();222 let date;223 humanBlock.block.extrinsics.forEach((ext: any) => {224 if(ext.method.section === 'timestamp') {225 date = Number(ext.method.args.now.replaceAll(',', ''));226 }227 });228 return date;229 };230 const block1date = await findCreationDate(block1);231 const block2date = await findCreationDate(block2);232 if(block2date! - block1date! < 9000) return true;233 };234 235 async calculcateFee(payer: ICrossAccountId, promise: () => Promise<any>): Promise<bigint> {236 const address = payer.Substrate ? payer.Substrate : await this.helper.address.ethToSubstrate(payer.Ethereum!);237 let balance = await this.helper.balance.getSubstrate(address); 238 239 await promise();240 241 balance -= await this.helper.balance.getSubstrate(address);242 243 return balance;244 }245}246247class WaitGroup {248 helper: UniqueHelper;249250 constructor(helper: UniqueHelper) {251 this.helper = helper;252 }253254 /**255 * Wait for specified bnumber of blocks256 * @param blocksCount number of blocks to wait257 * @returns 258 */259 async newBlocks(blocksCount = 1): Promise<void> {260 // eslint-disable-next-line no-async-promise-executor261 const promise = new Promise<void>(async (resolve) => {262 const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(() => {263 if (blocksCount > 0) {264 blocksCount--;265 } else {266 unsubscribe();267 resolve();268 }269 });270 });271 return promise;272 }273274 async forParachainBlockNumber(blockNumber: bigint) {275 // eslint-disable-next-line no-async-promise-executor276 return new Promise<void>(async (resolve) => {277 const unsubscribe = await this.helper.api!.rpc.chain.subscribeNewHeads(async (data: any) => {278 if (data.number.toNumber() >= blockNumber) {279 unsubscribe();280 resolve();281 }282 });283 });284 }285 286 async forRelayBlockNumber(blockNumber: bigint) {287 // eslint-disable-next-line no-async-promise-executor288 return new Promise<void>(async (resolve) => {289 const unsubscribe = await this.helper.api!.query.parachainSystem.validationData(async (data: any) => {290 if (data.value.relayParentNumber.toNumber() >= blockNumber) {291 // @ts-ignore292 unsubscribe();293 resolve();294 }295 });296 });297 }298}299300class AdminGroup {301 helper: UniqueHelper;302303 constructor(helper: UniqueHelper) {304 this.helper = helper;305 }306307 async payoutStakers(signer: IKeyringPair, stakersToPayout: number) {308 const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);309 return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {310 return {311 staker: e.event.data[0].toString(),312 stake: e.event.data[1].toBigInt(),313 payout: e.event.data[2].toBigInt(),314 };315 });316 }317}