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

package/build/index.d.ts

@@ -28,19 +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;
-    protocolFeeBalance?: AssetAmount;
     feeBalance: AssetAmount;
     max: AssetAmount;
-    otherFees: MrlOtherFees;
+    extraFees: MrlExtraFees;
 }
 interface DestinationTransferData extends ChainTransferData {
 }
@@ -89,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

@@ -17131,7 +17131,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())
   });
@@ -17345,13 +17345,6 @@ async function getSourceData({
     bridgeChain,
     bridgeChainFee: bridgeChainData.fee
   });
-  const protocolFeeConfig = route.source.protocolFee;
-  const protocolFeeBalance = protocolFeeConfig ? await getBalance2({
-    address: sourceAddress,
-    asset: source.getChainAsset(protocolFeeConfig.asset),
-    builder: protocolFeeConfig.balance,
-    chain: source
-  }) : void 0;
   const transfer = await buildTransfer({
     asset: getAmountForTransferSimulation(balance, protocolFee),
     protocolFee,
@@ -17371,7 +17364,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,
@@ -17380,13 +17379,8 @@ async function getSourceData({
     destinationAddress,
     route,
     sourceAddress,
-    bridgeChainFee: bridgeChainData.fee
-  });
-  const max = getMax({
-    balance,
-    existentialDeposit,
-    fee,
-    min
+    bridgeChainFee: bridgeChainData.fee,
+    protocolFee
   });
   return {
     balance,
@@ -17394,16 +17388,12 @@ async function getSourceData({
     destinationFee,
     destinationFeeBalance,
     bridgeChainFeeBalance,
-    protocolFeeBalance,
     existentialDeposit,
     fee,
     feeBalance,
     max,
     min,
-    otherFees: {
-      protocol: protocolFee,
-      relayer: relayerFee?.amount ? relayerFee : void 0
-    }
+    extraFees
   };
 }
 async function getFee({
@@ -17534,7 +17524,6 @@ async function getBridgeChainFeeBalance({
 async function getProtocolFee({
   address,
   asset,
-  feeAsset,
   balance,
   protocolFee,
   destination,
@@ -17568,21 +17557,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)) {
     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({
@@ -17631,7 +17657,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())
       });
@@ -17666,7 +17692,7 @@ async function getTransferData({
       );
       const transfer = await buildTransfer({
         asset,
-        protocolFee: sourceData.otherFees?.protocol,
+        protocolFee: sourceData.extraFees.local?.fee,
         bridgeChainFee: bridgeChainData.fee,
         destinationAddress,
         feeAsset,