@moonbeam-network/xcm-builder 1.0.0-dev.206 → 1.0.0-dev.207

package/build/index.mjs

@@ -3033,32 +3033,29 @@ function buildSendExtrinsic({
   if (!transact) {
     throw new Error("Transact params are required");
   }
-  const version = getExtrinsicArgumentVersion(sourceApi.tx.polkadotXcm.send);
   return sourceApi.tx.polkadotXcm.send(
     {
-      [version]: normalizeX1(version, {
+      // TODO apply XCM versioning
+      V3: {
         parents: 1,
-        interior: {
-          X1: { Parachain: moonChain.parachainId }
-        }
-      })
+        interior: { X1: { Parachain: moonChain.parachainId } }
+      }
     },
     {
-      [version]: [
+      V3: [
         {
           WithdrawAsset: [
             {
-              id: normalizeConcrete(
-                version,
-                normalizeX1(version, {
+              id: {
+                Concrete: {
                   parents: 0,
                   interior: {
                     X1: {
                       PalletInstance: moonAsset.getAssetPalletInstance()
                     }
                   }
-                })
-              ),
+                }
+              },
               fun: { Fungible: BUY_EXECUTION_FEE }
             }
           ]
@@ -3066,17 +3063,16 @@ function buildSendExtrinsic({
         {
           BuyExecution: {
             fees: {
-              id: normalizeConcrete(
-                version,
-                normalizeX1(version, {
+              id: {
+                Concrete: {
                   parents: 0,
                   interior: {
                     X1: {
                       PalletInstance: moonAsset.getAssetPalletInstance()
                     }
                   }
-                })
-              ),
+                }
+              },
               fun: { Fungible: BUY_EXECUTION_FEE }
             },
             weightLimit: "Unlimited"
@@ -3100,14 +3096,12 @@ function buildSendExtrinsic({
             {
               DepositAsset: {
                 assets: { Wild: { AllCounted: 1 } },
-                beneficiary: normalizeX1(version, {
+                beneficiary: {
                   parents: 0,
                   interior: {
-                    X1: {
-                      AccountKey20: { key: computedOriginAccount }
-                    }
+                    X1: { AccountKey20: { key: computedOriginAccount } }
                   }
-                })
+                }
               }
             }
           ]
@@ -3983,10 +3977,9 @@ function getPayload({
       `Destination ${destination.name} is not a Parachain or EvmParachain`
     );
   }
-  const isEvmDestination = EvmParachain4.is(destination);
-  const version = getExtrinsicArgumentVersion(moonApi.tx.polkadotXcm.send);
+  const isPeaqEvm = destination.key === "peaq-evm-Alphanet" || destination.key === "peaq-evm";
   const multilocation = moonApi.createType("XcmVersionedLocation", {
-    [version]: {
+    V3: {
       parents: 1,
       interior: {
         X2: [
@@ -3994,7 +3987,7 @@ function getPayload({
             Parachain: destination.parachainId
           },
           getExtrinsicAccount(
-            isEvmDestination ? evmToAddress4(destinationAddress) : destinationAddress
+            isPeaqEvm ? evmToAddress4(destinationAddress) : destinationAddress
           )
         ]
       }