From eca107b6869c8ae36696f487ad281059a2480e4e Mon Sep 17 00:00:00 2001 From: Mario J Maurello Date: Wed, 31 Jan 2024 19:17:10 +1300 Subject: [PATCH] change variable name --- packages/config/src/chains.ts | 2 +- packages/sdk/src/getTransferData/getSourceData.ts | 7 ++----- packages/sdk/src/getTransferData/getTransferData.utils.ts | 3 +-- packages/types/src/chain/parachain/Parachain.ts | 8 ++++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts index 624eef9c..dcd1c40c 100644 --- a/packages/config/src/chains.ts +++ b/packages/config/src/chains.ts @@ -1414,7 +1414,7 @@ export const zeitgeist = new Parachain({ name: 'Zeitgeist', parachainId: 2092, ss58Format: 73, - usesOwnDecimalsInternally: true, + usesChainDecimals: true, ws: 'wss://zeitgeist-rpc.dwellir.com', }); diff --git a/packages/sdk/src/getTransferData/getSourceData.ts b/packages/sdk/src/getTransferData/getSourceData.ts index c25105e3..8f26d8c9 100644 --- a/packages/sdk/src/getTransferData/getSourceData.ts +++ b/packages/sdk/src/getTransferData/getSourceData.ts @@ -187,7 +187,6 @@ export async function getFeeBalance({ return balance; } - const convertAmount = chain.usesOwnDecimalsInternally; const feeBalance = await polkadot.query( feeConfig.balance.build({ address, @@ -195,7 +194,7 @@ export async function getFeeBalance({ }) as SubstrateQueryConfig, ); - return convertAmount + return chain.usesChainDecimals ? convertDecimals(feeBalance, polkadot.decimals, decimals) : feeBalance; } @@ -241,11 +240,9 @@ export async function getFee({ const xcmDeliveryFee = getXcmDeliveryFee(decimals, feeConfig); - const convertAmount = chain.usesOwnDecimalsInternally; - const totalFee = extrinsicFee + xcmDeliveryFee; - return convertAmount + return chain.usesChainDecimals ? convertDecimals(totalFee, polkadot.decimals, decimals) : totalFee; } diff --git a/packages/sdk/src/getTransferData/getTransferData.utils.ts b/packages/sdk/src/getTransferData/getTransferData.utils.ts index 29ca2c40..d6fac4f8 100644 --- a/packages/sdk/src/getTransferData/getTransferData.utils.ts +++ b/packages/sdk/src/getTransferData/getTransferData.utils.ts @@ -32,9 +32,8 @@ export async function getBalance({ }); if (cfg.type === CallType.Substrate) { - const convertAmount = chain.usesOwnDecimalsInternally; const balance = await polkadot.query(cfg as SubstrateQueryConfig); - return convertAmount + return chain.usesChainDecimals ? convertDecimals(balance, polkadot.decimals, decimals) : balance; } diff --git a/packages/types/src/chain/parachain/Parachain.ts b/packages/types/src/chain/parachain/Parachain.ts index 3094cebb..98e7d7e2 100644 --- a/packages/types/src/chain/parachain/Parachain.ts +++ b/packages/types/src/chain/parachain/Parachain.ts @@ -10,7 +10,7 @@ export interface ParachainConstructorParams genesisHash: string; parachainId: number; ss58Format: number; - usesOwnDecimalsInternally?: boolean; + usesChainDecimals?: boolean; weight?: number; ws: string; } @@ -24,7 +24,7 @@ export class Parachain extends Chain { readonly ss58Format: number; - readonly usesOwnDecimalsInternally: boolean; + readonly usesChainDecimals: boolean; readonly weight: number | undefined; @@ -34,7 +34,7 @@ export class Parachain extends Chain { assetsData, genesisHash, parachainId, - usesOwnDecimalsInternally, + usesChainDecimals, ss58Format, weight, ws, @@ -50,7 +50,7 @@ export class Parachain extends Chain { this.genesisHash = genesisHash; this.parachainId = parachainId; this.ss58Format = ss58Format; - this.usesOwnDecimalsInternally = !!usesOwnDecimalsInternally; + this.usesChainDecimals = !!usesChainDecimals; this.weight = weight; this.ws = ws; }