@moonbeam-network/xcm-builder 1.0.0-dev.249 → 1.0.0-dev.250

package/build/index.d.ts

@@ -85,7 +85,7 @@ type DestinationMultilocation = [
     /**
      * 1 - if transaction is going through or to a relay chain
      */
-    1,
+    number,
     ([
         /**
          * example '0x00000007DC'
@@ -125,6 +125,7 @@ declare function XcmPrecompile(): {
     transferAssetsToPara20: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
     transferAssetsToPara32: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
     transferAssetsToRelay: () => ContractConfigBuilder;
+    transferAssetsLocation: () => ContractConfigBuilder;
     transferAssetsUsingTypeAndThenAddress: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
 };
 

package/build/index.mjs

@@ -280,9 +280,130 @@ var TransferType = /* @__PURE__ */ ((TransferType2) => {
 })(TransferType || {});
 
 // src/contract/ContractBuilder.utils.ts
-import { EvmParachain } from "@moonbeam-network/xcm-types";
+import {
+  EvmParachain
+} from "@moonbeam-network/xcm-types";
 import { u8aToHex as u8aToHex2 } from "@polkadot/util";
 import { decodeAddress as decodeAddress2 } from "@polkadot/util-crypto";
+
+// src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts
+import { Ecosystem } from "@moonbeam-network/xcm-types";
+function getPolkadotXcmExtrinsicArgs({
+  assets: assets3,
+  destinationAddress,
+  destination,
+  func,
+  parents = 1,
+  feeIndex = 0
+}) {
+  const version = getExtrinsicArgumentVersion(func);
+  return [
+    // dest
+    {
+      [version]: normalizeX1(version, {
+        parents,
+        interior: {
+          X1: {
+            Parachain: destination.parachainId
+          }
+        }
+      })
+    },
+    // beneficiary
+    {
+      [version]: normalizeX1(version, {
+        parents: 0,
+        interior: {
+          X1: getExtrinsicAccount(destinationAddress)
+        }
+      })
+    },
+    // assets
+    {
+      [version]: assets3
+    },
+    // feeAssetItem
+    feeIndex,
+    // weightLimit
+    "Unlimited"
+  ];
+}
+function isKusamaDestination(destination) {
+  return destination.ecosystem === Ecosystem.Kusama || destination.ecosystem === Ecosystem.MoonsamaRelay;
+}
+function isPolkadotDestination(destination) {
+  return destination.ecosystem === Ecosystem.Polkadot || destination.ecosystem === Ecosystem.MoonlamaRelay;
+}
+function getGlobalConsensus(destination) {
+  if (isKusamaDestination(destination)) {
+    return "Kusama";
+  }
+  if (isPolkadotDestination(destination)) {
+    return "Polkadot";
+  }
+  return {
+    ByGenesis: destination.relayGenesisHash
+  };
+}
+function getEcosystemTransferExtrinsicArgs({
+  assets: assets3,
+  destinationAddress,
+  destination,
+  func,
+  feeIndex = 0
+}) {
+  const version = getExtrinsicArgumentVersion(func);
+  const globalConsensus = getGlobalConsensus(destination);
+  return [
+    // dest
+    {
+      [version]: normalizeX1(version, {
+        parents: 2,
+        interior: {
+          X2: [
+            { GlobalConsensus: globalConsensus },
+            {
+              Parachain: destination.parachainId
+            }
+          ]
+        }
+      })
+    },
+    // beneficiary
+    {
+      [version]: normalizeX1(version, {
+        parents: 0,
+        interior: {
+          X1: getExtrinsicAccount(destinationAddress)
+        }
+      })
+    },
+    // assets
+    {
+      [version]: assets3
+    },
+    // feeAssetItem
+    feeIndex,
+    // weightLimit
+    "Unlimited"
+  ];
+}
+function shouldFeeAssetPrecedeAsset({
+  asset,
+  fee
+}) {
+  const assetIdNumber = Number(asset.getAssetId());
+  const feeAssetIdNumber = Number(fee.getAssetId());
+  if (Number.isNaN(assetIdNumber) || Number.isNaN(feeAssetIdNumber)) {
+    return false;
+  }
+  return assetIdNumber > feeAssetIdNumber;
+}
+
+// src/contract/ContractBuilder.utils.ts
+function encodeParachain(paraId) {
+  return `0x00${paraId.toString(16).padStart(8, "0")}`;
+}
 function getPrecompileDestinationInterior(destination, address) {
   if (!address) {
     return [`0x0000000${destination.parachainId.toString(16)}`];
@@ -295,6 +416,15 @@ function getPrecompileDestinationInterior(destination, address) {
   )}00`;
   return destination.parachainId ? [`0x0000000${destination.parachainId.toString(16)}`, acc] : [acc];
 }
+function getBeneficiaryMultilocation(address, destination) {
+  const accountType = EvmParachain.is(destination) ? "03" : "01";
+  const acc = `0x${accountType}${u8aToHex2(
+    decodeAddress2(address),
+    -1,
+    false
+  )}00`;
+  return [0, [acc]];
+}
 function getDestinationMultilocation(address, destination) {
   const interior = getPrecompileDestinationInterior(destination, address);
   return [1, interior];
@@ -305,6 +435,18 @@ function getDestinationParachainMultilocation(destination) {
   }
   return [1, [`0x00${destination.parachainId.toString(16).padStart(8, "0")}`]];
 }
+function getAssetMultilocation(sourceApi, asset) {
+  return [[0, [encodePalletInstance(sourceApi)]], asset.amount];
+}
+function getGlobalConsensusDestination(sourceApi, destination) {
+  return [
+    2,
+    [
+      encodeGlobalConsensus(sourceApi, destination),
+      encodeParachain(destination.parachainId)
+    ]
+  ];
+}
 function encodeXcmMessageToBytes(xcmMessage, api) {
   if (!api) {
     throw new Error("API is required to encode XCM message");
@@ -317,6 +459,26 @@ function encodeXcmMessageToBytes(xcmMessage, api) {
     throw error;
   }
 }
+function encodeGlobalConsensus(api, destination) {
+  if (!api) {
+    throw new Error("API is required to encode XCM message");
+  }
+  const globalConsensus = getGlobalConsensus(destination);
+  const junctionType = api.registry.createType("XcmV3Junction", {
+    GlobalConsensus: globalConsensus
+  });
+  return junctionType.toHex();
+}
+function encodePalletInstance(api) {
+  if (!api) {
+    throw new Error("API is required to encode asset");
+  }
+  const assetType = {
+    PalletInstance: 10
+  };
+  const multiLocationType = api.registry.createType("XcmV3Junction", assetType);
+  return multiLocationType.toHex();
+}
 
 // src/contract/contracts/XcmPrecompile/XcmPrecompileAbi.ts
 var XCM_ABI = [
@@ -855,6 +1017,32 @@ function XcmPrecompile() {
         });
       }
     }),
+    transferAssetsLocation: () => ({
+      // TODO
+      build: ({ destinationAddress, asset, destination, sourceApi }) => {
+        const destinationMultilocation = getGlobalConsensusDestination(
+          sourceApi,
+          destination
+        );
+        console.log("destinationMultilocation", destinationMultilocation);
+        console.log(
+          "assetMultilocation",
+          getAssetMultilocation(sourceApi, asset)
+        );
+        return new ContractConfig({
+          address: XCM_PRECOMPILE_ADDRESS,
+          abi: XCM_ABI,
+          args: [
+            getGlobalConsensusDestination(sourceApi, destination),
+            getBeneficiaryMultilocation(destinationAddress, destination),
+            [getAssetMultilocation(sourceApi, asset)],
+            0
+          ],
+          func: "transferAssetsLocation",
+          module: "Xcm"
+        });
+      }
+    }),
     transferAssetsUsingTypeAndThenAddress: (shouldTransferAssetPrecedeFeeAsset = false) => ({
       build: ({
         destinationAddress,
@@ -869,7 +1057,6 @@ function XcmPrecompile() {
           fee,
           shouldTransferAssetPrecedeFeeAsset
         );
-        const destLocation = getDestinationParachainMultilocation(destination);
         const xcmMessage = buildXcmMessage(
           assets3,
           destinationAddress,
@@ -884,7 +1071,7 @@ function XcmPrecompile() {
           address: XCM_PRECOMPILE_ADDRESS,
           abi: XCM_ABI,
           args: [
-            destLocation,
+            getDestinationParachainMultilocation(destination),
             assets3,
             2 /* DestinationReserve */,
             feeIndex,
@@ -1571,120 +1758,6 @@ function eqBalances() {
   };
 }
 
-// src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts
-import { Ecosystem } from "@moonbeam-network/xcm-types";
-function getPolkadotXcmExtrinsicArgs({
-  assets: assets3,
-  destinationAddress,
-  destination,
-  func,
-  parents = 1,
-  feeIndex = 0
-}) {
-  const version = getExtrinsicArgumentVersion(func);
-  return [
-    // dest
-    {
-      [version]: normalizeX1(version, {
-        parents,
-        interior: {
-          X1: {
-            Parachain: destination.parachainId
-          }
-        }
-      })
-    },
-    // beneficiary
-    {
-      [version]: normalizeX1(version, {
-        parents: 0,
-        interior: {
-          X1: getExtrinsicAccount(destinationAddress)
-        }
-      })
-    },
-    // assets
-    {
-      [version]: assets3
-    },
-    // feeAssetItem
-    feeIndex,
-    // weightLimit
-    "Unlimited"
-  ];
-}
-function isKusamaDestination(destination) {
-  return destination.ecosystem === Ecosystem.Kusama || destination.ecosystem === Ecosystem.MoonsamaRelay;
-}
-function isPolkadotDestination(destination) {
-  return destination.ecosystem === Ecosystem.Polkadot || destination.ecosystem === Ecosystem.MoonlamaRelay;
-}
-function getGlobalConsensus(destination) {
-  if (isKusamaDestination(destination)) {
-    return "Kusama";
-  }
-  if (isPolkadotDestination(destination)) {
-    return "Polkadot";
-  }
-  return {
-    ByGenesis: destination.relayGenesisHash
-  };
-}
-function getEcosystemTransferExtrinsicArgs({
-  assets: assets3,
-  destinationAddress,
-  destination,
-  func,
-  feeIndex = 0
-}) {
-  const version = getExtrinsicArgumentVersion(func);
-  const globalConsensus = getGlobalConsensus(destination);
-  return [
-    // dest
-    {
-      [version]: normalizeX1(version, {
-        parents: 2,
-        interior: {
-          X2: [
-            { GlobalConsensus: globalConsensus },
-            {
-              Parachain: destination.parachainId
-            }
-          ]
-        }
-      })
-    },
-    // beneficiary
-    {
-      [version]: normalizeX1(version, {
-        parents: 0,
-        interior: {
-          X1: getExtrinsicAccount(destinationAddress)
-        }
-      })
-    },
-    // assets
-    {
-      [version]: assets3
-    },
-    // feeAssetItem
-    feeIndex,
-    // weightLimit
-    "Unlimited"
-  ];
-}
-function shouldFeeAssetPrecedeAsset({
-  asset,
-  fee
-}) {
-  const assetIdNumber = Number(asset.getAssetId());
-  const feeAssetIdNumber = Number(fee.getAssetId());
-  if (Number.isNaN(assetIdNumber) || Number.isNaN(feeAssetIdNumber)) {
-    return false;
-  }
-  return assetIdNumber > feeAssetIdNumber;
-}
-
 // src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts
 var pallet2 = "polkadotXcm";
 function polkadotXcm() {