@moonbeam-network/xcm-builder 1.0.0-dev.280 → 1.0.0-dev.282

package/build/index.d.ts

@@ -417,7 +417,7 @@ declare function eqBalances(): {
     transferXcm: () => ExtrinsicConfigBuilder;
 };
 
-declare function polkadotXcm$1(): {
+declare function polkadotXcm$2(): {
     limitedReserveTransferAssets: () => {
         here: () => ExtrinsicConfigBuilder;
         X1: () => ExtrinsicConfigBuilder;
@@ -478,7 +478,7 @@ declare function ExtrinsicBuilder(): {
     eqBalances: typeof eqBalances;
     xTokens: typeof xTokens;
     xTransfer: typeof xTransfer;
-    polkadotXcm: typeof polkadotXcm$1;
+    polkadotXcm: typeof polkadotXcm$2;
     xcmPallet: typeof xcmPallet$1;
 };
 
@@ -511,6 +511,7 @@ interface BridgeFeeConfigBuilderParams {
     balance?: AssetAmount;
     destination: AnyChain;
     source: AnyChain;
+    bridgeChainFee: AssetAmount;
 }
 interface XcmPaymentFeeProps {
     isAssetReserveChain: boolean;
@@ -607,6 +608,7 @@ interface SnowbridgeFunctionArgs {
     destinationParaId: number;
     amount: bigint;
     bridgeFeeAmount: bigint;
+    bridgeChainFee: bigint;
     requiresApproval: boolean;
 }
 interface SnowbridgeConfigConstructorParams {
@@ -1739,6 +1741,7 @@ type MrlExecuteConfigBuilder = ConfigBuilder<ContractConfig, MrlExecuteBuilderPa
 interface MrlBuilderParams extends BuilderParams<AnyChain> {
     isAutomatic: boolean;
     protocolFee?: AssetAmount;
+    bridgeChainFee?: AssetAmount;
     moonApi: ApiPromise;
     moonAsset: ChainAsset;
     bridgeChain: AnyParachain;
@@ -1770,6 +1773,12 @@ declare function ethereumTokenTransfers(): {
     transferNativeToken: () => MrlConfigBuilder;
 };
 
+declare function polkadotXcm$1(): {
+    transferAssetsUsingTypeAndThen: () => {
+        canonicalEth: () => MrlConfigBuilder;
+    };
+};
+
 declare function xcmPallet(): {
     transferAssets: () => {
         globalConsensus: () => MrlConfigBuilder;
@@ -1780,6 +1789,7 @@ declare function xcmPallet(): {
 declare function extrinsic$1(): {
     ethereumTokenTransfers: typeof ethereumTokenTransfers;
     xcmPallet: typeof xcmPallet;
+    polkadotXcm: typeof polkadotXcm$1;
 };
 
 declare function snowbridge(): {

package/build/index.mjs

@@ -119,11 +119,11 @@ function AssetMinBuilder() {
   };
 }
 function assetRegistry() {
-  const pallet8 = "assetRegistry";
+  const pallet9 = "assetRegistry";
   return {
     assetMetadatas: () => ({
       build: ({ asset }) => new SubstrateQueryConfig({
-        module: pallet8,
+        module: pallet9,
         func: "assetMetadatas",
         args: [asset],
         // biome-ignore lint/suspicious/noExplicitAny: not sure how to fix this
@@ -132,7 +132,7 @@ function assetRegistry() {
     }),
     currencyMetadatas: () => ({
       build: ({ asset }) => new SubstrateQueryConfig({
-        module: pallet8,
+        module: pallet9,
         func: "currencyMetadatas",
         args: [asset],
         // biome-ignore lint/suspicious/noExplicitAny: not sure how to fix this
@@ -141,7 +141,7 @@ function assetRegistry() {
     }),
     metadata: () => ({
       build: ({ asset }) => new SubstrateQueryConfig({
-        module: pallet8,
+        module: pallet9,
         func: "metadata",
         args: [asset],
         // biome-ignore lint/suspicious/noExplicitAny: not sure how to fix this
@@ -3912,7 +3912,7 @@ function gateway() {
   return {
     quoteSendTokenFee() {
       return {
-        build: ({ asset, destination, source }) => {
+        build: ({ asset, destination, source, bridgeChainFee }) => {
           if (!asset.address) {
             throw new Error(`Asset ${asset.key} has no address`);
           }
@@ -3929,7 +3929,11 @@ function gateway() {
           return new ContractConfig({
             address: source.contracts.Gateway,
             abi: GATEWAY_ABI,
-            args: [asset.address, destination.parachainId, 0n],
+            args: [
+              asset.address,
+              destination.parachainId,
+              bridgeChainFee.amount
+            ],
             func: "quoteSendTokenFee",
             module: "Gateway"
           });
@@ -4715,27 +4719,49 @@ function Gateway() {
   return {
     sendToken: () => ({
       provider,
-      build: ({ asset, destinationAddress, protocolFee, destination }) => callSendToken(asset, protocolFee, destination, destinationAddress)
+      build: ({
+        asset,
+        destinationAddress,
+        protocolFee,
+        destination,
+        bridgeChainFee
+      }) => callSendToken(
+        asset,
+        protocolFee,
+        destination,
+        destinationAddress,
+        bridgeChainFee
+      )
     }),
     approveAndSendToken: () => ({
       provider,
-      build: ({ asset, destinationAddress, protocolFee, destination }) => {
+      build: ({
+        asset,
+        destinationAddress,
+        protocolFee,
+        destination,
+        bridgeChainFee
+      }) => {
         const requiresApproval = protocolFee && !protocolFee.isSame(asset);
         return callSendToken(
           asset,
           protocolFee,
           destination,
           destinationAddress,
+          bridgeChainFee,
           requiresApproval
         );
       }
     })
   };
 }
-function callSendToken(asset, protocolFee, destination, destinationAddress, requiresApproval = false) {
+function callSendToken(asset, protocolFee, destination, destinationAddress, bridgeChainFee, requiresApproval = false) {
   if (!protocolFee) {
     throw new Error("Protocol fee is required for Gateway module");
   }
+  if (!bridgeChainFee) {
+    throw new Error("Bridge chain fee is required for Gateway module");
+  }
   if (!EvmParachain4.isAnyParachain(destination)) {
     throw new Error(
       "Destination must be a Parachain or EvmParachain for sending token with Gateway module"
@@ -4748,6 +4774,7 @@ function callSendToken(asset, protocolFee, destination, destinationAddress, requ
       destinationParaId: destination.parachainId,
       amount: asset.amount,
       bridgeFeeAmount: protocolFee.amount,
+      bridgeChainFee: bridgeChainFee.amount,
       requiresApproval
     },
     func: "sendToken"
@@ -4780,8 +4807,170 @@ function ethereumTokenTransfers() {
   };
 }
 
-// src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.ts
+// src/mrl/providers/snowbridge/extrinsic/polkadotXcm/polkadotXcm.ts
 import { EvmChain as EvmChain2 } from "@moonbeam-network/xcm-types";
+var pallet7 = "polkadotXcm";
+function polkadotXcm2() {
+  return {
+    transferAssetsUsingTypeAndThen: () => {
+      const func = "transferAssetsUsingTypeAndThen";
+      const provider = "snowbridge" /* Snowbridge */;
+      return {
+        // TODO mjm rename ? nativeEth?
+        canonicalEth: () => ({
+          provider,
+          build: ({
+            asset,
+            destination,
+            destinationAddress,
+            bridgeChainFee
+          }) => {
+            if (!EvmChain2.is(destination)) {
+              throw new Error(
+                "Destination must be an EVM chain for globalConsensus function"
+              );
+            }
+            if (!bridgeChainFee) {
+              throw new Error(
+                "Bridge chain fee is required for the polkadotXcm.canonicalEth function"
+              );
+            }
+            return new ExtrinsicConfig({
+              module: pallet7,
+              func,
+              getArgs: (extrinsicFunction) => {
+                const version = getExtrinsicArgumentVersion(extrinsicFunction);
+                const dest = {
+                  [version]: {
+                    parents: 1,
+                    interior: "Here"
+                  }
+                };
+                const assets3 = {
+                  [version]: [
+                    {
+                      id: {
+                        parents: 1,
+                        interior: "Here"
+                      },
+                      fun: { Fungible: bridgeChainFee.amount }
+                    },
+                    {
+                      id: {
+                        parents: 2,
+                        interior: {
+                          X1: [
+                            {
+                              GlobalConsensus: {
+                                Ethereum: { chainId: destination.id }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      fun: { Fungible: asset.amount }
+                    }
+                  ]
+                };
+                const assetsTransferType = 2 /* DestinationReserve */;
+                const remoteFeesId = {
+                  [version]: {
+                    parents: 1,
+                    interior: "Here"
+                  }
+                };
+                const feesTransferType = 2 /* DestinationReserve */;
+                const customXcmOnDest = {
+                  [version]: [
+                    {
+                      InitiateReserveWithdraw: {
+                        assets: {
+                          Definite: [
+                            {
+                              id: {
+                                parents: 1,
+                                interior: {
+                                  X1: [
+                                    {
+                                      GlobalConsensus: {
+                                        Ethereum: { chainId: destination.id }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              fun: { Fungible: asset.amount }
+                            }
+                          ]
+                        },
+                        reserve: {
+                          parents: 1,
+                          interior: {
+                            X1: [
+                              {
+                                GlobalConsensus: {
+                                  Ethereum: { chainId: destination.id }
+                                }
+                              }
+                            ]
+                          }
+                        },
+                        xcm: [
+                          {
+                            DepositAsset: {
+                              assets: {
+                                Definite: [
+                                  {
+                                    id: {
+                                      parents: 0,
+                                      interior: "Here"
+                                    },
+                                    fun: { Fungible: asset.amount }
+                                  }
+                                ]
+                              },
+                              beneficiary: {
+                                parents: 0,
+                                interior: {
+                                  X1: [
+                                    {
+                                      AccountKey20: {
+                                        network: {
+                                          Ethereum: { chainId: destination.id }
+                                        },
+                                        key: destinationAddress
+                                      }
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
+                };
+                return [
+                  dest,
+                  assets3,
+                  assetsTransferType,
+                  remoteFeesId,
+                  feesTransferType,
+                  customXcmOnDest,
+                  "Unlimited"
+                ];
+              }
+            });
+          }
+        })
+      };
+    }
+  };
+}
+
+// src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.ts
+import { EvmChain as EvmChain3 } from "@moonbeam-network/xcm-types";
 
 // src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.utils.ts
 function getGlobalConsensusArgs({
@@ -4834,7 +5023,7 @@ function getGlobalConsensusArgs({
 }
 
 // src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.ts
-var pallet7 = "xcmPallet";
+var pallet8 = "xcmPallet";
 function xcmPallet2() {
   return {
     transferAssets: () => {
@@ -4844,13 +5033,13 @@ function xcmPallet2() {
         globalConsensus: () => ({
           provider,
           build: ({ asset, destination, destinationAddress }) => {
-            if (!EvmChain2.is(destination)) {
+            if (!EvmChain3.is(destination)) {
               throw new Error(
                 "Destination must be an EVM chain for globalConsensus function"
               );
             }
             return new ExtrinsicConfig({
-              module: pallet7,
+              module: pallet8,
               func,
               getArgs: (extrinsicFunction) => {
                 const assets3 = [
@@ -4883,14 +5072,14 @@ function xcmPallet2() {
         globalConsensusErc20: () => ({
           provider,
           build: ({ asset, destination, destinationAddress }) => {
-            if (!EvmChain2.is(destination)) {
+            if (!EvmChain3.is(destination)) {
               throw new Error(
                 "Destination must be an EVM chain for globalConsensusErc20 function"
               );
             }
             const assetInDestination = destination.getChainAsset(asset);
             return new ExtrinsicConfig({
-              module: pallet7,
+              module: pallet8,
               func,
               getArgs: (extrinsicFunction) => {
                 const assets3 = [
@@ -4935,7 +5124,7 @@ function xcmPallet2() {
 
 // src/mrl/providers/snowbridge/extrinsic/index.ts
 function extrinsic() {
-  return { ethereumTokenTransfers, xcmPallet: xcmPallet2 };
+  return { ethereumTokenTransfers, xcmPallet: xcmPallet2, polkadotXcm: polkadotXcm2 };
 }
 
 // src/mrl/providers/snowbridge/index.ts
@@ -4962,7 +5151,7 @@ import {
 import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 var BUY_EXECUTION_FEE = 100000000000000000n;
 var CROSS_CHAIN_FEE = 100000000000000000n;
-function polkadotXcm2() {
+function polkadotXcm3() {
   const provider = "wormhole" /* Wormhole */;
   return {
     send: () => ({
@@ -5915,7 +6104,7 @@ var WormholeConfig = class _WormholeConfig {
 };
 
 // src/mrl/providers/wormhole/wormhole/wormhole.ts
-import { EvmChain as EvmChain3, EvmParachain as EvmParachain7, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
+import { EvmChain as EvmChain4, EvmParachain as EvmParachain7, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
 import { getMultilocationDerivedAddresses as getMultilocationDerivedAddresses3 } from "@moonbeam-network/xcm-utils";
 import { evmToAddress as evmToAddress4 } from "@polkadot/util-crypto/address";
 import { Wormhole as Wormhole2 } from "@wormhole-foundation/sdk-connect";
@@ -5956,7 +6145,7 @@ function wormhole() {
       }) => {
         const isSourceParachain = Parachain3.is(source);
         const isDestinationMoonChain = destination.isEqual(moonChain);
-        const isDestinationEvmChain = EvmChain3.is(destination);
+        const isDestinationEvmChain = EvmChain4.is(destination);
         const isNativeAsset = asset.isSame(
           isDestinationEvmChain ? moonChain.nativeAsset : source.nativeAsset
         );
@@ -7610,7 +7799,7 @@ function ethereumXcm() {
 
 // src/mrl/providers/wormhole/extrinsic/index.ts
 function extrinsic2() {
-  return { ethereumXcm, polkadotXcm: polkadotXcm2 };
+  return { ethereumXcm, polkadotXcm: polkadotXcm3 };
 }
 
 // src/mrl/providers/wormhole/index.ts