@moonbeam-network/xcm-builder 1.0.0-dev.214 → 1.0.0-dev.215

package/build/index.d.ts

@@ -5,7 +5,7 @@ import { Struct, u128, Enum } from '@polkadot/types';
 import { Abi, PublicClient, HttpTransport } from 'viem';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/types';
 import { HexString } from '@polkadot/util/types';
-import { TokenId, ChainAddress, Wormhole } from '@wormhole-foundation/sdk-connect';
+import { Wormhole, Network } from '@wormhole-foundation/sdk-connect';
 
 interface ConfigBuilder<Config, Params = BuilderParams> {
     build: (params: Params) => Config;
@@ -364,12 +364,15 @@ declare function polkadotXcm$1(): {
         here: () => ExtrinsicConfigBuilder;
         X1: () => ExtrinsicConfigBuilder;
         X2: () => ExtrinsicConfigBuilder;
+        X2PalletInstance: () => ExtrinsicConfigBuilder;
     };
     limitedReserveWithdrawAssets: () => {
         X2: () => ExtrinsicConfigBuilder;
     };
     transferAssets: () => {
         here: (parents?: number) => ExtrinsicConfigBuilder;
+        X1: () => ExtrinsicConfigBuilder;
+        X1GeneralKey: () => ExtrinsicConfigBuilder;
         X2: () => ExtrinsicConfigBuilder;
         X3: () => ExtrinsicConfigBuilder;
         X2AndFeeHere: () => ExtrinsicConfigBuilder;
@@ -470,27 +473,7 @@ declare function FeeBuilder(): {
 };
 
 type WormholeTransferFunctions = 'tokenTransfer';
-type WormholeFunctionArgs = [
-    token: TokenId,
-    amount: bigint,
-    from: ChainAddress,
-    to: ChainAddress,
-    protocol: 'TokenBridge',
-    payload?: Uint8Array
-] | [
-    token: TokenId,
-    amount: bigint,
-    from: ChainAddress,
-    to: ChainAddress,
-    protocol: 'AutomaticTokenBridge',
-    nativeGas?: bigint
-] | [
-    token: TokenId,
-    amount: bigint,
-    from: ChainAddress,
-    to: ChainAddress,
-    protocol: 'ExecutorTokenBridge'
-];
+type WormholeFunctionArgs = Parameters<Wormhole<Network>[WormholeTransferFunctions]>;
 interface WormholeConfigConstructorParams {
     args: WormholeFunctionArgs;
     func: WormholeTransferFunctions;
@@ -506,7 +489,7 @@ declare function wormhole$1(): {
     tokenTransfer: () => MrlConfigBuilder;
 };
 
-declare function wormholeFactory(chain: AnyChain): Wormhole<"Testnet" | "Mainnet">;
+declare function wormholeFactory(chain: AnyChain): Wormhole<"Mainnet" | "Testnet">;
 
 type MrlConfigBuilder = ConfigBuilder<ContractConfig | ExtrinsicConfig | WormholeConfig, MrlBuilderParams>;
 type MrlExecuteConfigBuilder = ConfigBuilder<ContractConfig, MrlExecuteBuilderParams>;

package/build/index.mjs

@@ -1654,6 +1654,42 @@ function polkadotXcm() {
               });
             }
           })
+        }),
+        X2PalletInstance: () => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet2,
+            func,
+            getArgs: (extrinsicFunction) => {
+              const version = getExtrinsicArgumentVersion(extrinsicFunction);
+              const assetInDestination = params.destination.getChainAsset(
+                params.asset
+              );
+              return getPolkadotXcmExtrinsicArgs({
+                ...params,
+                func: extrinsicFunction,
+                asset: [
+                  {
+                    id: normalizeConcrete(version, {
+                      parents: 1,
+                      interior: {
+                        X2: [
+                          {
+                            Parachain: params.destination.parachainId
+                          },
+                          {
+                            PalletInstance: assetInDestination.getAssetPalletInstance()
+                          }
+                        ]
+                      }
+                    }),
+                    fun: {
+                      Fungible: params.asset.amount
+                    }
+                  }
+                ]
+              });
+            }
+          })
         })
       };
     },
@@ -1722,6 +1758,88 @@ function polkadotXcm() {
             }
           })
         }),
+        X1: () => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet2,
+            func,
+            getArgs: (extrinsicFunction) => {
+              const version = getExtrinsicArgumentVersion(extrinsicFunction);
+              return getPolkadotXcmExtrinsicArgs({
+                ...params,
+                func: extrinsicFunction,
+                asset: [
+                  {
+                    id: normalizeConcrete(version, {
+                      parents: 0,
+                      interior: {
+                        X1: [
+                          {
+                            GeneralIndex: params.asset.getAssetId()
+                          }
+                        ]
+                      }
+                    }),
+                    fun: {
+                      Fungible: params.asset.amount
+                    }
+                  }
+                ]
+              });
+            }
+          })
+        }),
+        X1GeneralKey: () => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet2,
+            func,
+            getArgs: (extrinsicFunction) => {
+              const version = getExtrinsicArgumentVersion(extrinsicFunction);
+              const isAssetDifferent = !params.asset.isSame(params.fee);
+              const assets3 = [
+                {
+                  id: normalizeConcrete(
+                    version,
+                    normalizeX1(version, {
+                      parents: 0,
+                      interior: {
+                        X1: {
+                          GeneralKey: params.asset.getGeneralKey()
+                        }
+                      }
+                    })
+                  ),
+                  fun: {
+                    Fungible: params.asset.amount
+                  }
+                }
+              ];
+              if (isAssetDifferent) {
+                const feeAsset = {
+                  id: normalizeConcrete(
+                    version,
+                    normalizeX1(version, {
+                      parents: 0,
+                      interior: {
+                        X1: {
+                          GeneralKey: params.fee.getGeneralKey()
+                        }
+                      }
+                    })
+                  ),
+                  fun: {
+                    Fungible: params.fee.amount
+                  }
+                };
+                assets3.unshift(feeAsset);
+              }
+              return getPolkadotXcmExtrinsicArgs({
+                ...params,
+                func: extrinsicFunction,
+                asset: assets3
+              });
+            }
+          })
+        }),
         X2: () => ({
           build: (params) => new ExtrinsicConfig({
             module: pallet2,
@@ -3959,25 +4077,13 @@ function wormhole() {
           isDestinationMoonChain || isDestinationEvmChain ? destinationAddress : GMP_CONTRACT_ADDRESS
         );
         return new WormholeConfig({
-          args: isAutomatic ? [
-            whAsset,
-            asset.amount,
-            whSourceAddress,
-            whDestinationAddress,
-            "AutomaticTokenBridge"
-          ] : isDestinationMoonChain || isDestinationEvmChain ? [
-            whAsset,
-            asset.amount,
-            whSourceAddress,
-            whDestinationAddress,
-            "ExecutorTokenBridge"
-          ] : [
+          args: [
             whAsset,
             asset.amount,
             whSourceAddress,
             whDestinationAddress,
-            "TokenBridge",
-            getPayload({ destination, destinationAddress, moonApi })
+            isAutomatic,
+            isDestinationMoonChain || isDestinationEvmChain ? void 0 : getPayload({ destination, destinationAddress, moonApi })
           ],
           func: "tokenTransfer"
         });