@moonbeam-network/mrl 4.2.4 → 4.2.6

package/build/index.mjs

@@ -16809,7 +16809,11 @@ import {
   ERC20_ABI,
   GATEWAY_ABI
 } from "@moonbeam-network/xcm-builder";
-import { EvmService as EvmService2 } from "@moonbeam-network/xcm-sdk";
+import {
+  EvmService as EvmService2,
+  getAllowanceSlot,
+  MAX_ALLOWANCE_HEX
+} from "@moonbeam-network/xcm-sdk";
 import { EvmChain } from "@moonbeam-network/xcm-types";
 import { isEthAddress } from "@moonbeam-network/xcm-utils";
 import { u8aToHex } from "@polkadot/util";
@@ -16908,7 +16912,7 @@ var SnowbridgeService = class _SnowbridgeService {
     });
     return hash;
   }
-  async getFee(address, transfer) {
+  async getFee(address, transfer, allowanceSlot) {
     const { args } = transfer;
     const { tokenAddress, amount, requiresApproval } = args;
     const contract = this.buildContractConfig(transfer);
@@ -16923,11 +16927,20 @@ var SnowbridgeService = class _SnowbridgeService {
     if (currentAllowance >= amount) {
       return await this.#evmService.getFee(address, contract);
     }
-    return await this.estimateApproveAndSendFee(address, transfer);
+    return await this.estimateApproveAndSendFee(
+      address,
+      transfer,
+      allowanceSlot
+    );
   }
-  async estimateApproveAndSendFee(address, transfer) {
+  async estimateApproveAndSendFee(address, transfer, allowanceSlotNumber) {
     const { args } = transfer;
     const { tokenAddress, amount } = args;
+    if (!allowanceSlotNumber) {
+      throw new Error(
+        "Allowance slot is required to calculate the fee for approve and send"
+      );
+    }
     const contract = this.buildContractConfig(transfer);
     try {
       const approveData = encodeFunctionData({
@@ -16940,19 +16953,24 @@ var SnowbridgeService = class _SnowbridgeService {
         to: tokenAddress,
         data: approveData
       });
-      const sendData = encodeFunctionData({
-        abi: contract.abi,
-        functionName: contract.func,
-        args: contract.args
-      });
-      const sendGas = await this.#evmService.client.estimateGas({
-        account: address,
-        to: contract.address,
-        data: sendData,
-        value: contract.value
-      });
+      const allowanceSlot = getAllowanceSlot(
+        address,
+        this.#gatewayAddress,
+        allowanceSlotNumber
+      );
+      const sendFee = await this.#evmService.getFee(address, contract, [
+        {
+          address: tokenAddress,
+          stateDiff: [
+            {
+              slot: allowanceSlot,
+              value: MAX_ALLOWANCE_HEX
+            }
+          ]
+        }
+      ]);
       const gasPrice = await this.#evmService.client.getGasPrice();
-      return (approveGas + sendGas) * gasPrice;
+      return approveGas * gasPrice + sendFee;
     } catch (error) {
       console.error("Error estimating approve + send fee:", error);
       return 0n;
@@ -17434,7 +17452,12 @@ async function getFee({
   if (SnowbridgeConfig.is(transfer)) {
     const snowbridge = SnowbridgeService.create(chain2);
     try {
-      const feeAmount = await snowbridge.getFee(sourceAddress, transfer);
+      const allowanceSlot = balance.ids?.allowanceSlot;
+      const feeAmount = await snowbridge.getFee(
+        sourceAddress,
+        transfer,
+        allowanceSlot
+      );
       return AssetAmount2.fromChainAsset(chain2.getChainAsset(feeBalance), {
         amount: feeAmount
       });