@moonbeam-network/xcm-builder 1.0.0-dev.209 → 1.0.0-dev.210

package/build/index.d.ts

@@ -384,6 +384,15 @@ declare function polkadotXcm$1(): {
     };
 };
 
+declare function xcmPallet(): {
+    limitedReserveTransferAssets: (parents?: Parents) => {
+        here: () => ExtrinsicConfigBuilder;
+    };
+    transferAssetsUsingTypeAndThen: () => {
+        here: () => ExtrinsicConfigBuilder;
+    };
+};
+
 declare function xTokens(): {
     transfer: () => ExtrinsicConfigBuilder;
     transferMultiAsset: (originParachainId: number) => {
@@ -401,15 +410,6 @@ declare function xTransfer(): {
     };
 };
 
-declare function xcmPallet(): {
-    limitedReserveTransferAssets: (parents?: Parents) => {
-        here: () => ExtrinsicConfigBuilder;
-    };
-    transferAssetsUsingTypeAndThen: () => {
-        here: () => ExtrinsicConfigBuilder;
-    };
-};
-
 declare function ExtrinsicBuilder(): {
     eqBalances: typeof eqBalances;
     xTokens: typeof xTokens;
@@ -469,10 +469,6 @@ declare function FeeBuilder(): {
     xcmPaymentApi: typeof xcmPaymentApi;
 };
 
-declare function wormhole$1(): {
-    tokenTransfer: () => MrlConfigBuilder;
-};
-
 type WormholeTransferFunctions = 'tokenTransfer';
 type WormholeFunctionArgs = Parameters<Wormhole<Network>[WormholeTransferFunctions]>;
 interface WormholeConfigConstructorParams {
@@ -486,6 +482,10 @@ declare class WormholeConfig {
     constructor({ args, func }: WormholeConfigConstructorParams);
 }
 
+declare function wormhole$1(): {
+    tokenTransfer: () => MrlConfigBuilder;
+};
+
 declare function wormholeFactory(chain: AnyChain): Wormhole<"Mainnet" | "Testnet">;
 
 type MrlConfigBuilder = ConfigBuilder<ContractConfig | ExtrinsicConfig | WormholeConfig, MrlBuilderParams>;

package/build/index.mjs

@@ -2161,6 +2161,112 @@ function polkadotXcm() {
   };
 }
 
+// src/extrinsic/pallets/xcmPallet/xcmPallet.ts
+var pallet3 = "xcmPallet";
+function xcmPallet() {
+  return {
+    limitedReserveTransferAssets: (parents = 1) => {
+      const func = "limitedReserveTransferAssets";
+      return {
+        here: () => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet3,
+            func,
+            getArgs: (extrinsicFunction) => {
+              const version = getExtrinsicArgumentVersion(extrinsicFunction);
+              return getPolkadotXcmExtrinsicArgs({
+                ...params,
+                parents,
+                func: extrinsicFunction,
+                asset: [
+                  {
+                    id: normalizeConcrete(version, {
+                      parents: 0,
+                      interior: "Here"
+                    }),
+                    fun: {
+                      Fungible: params.asset.amount
+                    }
+                  }
+                ]
+              });
+            }
+          })
+        })
+      };
+    },
+    transferAssetsUsingTypeAndThen: () => {
+      const func = "transferAssetsUsingTypeAndThen";
+      return {
+        here: () => ({
+          build: (params) => new ExtrinsicConfig({
+            module: pallet3,
+            func,
+            getArgs: () => {
+              const version = "V4" /* v4 */;
+              return [
+                {
+                  [version]: {
+                    parents: 0,
+                    interior: {
+                      X1: [
+                        {
+                          Parachain: params.destination.parachainId
+                        }
+                      ]
+                    }
+                  }
+                },
+                {
+                  [version]: [
+                    {
+                      id: {
+                        parents: 0,
+                        interior: "Here"
+                      },
+                      fun: {
+                        Fungible: params.asset.amount
+                      }
+                    }
+                  ]
+                },
+                "LocalReserve",
+                {
+                  [version]: {
+                    parents: 0,
+                    interior: "Here"
+                  }
+                },
+                "LocalReserve",
+                {
+                  [version]: [
+                    {
+                      DepositAsset: {
+                        assets: {
+                          Wild: { AllCounted: 1 }
+                        },
+                        beneficiary: {
+                          parents: 0,
+                          interior: {
+                            X1: [
+                              getExtrinsicAccount(params.destinationAddress)
+                            ]
+                          }
+                        }
+                      }
+                    }
+                  ]
+                },
+                "Unlimited"
+              ];
+            }
+          })
+        })
+      };
+    }
+  };
+}
+
 // src/extrinsic/pallets/xTokens/xTokens.utils.ts
 function getWeight() {
   return "Unlimited";
@@ -2182,12 +2288,12 @@ function getDestination(version, address, destination) {
 }
 
 // src/extrinsic/pallets/xTokens/xTokens.ts
-var pallet3 = "xTokens";
+var pallet4 = "xTokens";
 function xTokens() {
   return {
     transfer: () => ({
       build: ({ destinationAddress, asset, destination }) => new ExtrinsicConfig({
-        module: pallet3,
+        module: pallet4,
         func: "transfer",
         getArgs: (func) => {
           const destIndex = 2;
@@ -2207,7 +2313,7 @@ function xTokens() {
       return {
         here: () => ({
           build: ({ destinationAddress: address, asset, destination }) => new ExtrinsicConfig({
-            module: pallet3,
+            module: pallet4,
             func: funcName,
             getArgs: (func) => {
               const version = getExtrinsicArgumentVersion(func, destIndex);
@@ -2231,7 +2337,7 @@ function xTokens() {
         }),
         X1: () => ({
           build: ({ destinationAddress: address, asset, destination }) => new ExtrinsicConfig({
-            module: pallet3,
+            module: pallet4,
             func: funcName,
             getArgs: (func) => {
               const version = getExtrinsicArgumentVersion(func, destIndex);
@@ -2262,7 +2368,7 @@ function xTokens() {
         }),
         X2: () => ({
           build: ({ destinationAddress: address, asset, destination }) => new ExtrinsicConfig({
-            module: pallet3,
+            module: pallet4,
             func: funcName,
             getArgs: (func) => {
               const version = getExtrinsicArgumentVersion(func, destIndex);
@@ -2297,7 +2403,7 @@ function xTokens() {
     },
     transferMultiCurrencies: () => ({
       build: ({ destinationAddress: address, asset, destination, fee }) => new ExtrinsicConfig({
-        module: pallet3,
+        module: pallet4,
         func: "transferMulticurrencies",
         getArgs: () => [
           [
@@ -2314,7 +2420,7 @@ function xTokens() {
 }
 
 // src/extrinsic/pallets/xTransfer/xTransfer.ts
-var pallet4 = "xTransfer";
+var pallet5 = "xTransfer";
 function xTransfer() {
   return {
     transfer: () => {
@@ -2322,7 +2428,7 @@ function xTransfer() {
       return {
         here: () => ({
           build: ({ destinationAddress: address, asset, destination }) => new ExtrinsicConfig({
-            module: pallet4,
+            module: pallet5,
             func: method,
             getArgs: () => [
               {
@@ -2356,7 +2462,7 @@ function xTransfer() {
         }),
         X2: () => ({
           build: ({ destinationAddress, asset, destination }) => new ExtrinsicConfig({
-            module: pallet4,
+            module: pallet5,
             func: method,
             getArgs: () => [
               {
@@ -2402,112 +2508,6 @@ function xTransfer() {
   };
 }
 
-// src/extrinsic/pallets/xcmPallet/xcmPallet.ts
-var pallet5 = "xcmPallet";
-function xcmPallet() {
-  return {
-    limitedReserveTransferAssets: (parents = 1) => {
-      const func = "limitedReserveTransferAssets";
-      return {
-        here: () => ({
-          build: (params) => new ExtrinsicConfig({
-            module: pallet5,
-            func,
-            getArgs: (extrinsicFunction) => {
-              const version = getExtrinsicArgumentVersion(extrinsicFunction);
-              return getPolkadotXcmExtrinsicArgs({
-                ...params,
-                parents,
-                func: extrinsicFunction,
-                asset: [
-                  {
-                    id: normalizeConcrete(version, {
-                      parents: 0,
-                      interior: "Here"
-                    }),
-                    fun: {
-                      Fungible: params.asset.amount
-                    }
-                  }
-                ]
-              });
-            }
-          })
-        })
-      };
-    },
-    transferAssetsUsingTypeAndThen: () => {
-      const func = "transferAssetsUsingTypeAndThen";
-      return {
-        here: () => ({
-          build: (params) => new ExtrinsicConfig({
-            module: pallet5,
-            func,
-            getArgs: () => {
-              const version = "V4" /* v4 */;
-              return [
-                {
-                  [version]: {
-                    parents: 0,
-                    interior: {
-                      X1: [
-                        {
-                          Parachain: params.destination.parachainId
-                        }
-                      ]
-                    }
-                  }
-                },
-                {
-                  [version]: [
-                    {
-                      id: {
-                        parents: 0,
-                        interior: "Here"
-                      },
-                      fun: {
-                        Fungible: params.asset.amount
-                      }
-                    }
-                  ]
-                },
-                "LocalReserve",
-                {
-                  [version]: {
-                    parents: 0,
-                    interior: "Here"
-                  }
-                },
-                "LocalReserve",
-                {
-                  [version]: [
-                    {
-                      DepositAsset: {
-                        assets: {
-                          Wild: { AllCounted: 1 }
-                        },
-                        beneficiary: {
-                          parents: 0,
-                          interior: {
-                            X1: [
-                              getExtrinsicAccount(params.destinationAddress)
-                            ]
-                          }
-                        }
-                      }
-                    }
-                  ]
-                },
-                "Unlimited"
-              ];
-            }
-          })
-        })
-      };
-    }
-  };
-}
-
 // src/extrinsic/ExtrinsicBuilder.ts
 function ExtrinsicBuilder() {
   return {
@@ -3033,29 +3033,32 @@ function buildSendExtrinsic({
   if (!transact) {
     throw new Error("Transact params are required");
   }
+  const version = getExtrinsicArgumentVersion(sourceApi.tx.polkadotXcm.send);
   return sourceApi.tx.polkadotXcm.send(
     {
-      // TODO apply XCM versioning
-      V3: {
+      [version]: normalizeX1(version, {
         parents: 1,
-        interior: { X1: { Parachain: moonChain.parachainId } }
-      }
+        interior: {
+          X1: { Parachain: moonChain.parachainId }
+        }
+      })
     },
     {
-      V3: [
+      [version]: [
         {
           WithdrawAsset: [
             {
-              id: {
-                Concrete: {
+              id: normalizeConcrete(
+                version,
+                normalizeX1(version, {
                   parents: 0,
                   interior: {
                     X1: {
                       PalletInstance: moonAsset.getAssetPalletInstance()
                     }
                   }
-                }
-              },
+                })
+              ),
               fun: { Fungible: BUY_EXECUTION_FEE }
             }
           ]
@@ -3063,16 +3066,17 @@ function buildSendExtrinsic({
         {
           BuyExecution: {
             fees: {
-              id: {
-                Concrete: {
+              id: normalizeConcrete(
+                version,
+                normalizeX1(version, {
                   parents: 0,
                   interior: {
                     X1: {
                       PalletInstance: moonAsset.getAssetPalletInstance()
                     }
                   }
-                }
-              },
+                })
+              ),
               fun: { Fungible: BUY_EXECUTION_FEE }
             },
             weightLimit: "Unlimited"
@@ -3096,12 +3100,14 @@ function buildSendExtrinsic({
             {
               DepositAsset: {
                 assets: { Wild: { AllCounted: 1 } },
-                beneficiary: {
+                beneficiary: normalizeX1(version, {
                   parents: 0,
                   interior: {
-                    X1: { AccountKey20: { key: computedOriginAccount } }
+                    X1: {
+                      AccountKey20: { key: computedOriginAccount }
+                    }
                   }
-                }
+                })
               }
             }
           ]
@@ -3705,7 +3711,7 @@ var PEAQ_XTOKENS_ABI = [
 ];
 
 // src/mrl/providers/wormhole/contract/Batch/abi/abi.helpers.ts
-function getAbisForChain(chain) {
+function getAbisForChain(_) {
   return {
     BatchAbi: PEAQ_BATCH_ABI,
     XcmUtilsAbi: PEAQ_XCM_UTILS_ABI,
@@ -3874,12 +3880,6 @@ function Gmp() {
 // src/mrl/providers/wormhole/contract/TokenBridge/TokenBridge.ts
 import { convertAddressTo32Bytes } from "@moonbeam-network/xcm-utils";
 
-// src/mrl/providers/wormhole/wormhole/wormhole.ts
-import { EvmChain, EvmParachain as EvmParachain4, 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";
-
 // src/mrl/providers/wormhole/wormhole/WormholeConfig.ts
 var WormholeConfig = class _WormholeConfig {
   args;
@@ -3893,6 +3893,12 @@ var WormholeConfig = class _WormholeConfig {
   }
 };
 
+// src/mrl/providers/wormhole/wormhole/wormhole.ts
+import { EvmChain, EvmParachain as EvmParachain4, 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";
+
 // src/mrl/providers/wormhole/wormhole/wormholeFactory.ts
 import { EvmParachain as EvmParachain3 } from "@moonbeam-network/xcm-types";
 import { Wormhole } from "@wormhole-foundation/sdk-connect";
@@ -3977,9 +3983,10 @@ function getPayload({
       `Destination ${destination.name} is not a Parachain or EvmParachain`
     );
   }
-  const isPeaqEvm = destination.key === "peaq-evm-Alphanet" || destination.key === "peaq-evm";
+  const isEvmDestination = EvmParachain4.is(destination);
+  const version = getExtrinsicArgumentVersion(moonApi.tx.polkadotXcm.send);
   const multilocation = moonApi.createType("XcmVersionedLocation", {
-    V3: {
+    [version]: {
       parents: 1,
       interior: {
         X2: [
@@ -3987,7 +3994,7 @@ function getPayload({
             Parachain: destination.parachainId
           },
           getExtrinsicAccount(
-            isPeaqEvm ? evmToAddress4(destinationAddress) : destinationAddress
+            isEvmDestination ? evmToAddress4(destinationAddress) : destinationAddress
           )
         ]
       }