@moonbeam-network/mrl 1.0.0-dev.153 → 1.0.0-dev.157

package/build/index.d.ts

@@ -1,10 +1,11 @@
 import * as _moonbeam_network_xcm_sdk from '@moonbeam-network/xcm-sdk';
-import { SourceChainTransferData } from '@moonbeam-network/xcm-sdk';
+import { SourceChainTransferData, EvmSigner } from '@moonbeam-network/xcm-sdk';
 import * as _wormhole_foundation_sdk_connect from '@wormhole-foundation/sdk-connect';
+import { TokenTransfer } from '@wormhole-foundation/sdk-connect';
 import * as _moonbeam_network_xcm_types from '@moonbeam-network/xcm-types';
 import { AssetAmount, AnyChain, EvmChain, EvmParachain, Ecosystem, AnyAsset } from '@moonbeam-network/xcm-types';
 import { Signer } from '@polkadot/api/types';
-import { IKeyringPair } from '@polkadot/types/types';
+import { IKeyringPair, ISubmittableResult } from '@polkadot/types/types';
 import { WalletClient } from 'viem';
 import { ConfigService } from '@moonbeam-network/xcm-config';
 
@@ -15,11 +16,12 @@ interface Signers {
 interface TransferData {
     destination: DestinationTransferData;
     getEstimate(amount: number | string): AssetAmount;
+    isAutomaticPossible: boolean;
     max: AssetAmount;
     min: AssetAmount;
     moonChain: MoonChainTransferData;
     source: SourceTransferData;
-    transfer(amount: bigint | number | string, isAutomatic: boolean, signers: Signers): Promise<string[]>;
+    transfer(amount: bigint | number | string, isAutomatic: boolean, signers: Signers, statusCallback?: (params: ISubmittableResult) => void): Promise<string[]>;
 }
 interface SourceTransferData extends SourceChainTransferData {
     destinationFeeBalance: AssetAmount;
@@ -30,13 +32,20 @@ interface SourceTransferData extends SourceChainTransferData {
 }
 interface DestinationTransferData extends ChainTransferData {
 }
-type MoonChainTransferData = Omit<ChainTransferData, 'min'>;
+type MoonChainTransferData = Omit<ChainTransferData, 'min' | 'balance'> & {
+    feeBalance: AssetAmount;
+};
 interface ChainTransferData {
     chain: AnyChain;
     balance: AssetAmount;
     fee: AssetAmount;
     min: AssetAmount;
 }
+type RedeemData = {
+    vaa: TokenTransfer.VAA;
+    tokenTransfer: TokenTransfer;
+    transfer(signer: EvmSigner): Promise<string[]>;
+};
 
 interface WormholeRedeemParams {
     txId: string;
@@ -54,10 +63,12 @@ declare function Mrl(options?: MrlOptions): {
         setDestination(destination: string | AnyChain): {
             assets: _moonbeam_network_xcm_types.Asset[];
             setAsset(asset: string | AnyAsset): {
-                setAddresses({ sourceAddress, destinationAddress, }: {
-                    sourceAddress: string;
-                    destinationAddress: string;
-                }): Promise<TransferData>;
+                setIsAutomatic(isAutomatic: boolean): {
+                    setAddresses({ sourceAddress, destinationAddress, }: {
+                        sourceAddress: string;
+                        destinationAddress: string;
+                    }): Promise<TransferData>;
+                };
             };
         };
     };
@@ -68,4 +79,4 @@ declare function Mrl(options?: MrlOptions): {
     }>;
 };
 
-export { Mrl, type MrlOptions };
+export { type ChainTransferData, type DestinationTransferData, type MoonChainTransferData, Mrl, type MrlOptions, type RedeemData, type Signers, type SourceTransferData, type TransferData };

package/build/index.mjs

@@ -11085,7 +11085,7 @@ import {
   EvmChain,
   EvmParachain as EvmParachain2
 } from "@moonbeam-network/xcm-types";
-import { toBigInt as toBigInt2 } from "@moonbeam-network/xcm-utils";
+import { toBigInt as toBigInt3 } from "@moonbeam-network/xcm-utils";
 import Big2 from "big.js";
 
 // src/getTransferData/getMoonChainData.ts
@@ -11094,7 +11094,6 @@ import { getBalance, getDestinationFee } from "@moonbeam-network/xcm-sdk";
 import { Parachain } from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 async function getMoonChainData({
-  destinationData,
   route,
   sourceAddress
 }) {
@@ -11104,15 +11103,6 @@ async function getMoonChainData({
     );
   }
   const moonChain = getMoonChain(route.source.chain);
-  const asset = moonChain.getChainAsset(route.mrl.moonChain.asset);
-  const isDestinationMoonChain = route.destination.chain.isEqual(moonChain);
-  if (isDestinationMoonChain) {
-    return {
-      balance: destinationData.balance,
-      chain: destinationData.chain,
-      fee: destinationData.fee
-    };
-  }
   const fee = await getDestinationFee({
     address: sourceAddress,
     // TODO not correct
@@ -11122,7 +11112,7 @@ async function getMoonChainData({
     feeAsset: route.mrl.moonChain.fee.asset
   });
   let address = sourceAddress;
-  if (Parachain.is(route.source.chain)) {
+  if (Parachain.is(route.source.chain) && !route.source.chain.isEqual(moonChain)) {
     const { address20 } = getMultilocationDerivedAddresses({
       address: sourceAddress,
       paraId: route.source.chain.parachainId,
@@ -11130,14 +11120,14 @@ async function getMoonChainData({
     });
     address = address20;
   }
-  const balance = await getBalance({
+  const feeBalance = await getBalance({
     address,
-    asset,
+    asset: moonChain.getChainAsset(route.mrl.moonChain.fee.asset),
     builder: route.mrl.moonChain.fee.balance,
     chain: moonChain
   });
   return {
-    balance,
+    feeBalance,
     chain: moonChain,
     fee
   };
@@ -11161,6 +11151,7 @@ import {
 import {
   AssetAmount as AssetAmount2
 } from "@moonbeam-network/xcm-types";
+import { toBigInt as toBigInt2 } from "@moonbeam-network/xcm-utils";
 
 // src/getTransferData/getTransferData.utils.ts
 import {
@@ -11364,6 +11355,7 @@ async function getMoonGasLimit(params) {
 
 // src/getTransferData/getSourceData.ts
 async function getSourceData({
+  isAutomatic,
   route,
   destinationAddress,
   destinationFee,
@@ -11411,7 +11403,7 @@ async function getSourceData({
     asset: balance,
     destinationAddress,
     feeAsset: feeBalance,
-    isAutomatic: route.mrl.isAutomaticPossible,
+    isAutomatic,
     route,
     sourceAddress
   });
@@ -11429,7 +11421,7 @@ async function getSourceData({
     transfer,
     asset: balance,
     feeAsset: feeBalance,
-    isAutomatic: route.mrl.isAutomaticPossible,
+    isAutomatic,
     destinationAddress,
     route,
     sourceAddress
@@ -11517,10 +11509,11 @@ async function getWormholeFee({
   config
 }) {
   if (WormholeConfig.is(config)) {
+    const safetyAmount = toBigInt2(1e-6, asset.decimals);
     const wh = WormholeService.create(chain);
     const fee = await wh.getFee(config);
     return AssetAmount2.fromChainAsset(chain.getChainAsset(asset), {
-      amount: fee.relayFee?.amount || 0n
+      amount: fee.relayFee ? fee.relayFee.amount + safetyAmount : 0n
     });
   }
   return;
@@ -11557,7 +11550,8 @@ async function getMoonChainFeeBalance({
 async function getTransferData({
   route,
   sourceAddress,
-  destinationAddress
+  destinationAddress,
+  isAutomatic
 }) {
   if (!route.mrl) {
     throw new Error(
@@ -11573,13 +11567,13 @@ async function getTransferData({
     target: route.getDestinationFeeAssetOnSource()
   });
   const sourceData = await getSourceData({
+    isAutomatic: route.mrl.isAutomaticPossible && isAutomatic,
     route,
     destinationAddress,
     destinationFee,
     sourceAddress
   });
   const moonChainData = await getMoonChainData({
-    destinationData,
     route,
     sourceAddress
   });
@@ -11588,7 +11582,7 @@ async function getTransferData({
     getEstimate(amount) {
       const isSameAssetPayingDestinationFee = sourceData.balance.isSame(destinationFee);
       const bigAmount = Big2(
-        toBigInt2(amount, sourceData.balance.decimals).toString()
+        toBigInt3(amount, sourceData.balance.decimals).toString()
       );
       const fee = getMoonChainFeeValueOnSource({
         destinationData,
@@ -11597,11 +11591,12 @@ async function getTransferData({
       });
       const result = bigAmount.minus(
         isSameAssetPayingDestinationFee ? destinationFee.toBig() : Big2(0)
-      ).minus(fee);
+      ).minus(fee).minus(sourceData.relayerFee?.toBig() || Big2(0));
       return sourceData.balance.copyWith({
         amount: result.lt(0) ? 0n : BigInt(result.toFixed())
       });
     },
+    isAutomaticPossible: route.mrl.isAutomaticPossible,
     max: sourceData.max,
     min: getMrlMin({
       destinationData,
@@ -11610,9 +11605,9 @@ async function getTransferData({
     }),
     moonChain: moonChainData,
     source: sourceData,
-    async transfer(amount, isAutomatic, { evmSigner, polkadotSigner }) {
+    async transfer(amount, isAutomatic2, { evmSigner, polkadotSigner }, statusCallback) {
       const source = route.source.chain;
-      const bigintAmount = toBigInt2(amount, sourceData.balance.decimals);
+      const bigintAmount = toBigInt3(amount, sourceData.balance.decimals);
       const asset = AssetAmount3.fromChainAsset(
         route.source.chain.getChainAsset(route.source.asset),
         { amount: bigintAmount }
@@ -11627,7 +11622,7 @@ async function getTransferData({
         asset,
         destinationAddress,
         feeAsset,
-        isAutomatic,
+        isAutomatic: isAutomatic2,
         route,
         sourceAddress
       });
@@ -11647,7 +11642,8 @@ async function getTransferData({
         const hash = await polkadot.transfer(
           sourceAddress,
           transfer,
-          polkadotSigner
+          polkadotSigner,
+          statusCallback
         );
         return [hash];
       }
@@ -11685,15 +11681,20 @@ function Mrl(options) {
                 destination
               });
               return {
-                setAddresses({
-                  sourceAddress,
-                  destinationAddress
-                }) {
-                  return getTransferData({
-                    route,
-                    sourceAddress,
-                    destinationAddress
-                  });
+                setIsAutomatic(isAutomatic) {
+                  return {
+                    setAddresses({
+                      sourceAddress,
+                      destinationAddress
+                    }) {
+                      return getTransferData({
+                        route,
+                        sourceAddress,
+                        destinationAddress,
+                        isAutomatic
+                      });
+                    }
+                  };
                 }
               };
             }