@moonbeam-network/mrl 1.0.0-dev.273 → 1.0.0-dev.275

package/build/index.mjs

@@ -17255,6 +17255,11 @@ async function getBridgeChainGasLimit(params) {
   });
   return gasEstimation * 110n / 100n;
 }
+function getAmountForTransferSimulation(balance, protocolFee) {
+  return balance.copyWith({
+    amount: balance.amount - protocolFee.amount > 0 ? balance.amount - protocolFee.amount : 0n
+  });
+}
 
 // src/getTransferData/getSourceData.ts
 async function getSourceData({
@@ -17306,15 +17311,14 @@ async function getSourceData({
   const protocolFee = await getProtocolFee({
     source,
     destination,
-    // For now, the fee asset is always the one used for the protocol fee
-    // If it where to change, we need make protocolFee a FeeConfig in MrlSourceConfig
-    asset: feeAsset,
+    asset,
+    feeAsset,
     balance,
     protocolFee: route.source.protocolFee,
     address: destinationAddress
   });
   const transfer = await buildTransfer({
-    asset: balance.copyWith({ amount: balance.amount - protocolFee.amount }),
+    asset: getAmountForTransferSimulation(balance, protocolFee),
     protocolFee,
     destinationAddress,
     feeAsset: feeBalance,
@@ -17380,10 +17384,15 @@ async function getFee({
   }
   if (SnowbridgeConfig.is(transfer)) {
     const snowbridge = SnowbridgeService.create(chain2);
-    const feeAmount = await snowbridge.getFee(sourceAddress, transfer);
-    return AssetAmount2.fromChainAsset(chain2.getChainAsset(feeBalance), {
-      amount: feeAmount
-    });
+    try {
+      const feeAmount = await snowbridge.getFee(sourceAddress, transfer);
+      return AssetAmount2.fromChainAsset(chain2.getChainAsset(feeBalance), {
+        amount: feeAmount
+      });
+    } catch (error) {
+      console.error(error);
+      return feeBalance.copyWith({ amount: 0n });
+    }
   }
   if (ContractConfig2.is(transfer)) {
     try {
@@ -17485,6 +17494,7 @@ async function getBridgeChainFeeBalance({
 async function getProtocolFee({
   address,
   asset,
+  feeAsset,
   balance,
   protocolFee,
   destination,
@@ -17498,6 +17508,7 @@ async function getProtocolFee({
   const config = protocolFee?.build({
     address,
     asset,
+    feeAsset,
     balance,
     destination,
     source
@@ -17510,18 +17521,18 @@ async function getProtocolFee({
         `Error getting bridge fee: expected bigint from contract call, but received ${typeof amount}. `
       );
     }
-    return AssetAmount2.fromChainAsset(asset, {
+    return AssetAmount2.fromChainAsset(feeAsset, {
       amount
     });
   }
   if (SubstrateQueryConfig.is(config) && EvmParachain3.isAnyParachain(source)) {
     const polkadot = await PolkadotService2.create(source);
     const amount = await polkadot.query(config);
-    return AssetAmount2.fromChainAsset(asset, {
+    return AssetAmount2.fromChainAsset(feeAsset, {
       amount
     });
   }
-  return AssetAmount2.fromChainAsset(source.getChainAsset(asset), {
+  return AssetAmount2.fromChainAsset(feeAsset, {
     amount: 0n
   });
 }