@moonbeam-network/mrl 1.0.0-dev.285 → 1.0.0-dev.287

package/build/index.d.ts

@@ -28,18 +28,22 @@ interface TransferParams {
     statusCallback?: (status: ISubmittableResult) => void;
     sendOnlyRemoteExecution?: boolean;
 }
-interface MrlOtherFees {
-    /** Protocol bridge fee (e.g., Snowbridge) - deducted from transfer amount */
-    protocol?: AssetAmount;
-    /** Relayer service fee for automatic execution - only applies when isAutomatic=true */
-    relayer?: AssetAmount;
+interface FeeWithBalance {
+    fee: AssetAmount;
+    balance: AssetAmount;
+}
+interface MrlExtraFees {
+    /** Deducted from source balance */
+    local?: FeeWithBalance;
+    /** Deducted from transfer amount*/
+    remote?: FeeWithBalance;
 }
 interface SourceTransferData extends SourceChainTransferData {
     destinationFeeBalance: AssetAmount;
     bridgeChainFeeBalance?: AssetAmount;
     feeBalance: AssetAmount;
     max: AssetAmount;
-    otherFees: MrlOtherFees;
+    extraFees: MrlExtraFees;
 }
 interface DestinationTransferData extends ChainTransferData {
 }
@@ -88,4 +92,4 @@ declare function Mrl(options?: MrlOptions): {
     getExecuteTransferData({ txId, chain }: WormholeExecuteTransferParams): Promise<ExecuteTransferData>;
 };
 
-export { type BridgeChainTransferData, type ChainTransferData, type DestinationTransferData, type ExecuteTransferData, Mrl, type MrlOptions, type MrlOtherFees, type Signers, type SourceTransferData, type TransferData, type TransferParams };
+export { type BridgeChainTransferData, type ChainTransferData, type DestinationTransferData, type ExecuteTransferData, type FeeWithBalance, Mrl, type MrlExtraFees, type MrlOptions, type Signers, type SourceTransferData, type TransferData, type TransferParams };

package/build/index.mjs

@@ -16795,7 +16795,7 @@ import {
 import {
   AssetAmount as AssetAmount3,
   EvmChain as EvmChain3,
-  EvmParachain as EvmParachain4
+  EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
 import Big2 from "big.js";
@@ -16808,6 +16808,7 @@ import {
 } from "@moonbeam-network/xcm-builder";
 import { EvmService as EvmService2 } from "@moonbeam-network/xcm-sdk";
 import { EvmChain } from "@moonbeam-network/xcm-types";
+import { isEthAddress } from "@moonbeam-network/xcm-utils";
 import { u8aToHex } from "@polkadot/util";
 import { decodeAddress } from "@polkadot/util-crypto";
 import { encodeFunctionData } from "viem";
@@ -16869,16 +16870,16 @@ var SnowbridgeService = class _SnowbridgeService {
       destinationAddress,
       destinationParaId,
       amount,
+      bridgeChainFee,
       value
     } = args;
+    const isEthereumDestination = isEthAddress(destinationAddress);
+    const destination = isEthereumDestination ? { kind: 2, data: destinationAddress } : { kind: 1, data: u8aToHex(decodeAddress(destinationAddress)) };
     const contractArgs = [
       tokenAddress,
       destinationParaId,
-      {
-        kind: 1,
-        data: u8aToHex(decodeAddress(destinationAddress))
-      },
-      0n,
+      destination,
+      bridgeChainFee,
       amount
     ];
     return new ContractConfig({
@@ -16959,7 +16960,10 @@ var SnowbridgeService = class _SnowbridgeService {
 // src/getTransferData/getBridgeChainData.ts
 import { getBalance, getDestinationFee } from "@moonbeam-network/xcm-sdk";
 import { EvmParachain, Parachain } from "@moonbeam-network/xcm-types";
-import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
+import {
+  getMultilocationDerivedAddresses,
+  isEthAddress as isEthAddress2
+} from "@moonbeam-network/xcm-utils";
 import { evmToAddress } from "@polkadot/util-crypto";
 async function getBridgeChainData({
   route,
@@ -17016,6 +17020,10 @@ function getBridgeChainAddress({
   const isDestinationBridgeChain = bridgeChain.isEqual(destination);
   const isSourceBridgeChain = bridgeChain.isEqual(source);
   let bridgeChainAddress = isDestinationBridgeChain ? destinationAddress : sourceAddress;
+  if (Parachain.isExactly(bridgeChain) && isEthAddress2(bridgeChainAddress)) {
+    bridgeChainAddress = evmToAddress(bridgeChainAddress);
+    return bridgeChainAddress;
+  }
   if (Parachain.is(source) && !isSourceBridgeChain) {
     const isSourceEvmSigner = EvmParachain.is(source) && source.isEvmSigner;
     const { address20: computedOriginAccount } = getMultilocationDerivedAddresses({
@@ -17050,8 +17058,7 @@ import {
 } from "@moonbeam-network/xcm-sdk";
 import {
   AssetAmount as AssetAmount2,
-  EvmChain as EvmChain2,
-  EvmParachain as EvmParachain3
+  EvmChain as EvmChain2
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt2 } from "@moonbeam-network/xcm-utils";
 
@@ -17121,7 +17128,7 @@ function getMrlMin({
     bridgeChainData,
     sourceData
   });
-  const relayerFee = sourceData.otherFees?.relayer?.amount ? sourceData.otherFees.relayer.toBig() : Big(0);
+  const relayerFee = sourceData.extraFees?.remote?.fee.amount ? sourceData.extraFees.remote?.fee.toBig() : Big(0);
   return min.copyWith({
     amount: BigInt(min.toBig().add(bridgeChainFee).add(relayerFee).toFixed())
   });
@@ -17150,6 +17157,7 @@ async function buildTransfer(params) {
 async function getMrlBuilderParams({
   asset,
   protocolFee,
+  bridgeChainFee,
   destinationAddress,
   feeAsset,
   isAutomatic,
@@ -17173,6 +17181,7 @@ async function getMrlBuilderParams({
   return {
     asset,
     protocolFee,
+    bridgeChainFee,
     destination,
     destinationAddress,
     destinationApi,
@@ -17265,6 +17274,9 @@ async function getBridgeChainGasLimit(params) {
   return gasEstimation * 110n / 100n;
 }
 function getAmountForTransferSimulation(balance, protocolFee) {
+  if (!protocolFee || !balance.isSame(protocolFee)) {
+    return balance;
+  }
   return balance.copyWith({
     amount: balance.amount - protocolFee.amount > 0 ? balance.amount - protocolFee.amount : 0n
   });
@@ -17276,7 +17288,8 @@ async function getSourceData({
   route,
   destinationAddress,
   destinationFee,
-  sourceAddress
+  sourceAddress,
+  bridgeChainData
 }) {
   if (!route.mrl) {
     throw new Error(
@@ -17285,6 +17298,7 @@ async function getSourceData({
   }
   const source = route.source.chain;
   const destination = route.destination.chain;
+  const bridgeChain = route.mrl.bridgeChain.chain;
   const asset = source.getChainAsset(route.source.asset);
   const feeAsset = route.source.fee ? source.getChainAsset(route.source.fee.asset) : asset;
   const balance = await getBalance2({
@@ -17324,11 +17338,14 @@ async function getSourceData({
     feeAsset,
     balance,
     protocolFee: route.source.protocolFee,
-    address: destinationAddress
+    address: destinationAddress,
+    bridgeChain,
+    bridgeChainFee: bridgeChainData.fee
   });
   const transfer = await buildTransfer({
     asset: getAmountForTransferSimulation(balance, protocolFee),
     protocolFee,
+    bridgeChainFee: bridgeChainData.fee,
     destinationAddress,
     feeAsset: feeBalance,
     isAutomatic,
@@ -17344,7 +17361,13 @@ async function getSourceData({
     feeConfig: route.source.fee,
     sourceAddress
   });
-  const relayerFee = await getRelayerFee({
+  const max = getMax({
+    balance,
+    existentialDeposit,
+    fee,
+    min
+  });
+  const extraFees = await getExtraFees({
     chain: source,
     transfer,
     asset: balance,
@@ -17352,13 +17375,9 @@ async function getSourceData({
     isAutomatic,
     destinationAddress,
     route,
-    sourceAddress
-  });
-  const max = getMax({
-    balance,
-    existentialDeposit,
-    fee,
-    min
+    sourceAddress,
+    bridgeChainFee: bridgeChainData.fee,
+    protocolFee
   });
   return {
     balance,
@@ -17371,10 +17390,7 @@ async function getSourceData({
     feeBalance,
     max,
     min,
-    otherFees: {
-      protocol: protocolFee,
-      relayer: relayerFee?.amount ? relayerFee : void 0
-    }
+    extraFees
   };
 }
 async function getFee({
@@ -17436,7 +17452,8 @@ async function getRelayerFee({
   isAutomatic,
   route,
   sourceAddress,
-  transfer
+  transfer,
+  bridgeChainFee
 }) {
   if (route.mrl.transfer.provider === Provider2.Snowbridge || SnowbridgeConfig.is(transfer)) {
     return void 0;
@@ -17451,7 +17468,8 @@ async function getRelayerFee({
       feeAsset,
       isAutomatic,
       route,
-      sourceAddress
+      sourceAddress,
+      bridgeChainFee
     });
     const wormholeConfig = MrlBuilder3().wormhole().wormhole().tokenTransfer().build(builderParams);
     return getWormholeFee({ asset, chain: chain2, config: wormholeConfig });
@@ -17503,24 +17521,30 @@ async function getBridgeChainFeeBalance({
 async function getProtocolFee({
   address,
   asset,
-  feeAsset,
   balance,
   protocolFee,
   destination,
-  source
+  source,
+  bridgeChain,
+  bridgeChainFee
 }) {
-  if (typeof protocolFee === "number") {
-    return AssetAmount2.fromChainAsset(feeAsset, {
-      amount: protocolFee
+  if (!protocolFee) {
+    return void 0;
+  }
+  const protocolFeeAsset = source.getChainAsset(protocolFee.asset);
+  if (typeof protocolFee.amount === "number") {
+    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
+      amount: protocolFee.amount
     });
   }
-  const config = protocolFee?.build({
+  const config = protocolFee?.amount?.build({
     address,
     asset,
-    feeAsset,
+    feeAsset: protocolFeeAsset,
     balance,
     destination,
-    source
+    source,
+    bridgeChainFee
   });
   if (ContractConfig2.is(config) && EvmChain2.is(source)) {
     const evm = EvmService3.create(source);
@@ -17530,21 +17554,58 @@ async function getProtocolFee({
         `Error getting bridge fee: expected bigint from contract call, but received ${typeof amount}. `
       );
     }
-    return AssetAmount2.fromChainAsset(feeAsset, {
+    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
       amount
     });
   }
-  if (SubstrateQueryConfig.is(config) && EvmParachain3.isAnyParachain(source)) {
-    const polkadot = await PolkadotService2.create(source);
+  if (SubstrateQueryConfig.is(config)) {
+    const polkadot = await PolkadotService2.create(bridgeChain);
     const amount = await polkadot.query(config);
-    return AssetAmount2.fromChainAsset(feeAsset, {
+    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
       amount
     });
   }
-  return AssetAmount2.fromChainAsset(feeAsset, {
+  return AssetAmount2.fromChainAsset(protocolFeeAsset, {
     amount: 0n
   });
 }
+async function getExtraFees({
+  asset,
+  chain: chain2,
+  destinationAddress,
+  feeAsset,
+  isAutomatic,
+  route,
+  sourceAddress,
+  transfer,
+  bridgeChainFee,
+  protocolFee
+}) {
+  const relayerFee = await getRelayerFee({
+    chain: chain2,
+    transfer,
+    asset,
+    feeAsset,
+    isAutomatic,
+    destinationAddress,
+    route,
+    sourceAddress,
+    bridgeChainFee
+  });
+  const protocolFeeConfig = route.source.protocolFee;
+  const protocolFeeBalance = protocolFeeConfig ? await getBalance2({
+    address: sourceAddress,
+    asset: chain2.getChainAsset(protocolFeeConfig.asset),
+    builder: protocolFeeConfig.balance,
+    chain: chain2
+  }) : void 0;
+  const localFee = protocolFee && protocolFeeBalance ? { fee: protocolFee, balance: protocolFeeBalance } : void 0;
+  const remoteFee = relayerFee ? { fee: relayerFee, balance: feeAsset } : void 0;
+  return {
+    local: localFee,
+    remote: remoteFee
+  };
+}
 
 // src/getTransferData/getTransferData.ts
 async function getTransferData({
@@ -17566,17 +17627,18 @@ async function getTransferData({
     asset: destinationData.fee,
     target: route.getDestinationFeeAssetOnSource()
   });
+  const bridgeChainData = await getBridgeChainData({
+    route,
+    sourceAddress,
+    destinationAddress
+  });
   const sourceData = await getSourceData({
     isAutomatic: route.mrl.isAutomaticPossible && isAutomatic,
     route,
     destinationAddress,
     destinationFee,
-    sourceAddress
-  });
-  const bridgeChainData = await getBridgeChainData({
-    route,
     sourceAddress,
-    destinationAddress
+    bridgeChainData
   });
   return {
     destination: destinationData,
@@ -17592,7 +17654,7 @@ async function getTransferData({
       });
       const result = bigAmount.minus(
         isSameAssetPayingDestinationFee ? destinationFee.toBig() : Big2(0)
-      ).minus(fee).minus(sourceData.otherFees?.relayer?.toBig() || Big2(0));
+      ).minus(fee).minus(sourceData.extraFees.remote?.fee.toBig() || Big2(0));
       return sourceData.balance.copyWith({
         amount: result.lt(0) ? 0n : BigInt(result.toFixed())
       });
@@ -17627,7 +17689,8 @@ async function getTransferData({
       );
       const transfer = await buildTransfer({
         asset,
-        protocolFee: sourceData.otherFees?.protocol,
+        protocolFee: sourceData.extraFees.local?.fee,
+        bridgeChainFee: bridgeChainData.fee,
         destinationAddress,
         feeAsset,
         isAutomatic: isAutomatic2,
@@ -17635,7 +17698,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
+      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -17643,7 +17706,7 @@ async function getTransferData({
         const hash = await evm.transfer(evmSigner, transfer);
         return [hash];
       }
-      if (ExtrinsicConfig.is(transfer) && EvmParachain4.isAnyParachain(source)) {
+      if (ExtrinsicConfig.is(transfer) && EvmParachain3.isAnyParachain(source)) {
         if (!polkadotSigner) {
           throw new Error("Polkadot signer must be provided");
         }
@@ -17656,14 +17719,14 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
         const wh = WormholeService.create(source);
         return wh.transfer(evmSigner, transfer);
       }
-      if (SnowbridgeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
+      if (SnowbridgeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }