@moonbeam-network/xcm-builder 3.3.0 → 3.3.2

package/build/index.mjs

@@ -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 }
+                    }
                   }
-                }
+                })
               }
             }
           ]
@@ -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
           )
         ]
       }