@moonbeam-network/mrl 1.0.0-dev.290 → 1.0.0-dev.291

package/build/index.mjs

@@ -16796,7 +16796,7 @@ import {
 import {
   AssetAmount as AssetAmount3,
   EvmChain as EvmChain3,
-  EvmParachain as EvmParachain2
+  EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
 import Big2 from "big.js";
@@ -16960,7 +16960,7 @@ var SnowbridgeService = class _SnowbridgeService {
 
 // src/getTransferData/getBridgeChainData.ts
 import { getBalance, getDestinationFee } from "@moonbeam-network/xcm-sdk";
-import { Parachain } from "@moonbeam-network/xcm-types";
+import { EvmParachain, Parachain } from "@moonbeam-network/xcm-types";
 import {
   getMultilocationDerivedAddresses,
   isEthAddress as isEthAddress2
@@ -17020,17 +17020,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: sourceAddress,
+      address: isSourceEvmSigner ? evmToAddress(sourceAddress) : sourceAddress,
       paraId: source.parachainId,
-      parents: isDifferentEcosystem ? 2 : 1
+      isParents: true
     });
     bridgeChainAddress = computedOriginAccount;
   }
@@ -17072,8 +17072,7 @@ import {
 } from "@moonbeam-network/xcm-builder";
 import {
   moonbaseAlpha,
-  moonbeam,
-  moonriver
+  moonbeam
 } from "@moonbeam-network/xcm-config";
 import {
   convertToChainDecimals,
@@ -17081,7 +17080,7 @@ import {
   getMin,
   PolkadotService
 } from "@moonbeam-network/xcm-sdk";
-import { AssetAmount, EvmParachain } from "@moonbeam-network/xcm-types";
+import { AssetAmount, EvmParachain as EvmParachain2 } from "@moonbeam-network/xcm-types";
 import {
   getMultilocationDerivedAddresses as getMultilocationDerivedAddresses2,
   getPolkadotApi
@@ -17094,7 +17093,6 @@ import {
 } from "viem";
 var MOON_CHAIN_AUTOMATIC_GAS_ESTIMATION = {
   [moonbeam.key]: 1273110n,
-  [moonriver.key]: 1273110n,
   [moonbaseAlpha.key]: 1470417n
 };
 function getBridgeChainFeeValueOnSource({
@@ -17102,7 +17100,7 @@ function getBridgeChainFeeValueOnSource({
   bridgeChainData,
   sourceData
 }) {
-  const isSourceParachain = EvmParachain.isAnyParachain(sourceData.chain);
+  const isSourceParachain = EvmParachain2.isAnyParachain(sourceData.chain);
   const isDestinationBridgeChain = destinationData.chain.isEqual(
     bridgeChainData.chain
   );
@@ -17137,7 +17135,7 @@ function getMrlMin({
   });
 }
 function requiresTransact(route) {
-  return route.mrl?.transfer.provider === Provider.Wormhole && EvmParachain.isAnyParachain(route.source.chain);
+  return route.mrl?.transfer.provider === Provider.Wormhole && EvmParachain2.isAnyParachain(route.source.chain);
 }
 async function buildTransfer(params) {
   const { route } = params;
@@ -17177,8 +17175,8 @@ async function getMrlBuilderParams({
   const destination = route.destination.chain;
   const bridgeChain = route.mrl.bridgeChain.chain;
   const [sourceApi, destinationApi, bridgeApi] = await Promise.all([
-    EvmParachain.isAnyParachain(source) ? getPolkadotApi(source.ws) : void 0,
-    EvmParachain.isAnyParachain(destination) ? getPolkadotApi(destination.ws) : void 0,
+    EvmParachain2.isAnyParachain(source) ? getPolkadotApi(source.ws) : void 0,
+    EvmParachain2.isAnyParachain(destination) ? getPolkadotApi(destination.ws) : void 0,
     getPolkadotApi(bridgeChain.ws)
   ]);
   return {
@@ -17203,14 +17201,13 @@ async function getTransact(params) {
   const { sourceAddress, source, bridgeChain } = params;
   const polkadot = await PolkadotService.create(bridgeChain);
   const bridgeChainGasLimit = await getBridgeChainGasLimit(params);
-  if (!EvmParachain.isAnyParachain(source)) {
+  if (!EvmParachain2.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,
-    parents: isDifferentEcosystem ? 2 : 1
+    isParents: true
   });
   const extrinsic = MrlBuilder2().wormhole().extrinsic().ethereumXcm().transact().build({ ...params, bridgeChainGasLimit });
   const { weight } = await polkadot.getPaymentInfo(address20, extrinsic);
@@ -17224,10 +17221,10 @@ async function getTransact(params) {
 }
 async function getBridgeChainGasLimit(params) {
   const { asset, isAutomatic, bridgeChain, source, sourceAddress } = params;
-  if (!EvmParachain.isAnyParachain(source)) {
+  if (!EvmParachain2.isAnyParachain(source)) {
     throw new Error("Source chain must be Parachain or EvmParachain");
   }
-  if (!EvmParachain.is(bridgeChain)) {
+  if (!EvmParachain2.is(bridgeChain)) {
     throw new Error("Bridge chain must be an EvmParachain");
   }
   const client = createPublicClient2({
@@ -17237,7 +17234,7 @@ async function getBridgeChainGasLimit(params) {
   const { address20 } = getMultilocationDerivedAddresses2({
     address: sourceAddress,
     paraId: source.parachainId,
-    parents: 1
+    isParents: true
   });
   if (isAutomatic) {
     return MOON_CHAIN_AUTOMATIC_GAS_ESTIMATION[bridgeChain.key] * 110n / 100n;
@@ -17723,7 +17720,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain2.is(source))) {
+      if (ContractConfig3.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -17731,7 +17728,7 @@ async function getTransferData({
         const hash = await evm.transfer(evmSigner, transfer);
         return [hash];
       }
-      if (ExtrinsicConfig.is(transfer) && EvmParachain2.isAnyParachain(source)) {
+      if (ExtrinsicConfig.is(transfer) && EvmParachain3.isAnyParachain(source)) {
         if (!polkadotSigner) {
           throw new Error("Polkadot signer must be provided");
         }
@@ -17744,14 +17741,14 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain2.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.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) || EvmParachain2.is(source))) {
+      if (SnowbridgeConfig2.is(transfer) && (EvmChain3.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }