--wip-- [skip ci]

packages/builder/src/balance/BalanceBuilder.interfaces.ts

@@ -2,10 +2,11 @@ import type { ChainAsset } from '@moonbeam-network/xcm-types';
 import type { Struct, u128 } from '@polkadot/types';
 import type { ConfigBuilder } from '../builder.interfaces';
 import type { ContractConfig } from '../contract';
+import type { EvmQueryConfig } from '../types/evm/EvmQueryConfig';
 import type { SubstrateQueryConfig } from '../types/substrate/SubstrateQueryConfig';
 
 export type BalanceConfigBuilder = ConfigBuilder<
-  ContractConfig | SubstrateQueryConfig,
+  ContractConfig | SubstrateQueryConfig | EvmQueryConfig,
   BalanceBuilderPrams
 >;
 

packages/builder/src/balance/BalanceBuilder.ts

@@ -5,7 +5,9 @@ import type {
   PalletBalancesAccountData,
 } from '@polkadot/types/lookup';
 import { evmToAddress } from '@polkadot/util-crypto';
+import type { Address } from 'viem';
 import { ContractConfig } from '../contract';
+import { EvmQueryConfig } from '../types/evm/EvmQueryConfig';
 import { SubstrateQueryConfig } from '../types/substrate/SubstrateQueryConfig';
 import type {
   BalanceConfigBuilder,
@@ -25,6 +27,7 @@ export function BalanceBuilder() {
 export function evm() {
   return {
     erc20,
+    native,
   };
 }
 
@@ -46,6 +49,16 @@ function erc20(): BalanceConfigBuilder {
   };
 }
 
+function native(): BalanceConfigBuilder {
+  return {
+    build: ({ address }) => {
+      return new EvmQueryConfig({
+        func: 'getBalance',
+        args: [{ address: address as Address }],
+      });
+    },
+  };
+}
 export function substrate() {
   return {
     assets,

packages/builder/src/contract/ContractBuilder.interfaces.ts

@@ -1,4 +1,4 @@
 import type { ConfigBuilder } from '../builder.interfaces';
-import type { ContractConfig } from '../types/ContractConfig';
+import type { ContractConfig } from '../types/evm/ContractConfig';
 
 export type ContractConfigBuilder = ConfigBuilder<ContractConfig>;

packages/builder/src/contract/contracts/Xtokens/Xtokens.ts

@@ -2,7 +2,7 @@ import { type AnyParachain, EvmParachain } from '@moonbeam-network/xcm-types';
 import { formatAssetIdToERC20 } from '@moonbeam-network/xcm-utils';
 import { u8aToHex } from '@polkadot/util';
 import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
-import { ContractConfig } from '../../../types/ContractConfig';
+import { ContractConfig } from '../../../types/evm/ContractConfig';
 import type { ContractConfigBuilder } from '../../ContractBuilder.interfaces';
 import { XTOKENS_ABI } from './XtokensABI';
 

packages/builder/src/contract/index.ts

@@ -1,3 +1,3 @@
+export * from '../types/evm/ContractConfig';
 export * from './ContractBuilder';
 export * from './ContractBuilder.interfaces';
-export * from '../types/ContractConfig';

packages/builder/src/index.ts

@@ -7,5 +7,4 @@ export * from './contract';
 export * from './extrinsic';
 export * from './fee';
 export * from './mrl';
-export * from './types/BaseConfig';
-export * from './types/substrate/SubstrateQueryConfig';
+export * from './types';

packages/builder/src/mrl/providers/wormhole/extrinsic/ethereumXcm/ethereumXcm.ts

@@ -1,6 +1,6 @@
 import { type Address, encodeFunctionData } from 'viem';
 import { ERC20_ABI } from '../../../../../balance/Erc20Abi';
-import type { ContractConfig } from '../../../../../types/ContractConfig';
+import type { ContractConfig } from '../../../../../types/evm/ContractConfig';
 import { ExtrinsicConfig } from '../../../../../types/substrate/ExtrinsicConfig';
 import { BATCH_CONTRACT_ADDRESS } from '../../../../MrlBuilder.constants';
 import type { MrlConfigBuilder } from '../../../../MrlBuilder.interfaces';

packages/builder/src/mrl/providers/wormhole/index.ts

@@ -2,9 +2,9 @@ import { contract } from './contract';
 import { extrinsic } from './extrinsic';
 import { wormhole as whBuilder } from './wormhole';
 
-export * from './wormhole/wormholeFactory';
-export * from './wormhole/WormholeConfig';
 export * from './extrinsic/ethereumXcm/BatchContractAbi';
+export * from './wormhole/WormholeConfig';
+export * from './wormhole/wormholeFactory';
 
 export function wormhole() {
   return {

packages/builder/src/mrl/providers/wormhole/wormhole/WormholeConfig.ts

@@ -1,15 +1,17 @@
 import type { Network, Wormhole } from '@wormhole-foundation/sdk-connect';
 
 export type WormholeTransferFunctions = 'tokenTransfer';
-export type Args = Parameters<Wormhole<Network>[WormholeTransferFunctions]>;
+export type WormholeFunctionArgs = Parameters<
+  Wormhole<Network>[WormholeTransferFunctions]
+>;
 
 export interface WormholeConfigConstructorParams {
-  args: Args;
+  args: WormholeFunctionArgs;
   func: WormholeTransferFunctions;
 }
 
 export class WormholeConfig {
-  readonly args: Args;
+  readonly args: WormholeFunctionArgs;
 
   readonly func: WormholeTransferFunctions;
 

packages/builder/src/types/ContractConfig.ts → packages/builder/src/types/evm/ContractConfig.ts

@@ -1,5 +1,5 @@
 import { type Abi, encodeFunctionData } from 'viem';
-import { BaseConfig, type BaseConfigConstructorParams } from './BaseConfig';
+import { BaseConfig, type BaseConfigConstructorParams } from '../BaseConfig';
 
 export interface ContractConfigConstructorParams
   extends BaseConfigConstructorParams {

packages/builder/src/types/evm/EvmQueryConfig.ts

@@ -0,0 +1,25 @@
+import type { HttpTransport, PublicClient } from 'viem';
+
+export type EvmQueryFunctions = 'getBalance';
+export type EvmFunctionArgs = Parameters<
+  PublicClient<HttpTransport>[EvmQueryFunctions]
+>;
+
+export interface EvmQueryConfigParams {
+  readonly args: EvmFunctionArgs;
+  readonly func: EvmQueryFunctions;
+}
+
+export class EvmQueryConfig {
+  readonly args: EvmFunctionArgs;
+  readonly func: EvmQueryFunctions;
+
+  static is(obj: unknown): obj is EvmQueryConfig {
+    return obj instanceof EvmQueryConfig;
+  }
+
+  constructor({ args, func }: EvmQueryConfigParams) {
+    this.args = args;
+    this.func = func;
+  }
+}

packages/builder/src/types/evm/index.ts

@@ -0,0 +1,2 @@
+export * from './ContractConfig';
+export * from './EvmQueryConfig';

packages/builder/src/types/index.ts

@@ -0,0 +1,2 @@
+export * from './evm';
+export * from './substrate';

packages/builder/src/types/substrate/index.ts

@@ -0,0 +1,3 @@
+export * from './ExtrinsicConfig';
+export * from './SubstrateCallConfig';
+export * from './SubstrateQueryConfig';

packages/config/src/mrl-configs/fantomTestnet.ts

@@ -1,10 +1,6 @@
-import {
-  BalanceBuilder,
-  FeeBuilder,
-  MrlBuilder,
-} from '@moonbeam-network/xcm-builder';
-import { ftmwh, hdx } from '../assets';
-import { fantomTestnet, hydrationAlphanet } from '../chains';
+import { BalanceBuilder, MrlBuilder } from '@moonbeam-network/xcm-builder';
+import { dev, ftmwh } from '../assets';
+import { fantomTestnet, peaqAlphanet } from '../chains';
 import { ChainRoutes } from '../types/ChainRoutes';
 
 export const fantomTestnetRoutes = new ChainRoutes({
@@ -13,21 +9,27 @@ export const fantomTestnetRoutes = new ChainRoutes({
     {
       asset: ftmwh,
       source: {
-        balance: BalanceBuilder().substrate().system().account(), // TODO:
+        balance: BalanceBuilder().evm().native(),
+        destinationFee: {
+          balance: BalanceBuilder().evm().native(),
+        },
       },
       destination: {
-        chain: hydrationAlphanet,
-        balance: BalanceBuilder().substrate().system().account(), // TODO:
+        chain: peaqAlphanet,
+        balance: BalanceBuilder().substrate().assets().account(),
         fee: {
-          // TODO:
-          amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
-          asset: hdx,
-          balance: BalanceBuilder().substrate().system().account(),
+          asset: ftmwh,
+          amount: 0.01,
         },
       },
       mrl: {
         isAutomatic: true,
         transfer: MrlBuilder().wormhole().wormhole().tokenTransfer(),
+        moonChainFee: {
+          asset: dev,
+          amount: 0.1,
+          balance: BalanceBuilder().substrate().system().account(),
+        },
       },
     },
   ],

packages/config/src/types/AssetRoute.ts

@@ -42,6 +42,11 @@ export interface FeeConfig {
 export interface MrlConfig {
   isAutomatic: boolean;
   transfer: MrlConfigBuilder;
+  moonChainFee: {
+    asset: Asset;
+    amount: number | FeeConfigBuilder;
+    balance: BalanceConfigBuilder;
+  };
 }
 
 export interface DestinationFeeConfig

packages/sdk/src/getTransferData/getTransferData.utils.ts

@@ -2,6 +2,7 @@ import {
   type AssetMinConfigBuilder,
   type BalanceConfigBuilder,
   ContractConfig,
+  EvmQueryConfig,
   type ExtrinsicConfig,
   type FeeConfigBuilder,
   SubstrateQueryConfig,
@@ -51,14 +52,20 @@ export async function getBalance({
     return amount.copyWith({ amount: converted });
   }
 
-  if (
-    ContractConfig.is(config) &&
-    (EvmChain.is(chain) || EvmParachain.is(chain))
-  ) {
+  if (EvmChain.is(chain) || EvmParachain.is(chain)) {
     const evm = EvmService.create(chain);
-    const balance = await evm.getBalance(address, config);
 
-    return amount.copyWith({ amount: balance });
+    if (ContractConfig.is(config)) {
+      const balance = await evm.getBalance(address, config);
+
+      return amount.copyWith({ amount: balance });
+    }
+
+    if (EvmQueryConfig.is(config)) {
+      const balance = await evm.query(config);
+
+      return amount.copyWith({ amount: balance });
+    }
   }
 
   throw new Error(

packages/sdk/src/services/evm/EvmService.ts

@@ -1,12 +1,15 @@
-import type { ContractConfig } from '@moonbeam-network/xcm-builder';
+import type {
+  ContractConfig,
+  EvmQueryConfig,
+} from '@moonbeam-network/xcm-builder';
 import type { EvmChain, EvmParachain } from '@moonbeam-network/xcm-types';
 import {
+  createPublicClient,
   http,
   type Address,
   type Hash,
   type HttpTransport,
   type PublicClient,
-  createPublicClient,
 } from 'viem';
 import type { EvmSigner } from '../../sdk.interfaces';
 
@@ -27,6 +30,10 @@ export class EvmService {
     });
   }
 
+  async query(query: EvmQueryConfig) {
+    return this.client[query.func](...query.args);
+  }
+
   async getFee(address: string, contract: ContractConfig): Promise<bigint> {
     const gas = await this.client.estimateContractGas({
       abi: contract.abi,