@moonbeam-network/mrl 1.0.0-dev.294 → 1.0.0-dev.296

package/build/index.mjs

@@ -16798,7 +16798,7 @@ import {
 import {
   AssetAmount as AssetAmount3,
   EvmChain as EvmChain3,
-  EvmParachain as EvmParachain3
+  EvmParachain as EvmParachain2
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
 import Big2 from "big.js";
@@ -16809,11 +16809,7 @@ import {
   ERC20_ABI,
   GATEWAY_ABI
 } from "@moonbeam-network/xcm-builder";
-import {
-  EvmService as EvmService2,
-  getAllowanceSlot,
-  MAX_ALLOWANCE_HEX
-} from "@moonbeam-network/xcm-sdk";
+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";
@@ -16912,7 +16908,7 @@ var SnowbridgeService = class _SnowbridgeService {
     });
     return hash;
   }
-  async getFee(address, transfer, allowanceSlot) {
+  async getFee(address, transfer) {
     const { args } = transfer;
     const { tokenAddress, amount, requiresApproval } = args;
     const contract = this.buildContractConfig(transfer);
@@ -16927,13 +16923,9 @@ var SnowbridgeService = class _SnowbridgeService {
     if (currentAllowance >= amount) {
       return await this.#evmService.getFee(address, contract);
     }
-    return await this.estimateApproveAndSendFee(
-      address,
-      transfer,
-      allowanceSlot
-    );
+    return await this.estimateApproveAndSendFee(address, transfer);
   }
-  async estimateApproveAndSendFee(address, transfer, allowanceSlotNumber) {
+  async estimateApproveAndSendFee(address, transfer) {
     const { args } = transfer;
     const { tokenAddress, amount } = args;
     const contract = this.buildContractConfig(transfer);
@@ -16948,24 +16940,19 @@ var SnowbridgeService = class _SnowbridgeService {
         to: tokenAddress,
         data: approveData
       });
-      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 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 gasPrice = await this.#evmService.client.getGasPrice();
-      return approveGas * gasPrice + sendFee;
+      return (approveGas + sendGas) * gasPrice;
     } catch (error) {
       console.error("Error estimating approve + send fee:", error);
       return 0n;
@@ -16975,7 +16962,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 { Parachain } from "@moonbeam-network/xcm-types";
 import {
   getMultilocationDerivedAddresses,
   isEthAddress as isEthAddress2
@@ -17035,17 +17022,17 @@ function getBridgeChainAddress({
   const bridgeChain = route.mrl.bridgeChain.chain;
   const isDestinationBridgeChain = bridgeChain.isEqual(destination);
   const isSourceBridgeChain = bridgeChain.isEqual(source);
+  const isDifferentEcosystem = source.ecosystem !== bridgeChain.ecosystem;
   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({
-      address: isSourceEvmSigner ? evmToAddress(sourceAddress) : sourceAddress,
+      address: sourceAddress,
       paraId: source.parachainId,
-      isParents: true
+      parents: isDifferentEcosystem ? 2 : 1
     });
     bridgeChainAddress = computedOriginAccount;
   }
@@ -17087,7 +17074,8 @@ import {
 } from "@moonbeam-network/xcm-builder";
 import {
   moonbaseAlpha,
-  moonbeam
+  moonbeam,
+  moonriver
 } from "@moonbeam-network/xcm-config";
 import {
   convertToChainDecimals,
@@ -17095,7 +17083,7 @@ import {
   getMin,
   PolkadotService
 } from "@moonbeam-network/xcm-sdk";
-import { AssetAmount, EvmParachain as EvmParachain2 } from "@moonbeam-network/xcm-types";
+import { AssetAmount, EvmParachain } from "@moonbeam-network/xcm-types";
 import {
   getMultilocationDerivedAddresses as getMultilocationDerivedAddresses2,
   getPolkadotApi
@@ -17108,6 +17096,7 @@ import {
 } from "viem";
 var MOON_CHAIN_AUTOMATIC_GAS_ESTIMATION = {
   [moonbeam.key]: 1273110n,
+  [moonriver.key]: 1273110n,
   [moonbaseAlpha.key]: 1470417n
 };
 function getBridgeChainFeeValueOnSource({
@@ -17115,7 +17104,7 @@ function getBridgeChainFeeValueOnSource({
   bridgeChainData,
   sourceData
 }) {
-  const isSourceParachain = EvmParachain2.isAnyParachain(sourceData.chain);
+  const isSourceParachain = EvmParachain.isAnyParachain(sourceData.chain);
   const isDestinationBridgeChain = destinationData.chain.isEqual(
     bridgeChainData.chain
   );
@@ -17150,7 +17139,7 @@ function getMrlMin({
   });
 }
 function requiresTransact(route) {
-  return route.mrl?.transfer.provider === Provider.Wormhole && EvmParachain2.isAnyParachain(route.source.chain);
+  return route.mrl?.transfer.provider === Provider.Wormhole && EvmParachain.isAnyParachain(route.source.chain);
 }
 async function buildTransfer(params) {
   const { route } = params;
@@ -17190,8 +17179,8 @@ async function getMrlBuilderParams({
   const destination = route.destination.chain;
   const bridgeChain = route.mrl.bridgeChain.chain;
   const [sourceApi, destinationApi, bridgeApi] = await Promise.all([
-    EvmParachain2.isAnyParachain(source) ? getPolkadotApi(source.ws) : void 0,
-    EvmParachain2.isAnyParachain(destination) ? getPolkadotApi(destination.ws) : void 0,
+    EvmParachain.isAnyParachain(source) ? getPolkadotApi(source.ws) : void 0,
+    EvmParachain.isAnyParachain(destination) ? getPolkadotApi(destination.ws) : void 0,
     getPolkadotApi(bridgeChain.ws)
   ]);
   return {
@@ -17216,13 +17205,14 @@ async function getTransact(params) {
   const { sourceAddress, source, bridgeChain } = params;
   const polkadot = await PolkadotService.create(bridgeChain);
   const bridgeChainGasLimit = await getBridgeChainGasLimit(params);
-  if (!EvmParachain2.isAnyParachain(source)) {
+  if (!EvmParachain.isAnyParachain(source)) {
     throw new Error("Source chain must be Parachain or EvmParachain");
   }
+  const isDifferentEcosystem = source.ecosystem !== bridgeChain.ecosystem;
   const { address20 } = getMultilocationDerivedAddresses2({
     address: sourceAddress,
     paraId: source.parachainId,
-    isParents: true
+    parents: isDifferentEcosystem ? 2 : 1
   });
   const extrinsic = MrlBuilder2().wormhole().extrinsic().ethereumXcm().transact().build({ ...params, bridgeChainGasLimit });
   const { weight } = await polkadot.getPaymentInfo(address20, extrinsic);
@@ -17236,10 +17226,10 @@ async function getTransact(params) {
 }
 async function getBridgeChainGasLimit(params) {
   const { asset, isAutomatic, bridgeChain, source, sourceAddress } = params;
-  if (!EvmParachain2.isAnyParachain(source)) {
+  if (!EvmParachain.isAnyParachain(source)) {
     throw new Error("Source chain must be Parachain or EvmParachain");
   }
-  if (!EvmParachain2.is(bridgeChain)) {
+  if (!EvmParachain.is(bridgeChain)) {
     throw new Error("Bridge chain must be an EvmParachain");
   }
   const client = createPublicClient2({
@@ -17249,7 +17239,7 @@ async function getBridgeChainGasLimit(params) {
   const { address20 } = getMultilocationDerivedAddresses2({
     address: sourceAddress,
     paraId: source.parachainId,
-    isParents: true
+    parents: 1
   });
   if (isAutomatic) {
     return MOON_CHAIN_AUTOMATIC_GAS_ESTIMATION[bridgeChain.key] * 110n / 100n;
@@ -17447,12 +17437,7 @@ async function getFee({
   if (SnowbridgeConfig.is(transfer)) {
     const snowbridge = SnowbridgeService.create(chain2);
     try {
-      const allowanceSlot = balance.ids?.allowanceSlot;
-      const feeAmount = await snowbridge.getFee(
-        sourceAddress,
-        transfer,
-        allowanceSlot
-      );
+      const feeAmount = await snowbridge.getFee(sourceAddress, transfer);
       return AssetAmount2.fromChainAsset(chain2.getChainAsset(feeBalance), {
         amount: feeAmount
       });
@@ -17740,7 +17725,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
+      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain2.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -17748,7 +17733,7 @@ async function getTransferData({
         const hash = await evm.transfer(evmSigner, transfer);
         return [hash];
       }
-      if (ExtrinsicConfig.is(transfer) && EvmParachain3.isAnyParachain(source)) {
+      if (ExtrinsicConfig.is(transfer) && EvmParachain2.isAnyParachain(source)) {
         if (!polkadotSigner) {
           throw new Error("Polkadot signer must be provided");
         }
@@ -17761,14 +17746,14 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain2.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) || EvmParachain2.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }