@moonbeam-network/mrl 1.0.0-dev.266 → 1.0.0-dev.268

package/build/index.d.ts

@@ -36,6 +36,7 @@ interface MrlOtherFees {
 }
 interface SourceTransferData extends SourceChainTransferData {
     destinationFeeBalance: AssetAmount;
+    bridgeChainFeeBalance?: AssetAmount;
     feeBalance: AssetAmount;
     max: AssetAmount;
     otherFees: MrlOtherFees;

package/build/index.mjs

@@ -16768,7 +16768,7 @@ import {
 } from "@moonbeam-network/xcm-sdk";
 import {
   AssetAmount as AssetAmount3,
-  EvmChain as EvmChain2,
+  EvmChain as EvmChain3,
   EvmParachain as EvmParachain4
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
@@ -16778,21 +16778,28 @@ import Big2 from "big.js";
 import {
   ContractConfig,
   ERC20_ABI,
-  GATEWAY_ABI,
-  GATEWAY_CONTRACT_ADDRESS
+  GATEWAY_ABI
 } from "@moonbeam-network/xcm-builder";
 import { EvmService as EvmService2 } from "@moonbeam-network/xcm-sdk";
+import { EvmChain } from "@moonbeam-network/xcm-types";
 import { u8aToHex } from "@polkadot/util";
 import { decodeAddress } from "@polkadot/util-crypto";
 import { encodeFunctionData } from "viem";
 var SnowbridgeService = class _SnowbridgeService {
   chain;
   #evmService;
+  #gatewayAddress;
   static create(chain2) {
     return new _SnowbridgeService(chain2);
   }
   constructor(chain2) {
+    if (!EvmChain.is(chain2) || !chain2.contracts?.Gateway) {
+      throw new Error(
+        "Chain must be an EVMChain with the Gateway contract address configured for Snowbridge operations"
+      );
+    }
     this.chain = chain2;
+    this.#gatewayAddress = chain2.contracts.Gateway;
     this.#evmService = EvmService2.create(chain2);
   }
   async checkAllowance(ownerAddress, tokenAddress, spenderAddress) {
@@ -16822,16 +16829,10 @@ var SnowbridgeService = class _SnowbridgeService {
     const currentAllowance = await this.checkAllowance(
       signer.account.address,
       tokenAddress,
-      GATEWAY_CONTRACT_ADDRESS
+      this.#gatewayAddress
     );
-    console.log("currentAllowance", currentAllowance);
     if (currentAllowance < amount) {
-      await this.approve(
-        signer,
-        tokenAddress,
-        GATEWAY_CONTRACT_ADDRESS,
-        amount
-      );
+      await this.approve(signer, tokenAddress, this.#gatewayAddress, amount);
     }
     return await this.#evmService.transfer(signer, contract);
   }
@@ -16857,7 +16858,7 @@ var SnowbridgeService = class _SnowbridgeService {
       amount
     ];
     return new ContractConfig({
-      address: GATEWAY_CONTRACT_ADDRESS,
+      address: this.#gatewayAddress,
       abi: GATEWAY_ABI,
       args: contractArgs,
       func: "sendToken",
@@ -16889,7 +16890,7 @@ var SnowbridgeService = class _SnowbridgeService {
     const currentAllowance = await this.checkAllowance(
       address,
       tokenAddress,
-      GATEWAY_CONTRACT_ADDRESS
+      this.#gatewayAddress
     );
     if (currentAllowance >= amount) {
       return await this.#evmService.getFee(address, contract);
@@ -16904,7 +16905,7 @@ var SnowbridgeService = class _SnowbridgeService {
       const approveData = encodeFunctionData({
         abi: ERC20_ABI,
         functionName: "approve",
-        args: [GATEWAY_CONTRACT_ADDRESS, amount]
+        args: [this.#gatewayAddress, amount]
       });
       const approveGas = await this.#evmService.client.estimateGas({
         account: address,
@@ -16923,9 +16924,6 @@ var SnowbridgeService = class _SnowbridgeService {
         value: contract.value
       });
       const gasPrice = await this.#evmService.client.getGasPrice();
-      console.log("gasPrice", gasPrice);
-      console.log("approveGas", approveGas);
-      console.log("sendGas", sendGas);
       return (approveGas + sendGas) * gasPrice;
     } catch (error) {
       console.error("Error estimating approve + send fee:", error);
@@ -17027,7 +17025,7 @@ import {
 } from "@moonbeam-network/xcm-sdk";
 import {
   AssetAmount as AssetAmount2,
-  EvmChain,
+  EvmChain as EvmChain2,
   EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt2 } from "@moonbeam-network/xcm-utils";
@@ -17276,6 +17274,12 @@ async function getSourceData({
     route,
     sourceAddress
   });
+  const bridgeChainFeeBalance = await getBridgeChainFeeBalance({
+    balance,
+    feeBalance,
+    route,
+    sourceAddress
+  });
   const existentialDeposit = await getExistentialDeposit(source);
   const min = await getAssetMin({
     asset,
@@ -17331,7 +17335,7 @@ async function getSourceData({
     chain: source,
     destinationFee,
     destinationFeeBalance,
-    // bridgeChainFeeBalance,
+    bridgeChainFeeBalance,
     existentialDeposit,
     fee,
     feeBalance,
@@ -17358,9 +17362,7 @@ async function getFee({
     });
   }
   if (SnowbridgeConfig.is(transfer)) {
-    const snowbridge = SnowbridgeService.create(
-      chain2
-    );
+    const snowbridge = SnowbridgeService.create(chain2);
     const feeAmount = await snowbridge.getFee(sourceAddress, transfer);
     return AssetAmount2.fromChainAsset(chain2.getChainAsset(feeBalance), {
       amount: feeAmount
@@ -17436,6 +17438,33 @@ async function getWormholeFee({
   }
   return;
 }
+async function getBridgeChainFeeBalance({
+  balance,
+  feeBalance,
+  route,
+  sourceAddress
+}) {
+  if (!route.source.bridgeChainFee) {
+    return void 0;
+  }
+  if (route.mrl?.bridgeChain.fee.asset.isEqual(balance)) {
+    return balance;
+  }
+  if (route.mrl?.bridgeChain.fee.asset.isEqual(feeBalance)) {
+    return feeBalance;
+  }
+  if (!route.source.bridgeChainFee.balance) {
+    throw new Error(
+      "BalanceBuilder must be defined for source.bridgeChainFee.balance for MrlAssetRoute"
+    );
+  }
+  return getBalance2({
+    address: sourceAddress,
+    asset: route.source.chain.getChainAsset(route.source.bridgeChainFee.asset),
+    builder: route.source.bridgeChainFee.balance,
+    chain: route.source.chain
+  });
+}
 async function getProtocolFee({
   address,
   asset,
@@ -17456,7 +17485,7 @@ async function getProtocolFee({
     destination,
     source
   });
-  if (ContractConfig2.is(config) && EvmChain.is(source)) {
+  if (ContractConfig2.is(config) && EvmChain2.is(source)) {
     const evm = EvmService3.create(source);
     const amount = await evm.read(config);
     if (typeof amount !== "bigint") {
@@ -17496,12 +17525,10 @@ async function getTransferData({
     route,
     destinationAddress
   });
-  console.log("destinationData", destinationData);
   const destinationFee = convertToChainDecimals2({
     asset: destinationData.fee,
     target: route.getDestinationFeeAssetOnSource()
   });
-  console.log("destinationFee", destinationFee);
   const sourceData = await getSourceData({
     isAutomatic: route.mrl.isAutomaticPossible && isAutomatic,
     route,
@@ -17509,13 +17536,11 @@ async function getTransferData({
     destinationFee,
     sourceAddress
   });
-  console.log("sourceData", sourceData);
   const bridgeChainData = await getBridgeChainData({
     route,
     sourceAddress,
     destinationAddress
   });
-  console.log("bridgeChainData", bridgeChainData);
   return {
     destination: destinationData,
     getEstimate(amount) {
@@ -17573,7 +17598,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig3.is(transfer) && (EvmChain2.is(source) || EvmParachain4.is(source))) {
+      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -17594,14 +17619,14 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain2.is(source) || EvmParachain4.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) && (EvmChain2.is(source) || EvmParachain4.is(source))) {
+      if (SnowbridgeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain4.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }