@moonbeam-network/mrl 1.0.0-dev.161 → 1.0.0-dev.162

package/build/index.mjs

@@ -11085,7 +11085,7 @@ import {
 } from "@moonbeam-network/xcm-sdk";
 import {
   AssetAmount as AssetAmount3,
-  EvmChain as EvmChain2,
+  EvmChain,
   EvmParachain as EvmParachain3
 } from "@moonbeam-network/xcm-types";
 import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
@@ -11094,7 +11094,10 @@ import Big2 from "big.js";
 // src/getTransferData/getMoonChainData.ts
 import { getMoonChain } from "@moonbeam-network/xcm-config";
 import { getBalance, getDestinationFee } from "@moonbeam-network/xcm-sdk";
-import { EvmParachain, Parachain } from "@moonbeam-network/xcm-types";
+import {
+  EvmParachain,
+  Parachain
+} from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 import { evmToAddress } from "@polkadot/util-crypto";
 async function getMoonChainData({
@@ -11108,44 +11111,60 @@ async function getMoonChainData({
     );
   }
   const moonChain = getMoonChain(route.source.chain);
-  const isDestinationMoonChain = moonChain.isEqual(route.destination.chain);
-  let address = isDestinationMoonChain ? destinationAddress : sourceAddress;
+  const moonChainAddress = getMoonChainAddress({
+    source: route.source.chain,
+    destination: route.destination.chain,
+    sourceAddress,
+    destinationAddress
+  });
   const fee = await getDestinationFee({
-    address,
+    address: moonChainAddress,
     asset: route.source.asset,
     destination: moonChain,
     fee: route.mrl.moonChain.fee.amount,
     feeAsset: route.mrl.moonChain.fee.asset
   });
-  if (Parachain.is(route.source.chain) && !route.source.chain.isEqual(moonChain)) {
-    const addressToUse = EvmParachain.is(route.source.chain) ? evmToAddress(sourceAddress) : sourceAddress;
-    const { address20 } = getMultilocationDerivedAddresses({
-      address: addressToUse,
-      paraId: route.source.chain.parachainId,
-      isParents: true
-    });
-    address = address20;
-  }
   const balance = await getBalance({
-    address,
+    address: moonChainAddress,
     asset: moonChain.getChainAsset(route.mrl.moonChain.asset),
     builder: route.mrl.moonChain.balance,
     chain: moonChain
   });
   const feeBalance = await getBalance({
-    address,
+    address: moonChainAddress,
     asset: moonChain.getChainAsset(route.mrl.moonChain.fee.asset),
     builder: route.mrl.moonChain.fee.balance,
     chain: moonChain
   });
   return {
-    address,
+    address: moonChainAddress,
     balance,
     feeBalance,
     chain: moonChain,
     fee
   };
 }
+function getMoonChainAddress({
+  source,
+  destination,
+  sourceAddress,
+  destinationAddress
+}) {
+  const moonChain = getMoonChain(source);
+  const isDestinationMoonChain = moonChain.isEqual(destination);
+  const isSourceMoonChain = moonChain.isEqual(source);
+  let moonChainAddress = isDestinationMoonChain ? destinationAddress : sourceAddress;
+  if (Parachain.is(source) && !isSourceMoonChain) {
+    const isSourceEvmSigner = EvmParachain.is(source) && source.isEvmSigner;
+    const { address20: computedOriginAccount } = getMultilocationDerivedAddresses({
+      address: isSourceEvmSigner ? evmToAddress(sourceAddress) : sourceAddress,
+      paraId: source.parachainId,
+      isParents: true
+    });
+    moonChainAddress = computedOriginAccount;
+  }
+  return moonChainAddress;
+}
 
 // src/getTransferData/getSourceData.ts
 import {
@@ -11644,7 +11663,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig2.is(transfer) && (EvmChain2.is(source) || EvmParachain3.is(source))) {
+      if (ContractConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -11665,7 +11684,7 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain2.is(source) || EvmParachain3.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }