From af79815d894b0011a61bce6f828088dedb02f84c Mon Sep 17 00:00:00 2001 From: Mario J Maurello Date: Wed, 16 Oct 2024 18:18:59 +0200 Subject: [PATCH] fix linter issues from sovereign account balance checking implementations --- .../src/getTransferData/getDestinationData.ts | 37 +++++++++---------- .../getTransferData/getTransferData.utils.ts | 9 ++--- .../types/src/chain/parachain/Parachain.ts | 1 - 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/packages/sdk/src/getTransferData/getDestinationData.ts b/packages/sdk/src/getTransferData/getDestinationData.ts index b65a7952..a813a09b 100644 --- a/packages/sdk/src/getTransferData/getDestinationData.ts +++ b/packages/sdk/src/getTransferData/getDestinationData.ts @@ -1,4 +1,10 @@ -import type { AssetRoute, DestinationConfig, SourceConfig } from '@moonbeam-network/xcm-config'; +import type { + AssetRoute, + DestinationConfig, + SourceConfig, +} from '@moonbeam-network/xcm-config'; +import { Parachain } from '@moonbeam-network/xcm-types'; +import { getSovereignAccountAddresses } from '@moonbeam-network/xcm-utils'; import type { DestinationChainTransferData } from '../sdk.interfaces'; import { getAssetMin, @@ -6,10 +12,6 @@ import { getDestinationFee, getExistentialDeposit, } from './getTransferData.utils'; -import { - getSovereignAccountAddresses, -} from '@moonbeam-network/xcm-utils'; -import { Parachain } from '@moonbeam-network/xcm-types'; export interface GetDestinationDataParams { route: AssetRoute; @@ -48,34 +50,31 @@ export async function getDestinationData({ existentialDeposit, fee, min, - sovereignAccountBalances: await getSovereignAccountBalances({ - source: route.source, - destination: route.destination, - }), + sovereignAccountBalances: await getSovereignAccountBalances({ + source: route.source, + destination: route.destination, + }), }; - } interface GetSovereignAccountBalancesProps { - source: SourceConfig; - destination: DestinationConfig; + source: SourceConfig; + destination: DestinationConfig; } -async function getSovereignAccountBalances( { +async function getSovereignAccountBalances({ destination, source, }: GetSovereignAccountBalancesProps) { - - if(!Parachain.is(source.chain) || !Parachain.is(destination.chain)) { - return undefined + if (!Parachain.is(source.chain) || !Parachain.is(destination.chain)) { + return undefined; } const sovereignAccountAddresses = getSovereignAccountAddresses( source.chain.parachainId, ); - const destinationFeeAssetBalance = - destination.fee.balance; + const destinationFeeAssetBalance = destination.fee.balance; const sovereignAccountAddress = destination.chain.isRelay ? sovereignAccountAddresses.relay @@ -93,7 +92,7 @@ async function getSovereignAccountBalances( { address: sovereignAccountAddress, asset: destination.chain.getChainAsset(destination.fee.asset), builder: destinationFeeAssetBalance, - chain: destination.chain, + chain: destination.chain, }) : undefined; return { diff --git a/packages/sdk/src/getTransferData/getTransferData.utils.ts b/packages/sdk/src/getTransferData/getTransferData.utils.ts index 05223500..1c1ba17a 100644 --- a/packages/sdk/src/getTransferData/getTransferData.utils.ts +++ b/packages/sdk/src/getTransferData/getTransferData.utils.ts @@ -20,13 +20,12 @@ import { } from '@moonbeam-network/xcm-types'; import { convertDecimals, toBigInt } from '@moonbeam-network/xcm-utils'; import Big from 'big.js'; -import { EvmService } from '../services/evm/EvmService'; -import { PolkadotService } from '../services/polkadot'; -import { +import type { DestinationChainTransferData, SourceChainTransferData, } from '../sdk.interfaces'; - +import { EvmService } from '../services/evm/EvmService'; +import { PolkadotService } from '../services/polkadot'; export interface GetBalancesParams { address: string; @@ -355,7 +354,7 @@ export function validateSovereignAccountBalances({ destination, }: ValidateSovereignAccountBalancesProps): void { if ( - !Parachain.is(destination.chain) || + !Parachain.is(destination.chain) || !destination.chain.checkSovereignAccountBalances || !destination.sovereignAccountBalances ) { diff --git a/packages/types/src/chain/parachain/Parachain.ts b/packages/types/src/chain/parachain/Parachain.ts index 712aa87d..391dc896 100644 --- a/packages/types/src/chain/parachain/Parachain.ts +++ b/packages/types/src/chain/parachain/Parachain.ts @@ -12,7 +12,6 @@ export interface ParachainConstructorParams extends ChainConstructorParams { } export class Parachain extends Chain { - readonly checkSovereignAccountBalances: boolean; readonly genesisHash: string;