difftreelog
Fixes after review
in: master
6 files changed
.docker/xcm-config/launch-config-xcm-quartz.j2diffbeforeafterboth--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -169,7 +169,7 @@
{
"bin": "/astar/target/release/astar",
"id": "2007",
- "chain": "astar-dev",
+ "chain": "shiden-dev",
"balance": "1000000000000000000000000",
"nodes": [
{
@@ -224,12 +224,12 @@
},
{
"sender": 2007,
- "recipient": 1000,
+ "recipient": 2095,
"maxCapacity": 8,
"maxMessageSize": 512
},
{
- "sender": 1000,
+ "sender": 2095,
"recipient": 2007,
"maxCapacity": 8,
"maxMessageSize": 512
.docker/xcm-config/launch-config-xcm-unique.j2diffbeforeafterboth--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -224,12 +224,12 @@
},
{
"sender": 2006,
- "recipient": 1000,
+ "recipient": 2037,
"maxCapacity": 8,
"maxMessageSize": 512
},
{
- "sender": 1000,
+ "sender": 2037,
"recipient": 2006,
"maxCapacity": 8,
"maxMessageSize": 512
tests/src/util/index.tsdiffbeforeafterboth--- a/tests/src/util/index.ts
+++ b/tests/src/util/index.ts
@@ -11,7 +11,7 @@
import config from '../config';
import {ChainHelperBase} from './playgrounds/unique';
import {ILogger} from './playgrounds/types';
-import {DevUniqueHelper, SilentLogger, SilentConsole, DevMoonbeamHelper, DevMoonriverHelper, DevAcalaHelper, DevKaruraHelper, DevRelayHelper, DevWestmintHelper, DevStatemineHelper, DevStatemintHelper, DevAstarHelper} from './playgrounds/unique.dev';
+import {DevUniqueHelper, SilentLogger, SilentConsole, DevMoonbeamHelper, DevMoonriverHelper, DevAcalaHelper, DevKaruraHelper, DevRelayHelper, DevWestmintHelper, DevStatemineHelper, DevStatemintHelper, DevAstarHelper, DevShidenHelper} from './playgrounds/unique.dev';
import {dirname} from 'path';
import {fileURLToPath} from 'url';
@@ -105,6 +105,9 @@
return usingPlaygroundsGeneral<DevAstarHelper>(DevAstarHelper, url, code);
};
+export const usingShidenPlaygrounds = (url: string, code: (helper: DevShidenHelper, privateKey: (seed: string) => Promise<IKeyringPair>) => Promise<void>) => {
+ return usingPlaygroundsGeneral<DevShidenHelper>(DevShidenHelper, url, code);
+};
export const MINIMUM_DONOR_FUND = 100_000n;
export const DONOR_FUNDING = 2_000_000n;
tests/src/util/playgrounds/unique.dev.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// SPDX-License-Identifier: Apache-2.034import {stringToU8a} from '@polkadot/util';5import {encodeAddress, mnemonicGenerate} from '@polkadot/util-crypto';6import {UniqueHelper, MoonbeamHelper, ChainHelperBase, AcalaHelper, RelayHelper, WestmintHelper, AstarHelper} from './unique';7import {ApiPromise, Keyring, WsProvider} from '@polkadot/api';8import * as defs from '../../interfaces/definitions';9import {IKeyringPair} from '@polkadot/types/types';10import {EventRecord} from '@polkadot/types/interfaces';11import {ICrossAccountId, IPovInfo, TSigner} from './types';12import {FrameSystemEventRecord} from '@polkadot/types/lookup';13import {VoidFn} from '@polkadot/api/types';14import {Pallets} from '..';15import {spawnSync} from 'child_process';1617export class SilentLogger {18 log(_msg: any, _level: any): void { }19 level = {20 ERROR: 'ERROR' as const,21 WARNING: 'WARNING' as const,22 INFO: 'INFO' as const,23 };24}2526export class SilentConsole {27 // TODO: Remove, this is temporary: Filter unneeded API output28 // (Jaco promised it will be removed in the next version)29 consoleErr: any;30 consoleLog: any;31 consoleWarn: any;3233 constructor() {34 this.consoleErr = console.error;35 this.consoleLog = console.log;36 this.consoleWarn = console.warn;37 }3839 enable() {40 const outFn = (printer: any) => (...args: any[]) => {41 for (const arg of args) {42 if (typeof arg !== 'string')43 continue;44 if (arg.includes('1000:: Normal connection closure') || arg.includes('Not decorating unknown runtime apis:') || arg.includes('RPC methods not decorated:') || arg === 'Normal connection closure')45 return;46 }47 printer(...args);48 };4950 console.error = outFn(this.consoleErr.bind(console));51 console.log = outFn(this.consoleLog.bind(console));52 console.warn = outFn(this.consoleWarn.bind(console));53 }5455 disable() {56 console.error = this.consoleErr;57 console.log = this.consoleLog;58 console.warn = this.consoleWarn;59 }60}6162export class DevUniqueHelper extends UniqueHelper {63 /**64 * Arrange methods for tests65 */66 arrange: ArrangeGroup;67 wait: WaitGroup;68 admin: AdminGroup;69 session: SessionGroup;70 testUtils: TestUtilGroup;7172 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {73 options.helperBase = options.helperBase ?? DevUniqueHelper;7475 super(logger, options);76 this.arrange = new ArrangeGroup(this);77 this.wait = new WaitGroup(this);78 this.admin = new AdminGroup(this);79 this.testUtils = new TestUtilGroup(this);80 this.session = new SessionGroup(this);81 }8283 async connect(wsEndpoint: string, _listeners?: any): Promise<void> {84 const wsProvider = new WsProvider(wsEndpoint);85 this.api = new ApiPromise({86 provider: wsProvider,87 signedExtensions: {88 ContractHelpers: {89 extrinsic: {},90 payload: {},91 },92 CheckMaintenance: {93 extrinsic: {},94 payload: {},95 },96 DisableIdentityCalls: {97 extrinsic: {},98 payload: {},99 },100 FakeTransactionFinalizer: {101 extrinsic: {},102 payload: {},103 },104 },105 rpc: {106 unique: defs.unique.rpc,107 appPromotion: defs.appPromotion.rpc,108 povinfo: defs.povinfo.rpc,109 eth: {110 feeHistory: {111 description: 'Dummy',112 params: [],113 type: 'u8',114 },115 maxPriorityFeePerGas: {116 description: 'Dummy',117 params: [],118 type: 'u8',119 },120 },121 },122 });123 await this.api.isReadyOrError;124 this.network = await UniqueHelper.detectNetwork(this.api);125 this.wsEndpoint = wsEndpoint;126 }127}128129export class DevRelayHelper extends RelayHelper {130 wait: WaitGroup;131132 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {133 options.helperBase = options.helperBase ?? DevRelayHelper;134135 super(logger, options);136 this.wait = new WaitGroup(this);137 }138}139140export class DevWestmintHelper extends WestmintHelper {141 wait: WaitGroup;142143 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {144 options.helperBase = options.helperBase ?? DevWestmintHelper;145146 super(logger, options);147 this.wait = new WaitGroup(this);148 }149}150151export class DevStatemineHelper extends DevWestmintHelper {}152153export class DevStatemintHelper extends DevWestmintHelper {}154155export class DevMoonbeamHelper extends MoonbeamHelper {156 account: MoonbeamAccountGroup;157 wait: WaitGroup;158159 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {160 options.helperBase = options.helperBase ?? DevMoonbeamHelper;161 options.notePreimagePallet = options.notePreimagePallet ?? 'preimage';162163 super(logger, options);164 this.account = new MoonbeamAccountGroup(this);165 this.wait = new WaitGroup(this);166 }167}168169export class DevMoonriverHelper extends DevMoonbeamHelper {170 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {171 options.notePreimagePallet = options.notePreimagePallet ?? 'preimage';172 super(logger, options);173 }174}175176export class DevAstarHelper extends AstarHelper {177 wait: WaitGroup;178179 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {180 options.helperBase = options.helperBase ?? DevAstarHelper;181182 super(logger, options);183 this.wait = new WaitGroup(this);184 }185}186187export class DevAcalaHelper extends AcalaHelper {188 wait: WaitGroup;189190 constructor(logger: { log: (msg: any, level: any) => void, level: any }, options: {[key: string]: any} = {}) {191 options.helperBase = options.helperBase ?? DevAcalaHelper;192193 super(logger, options);194 this.wait = new WaitGroup(this);195 }196}197198export class DevKaruraHelper extends DevAcalaHelper {}199200export class ArrangeGroup {201 helper: DevUniqueHelper;202203 scheduledIdSlider = 0;204205 constructor(helper: DevUniqueHelper) {206 this.helper = helper;207 }208209 /**210 * Generates accounts with the specified UNQ token balance211 * @param balances balances for generated accounts. Each balance will be multiplied by the token nominal.212 * @param donor donor account for balances213 * @returns array of newly created accounts214 * @example const [acc1, acc2, acc3] = await createAccounts([0n, 10n, 20n], donor);215 */216 createAccounts = async (balances: bigint[], donor: IKeyringPair): Promise<IKeyringPair[]> => {217 let nonce = await this.helper.chain.getNonce(donor.address);218 const wait = new WaitGroup(this.helper);219 const ss58Format = this.helper.chain.getChainProperties().ss58Format;220 const tokenNominal = this.helper.balance.getOneTokenNominal();221 const transactions = [];222 const accounts: IKeyringPair[] = [];223 for (const balance of balances) {224 const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);225 accounts.push(recipient);226 if (balance !== 0n) {227 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, balance * tokenNominal]);228 transactions.push(this.helper.signTransaction(donor, tx, {nonce, era: 0}, 'account generation'));229 nonce++;230 }231 }232233 await Promise.all(transactions).catch(_e => {});234235 //#region TODO remove this region, when nonce problem will be solved236 const checkBalances = async () => {237 let isSuccess = true;238 for (let i = 0; i < balances.length; i++) {239 const balance = await this.helper.balance.getSubstrate(accounts[i].address);240 if (balance !== balances[i] * tokenNominal) {241 isSuccess = false;242 break;243 }244 }245 return isSuccess;246 };247248 let accountsCreated = false;249 const maxBlocksChecked = await this.helper.arrange.isDevNode() ? 50 : 5;250 // checkBalances retry up to 5-50 blocks251 for (let index = 0; index < maxBlocksChecked; index++) {252 accountsCreated = await checkBalances();253 if(accountsCreated) break;254 await wait.newBlocks(1);255 }256257 if (!accountsCreated) throw Error('Accounts generation failed');258 //#endregion259260 return accounts;261 };262263 // TODO combine this method and createAccounts into one264 createCrowd = async (accountsToCreate: number, withBalance: bigint, donor: IKeyringPair): Promise<IKeyringPair[]> => {265 const createAsManyAsCan = async () => {266 let transactions: any = [];267 const accounts: IKeyringPair[] = [];268 let nonce = await this.helper.chain.getNonce(donor.address);269 const tokenNominal = this.helper.balance.getOneTokenNominal();270 const ss58Format = this.helper.chain.getChainProperties().ss58Format;271 for (let i = 0; i < accountsToCreate; i++) {272 if (i === 500) { // if there are too many accounts to create273 await Promise.allSettled(transactions); // wait while first 500 (should be 100 for devnode) tx will be settled274 transactions = []; //275 nonce = await this.helper.chain.getNonce(donor.address); // update nonce276 }277 const recipient = this.helper.util.fromSeed(mnemonicGenerate(), ss58Format);278 accounts.push(recipient);279 if (withBalance !== 0n) {280 const tx = this.helper.constructApiCall('api.tx.balances.transfer', [{Id: recipient.address}, withBalance * tokenNominal]);281 transactions.push(this.helper.signTransaction(donor, tx, {nonce}, 'account generation'));282 nonce++;283 }284 }285286 const fullfilledAccounts = [];287 await Promise.allSettled(transactions);288 for (const account of accounts) {289 const accountBalance = await this.helper.balance.getSubstrate(account.address);290 if (accountBalance === withBalance * tokenNominal) {291 fullfilledAccounts.push(account);292 }293 }294 return fullfilledAccounts;295 };296297298 const crowd: IKeyringPair[] = [];299 // do up to 5 retries300 for (let index = 0; index < 5 && accountsToCreate !== 0; index++) {301 const asManyAsCan = await createAsManyAsCan();302 crowd.push(...asManyAsCan);303 accountsToCreate -= asManyAsCan.length;304 }305306 if (accountsToCreate !== 0) throw Error(`Crowd generation failed: ${accountsToCreate} accounts left`);307308 return crowd;309 };310311 isDevNode = async () => {312 let blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();313 if (blockNumber == 0) {314 await this.helper.wait.newBlocks(1);315 blockNumber = (await this.helper.callRpc('api.query.system.number')).toJSON();316 }317 const block2 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber])]);318 const block1 = await this.helper.callRpc('api.rpc.chain.getBlock', [await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockNumber - 1])]);319 const findCreationDate = (block: any) => {320 const humanBlock = block.toHuman();321 let date;322 humanBlock.block.extrinsics.forEach((ext: any) => {323 if(ext.method.section === 'timestamp') {324 date = Number(ext.method.args.now.replaceAll(',', ''));325 }326 });327 return date;328 };329 const block1date = await findCreationDate(block1);330 const block2date = await findCreationDate(block2);331 if(block2date! - block1date! < 9000) return true;332 };333334 async calculcateFee(payer: ICrossAccountId, promise: () => Promise<any>): Promise<bigint> {335 const address = payer.Substrate ? payer.Substrate : this.helper.address.ethToSubstrate(payer.Ethereum!);336 let balance = await this.helper.balance.getSubstrate(address);337338 await promise();339340 balance -= await this.helper.balance.getSubstrate(address);341342 return balance;343 }344345 async calculatePoVInfo(txs: any[]): Promise<IPovInfo> {346 const rawPovInfo = await this.helper.callRpc('api.rpc.povinfo.estimateExtrinsicPoV', [txs]);347348 const kvJson: {[key: string]: string} = {};349350 for (const kv of rawPovInfo.keyValues) {351 kvJson[kv.key.toHex()] = kv.value.toHex();352 }353354 const kvStr = JSON.stringify(kvJson);355356 const chainql = spawnSync(357 'chainql',358 [359 `--tla-code=data=${kvStr}`,360 '-e', `function(data) cql.dump(cql.chain("${this.helper.getEndpoint()}").latest._meta, data, {omit_empty:true})`,361 ],362 );363364 if (!chainql.stdout) {365 throw Error('unable to get an output from the `chainql`');366 }367368 return {369 proofSize: rawPovInfo.proofSize.toNumber(),370 compactProofSize: rawPovInfo.compactProofSize.toNumber(),371 compressedProofSize: rawPovInfo.compressedProofSize.toNumber(),372 results: rawPovInfo.results,373 kv: JSON.parse(chainql.stdout.toString()),374 };375 }376377 calculatePalletAddress(palletId: any) {378 const address = stringToU8a(('modl' + palletId).padEnd(32, '\0'));379 return encodeAddress(address, this.helper.chain.getChainProperties().ss58Format);380 }381382 makeScheduledIds(num: number): string[] {383 function makeId(slider: number) {384 const scheduledIdSize = 64;385 const hexId = slider.toString(16);386 const prefixSize = scheduledIdSize - hexId.length;387388 const scheduledId = '0x' + '0'.repeat(prefixSize) + hexId;389390 return scheduledId;391 }392393 const ids = [];394 for (let i = 0; i < num; i++) {395 ids.push(makeId(this.scheduledIdSlider));396 this.scheduledIdSlider += 1;397 }398399 return ids;400 }401402 makeScheduledId(): string {403 return (this.makeScheduledIds(1))[0];404 }405406 async captureEvents(eventSection: string, eventMethod: string): Promise<EventCapture> {407 const capture = new EventCapture(this.helper, eventSection, eventMethod);408 await capture.startCapture();409410 return capture;411 }412}413414class MoonbeamAccountGroup {415 helper: MoonbeamHelper;416417 keyring: Keyring;418 _alithAccount: IKeyringPair;419 _baltatharAccount: IKeyringPair;420 _dorothyAccount: IKeyringPair;421422 constructor(helper: MoonbeamHelper) {423 this.helper = helper;424425 this.keyring = new Keyring({type: 'ethereum'});426 const alithPrivateKey = '0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133';427 const baltatharPrivateKey = '0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b';428 const dorothyPrivateKey = '0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68';429430 this._alithAccount = this.keyring.addFromUri(alithPrivateKey, undefined, 'ethereum');431 this._baltatharAccount = this.keyring.addFromUri(baltatharPrivateKey, undefined, 'ethereum');432 this._dorothyAccount = this.keyring.addFromUri(dorothyPrivateKey, undefined, 'ethereum');433 }434435 alithAccount() {436 return this._alithAccount;437 }438439 baltatharAccount() {440 return this._baltatharAccount;441 }442443 dorothyAccount() {444 return this._dorothyAccount;445 }446447 create() {448 return this.keyring.addFromUri(mnemonicGenerate());449 }450}451452class WaitGroup {453 helper: ChainHelperBase;454455 constructor(helper: ChainHelperBase) {456 this.helper = helper;457 }458459 sleep(milliseconds: number) {460 return new Promise((resolve) => setTimeout(resolve, milliseconds));461 }462463 private async waitWithTimeout(promise: Promise<any>, timeout: number) {464 let isBlock = false;465 promise.then(() => isBlock = true).catch(() => isBlock = true);466 let totalTime = 0;467 const step = 100;468 while(!isBlock) {469 await this.sleep(step);470 totalTime += step;471 if(totalTime >= timeout) throw Error('Blocks production failed');472 }473 return promise;474 }475476 /**477 * Launch some async operation, or throw an error after some time. Note that it will still continue executing after the timeout.478 * @param promise async operation to race against the timeout479 * @param timeoutMS time after which to time out480 * @param timeoutError error message to throw481 * @returns promise of the same type the operation had482 */483 withTimeout<T>(484 promise: Promise<T>,485 timeoutMS = 30000,486 timeoutError = 'The operation has timed out!',487 ): Promise<T> {488 const timeout = new Promise<never>((_, reject) => {489 setTimeout(() => {490 reject(new Error(timeoutError));491 }, timeoutMS);492 });493494 return Promise.race<T>([promise, timeout]).catch(e => {throw new Error(e);});495 }496497 /**498 * Wait for specified number of blocks499 * @param blocksCount number of blocks to wait500 * @returns501 */502 async newBlocks(blocksCount = 1, timeout?: number): Promise<void> {503 timeout = timeout ?? blocksCount * 60_000;504 // eslint-disable-next-line no-async-promise-executor505 const promise = new Promise<void>(async (resolve) => {506 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(() => {507 if (blocksCount > 0) {508 blocksCount--;509 } else {510 unsubscribe();511 resolve();512 }513 });514 });515 await this.waitWithTimeout(promise, timeout);516 return promise;517 }518519 /**520 * Wait for the specified number of sessions to pass.521 * Only applicable if the Session pallet is turned on.522 * @param sessionCount number of sessions to wait523 * @param blockTimeout time in ms until panicking that the chain has stopped producing blocks524 * @returns525 */526 async newSessions(sessionCount = 1, blockTimeout = 60000): Promise<void> {527 console.log(`Waiting for ${sessionCount} new session${sessionCount>1's'''}.`528 + ' This might take a while -- check SessionPeriod in pallet_session::Config for session time.');529530 const expectedSessionIndex = await (this.helper as DevUniqueHelper).session.getIndex() + sessionCount;531 let currentSessionIndex = -1;532533 while (currentSessionIndex < expectedSessionIndex) {534 // eslint-disable-next-line no-async-promise-executor535 currentSessionIndex = await this.withTimeout(new Promise(async (resolve) => {536 await this.newBlocks(1);537 const res = await (this.helper as DevUniqueHelper).session.getIndex();538 resolve(res);539 }), blockTimeout, 'The chain has stopped producing blocks!');540 }541 }542543 async forParachainBlockNumber(blockNumber: bigint | number, timeout?: number) {544 timeout = timeout ?? 30 * 60 * 1000;545 // eslint-disable-next-line no-async-promise-executor546 const promise = new Promise<void>(async (resolve) => {547 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads((data: any) => {548 if (data.number.toNumber() >= blockNumber) {549 unsubscribe();550 resolve();551 }552 });553 });554 await this.waitWithTimeout(promise, timeout);555 return promise;556 }557558 async forRelayBlockNumber(blockNumber: bigint | number, timeout?: number) {559 timeout = timeout ?? 30 * 60 * 1000;560 // eslint-disable-next-line no-async-promise-executor561 const promise = new Promise<void>(async (resolve) => {562 const unsubscribe = await this.helper.getApi().query.parachainSystem.validationData((data: any) => {563 if (data.value.relayParentNumber.toNumber() >= blockNumber) {564 // @ts-ignore565 unsubscribe();566 resolve();567 }568 });569 });570 await this.waitWithTimeout(promise, timeout);571 return promise;572 }573574 noScheduledTasks() {575 const api = this.helper.getApi();576577 // eslint-disable-next-line no-async-promise-executor578 const promise = new Promise<void>(async resolve => {579 const unsubscribe = await api.rpc.chain.subscribeNewHeads(async () => {580 const areThereScheduledTasks = await api.query.scheduler.lookup.entries();581582 if(areThereScheduledTasks.length == 0) {583 unsubscribe();584 resolve();585 }586 });587 });588589 return promise;590 }591592 event(maxBlocksToWait: number, eventSection: string, eventMethod: string) {593 // eslint-disable-next-line no-async-promise-executor594 const promise = new Promise<EventRecord | null>(async (resolve) => {595 const unsubscribe = await this.helper.getApi().rpc.chain.subscribeNewHeads(async header => {596 const blockNumber = header.number.toHuman();597 const blockHash = header.hash;598 const eventIdStr = `${eventSection}.${eventMethod}`;599 const waitLimitStr = `wait blocks remaining: ${maxBlocksToWait}`;600601 this.helper.logger.log(`[Block #${blockNumber}] Waiting for event \`${eventIdStr}\` (${waitLimitStr})`);602603 const apiAt = await this.helper.getApi().at(blockHash);604 const eventRecords = (await apiAt.query.system.events()) as any;605606 const neededEvent = eventRecords.toArray().find((r: FrameSystemEventRecord) => {607 return r.event.section == eventSection && r.event.method == eventMethod;608 });609610 if (neededEvent) {611 unsubscribe();612 resolve(neededEvent);613 } else if (maxBlocksToWait > 0) {614 maxBlocksToWait--;615 } else {616 this.helper.logger.log(`Event \`${eventIdStr}\` is NOT found`);617 unsubscribe();618 resolve(null);619 }620 });621 });622 return promise;623 }624}625626class SessionGroup {627 helper: ChainHelperBase;628629 constructor(helper: ChainHelperBase) {630 this.helper = helper;631 }632633 //todo:collator documentation634 async getIndex(): Promise<number> {635 return (await this.helper.callRpc('api.query.session.currentIndex')).toNumber();636 }637638 newSessions(sessionCount = 1, blockTimeout = 24000): Promise<void> {639 return (this.helper as DevUniqueHelper).wait.newSessions(sessionCount, blockTimeout);640 }641642 setOwnKeys(signer: TSigner, key: string) {643 return this.helper.executeExtrinsic(644 signer,645 'api.tx.session.setKeys',646 [key, '0x0'],647 true,648 );649 }650651 setOwnKeysFromAddress(signer: TSigner) {652 return this.setOwnKeys(signer, '0x' + Buffer.from(signer.addressRaw).toString('hex'));653 }654}655656class TestUtilGroup {657 helper: DevUniqueHelper;658659 constructor(helper: DevUniqueHelper) {660 this.helper = helper;661 }662663 async enable() {664 if (this.helper.fetchMissingPalletNames([Pallets.TestUtils]).length != 0) {665 return;666 }667668 const signer = this.helper.util.fromSeed('//Alice');669 await this.helper.getSudo<DevUniqueHelper>().executeExtrinsic(signer, 'api.tx.testUtils.enable', [], true);670 }671672 async setTestValue(signer: TSigner, testVal: number) {673 await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValue', [testVal], true);674 }675676 async incTestValue(signer: TSigner) {677 await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.incTestValue', [], true);678 }679680 async setTestValueAndRollback(signer: TSigner, testVal: number) {681 await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.setTestValueAndRollback', [testVal], true);682 }683684 async testValue(blockIdx?: number) {685 const api = blockIdx686 ? await this.helper.getApi().at(await this.helper.callRpc('api.rpc.chain.getBlockHash', [blockIdx]))687 : this.helper.getApi();688689 return (await api.query.testUtils.testValue()).toJSON();690 }691692 async justTakeFee(signer: TSigner) {693 await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.justTakeFee', [], true);694 }695696 async selfCancelingInc(signer: TSigner, scheduledId: string, maxTestVal: number) {697 await this.helper.executeExtrinsic(signer, 'api.tx.testUtils.selfCancelingInc', [scheduledId, maxTestVal], true);698 }699}700701class EventCapture {702 helper: DevUniqueHelper;703 eventSection: string;704 eventMethod: string;705 events: EventRecord[] = [];706 unsubscribe: VoidFn | null = null;707708 constructor(709 helper: DevUniqueHelper,710 eventSection: string,711 eventMethod: string,712 ) {713 this.helper = helper;714 this.eventSection = eventSection;715 this.eventMethod = eventMethod;716 }717718 async startCapture() {719 this.stopCapture();720 this.unsubscribe = (await this.helper.getApi().query.system.events((eventRecords: FrameSystemEventRecord[]) => {721 const newEvents = eventRecords.filter(r => {722 return r.event.section == this.eventSection && r.event.method == this.eventMethod;723 });724725 this.events.push(...newEvents);726 })) as any;727 }728729 stopCapture() {730 if (this.unsubscribe !== null) {731 this.unsubscribe();732 }733 }734735 extractCapturedEvents() {736 return this.events;737 }738}739740class AdminGroup {741 helper: UniqueHelper;742743 constructor(helper: UniqueHelper) {744 this.helper = helper;745 }746747 async payoutStakers(signer: IKeyringPair, stakersToPayout: number): Promise<{staker: string, stake: bigint, payout: bigint}[]> {748 const payoutResult = await this.helper.executeExtrinsic(signer, 'api.tx.appPromotion.payoutStakers', [stakersToPayout], true);749 return payoutResult.result.events.filter(e => e.event.method === 'StakingRecalculation').map(e => {750 return {751 staker: e.event.data[0].toString(),752 stake: e.event.data[1].toBigInt(),753 payout: e.event.data[2].toBigInt(),754 };755 });756 }757}tests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmQuartz.test.ts
+++ b/tests/src/xcm/xcmQuartz.test.ts
@@ -18,7 +18,7 @@
import {blake2AsHex} from '@polkadot/util-crypto';
import config from '../config';
import {XcmV2TraitsError} from '../interfaces';
-import {itSub, expect, describeXCM, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds, usingStateminePlaygrounds, usingAstarPlaygrounds} from '../util';
+import {itSub, expect, describeXCM, usingPlaygrounds, usingKaruraPlaygrounds, usingRelayPlaygrounds, usingMoonriverPlaygrounds, usingStateminePlaygrounds, usingShidenPlaygrounds} from '../util';
const QUARTZ_CHAIN = 2095;
const STATEMINE_CHAIN = 1000;
@@ -983,19 +983,28 @@
describeXCM('[XCM] Integration test: Exchanging tokens with Shiden', () => {
let alice: IKeyringPair;
- let randomAccount: IKeyringPair;
+ let sender: IKeyringPair;
+
+ // Quartz -> Shiden
+ const shidenInitialBalance = 1n * (10n ** 18n); // 1 SHD, existencial deposit required in order to perform XCM call
+ const unitsPerSecond = 228_000_000_000n; // This is Phala's value. What will be ours?
+ const qtzToShidenTransferred = 10n * (10n ** 18n); // 10 QTZ
+ const qtzToShidenArrived = 9_999_999_999_088_000_000n; // 9.999 ... QTZ, Shiden takes a commision in foreign tokens
+ const senderIinitialBalanceQTZ = 100n * (10n ** 18n); // How many QTZ sender has initially
+ const senderBalanceAfterXCM = 89_941967662676666465n; // 89.94... QTZ after XCM call
- const shidenInitialBalance = 1n * (10n ** 18n);
- const qtzToShidenAmount = 10n * (10n ** 18n);
+ // Shiden -> Quartz
+ const qtzFromShidenTransfered = 5n * (10n ** 18n); // 5 QTZ
+ const qtzOnShidenLeft = qtzToShidenArrived - qtzFromShidenTransfered; // 4.999_999_999_088_000_000n QTZ
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
alice = await privateKey('//Alice');
- [randomAccount] = await helper.arrange.createAccounts([100n], alice);
- console.log('randomAccount', randomAccount.address);
+ [sender] = await helper.arrange.createAccounts([100n], alice);
+ console.log('sender', sender.address);
});
- await usingAstarPlaygrounds(shidenUrl, async (helper) => {
+ await usingShidenPlaygrounds(shidenUrl, async (helper) => {
console.log('1. Create foreign asset and metadata');
await helper.assets.create(
alice,
@@ -1027,12 +1036,10 @@
await helper.getSudo().executeExtrinsic(alice, 'api.tx.xcAssetConfig.registerAssetLocation', [assetLocation, 1]);
console.log('3. Set payment for computation');
- // TODO this is Phala's price, what price will be for Unique?
- const unitsPerSecond = 228_000_000_000n;
await helper.getSudo().executeExtrinsic(alice, 'api.tx.xcAssetConfig.setAssetUnitsPerSecond', [assetLocation, unitsPerSecond]);
console.log('4. Transfer 1 SDN to recepient');
- await helper.balance.transferToSubstrate(alice, randomAccount.address, shidenInitialBalance);
+ await helper.balance.transferToSubstrate(alice, sender.address, shidenInitialBalance);
});
});
@@ -1055,7 +1062,7 @@
X1: {
AccountId32: {
network: 'Any',
- id: randomAccount.addressRaw,
+ id: sender.addressRaw,
},
},
},
@@ -1072,34 +1079,42 @@
},
},
fun: {
- Fungible: qtzToShidenAmount,
+ Fungible: qtzToShidenTransferred,
},
},
],
};
- // Initial balance is 100 UNQ
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(100n * (10n ** 18n));
+ // Initial balance is 100 QTZ
+ const balanceBefore = await helper.balance.getSubstrate(sender.address);
+ console.log(`Initial balance is: ${balanceBefore}`);
+ expect(balanceBefore).to.eq(senderIinitialBalanceQTZ);
const feeAssetItem = 0;
- await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
+ await helper.xcm.limitedReserveTransferAssets(sender, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
// Balance after reserve transfer is less than 90
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(89_941967662676666465n);
+ const balanceAfter = await helper.balance.getSubstrate(sender.address);
+ console.log(`QTZ Balance on Quartz after XCM is: ${balanceAfter}`);
+ console.log(`Quartz's QTZ commission is: ${balanceBefore - balanceAfter}`);
+ expect(balanceAfter).to.eq(senderBalanceAfterXCM);
- await usingAstarPlaygrounds(shidenUrl, async (helper) => {
+ await usingShidenPlaygrounds(shidenUrl, async (helper) => {
await helper.wait.newBlocks(3);
- const xcUNQbalance = await helper.assets.account(1, randomAccount.address);
- const astarBalance = await helper.balance.getSubstrate(randomAccount.address);
+ const xcQTZbalance = await helper.assets.account(1, sender.address);
+ const shidenBalance = await helper.balance.getSubstrate(sender.address);
- expect(xcUNQbalance).to.eq(9_999_999_999_088_000_000n);
- // Astar balance does not changed
- expect(astarBalance).to.eq(1_000_000_000_000_000_000n);
+ console.log(`xcQTZ balance on Shiden after XCM is: ${xcQTZbalance}`);
+ console.log(`Shiden's QTZ commission is: ${qtzToShidenTransferred - xcQTZbalance!}`);
+
+ expect(xcQTZbalance).to.eq(qtzToShidenArrived);
+ // SHD balance does not changed:
+ expect(shidenBalance).to.eq(shidenInitialBalance);
});
});
itSub.only('Should connect to Shiden and send QTZ back', async ({helper}) => {
- await usingAstarPlaygrounds(shidenUrl, async (helper) => {
+ await usingShidenPlaygrounds(shidenUrl, async (helper) => {
const destination = {
V1: {
parents: 1,
@@ -1118,7 +1133,7 @@
X1: {
AccountId32: {
network: 'Any',
- id: randomAccount.addressRaw,
+ id: sender.addressRaw,
},
},
},
@@ -1139,30 +1154,35 @@
},
},
fun: {
- Fungible: 5_000_000_000_000_000_000n,
+ Fungible: qtzFromShidenTransfered,
},
},
],
};
// Initial balance is 1 SDN
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(1_000_000_000_000_000_000n);
+ const balanceSDNbefore = await helper.balance.getSubstrate(sender.address);
+ console.log(`SDN balance is: ${balanceSDNbefore}, it does not changed`);
+ expect(balanceSDNbefore).to.eq(shidenInitialBalance);
const feeAssetItem = 0;
- await helper.executeExtrinsic(randomAccount, 'api.tx.polkadotXcm.reserveWithdrawAssets', [destination, beneficiary, assets, feeAssetItem]);
+ // this is non-standard polkadotXcm extension for Astar only. It calls InitiateReserveWithdraw
+ await helper.executeExtrinsic(sender, 'api.tx.polkadotXcm.reserveWithdrawAssets', [destination, beneficiary, assets, feeAssetItem]);
// Balance after reserve transfer is less than 1 SDN
- const xcUNQbalance = await helper.assets.account(1, randomAccount.address);
- const balanceSDN = await helper.balance.getSubstrate(randomAccount.address);
+ const xcQTZbalance = await helper.assets.account(1, sender.address);
+ const balanceSDN = await helper.balance.getSubstrate(sender.address);
+ console.log(`xcQTZ balance on Shiden after XCM is: ${xcQTZbalance}`);
- // Assert: xcQTZ balance decreased
- expect(xcUNQbalance).to.eq(4_999_999_999_088_000_000n);
+ // Assert: xcQTZ balance correctly decreased
+ expect(xcQTZbalance).to.eq(qtzOnShidenLeft);
// Assert: SDN balance is 0.996...
expect(balanceSDN / (10n ** 15n)).to.eq(996n);
});
await helper.wait.newBlocks(3);
- const balanceUNQ = await helper.balance.getSubstrate(randomAccount.address);
- expect(balanceUNQ).to.eq(89_941967662676666465n + 5_000_000_000_000_000_000n);
+ const balanceQTZ = await helper.balance.getSubstrate(sender.address);
+ console.log(`QTZ Balance on Quartz after XCM is: ${balanceQTZ}`);
+ expect(balanceQTZ).to.eq(senderBalanceAfterXCM + qtzFromShidenTransfered);
});
});
tests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -987,8 +987,17 @@
let alice: IKeyringPair;
let randomAccount: IKeyringPair;
- const astarInitialBalance = 1n * (10n ** 18n);
- const unqToAstarAmount = 10n * (10n ** 18n);
+ // Unique -> Astar
+ const astarInitialBalance = 1n * (10n ** 18n); // 1 ASTR. Existencial deposit required in order to perform XCM call
+ const unitsPerSecond = 228_000_000_000n; // This is Phala's value. What will be ours?
+ const unqToAstarTransferred = 10n * (10n ** 18n); // 10 UNQ
+ const unqToAstarArrived = 9_999_999_999_088_000_000n; // 9.999 ... UNQ, Shiden takes a commision in foreign tokens
+ const senderIinitialBalanceUNQ = 100n * (10n ** 18n); // How many UNQ sender has initially
+ const senderBalanceAfterXCM = 89_941967662676666465n; // 89.94... UNQ after XCM call
+
+ // Astar -> Unique
+ const unqFromAstarTransfered = 5n * (10n ** 18n); // 5 UNQ
+ const unqOnAstarLeft = unqToAstarArrived - unqFromAstarTransfered; // 4.999_999_999_088_000_000n UNQ
before(async () => {
await usingPlaygrounds(async (helper, privateKey) => {
@@ -1029,8 +1038,6 @@
await helper.getSudo().executeExtrinsic(alice, 'api.tx.xcAssetConfig.registerAssetLocation', [assetLocation, 1]);
console.log('3. Set payment for computation');
- // TODO this is Phala's price, what price will be for Unique?
- const unitsPerSecond = 228_000_000_000n;
await helper.getSudo().executeExtrinsic(alice, 'api.tx.xcAssetConfig.setAssetUnitsPerSecond', [assetLocation, unitsPerSecond]);
console.log('4. Transfer 1 ASTR to recepient');
@@ -1074,29 +1081,37 @@
},
},
fun: {
- Fungible: unqToAstarAmount,
+ Fungible: unqToAstarTransferred,
},
},
],
};
// Initial balance is 100 UNQ
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(100n * (10n ** 18n));
+ const balanceBefore = await helper.balance.getSubstrate(randomAccount.address);
+ console.log(`Initial balance is: ${balanceBefore}`);
+ expect(balanceBefore).to.eq(senderIinitialBalanceUNQ);
const feeAssetItem = 0;
await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
// Balance after reserve transfer is less than 90
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(89_941967662676666465n);
+ const balanceAfter = await helper.balance.getSubstrate(randomAccount.address);
+ console.log(`UNQ Balance on Unique after XCM is: ${balanceAfter}`);
+ console.log(`Unique's UNQ commission is: ${balanceBefore - balanceAfter}`);
+ expect(balanceAfter).to.eq(senderBalanceAfterXCM);
await usingAstarPlaygrounds(astarUrl, async (helper) => {
await helper.wait.newBlocks(3);
const xcUNQbalance = await helper.assets.account(1, randomAccount.address);
const astarBalance = await helper.balance.getSubstrate(randomAccount.address);
- expect(xcUNQbalance).to.eq(9_999_999_999_088_000_000n);
+ console.log(`xcUNQ balance on Astar after XCM is: ${xcUNQbalance}`);
+ console.log(`Astar's UNQ commission is: ${unqToAstarTransferred - xcUNQbalance!}`);
+
+ expect(xcUNQbalance).to.eq(unqToAstarArrived);
// Astar balance does not changed
- expect(astarBalance).to.eq(1_000_000_000_000_000_000n);
+ expect(astarBalance).to.eq(astarInitialBalance);
});
});
@@ -1141,30 +1156,35 @@
},
},
fun: {
- Fungible: 5_000_000_000_000_000_000n,
+ Fungible: unqFromAstarTransfered,
},
},
],
};
// Initial balance is 1 ASTR
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(1_000_000_000_000_000_000n);
+ const balanceASTRbefore = await helper.balance.getSubstrate(randomAccount.address);
+ console.log(`ASTR balance is: ${balanceASTRbefore}, it does not changed`);
+ expect(balanceASTRbefore).to.eq(astarInitialBalance);
const feeAssetItem = 0;
+ // this is non-standard polkadotXcm extension for Astar only. It calls InitiateReserveWithdraw
await helper.executeExtrinsic(randomAccount, 'api.tx.polkadotXcm.reserveWithdrawAssets', [destination, beneficiary, assets, feeAssetItem]);
const xcUNQbalance = await helper.assets.account(1, randomAccount.address);
const balanceAstar = await helper.balance.getSubstrate(randomAccount.address);
+ console.log(`xcUNQ balance on Astar after XCM is: ${xcUNQbalance}`);
- // Assert: xcUNQ balance decreased
- expect(xcUNQbalance).to.eq(4_999_999_999_088_000_000n);
+ // Assert: xcUNQ balance correctly decreased
+ expect(xcUNQbalance).to.eq(unqOnAstarLeft);
// Assert: ASTR balance is 0.996...
expect(balanceAstar / (10n ** 15n)).to.eq(996n);
});
await helper.wait.newBlocks(3);
const balanceUNQ = await helper.balance.getSubstrate(randomAccount.address);
- expect(balanceUNQ).to.eq(89_941967662676666465n + 5_000_000_000_000_000_000n);
+ console.log(`UNQ Balance on Unique after XCM is: ${balanceUNQ}`);
+ expect(balanceUNQ).to.eq(senderBalanceAfterXCM + unqFromAstarTransfered);
});
itSub.skip('Should not accept limitedReserveTransfer of UNQ from ASTAR', async ({helper}) => {
@@ -1208,30 +1228,18 @@
},
},
fun: {
- Fungible: 5_000_000_000_000_000_000n, // TODO set another value
+ Fungible: unqFromAstarTransfered,
},
},
],
};
// Initial balance is 1 ASTAR
- expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(1_000_000_000_000_000_000n);
+ expect(await helper.balance.getSubstrate(randomAccount.address)).to.eq(astarInitialBalance);
const feeAssetItem = 0;
+ // TODO: expect rejected:
await helper.xcm.limitedReserveTransferAssets(randomAccount, destination, beneficiary, assets, feeAssetItem, 'Unlimited');
-
- // Balance after reserve transfer is less than 1 ASTAR
- const xcUNQbalance = await helper.assets.account(1, randomAccount.address);
- const balanceAstar = await helper.balance.getSubstrate(randomAccount.address);
-
- // xcUNQ balance decreased
- expect(xcUNQbalance).to.eq(4_999_999_999_088_000_000n);
- // Astar balance is 0.997...
- expect(balanceAstar / (10n ** 15n)).to.eq(997n);
});
-
- await helper.wait.newBlocks(3);
- const balanceUNQ = await helper.balance.getSubstrate(randomAccount.address);
- expect(balanceUNQ).to.eq(89_941967662676666465n + 5_000_000_000_000_000_000n);
});
});