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

package/build/index.d.ts

@@ -30,7 +30,8 @@ interface SourceTransferData extends SourceChainTransferData {
 }
 interface DestinationTransferData extends ChainTransferData {
 }
-type MoonChainTransferData = Omit<ChainTransferData, 'min' | 'balance'> & {
+type MoonChainTransferData = Omit<ChainTransferData, 'min'> & {
+    address: string;
     feeBalance: AssetAmount;
 };
 interface ChainTransferData {

package/build/index.mjs

@@ -11086,7 +11086,7 @@ import {
 import {
   AssetAmount as AssetAmount3,
   EvmChain,
-  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";
@@ -11094,11 +11094,16 @@ 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 { 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({
   route,
-  sourceAddress
+  sourceAddress,
+  destinationAddress
 }) {
   if (!route.mrl) {
     throw new Error(
@@ -11106,35 +11111,60 @@ async function getMoonChainData({
     );
   }
   const moonChain = getMoonChain(route.source.chain);
+  const moonChainAddress = getMoonChainAddress({
+    source: route.source.chain,
+    destination: route.destination.chain,
+    sourceAddress,
+    destinationAddress
+  });
   const fee = await getDestinationFee({
-    address: sourceAddress,
-    // TODO not correct
+    address: moonChainAddress,
     asset: route.source.asset,
     destination: moonChain,
     fee: route.mrl.moonChain.fee.amount,
     feeAsset: route.mrl.moonChain.fee.asset
   });
-  let address = sourceAddress;
-  if (Parachain.is(route.source.chain) && !route.source.chain.isEqual(moonChain)) {
-    const { address20 } = getMultilocationDerivedAddresses({
-      address: sourceAddress,
-      paraId: route.source.chain.parachainId,
-      isParents: true
-    });
-    address = address20;
-  }
+  const balance = await getBalance({
+    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: 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 {
@@ -11173,7 +11203,7 @@ import {
   convertToChainDecimals,
   getMin
 } 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
@@ -11193,7 +11223,7 @@ function getMoonChainFeeValueOnSource({
   moonChainData,
   sourceData
 }) {
-  const isSourceParachain = EvmParachain.isAnyParachain(sourceData.chain);
+  const isSourceParachain = EvmParachain2.isAnyParachain(sourceData.chain);
   const isDestinationMoonChain = destinationData.chain.isEqual(
     moonChainData.chain
   );
@@ -11242,7 +11272,7 @@ async function buildTransfer(params) {
   const builderParams = await getMrlBuilderParams(params);
   return route.mrl.transfer.build({
     ...builderParams,
-    transact: EvmParachain.isAnyParachain(route.source.chain) ? await getTransact(builderParams) : void 0
+    transact: EvmParachain2.isAnyParachain(route.source.chain) ? await getTransact(builderParams) : void 0
   });
 }
 async function getMrlBuilderParams({
@@ -11263,8 +11293,8 @@ async function getMrlBuilderParams({
   const destination = route.destination.chain;
   const moonChain = getMoonChain2(source);
   const [sourceApi, destinationApi, moonApi] = 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(moonChain.ws)
   ]);
   return {
@@ -11287,7 +11317,7 @@ async function getTransact(params) {
   const { sourceAddress, source, moonChain } = params;
   const polkadot = await PolkadotService.create(moonChain);
   const moonGasLimit = await getMoonGasLimit(params);
-  if (!EvmParachain.isAnyParachain(source)) {
+  if (!EvmParachain2.isAnyParachain(source)) {
     throw new Error("Source chain must be Parachain or EvmParachain");
   }
   const { address20 } = getMultilocationDerivedAddresses2({
@@ -11307,7 +11337,7 @@ async function getTransact(params) {
 }
 async function getMoonGasLimit(params) {
   const { asset, isAutomatic, moonChain, source, sourceAddress } = params;
-  if (!EvmParachain.isAnyParachain(source)) {
+  if (!EvmParachain2.isAnyParachain(source)) {
     throw new Error("Source chain must be Parachain or EvmParachain");
   }
   const client = createPublicClient2({
@@ -11580,7 +11610,8 @@ async function getTransferData({
   });
   const moonChainData = await getMoonChainData({
     route,
-    sourceAddress
+    sourceAddress,
+    destinationAddress
   });
   return {
     destination: destinationData,
@@ -11632,7 +11663,7 @@ async function getTransferData({
         sendOnlyRemoteExecution,
         sourceAddress
       });
-      if (ContractConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain2.is(source))) {
+      if (ContractConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }
@@ -11640,7 +11671,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");
         }
@@ -11653,7 +11684,7 @@ async function getTransferData({
         );
         return [hash];
       }
-      if (WormholeConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain2.is(source))) {
+      if (WormholeConfig2.is(transfer) && (EvmChain.is(source) || EvmParachain3.is(source))) {
         if (!evmSigner) {
           throw new Error("EVM Signer must be provided");
         }