@moonbeam-network/xcm-builder 1.0.0-dev.284 → 1.0.0-dev.285

package/build/index.d.ts

@@ -417,7 +417,7 @@ declare function eqBalances(): {
     transferXcm: () => ExtrinsicConfigBuilder;
 };
 
-declare function polkadotXcm$2(): {
+declare function polkadotXcm$1(): {
     limitedReserveTransferAssets: () => {
         here: () => ExtrinsicConfigBuilder;
         X1: () => ExtrinsicConfigBuilder;
@@ -478,7 +478,7 @@ declare function ExtrinsicBuilder(): {
     eqBalances: typeof eqBalances;
     xTokens: typeof xTokens;
     xTransfer: typeof xTransfer;
-    polkadotXcm: typeof polkadotXcm$2;
+    polkadotXcm: typeof polkadotXcm$1;
     xcmPallet: typeof xcmPallet$1;
 };
 
@@ -494,7 +494,7 @@ declare class SubstrateCallConfig {
 }
 
 type FeeConfigBuilder = ConfigBuilder<SubstrateCallConfig | ContractConfig, FeeConfigBuilderParams>;
-type ProtocolFeeConfigBuilder = ConfigBuilder<SubstrateQueryConfig | ContractConfig, ProtocolFeeConfigBuilderParams>;
+type BridgeFeeConfigBuilder = ConfigBuilder<SubstrateQueryConfig | ContractConfig, BridgeFeeConfigBuilderParams>;
 interface FeeConfigBuilderParams {
     address: string;
     api: ApiPromise;
@@ -504,8 +504,13 @@ interface FeeConfigBuilderParams {
     feeAsset: ChainAsset;
     source: AnyChain;
 }
-interface ProtocolFeeConfigBuilderParams extends Omit<FeeConfigBuilderParams, 'api'> {
-    bridgeChainFee: AssetAmount;
+interface BridgeFeeConfigBuilderParams {
+    asset: ChainAsset;
+    feeAsset: ChainAsset;
+    address: string;
+    balance?: AssetAmount;
+    destination: AnyChain;
+    source: AnyChain;
 }
 interface XcmPaymentFeeProps {
     isAssetReserveChain: boolean;
@@ -521,14 +526,11 @@ interface MoonbeamRuntimeXcmConfigAssetType extends Enum {
 type GetVersionedAssetId = (params: FeeConfigBuilderParams) => Promise<object> | object;
 
 declare function gateway(): {
-    quoteSendTokenFee(): ProtocolFeeConfigBuilder;
+    quoteSendTokenFee(): BridgeFeeConfigBuilder;
 };
 
 declare function outboundQueueApi(): {
-    calculateFee: () => {
-        mintForeignToken: () => ProtocolFeeConfigBuilder;
-        agentExecute: () => ProtocolFeeConfigBuilder;
-    };
+    calculateFee: () => BridgeFeeConfigBuilder;
 };
 
 declare function xcmPaymentApi(): {
@@ -605,8 +607,8 @@ interface SnowbridgeFunctionArgs {
     destinationParaId: number;
     amount: bigint;
     bridgeFeeAmount: bigint;
-    bridgeChainFee: bigint;
     requiresApproval: boolean;
+    value: bigint;
 }
 interface SnowbridgeConfigConstructorParams {
     args: SnowbridgeFunctionArgs;
@@ -1738,7 +1740,6 @@ type MrlExecuteConfigBuilder = ConfigBuilder<ContractConfig, MrlExecuteBuilderPa
 interface MrlBuilderParams extends BuilderParams<AnyChain> {
     isAutomatic: boolean;
     protocolFee?: AssetAmount;
-    bridgeChainFee?: AssetAmount;
     moonApi: ApiPromise;
     moonAsset: ChainAsset;
     bridgeChain: AnyParachain;
@@ -1770,12 +1771,6 @@ declare function ethereumTokenTransfers(): {
     transferNativeToken: () => MrlConfigBuilder;
 };
 
-declare function polkadotXcm$1(): {
-    transferAssetsUsingTypeAndThen: () => {
-        canonicalEth: () => MrlConfigBuilder;
-    };
-};
-
 declare function xcmPallet(): {
     transferAssets: () => {
         globalConsensus: () => MrlConfigBuilder;
@@ -1786,7 +1781,6 @@ declare function xcmPallet(): {
 declare function extrinsic$1(): {
     ethereumTokenTransfers: typeof ethereumTokenTransfers;
     xcmPallet: typeof xcmPallet;
-    polkadotXcm: typeof polkadotXcm$1;
 };
 
 declare function snowbridge(): {
@@ -1931,4 +1925,4 @@ declare function MrlBuilder(): {
 
 declare const BATCH_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000000808";
 
-export { type AssetAddressFormat, AssetMinBuilder, type AssetMinConfigBuilder, type AssetMinConfigBuilderParams, type AssetMultilocation, BATCH_CONTRACT_ABI, BATCH_CONTRACT_ADDRESS, BalanceBuilder, type BalanceBuilderParams, type BalanceConfigBuilder, type BuilderParams, type ConfigBuilder, ContractBuilder, ContractConfig, type ContractConfigBuilder, type ContractConfigConstructorParams, type DestinationMultilocation, ERC20_ABI, type EquilibriumSystemBalanceData, type EventMonitoringConfig, type EvmFunctionArgs, EvmQueryConfig, type EvmQueryConfigParams, type EvmQueryFunctions, ExtrinsicBuilder, ExtrinsicConfig, type ExtrinsicConfigBuilder, type ExtrinsicConfigConstructorParams, FeeBuilder, type FeeConfigBuilder, type FeeConfigBuilderParams, GATEWAY_ABI, type GetVersionedAssetId, MonitoringBuilder, type MonitoringBuilderConfig, type MoonbeamRuntimeXcmConfigAssetType, MrlBuilder, type MrlBuilderParams, type MrlConfigBuilder, type MrlExecuteBuilderParams, type MrlExecuteConfigBuilder, type MrlTransferConfig, type PalletBalancesAccountDataOld, type Parents, type ProtocolFeeConfigBuilder, type ProtocolFeeConfigBuilderParams, Protocols, Provider, type QueryConfigConstructorParams, SnowbridgeConfig, type SnowbridgeConfigConstructorParams, type SnowbridgeFunctionArgs, type SnowbridgeFunctions, SubstrateCallConfig, type SubstrateCallConfigConstructorParams, SubstrateQueryConfig, type TokensPalletAccountData, type Transact, TransferType, WormholeConfig, type WormholeConfigConstructorParams, type WormholeFunctionArgs, type WormholeTransferFunctions, type XcmPaymentFeeProps, XcmVersion, calculateSystemAccountBalance, evm, snowbridge, substrate, wormhole, wormholeFactory };
+export { type AssetAddressFormat, AssetMinBuilder, type AssetMinConfigBuilder, type AssetMinConfigBuilderParams, type AssetMultilocation, BATCH_CONTRACT_ABI, BATCH_CONTRACT_ADDRESS, BalanceBuilder, type BalanceBuilderParams, type BalanceConfigBuilder, type BridgeFeeConfigBuilder, type BridgeFeeConfigBuilderParams, type BuilderParams, type ConfigBuilder, ContractBuilder, ContractConfig, type ContractConfigBuilder, type ContractConfigConstructorParams, type DestinationMultilocation, ERC20_ABI, type EquilibriumSystemBalanceData, type EventMonitoringConfig, type EvmFunctionArgs, EvmQueryConfig, type EvmQueryConfigParams, type EvmQueryFunctions, ExtrinsicBuilder, ExtrinsicConfig, type ExtrinsicConfigBuilder, type ExtrinsicConfigConstructorParams, FeeBuilder, type FeeConfigBuilder, type FeeConfigBuilderParams, GATEWAY_ABI, type GetVersionedAssetId, MonitoringBuilder, type MonitoringBuilderConfig, type MoonbeamRuntimeXcmConfigAssetType, MrlBuilder, type MrlBuilderParams, type MrlConfigBuilder, type MrlExecuteBuilderParams, type MrlExecuteConfigBuilder, type MrlTransferConfig, type PalletBalancesAccountDataOld, type Parents, Protocols, Provider, type QueryConfigConstructorParams, SnowbridgeConfig, type SnowbridgeConfigConstructorParams, type SnowbridgeFunctionArgs, type SnowbridgeFunctions, SubstrateCallConfig, type SubstrateCallConfigConstructorParams, SubstrateQueryConfig, type TokensPalletAccountData, type Transact, TransferType, WormholeConfig, type WormholeConfigConstructorParams, type WormholeFunctionArgs, type WormholeTransferFunctions, type XcmPaymentFeeProps, XcmVersion, calculateSystemAccountBalance, evm, snowbridge, substrate, wormhole, wormholeFactory };

package/build/index.mjs

@@ -119,11 +119,11 @@ function AssetMinBuilder() {
   };
 }
 function assetRegistry() {
-  const pallet9 = "assetRegistry";
+  const pallet8 = "assetRegistry";
   return {
     assetMetadatas: () => ({
       build: ({ asset }) => new SubstrateQueryConfig({
-        module: pallet9,
+        module: pallet8,
         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: pallet9,
+        module: pallet8,
         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: pallet9,
+        module: pallet8,
         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, bridgeChainFee }) => {
+        build: ({ asset, destination, source }) => {
           if (!asset.address) {
             throw new Error(`Asset ${asset.key} has no address`);
           }
@@ -3929,11 +3929,7 @@ function gateway() {
           return new ContractConfig({
             address: source.contracts.Gateway,
             abi: GATEWAY_ABI,
-            args: [
-              asset.address,
-              destination.parachainId,
-              bridgeChainFee.amount
-            ],
+            args: [asset.address, destination.parachainId, 0n],
             func: "quoteSendTokenFee",
             module: "Gateway"
           });
@@ -3946,8 +3942,8 @@ function gateway() {
 // src/fee/outboundQueueApi/outboundQueueApi.ts
 function outboundQueueApi() {
   return {
-    calculateFee: () => ({
-      mintForeignToken: () => ({
+    calculateFee: () => {
+      return {
         build: ({ address, balance, feeAsset }) => {
           const args = [
             {
@@ -3967,34 +3963,8 @@ function outboundQueueApi() {
             transform: async (data) => data.local.toBigInt() + data.remote.toBigInt()
           });
         }
-      }),
-      agentExecute: () => ({
-        build: ({ address, balance, destination }) => {
-          const assetInDestination = balance ? destination.getChainAsset(balance) : void 0;
-          const args = [
-            {
-              AgentExecute: {
-                agentId: "0x0000000000000000000000000000000000000000000000000000000000000000",
-                // actual value is not important
-                TokenTransfer: {
-                  tokenId: assetInDestination?.address,
-                  recipient: address,
-                  amount: balance?.amount
-                }
-              }
-            },
-            null
-          ];
-          return new SubstrateQueryConfig({
-            module: "outboundQueueApi",
-            func: "calculateFee",
-            args,
-            queryType: "call",
-            transform: async (data) => data.local.toBigInt() + data.remote.toBigInt()
-          });
-        }
-      })
-    })
+      };
+    }
   };
 }
 
@@ -4745,54 +4715,34 @@ function Gateway() {
   return {
     sendToken: () => ({
       provider,
-      build: ({
-        asset,
-        destinationAddress,
-        protocolFee,
-        destination,
-        bridgeChainFee
-      }) => callSendToken(
-        asset,
-        protocolFee,
-        destination,
-        destinationAddress,
-        bridgeChainFee
-      )
+      build: ({ asset, destinationAddress, protocolFee, destination }) => callSendToken(asset, protocolFee, destination, destinationAddress)
     }),
     approveAndSendToken: () => ({
       provider,
-      build: ({
-        asset,
-        destinationAddress,
-        protocolFee,
-        destination,
-        bridgeChainFee
-      }) => {
+      build: ({ asset, destinationAddress, protocolFee, destination }) => {
         const requiresApproval = protocolFee && !protocolFee.isSame(asset);
         return callSendToken(
           asset,
           protocolFee,
           destination,
           destinationAddress,
-          bridgeChainFee,
           requiresApproval
         );
       }
     })
   };
 }
-function callSendToken(asset, protocolFee, destination, destinationAddress, bridgeChainFee, requiresApproval = false) {
+function callSendToken(asset, protocolFee, destination, destinationAddress, 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"
     );
   }
+  const isDifferentAsset = !asset.isSame(protocolFee);
+  const value = requiresApproval || isDifferentAsset ? protocolFee.amount : asset.amount + protocolFee.amount;
   return new SnowbridgeConfig({
     args: {
       tokenAddress: asset.address,
@@ -4800,8 +4750,8 @@ function callSendToken(asset, protocolFee, destination, destinationAddress, brid
       destinationParaId: destination.parachainId,
       amount: asset.amount,
       bridgeFeeAmount: protocolFee.amount,
-      bridgeChainFee: bridgeChainFee.amount,
-      requiresApproval
+      requiresApproval,
+      value
     },
     func: "sendToken"
   });
@@ -4833,165 +4783,8 @@ function ethereumTokenTransfers() {
   };
 }
 
-// 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 {
-        canonicalEth: () => ({
-          provider,
-          build: ({ asset, destination, destinationAddress, protocolFee }) => {
-            if (!EvmChain2.is(destination)) {
-              throw new Error(
-                "Destination must be an EVM chain for globalConsensus function"
-              );
-            }
-            if (!protocolFee) {
-              throw new Error(
-                "Bridge chain fee is required for the polkadotXcm.canonicalEth function"
-              );
-            }
-            const protocolFeeAmount = protocolFee.amount * 110n / 100n;
-            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: protocolFeeAmount }
-                    },
-                    {
-                      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";
+import { EvmChain as EvmChain2 } from "@moonbeam-network/xcm-types";
 
 // src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.utils.ts
 function getGlobalConsensusArgs({
@@ -5044,7 +4837,7 @@ function getGlobalConsensusArgs({
 }
 
 // src/mrl/providers/snowbridge/extrinsic/xcmPallet/xcmPallet.ts
-var pallet8 = "xcmPallet";
+var pallet7 = "xcmPallet";
 function xcmPallet2() {
   return {
     transferAssets: () => {
@@ -5054,13 +4847,13 @@ function xcmPallet2() {
         globalConsensus: () => ({
           provider,
           build: ({ asset, destination, destinationAddress }) => {
-            if (!EvmChain3.is(destination)) {
+            if (!EvmChain2.is(destination)) {
               throw new Error(
                 "Destination must be an EVM chain for globalConsensus function"
               );
             }
             return new ExtrinsicConfig({
-              module: pallet8,
+              module: pallet7,
               func,
               getArgs: (extrinsicFunction) => {
                 const assets3 = [
@@ -5093,14 +4886,14 @@ function xcmPallet2() {
         globalConsensusErc20: () => ({
           provider,
           build: ({ asset, destination, destinationAddress }) => {
-            if (!EvmChain3.is(destination)) {
+            if (!EvmChain2.is(destination)) {
               throw new Error(
                 "Destination must be an EVM chain for globalConsensusErc20 function"
               );
             }
             const assetInDestination = destination.getChainAsset(asset);
             return new ExtrinsicConfig({
-              module: pallet8,
+              module: pallet7,
               func,
               getArgs: (extrinsicFunction) => {
                 const assets3 = [
@@ -5145,7 +4938,7 @@ function xcmPallet2() {
 
 // src/mrl/providers/snowbridge/extrinsic/index.ts
 function extrinsic() {
-  return { ethereumTokenTransfers, xcmPallet: xcmPallet2, polkadotXcm: polkadotXcm2 };
+  return { ethereumTokenTransfers, xcmPallet: xcmPallet2 };
 }
 
 // src/mrl/providers/snowbridge/index.ts
@@ -5172,7 +4965,7 @@ import {
 import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 var BUY_EXECUTION_FEE = 100000000000000000n;
 var CROSS_CHAIN_FEE = 100000000000000000n;
-function polkadotXcm3() {
+function polkadotXcm2() {
   const provider = "wormhole" /* Wormhole */;
   return {
     send: () => ({
@@ -6125,7 +5918,7 @@ var WormholeConfig = class _WormholeConfig {
 };
 
 // src/mrl/providers/wormhole/wormhole/wormhole.ts
-import { EvmChain as EvmChain4, EvmParachain as EvmParachain7, Parachain as Parachain3 } from "@moonbeam-network/xcm-types";
+import { EvmChain as EvmChain3, 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";
@@ -6166,7 +5959,7 @@ function wormhole() {
       }) => {
         const isSourceParachain = Parachain3.is(source);
         const isDestinationMoonChain = destination.isEqual(moonChain);
-        const isDestinationEvmChain = EvmChain4.is(destination);
+        const isDestinationEvmChain = EvmChain3.is(destination);
         const isNativeAsset = asset.isSame(
           isDestinationEvmChain ? moonChain.nativeAsset : source.nativeAsset
         );
@@ -7820,7 +7613,7 @@ function ethereumXcm() {
 
 // src/mrl/providers/wormhole/extrinsic/index.ts
 function extrinsic2() {
-  return { ethereumXcm, polkadotXcm: polkadotXcm3 };
+  return { ethereumXcm, polkadotXcm: polkadotXcm2 };
 }
 
 // src/mrl/providers/wormhole/index.ts