difftreelog
fix parse bitint to decimals
in: master
4 files changed
tests/src/util/helpers.tsdiffbeforeafterboth--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -103,6 +103,24 @@
return api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();
}
+export function bigIntToDecimals(number: bigint, decimals = 18): string {
+ let numberStr = number.toString();
+ console.log('[0] str = ', numberStr);
+
+ // Get rid of `n` at the end
+ numberStr = numberStr.substring(0, numberStr.length - 1);
+ console.log('[1] str = ', numberStr);
+
+ const dotPos = numberStr.length - decimals;
+ if (dotPos <= 0) {
+ return '0.' + numberStr;
+ } else {
+ const intPart = numberStr.substring(0, dotPos);
+ const fractPart = numberStr.substring(dotPos);
+ return intPart + '.' + fractPart;
+ }
+}
+
export function normalizeAccountId(input: string | AccountId | CrossAccountId | IKeyringPair): CrossAccountId {
if (typeof input === 'string') {
if (input.length >= 47) {
tests/src/xcm/xcmOpal.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmOpal.test.ts
+++ b/tests/src/xcm/xcmOpal.test.ts
@@ -21,7 +21,7 @@
import {ApiOptions} from '@polkadot/api/types';
import {IKeyringPair} from '@polkadot/types/types';
import usingApi, {submitTransactionAsync} from './../substrate/substrate-api';
-import {getGenericResult, paraSiblingSovereignAccount} from './../util/helpers';
+import {bigIntToDecimals, getGenericResult, paraSiblingSovereignAccount} from './../util/helpers';
import waitNewBlocks from './../substrate/wait-new-blocks';
import {normalizeAccountId} from './../util/helpers';
import getBalance from './../substrate/get-balance';
@@ -43,6 +43,8 @@
const ASSET_METADATA_DESCRIPTION = 'USDT';
const ASSET_METADATA_MINIMAL_BALANCE = 1;
+const WESTMINT_DECIMALS = 12;
+
const TRANSFER_AMOUNT = 1_000_000_000_000_000_000n;
// 10,000.00 (ten thousands) USDT
@@ -281,7 +283,10 @@
[balanceStmnAfter] = await getBalance(api, [alice.address]);
// common good parachain take commission in it native token
- console.log('Opal to Westmint transaction fees on Westmint: %s WND', balanceStmnBefore - balanceStmnAfter);
+ console.log(
+ 'Opal to Westmint transaction fees on Westmint: %s WND',
+ bigIntToDecimals(balanceStmnBefore - balanceStmnAfter, WESTMINT_DECIMALS),
+ );
expect(balanceStmnBefore > balanceStmnAfter).to.be.true;
}, statemineApiOptions);
@@ -297,10 +302,16 @@
// commission has not paid in USDT token
expect(free == TRANSFER_AMOUNT).to.be.true;
- console.log('Opal to Westmint transaction fees on Opal: %s USDT', TRANSFER_AMOUNT - free);
+ console.log(
+ 'Opal to Westmint transaction fees on Opal: %s USDT',
+ bigIntToDecimals(TRANSFER_AMOUNT - free),
+ );
// ... and parachain native token
expect(balanceOpalAfter == balanceOpalBefore).to.be.true;
- console.log('Opal to Westmint transaction fees on Opal: %s WND', balanceOpalAfter - balanceOpalBefore);
+ console.log(
+ 'Opal to Westmint transaction fees on Opal: %s WND',
+ bigIntToDecimals(balanceOpalAfter - balanceOpalBefore, WESTMINT_DECIMALS),
+ );
}, uniqueApiOptions);
@@ -451,8 +462,14 @@
[balanceBobAfter] = await getBalance(api, [bob.address]);
balanceBobRelayTokenAfter = BigInt(((await api.query.tokens.accounts(bob.addressRaw, {NativeAssetId: 'Parent'})).toJSON() as any).free);
const wndFee = balanceBobRelayTokenAfter - TRANSFER_AMOUNT_RELAY - balanceBobRelayTokenBefore;
- console.log('Relay (Westend) to Opal transaction fees: %s OPL', balanceBobAfter - balanceBobBefore);
- console.log('Relay (Westend) to Opal transaction fees: %s WND', wndFee);
+ console.log(
+ 'Relay (Westend) to Opal transaction fees: %s OPL',
+ bigIntToDecimals(balanceBobAfter - balanceBobBefore),
+ );
+ console.log(
+ 'Relay (Westend) to Opal transaction fees: %s WND',
+ bigIntToDecimals(wndFee, WESTMINT_DECIMALS),
+ );
expect(balanceBobBefore == balanceBobAfter).to.be.true;
expect(balanceBobRelayTokenBefore < balanceBobRelayTokenAfter).to.be.true;
}, uniqueApiOptions2);
@@ -504,4 +521,4 @@
}, uniqueApiOptions);
});
-});
\ No newline at end of file
+});
tests/src/xcm/xcmQuartz.test.tsdiffbeforeafterboth21import {ApiOptions} from '@polkadot/api/types';21import {ApiOptions} from '@polkadot/api/types';22import {IKeyringPair} from '@polkadot/types/types';22import {IKeyringPair} from '@polkadot/types/types';23import usingApi, {submitTransactionAsync} from '../substrate/substrate-api';23import usingApi, {submitTransactionAsync} from '../substrate/substrate-api';24import {getGenericResult, generateKeyringPair, waitEvent, describe_xcm} from '../util/helpers';24import {getGenericResult, generateKeyringPair, waitEvent, describe_xcm, bigIntToDecimals} from '../util/helpers';25import {MultiLocation} from '@polkadot/types/interfaces';25import {MultiLocation} from '@polkadot/types/interfaces';26import {blake2AsHex} from '@polkadot/util-crypto';26import {blake2AsHex} from '@polkadot/util-crypto';27import waitNewBlocks from '../substrate/wait-new-blocks';27import waitNewBlocks from '../substrate/wait-new-blocks';37const KARURA_PORT = 9946;37const KARURA_PORT = 9946;38const MOONRIVER_PORT = 9947;38const MOONRIVER_PORT = 9947;393940const KARURA_DECIMALS = 12;4140const TRANSFER_AMOUNT = 2000000000000000000000000n;42const TRANSFER_AMOUNT = 2000000000000000000000000n;414342function parachainApiOptions(port: number): ApiOptions {44function parachainApiOptions(port: number): ApiOptions {182 [balanceQuartzTokenMiddle] = await getBalance(api, [randomAccount.address]);184 [balanceQuartzTokenMiddle] = await getBalance(api, [randomAccount.address]);183 185 184 const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;186 const qtzFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;185 console.log('[Quartz -> Karura] transaction fees on Quartz: %s QTZ', qtzFees);187 console.log('[Quartz -> Karura] transaction fees on Quartz: %s QTZ', bigIntToDecimals(qtzFees));186 expect(qtzFees > 0n).to.be.true;188 expect(qtzFees > 0n).to.be.true;187 });189 });188 190 198 const karFees = balanceKaruraTokenInit - balanceKaruraTokenMiddle;200 const karFees = balanceKaruraTokenInit - balanceKaruraTokenMiddle;199 const qtzIncomeTransfer = balanceQuartzForeignTokenMiddle - balanceQuartzForeignTokenInit;201 const qtzIncomeTransfer = balanceQuartzForeignTokenMiddle - balanceQuartzForeignTokenInit;200202201 console.log('[Quartz -> Karura] transaction fees on Karura: %s KAR', karFees);203 console.log('204 [Quartz -> Karura] transaction fees on Karura: %s KAR',205 bigIntToDecimals(karFees, KARURA_DECIMALS),206 );202 console.log('[Quartz -> Karura] income %s QTZ', qtzIncomeTransfer);207 console.log('[Quartz -> Karura] income %s QTZ', bigIntToDecimals(qtzIncomeTransfer));203 expect(karFees == 0n).to.be.true;208 expect(karFees == 0n).to.be.true;204 expect(qtzIncomeTransfer == TRANSFER_AMOUNT).to.be.true;209 expect(qtzIncomeTransfer == TRANSFER_AMOUNT).to.be.true;205 },210 },249 const karFees = balanceKaruraTokenMiddle - balanceKaruraTokenFinal;254 const karFees = balanceKaruraTokenMiddle - balanceKaruraTokenFinal;250 const qtzOutcomeTransfer = balanceQuartzForeignTokenMiddle - balanceQuartzForeignTokenFinal;255 const qtzOutcomeTransfer = balanceQuartzForeignTokenMiddle - balanceQuartzForeignTokenFinal;251256252 console.log('[Karura -> Quartz] transaction fees on Karura: %s KAR', karFees);257 console.log(258 '[Karura -> Quartz] transaction fees on Karura: %s KAR',259 bigIntToDecimals(karFees, KARURA_DECIMALS),260 );253 console.log('[Karura -> Quartz] outcome %s QTZ', qtzOutcomeTransfer);261 console.log('[Karura -> Quartz] outcome %s QTZ', bigIntToDecimals(qtzOutcomeTransfer));254262255 expect(karFees > 0).to.be.true;263 expect(karFees > 0).to.be.true;256 expect(qtzOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;264 expect(qtzOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;266 const actuallyDelivered = balanceQuartzTokenFinal - balanceQuartzTokenMiddle;274 const actuallyDelivered = balanceQuartzTokenFinal - balanceQuartzTokenMiddle;267 expect(actuallyDelivered > 0).to.be.true;275 expect(actuallyDelivered > 0).to.be.true;268276269 console.log('[Karura -> Quartz] actually delivered %s QTZ', actuallyDelivered);277 console.log('[Karura -> Quartz] actually delivered %s QTZ', bigIntToDecimals(actuallyDelivered));270 278 271 const qtzFees = TRANSFER_AMOUNT - actuallyDelivered;279 const qtzFees = TRANSFER_AMOUNT - actuallyDelivered;272 console.log('[Karura -> Quartz] transaction fees on Quartz: %s QTZ', qtzFees);280 console.log('[Karura -> Quartz] transaction fees on Quartz: %s QTZ', bigIntToDecimals(qtzFees));273 expect(qtzFees == 0n).to.be.true;281 expect(qtzFees == 0n).to.be.true;274 });282 });275 });283 });581 expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;589 expect(balanceQuartzTokenMiddle < balanceQuartzTokenInit).to.be.true;582590583 const transactionFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;591 const transactionFees = balanceQuartzTokenInit - balanceQuartzTokenMiddle - TRANSFER_AMOUNT;584 console.log('[Quartz -> Moonriver] transaction fees on Quartz: %s QTZ', transactionFees);592 console.log('[Quartz -> Moonriver] transaction fees on Quartz: %s QTZ', bigIntToDecimals(transactionFees));585 expect(transactionFees > 0).to.be.true;593 expect(transactionFees > 0).to.be.true;586 });594 });587595592 [balanceMovrTokenMiddle] = await getBalance(api, [randomAccountMoonriver.address]);600 [balanceMovrTokenMiddle] = await getBalance(api, [randomAccountMoonriver.address]);593601594 const movrFees = balanceMovrTokenInit - balanceMovrTokenMiddle;602 const movrFees = balanceMovrTokenInit - balanceMovrTokenMiddle;595 console.log('[Quartz -> Moonriver] transaction fees on Moonriver: %s MOVR', movrFees);603 console.log('[Quartz -> Moonriver] transaction fees on Moonriver: %s MOVR',bigIntToDecimals(movrFees));596 expect(movrFees == 0n).to.be.true;604 expect(movrFees == 0n).to.be.true;597605598 const qtzRandomAccountAsset = (606 const qtzRandomAccountAsset = (601609602 balanceForeignQtzTokenMiddle = BigInt(qtzRandomAccountAsset['balance']);610 balanceForeignQtzTokenMiddle = BigInt(qtzRandomAccountAsset['balance']);603 const qtzIncomeTransfer = balanceForeignQtzTokenMiddle - balanceForeignQtzTokenInit;611 const qtzIncomeTransfer = balanceForeignQtzTokenMiddle - balanceForeignQtzTokenInit;604 console.log('[Quartz -> Moonriver] income %s QTZ', qtzIncomeTransfer);612 console.log('[Quartz -> Moonriver] income %s QTZ', bigIntToDecimals(qtzIncomeTransfer));605 expect(qtzIncomeTransfer == TRANSFER_AMOUNT).to.be.true;613 expect(qtzIncomeTransfer == TRANSFER_AMOUNT).to.be.true;606 },614 },607 moonriverOptions(),615 moonriverOptions(),647 [balanceMovrTokenFinal] = await getBalance(api, [randomAccountMoonriver.address]);655 [balanceMovrTokenFinal] = await getBalance(api, [randomAccountMoonriver.address]);648656649 const movrFees = balanceMovrTokenMiddle - balanceMovrTokenFinal;657 const movrFees = balanceMovrTokenMiddle - balanceMovrTokenFinal;650 console.log('[Moonriver -> Quartz] transaction fees on Moonriver: %s MOVR', movrFees);658 console.log('[Moonriver -> Quartz] transaction fees on Moonriver: %s MOVR', bigIntToDecimals(movrFees));651 expect(movrFees > 0).to.be.true;659 expect(movrFees > 0).to.be.true;652660653 const qtzRandomAccountAsset = (661 const qtzRandomAccountAsset = (659 balanceForeignQtzTokenFinal = 0n;667 balanceForeignQtzTokenFinal = 0n;660668661 const qtzOutcomeTransfer = balanceForeignQtzTokenMiddle - balanceForeignQtzTokenFinal;669 const qtzOutcomeTransfer = balanceForeignQtzTokenMiddle - balanceForeignQtzTokenFinal;662 console.log('[Quartz -> Moonriver] outcome %s QTZ', qtzOutcomeTransfer);670 console.log('[Quartz -> Moonriver] outcome %s QTZ', bigIntToDecimals(qtzOutcomeTransfer));663 expect(qtzOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;671 expect(qtzOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;664 },672 },665 moonriverOptions(),673 moonriverOptions(),672 const actuallyDelivered = balanceQuartzTokenFinal - balanceQuartzTokenMiddle;680 const actuallyDelivered = balanceQuartzTokenFinal - balanceQuartzTokenMiddle;673 expect(actuallyDelivered > 0).to.be.true;681 expect(actuallyDelivered > 0).to.be.true;674682675 console.log('[Moonriver -> Quartz] actually delivered %s QTZ', actuallyDelivered);683 console.log('[Moonriver -> Quartz] actually delivered %s QTZ', bigIntToDecimals(actuallyDelivered));676684677 const qtzFees = TRANSFER_AMOUNT - actuallyDelivered;685 const qtzFees = TRANSFER_AMOUNT - actuallyDelivered;678 console.log('[Moonriver -> Quartz] transaction fees on Quartz: %s QTZ', qtzFees);686 console.log('[Moonriver -> Quartz] transaction fees on Quartz: %s QTZ', bigIntToDecimals(qtzFees));679 expect(qtzFees == 0n).to.be.true;687 expect(qtzFees == 0n).to.be.true;680 });688 });681 });689 });tests/src/xcm/xcmUnique.test.tsdiffbeforeafterboth--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -21,7 +21,7 @@
import {ApiOptions} from '@polkadot/api/types';
import {IKeyringPair} from '@polkadot/types/types';
import usingApi, {submitTransactionAsync} from '../substrate/substrate-api';
-import {getGenericResult, generateKeyringPair, waitEvent, describe_xcm} from '../util/helpers';
+import {getGenericResult, generateKeyringPair, waitEvent, describe_xcm, bigIntToDecimals} from '../util/helpers';
import {MultiLocation} from '@polkadot/types/interfaces';
import {blake2AsHex} from '@polkadot/util-crypto';
import waitNewBlocks from '../substrate/wait-new-blocks';
@@ -37,6 +37,8 @@
const ACALA_PORT = 9946;
const MOONBEAM_PORT = 9947;
+const ACALA_DECIMALS = 12;
+
const TRANSFER_AMOUNT = 2000000000000000000000000n;
function parachainApiOptions(port: number): ApiOptions {
@@ -182,7 +184,7 @@
[balanceUniqueTokenMiddle] = await getBalance(api, [randomAccount.address]);
const unqFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;
- console.log('[Unique -> Acala] transaction fees on Unique: %s UNQ', unqFees);
+ console.log('[Unique -> Acala] transaction fees on Unique: %s UNQ', bigIntToDecimals(unqFees));
expect(unqFees > 0n).to.be.true;
});
@@ -198,8 +200,11 @@
const acaFees = balanceAcalaTokenInit - balanceAcalaTokenMiddle;
const unqIncomeTransfer = balanceUniqueForeignTokenMiddle - balanceUniqueForeignTokenInit;
- console.log('[Unique -> Acala] transaction fees on Acala: %s ACA', acaFees);
- console.log('[Unique -> Acala] income %s UNQ', unqIncomeTransfer);
+ console.log(
+ '[Unique -> Acala] transaction fees on Acala: %s ACA',
+ bigIntToDecimals(acaFees, ACALA_DECIMALS),
+ );
+ console.log('[Unique -> Acala] income %s UNQ', bigIntToDecimals(unqIncomeTransfer));
expect(acaFees == 0n).to.be.true;
expect(unqIncomeTransfer == TRANSFER_AMOUNT).to.be.true;
},
@@ -249,8 +254,11 @@
const acaFees = balanceAcalaTokenMiddle - balanceAcalaTokenFinal;
const unqOutcomeTransfer = balanceUniqueForeignTokenMiddle - balanceUniqueForeignTokenFinal;
- console.log('[Acala -> Unique] transaction fees on Acala: %s ACA', acaFees);
- console.log('[Acala -> Unique] outcome %s UNQ', unqOutcomeTransfer);
+ console.log(
+ '[Acala -> Unique] transaction fees on Acala: %s ACA',
+ bigIntToDecimals(acaFees, ACALA_DECIMALS),
+ );
+ console.log('[Acala -> Unique] outcome %s UNQ', bigIntToDecimals(unqOutcomeTransfer));
expect(acaFees > 0).to.be.true;
expect(unqOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;
@@ -266,10 +274,10 @@
const actuallyDelivered = balanceUniqueTokenFinal - balanceUniqueTokenMiddle;
expect(actuallyDelivered > 0).to.be.true;
- console.log('[Acala -> Unique] actually delivered %s UNQ', actuallyDelivered);
+ console.log('[Acala -> Unique] actually delivered %s UNQ', bigIntToDecimals(actuallyDelivered));
const unqFees = TRANSFER_AMOUNT - actuallyDelivered;
- console.log('[Acala -> Unique] transaction fees on Unique: %s UNQ', unqFees);
+ console.log('[Acala -> Unique] transaction fees on Unique: %s UNQ', bigIntToDecimals(unqFees));
expect(unqFees == 0n).to.be.true;
});
});
@@ -581,7 +589,7 @@
expect(balanceUniqueTokenMiddle < balanceUniqueTokenInit).to.be.true;
const transactionFees = balanceUniqueTokenInit - balanceUniqueTokenMiddle - TRANSFER_AMOUNT;
- console.log('[Unique -> Moonbeam] transaction fees on Unique: %s UNQ', transactionFees);
+ console.log('[Unique -> Moonbeam] transaction fees on Unique: %s UNQ', bigIntToDecimals(transactionFees));
expect(transactionFees > 0).to.be.true;
});
@@ -592,7 +600,7 @@
[balanceGlmrTokenMiddle] = await getBalance(api, [randomAccountMoonbeam.address]);
const glmrFees = balanceGlmrTokenInit - balanceGlmrTokenMiddle;
- console.log('[Unique -> Moonbeam] transaction fees on Moonbeam: %s GLMR', glmrFees);
+ console.log('[Unique -> Moonbeam] transaction fees on Moonbeam: %s GLMR', bigIntToDecimals(glmrFees));
expect(glmrFees == 0n).to.be.true;
const unqRandomAccountAsset = (
@@ -601,7 +609,7 @@
balanceForeignUnqTokenMiddle = BigInt(unqRandomAccountAsset['balance']);
const unqIncomeTransfer = balanceForeignUnqTokenMiddle - balanceForeignUnqTokenInit;
- console.log('[Unique -> Moonbeam] income %s UNQ', unqIncomeTransfer);
+ console.log('[Unique -> Moonbeam] income %s UNQ', bigIntToDecimals(unqIncomeTransfer));
expect(unqIncomeTransfer == TRANSFER_AMOUNT).to.be.true;
},
moonbeamOptions(),
@@ -647,7 +655,7 @@
[balanceGlmrTokenFinal] = await getBalance(api, [randomAccountMoonbeam.address]);
const glmrFees = balanceGlmrTokenMiddle - balanceGlmrTokenFinal;
- console.log('[Moonbeam -> Unique] transaction fees on Moonbeam: %s GLMR', glmrFees);
+ console.log('[Moonbeam -> Unique] transaction fees on Moonbeam: %s GLMR', bigIntToDecimals(glmrFees));
expect(glmrFees > 0).to.be.true;
const unqRandomAccountAsset = (
@@ -659,7 +667,7 @@
balanceForeignUnqTokenFinal = 0n;
const unqOutcomeTransfer = balanceForeignUnqTokenMiddle - balanceForeignUnqTokenFinal;
- console.log('[Unique -> Moonbeam] outcome %s UNQ', unqOutcomeTransfer);
+ console.log('[Unique -> Moonbeam] outcome %s UNQ', bigIntToDecimals(unqOutcomeTransfer));
expect(unqOutcomeTransfer == TRANSFER_AMOUNT).to.be.true;
},
moonbeamOptions(),
@@ -672,10 +680,10 @@
const actuallyDelivered = balanceUniqueTokenFinal - balanceUniqueTokenMiddle;
expect(actuallyDelivered > 0).to.be.true;
- console.log('[Moonbeam -> Unique] actually delivered %s UNQ', actuallyDelivered);
+ console.log('[Moonbeam -> Unique] actually delivered %s UNQ', bigIntToDecimals(actuallyDelivered));
const unqFees = TRANSFER_AMOUNT - actuallyDelivered;
- console.log('[Moonbeam -> Unique] transaction fees on Unique: %s UNQ', unqFees);
+ console.log('[Moonbeam -> Unique] transaction fees on Unique: %s UNQ', bigIntToDecimals(unqFees));
expect(unqFees == 0n).to.be.true;
});
});