@moonbeam-network/mrl 1.0.0-dev.284 → 1.0.0-dev.286

package/build/index.d.ts

@@ -28,22 +28,18 @@ interface TransferParams {
     statusCallback?: (status: ISubmittableResult) => void;
     sendOnlyRemoteExecution?: boolean;
 }
-interface FeeWithBalance {
-    fee: AssetAmount;
-    balance: AssetAmount;
-}
-interface MrlExtraFees {
-    /** Deducted from source balance */
-    local?: FeeWithBalance;
-    /** Deducted from transfer amount*/
-    remote?: FeeWithBalance;
+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 SourceTransferData extends SourceChainTransferData {
     destinationFeeBalance: AssetAmount;
     bridgeChainFeeBalance?: AssetAmount;
     feeBalance: AssetAmount;
     max: AssetAmount;
-    extraFees: MrlExtraFees;
+    otherFees: MrlOtherFees;
 }
 interface DestinationTransferData extends ChainTransferData {
 }
@@ -92,4 +88,4 @@ declare function Mrl(options?: MrlOptions): {
     getExecuteTransferData({ txId, chain }: WormholeExecuteTransferParams): Promise<ExecuteTransferData>;
 };
 
-export { type BridgeChainTransferData, type ChainTransferData, type DestinationTransferData, type ExecuteTransferData, type FeeWithBalance, Mrl, type MrlExtraFees, type MrlOptions, type Signers, type SourceTransferData, type TransferData, type TransferParams };
+export { type BridgeChainTransferData, type ChainTransferData, type DestinationTransferData, type ExecuteTransferData, Mrl, type MrlOptions, type MrlOtherFees, 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 EvmParachain3
+  EvmParachain as EvmParachain4
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
 import Big2 from "big.js";
@@ -16808,7 +16808,6 @@ 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";
@@ -16870,21 +16869,18 @@ var SnowbridgeService = class _SnowbridgeService {
       destinationAddress,
       destinationParaId,
       amount,
-      bridgeFeeAmount,
-      bridgeChainFee,
-      requiresApproval
+      value
     } = args;
-    const value = requiresApproval ? bridgeFeeAmount : amount + bridgeFeeAmount;
-    const isEthereumDestination = isEthAddress(destinationAddress);
-    const destination = isEthereumDestination ? { kind: 2, data: destinationAddress } : { kind: 1, data: u8aToHex(decodeAddress(destinationAddress)) };
     const contractArgs = [
       tokenAddress,
       destinationParaId,
-      destination,
-      bridgeChainFee,
+      {
+        kind: 1,
+        data: u8aToHex(decodeAddress(destinationAddress))
+      },
+      0n,
       amount
     ];
-    console.log("contractArgs", contractArgs);
     return new ContractConfig({
       address: this.#gatewayAddress,
       abi: GATEWAY_ABI,
@@ -16963,10 +16959,7 @@ 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,
-  isEthAddress as isEthAddress2
-} from "@moonbeam-network/xcm-utils";
+import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 import { evmToAddress } from "@polkadot/util-crypto";
 async function getBridgeChainData({
   route,
@@ -17023,10 +17016,6 @@ 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({
@@ -17061,7 +17050,8 @@ import {
 } from "@moonbeam-network/xcm-sdk";
 import {
   AssetAmount as AssetAmount2,
-  EvmChain as EvmChain2
+  EvmChain as EvmChain2,
+  EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt2 } from "@moonbeam-network/xcm-utils";
 
@@ -17131,7 +17121,7 @@ function getMrlMin({
     bridgeChainData,
     sourceData
   });
-  const relayerFee = sourceData.extraFees?.remote?.fee.amount ? sourceData.extraFees.remote?.fee.toBig() : Big(0);
+  const relayerFee = sourceData.otherFees?.relayer?.amount ? sourceData.otherFees.relayer.toBig() : Big(0);
   return min.copyWith({
     amount: BigInt(min.toBig().add(bridgeChainFee).add(relayerFee).toFixed())
   });
@@ -17160,7 +17150,6 @@ async function buildTransfer(params) {
 async function getMrlBuilderParams({
   asset,
   protocolFee,
-  bridgeChainFee,
   destinationAddress,
   feeAsset,
   isAutomatic,
@@ -17184,7 +17173,6 @@ async function getMrlBuilderParams({
   return {
     asset,
     protocolFee,
-    bridgeChainFee,
     destination,
     destinationAddress,
     destinationApi,
@@ -17277,7 +17265,7 @@ async function getBridgeChainGasLimit(params) {
   return gasEstimation * 110n / 100n;
 }
 function getAmountForTransferSimulation(balance, protocolFee) {
-  if (!protocolFee) {
+  if (!balance.isSame(protocolFee)) {
     return balance;
   }
   return balance.copyWith({
@@ -17291,8 +17279,7 @@ async function getSourceData({
   route,
   destinationAddress,
   destinationFee,
-  sourceAddress,
-  bridgeChainData
+  sourceAddress
 }) {
   if (!route.mrl) {
     throw new Error(
@@ -17301,7 +17288,6 @@ 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({
@@ -17341,14 +17327,11 @@ async function getSourceData({
     feeAsset,
     balance,
     protocolFee: route.source.protocolFee,
-    address: destinationAddress,
-    bridgeChain,
-    bridgeChainFee: bridgeChainData.fee
+    address: destinationAddress
   });
   const transfer = await buildTransfer({
     asset: getAmountForTransferSimulation(balance, protocolFee),
     protocolFee,
-    bridgeChainFee: bridgeChainData.fee,
     destinationAddress,
     feeAsset: feeBalance,
     isAutomatic,
@@ -17364,13 +17347,7 @@ async function getSourceData({
     feeConfig: route.source.fee,
     sourceAddress
   });
-  const max = getMax({
-    balance,
-    existentialDeposit,
-    fee,
-    min
-  });
-  const extraFees = await getExtraFees({
+  const relayerFee = await getRelayerFee({
     chain: source,
     transfer,
     asset: balance,
@@ -17378,9 +17355,13 @@ async function getSourceData({
     isAutomatic,
     destinationAddress,
     route,
-    sourceAddress,
-    bridgeChainFee: bridgeChainData.fee,
-    protocolFee
+    sourceAddress
+  });
+  const max = getMax({
+    balance,
+    existentialDeposit,
+    fee,
+    min
   });
   return {
     balance,
@@ -17393,7 +17374,10 @@ async function getSourceData({
     feeBalance,
     max,
     min,
-    extraFees
+    otherFees: {
+      protocol: protocolFee,
+      relayer: relayerFee?.amount ? relayerFee : void 0
+    }
   };
 }
 async function getFee({
@@ -17455,8 +17439,7 @@ async function getRelayerFee({
   isAutomatic,
   route,
   sourceAddress,
-  transfer,
-  bridgeChainFee
+  transfer
 }) {
   if (route.mrl.transfer.provider === Provider2.Snowbridge || SnowbridgeConfig.is(transfer)) {
     return void 0;
@@ -17471,8 +17454,7 @@ async function getRelayerFee({
       feeAsset,
       isAutomatic,
       route,
-      sourceAddress,
-      bridgeChainFee
+      sourceAddress
     });
     const wormholeConfig = MrlBuilder3().wormhole().wormhole().tokenTransfer().build(builderParams);
     return getWormholeFee({ asset, chain: chain2, config: wormholeConfig });
@@ -17524,30 +17506,24 @@ async function getBridgeChainFeeBalance({
 async function getProtocolFee({
   address,
   asset,
+  feeAsset,
   balance,
   protocolFee,
   destination,
-  source,
-  bridgeChain,
-  bridgeChainFee
+  source
 }) {
-  if (!protocolFee) {
-    return void 0;
-  }
-  const protocolFeeAsset = source.getChainAsset(protocolFee.asset);
-  if (typeof protocolFee.amount === "number") {
-    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
-      amount: protocolFee.amount
+  if (typeof protocolFee === "number") {
+    return AssetAmount2.fromChainAsset(feeAsset, {
+      amount: protocolFee
     });
   }
-  const config = protocolFee?.amount?.build({
+  const config = protocolFee?.build({
     address,
     asset,
-    feeAsset: protocolFeeAsset,
+    feeAsset,
     balance,
     destination,
-    source,
-    bridgeChainFee
+    source
   });
   if (ContractConfig2.is(config) && EvmChain2.is(source)) {
     const evm = EvmService3.create(source);
@@ -17557,58 +17533,21 @@ async function getProtocolFee({
         `Error getting bridge fee: expected bigint from contract call, but received ${typeof amount}. `
       );
     }
-    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
+    return AssetAmount2.fromChainAsset(feeAsset, {
       amount
     });
   }
-  if (SubstrateQueryConfig.is(config)) {
-    const polkadot = await PolkadotService2.create(bridgeChain);
+  if (SubstrateQueryConfig.is(config) && EvmParachain3.isAnyParachain(source)) {
+    const polkadot = await PolkadotService2.create(source);
     const amount = await polkadot.query(config);
-    return AssetAmount2.fromChainAsset(protocolFeeAsset, {
+    return AssetAmount2.fromChainAsset(feeAsset, {
       amount
     });
   }
-  return AssetAmount2.fromChainAsset(protocolFeeAsset, {
+  return AssetAmount2.fromChainAsset(feeAsset, {
     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({
@@ -17630,18 +17569,17 @@ 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,
-    bridgeChainData
+    destinationAddress
   });
   return {
     destination: destinationData,
@@ -17657,7 +17595,7 @@ async function getTransferData({
       });
       const result = bigAmount.minus(
         isSameAssetPayingDestinationFee ? destinationFee.toBig() : Big2(0)
-      ).minus(fee).minus(sourceData.extraFees.remote?.fee.toBig() || Big2(0));
+      ).minus(fee).minus(sourceData.otherFees?.relayer?.toBig() || Big2(0));
       return sourceData.balance.copyWith({
         amount: result.lt(0) ? 0n : BigInt(result.toFixed())
       });
@@ -17692,8 +17630,7 @@ async function getTransferData({
       );
       const transfer = await buildTransfer({
         asset,
-        protocolFee: sourceData.extraFees.local?.fee,
-        bridgeChainFee: bridgeChainData.fee,
+        protocolFee: sourceData.otherFees?.protocol,
         destinationAddress,
         feeAsset,
         isAutomatic: isAutomatic2,
@@ -17701,7 +17638,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
+      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -17709,7 +17646,7 @@ async function getTransferData({
         const hash = await evm.transfer(evmSigner, transfer);
         return [hash];
       }
-      if (ExtrinsicConfig.is(transfer) && EvmParachain3.isAnyParachain(source)) {
+      if (ExtrinsicConfig.is(transfer) && EvmParachain4.isAnyParachain(source)) {
         if (!polkadotSigner) {
           throw new Error("Polkadot signer must be provided");
         }
@@ -17722,14 +17659,14 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain4.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) || EvmParachain3.is(source))) {
+      if (SnowbridgeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }