@moonbeam-network/xcm-builder 1.0.0-dev.252 → 1.0.0-dev.254

package/build/index.d.ts

@@ -127,8 +127,10 @@ declare function XcmPrecompile(): {
     transferAssetsToPara32: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
     transferAssetsToRelay: () => ContractConfigBuilder;
     transferAssetsLocation: () => {
-        X1: () => ContractConfigBuilder;
-        X2: () => ContractConfigBuilder;
+        nativeAsset: () => ContractConfigBuilder;
+        localErc20: () => ContractConfigBuilder;
+        foreignAsset: () => ContractConfigBuilder;
+        foreignErc20: () => ContractConfigBuilder;
     };
     transferAssetsUsingTypeAndThenAddress: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
 };

package/build/index.mjs

@@ -280,9 +280,7 @@ 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";
 
@@ -401,29 +399,15 @@ function shouldFeeAssetPrecedeAsset({
 }
 
 // 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)}`];
+    return [encodeParachain(destination.parachainId)];
   }
-  const accountType = EvmParachain.is(destination) ? "03" : "01";
-  const acc = `0x${accountType}${u8aToHex2(
-    decodeAddress2(address),
-    -1,
-    false
-  )}00`;
-  return destination.parachainId ? [`0x0000000${destination.parachainId.toString(16)}`, acc] : [acc];
+  const acc = encodeAddress(destination, address);
+  return destination.parachainId ? [encodeParachain(destination.parachainId), 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]];
+  return [0, [encodeAddress(destination, address)]];
 }
 function getDestinationMultilocation(address, destination) {
   const interior = getPrecompileDestinationInterior(destination, address);
@@ -433,15 +417,31 @@ function getDestinationParachainMultilocation(destination) {
   if (destination.isRelay) {
     return [1, []];
   }
-  return [1, [`0x00${destination.parachainId.toString(16).padStart(8, "0")}`]];
+  return [1, [encodeParachain(destination.parachainId)]];
 }
-function getPalletInstanceMultilocation(sourceApi, asset) {
+function getGlobalConsensusDestination(sourceApi, destination) {
+  return [
+    2,
+    [
+      encodeGlobalConsensus(sourceApi, destination),
+      encodeParachain(destination.parachainId)
+    ]
+  ];
+}
+function getPalletInstanceMultilocation({
+  sourceApi,
+  asset
+}) {
   return [
     [0, [encodePalletInstance(sourceApi, asset.getAssetPalletInstance())]],
     asset.amount
   ];
 }
-function getAccountKey20Multilocation(sourceApi, asset, destination) {
+function getAssetAddressMultilocation({
+  sourceApi,
+  asset,
+  destination
+}) {
   if (!asset.address) {
     throw new Error(`Asset address is required for ${asset.key}`);
   }
@@ -456,13 +456,46 @@ function getAccountKey20Multilocation(sourceApi, asset, destination) {
     asset.amount
   ];
 }
-function getGlobalConsensusDestination(sourceApi, destination) {
+function getGlobalConsensusAssetMultilocation({
+  sourceApi,
+  asset,
+  destination
+}) {
+  const assetInDestination = destination.getChainAsset(asset);
   return [
-    2,
     [
-      encodeGlobalConsensus(sourceApi, destination),
-      encodeParachain(destination.parachainId)
-    ]
+      2,
+      [
+        encodeGlobalConsensus(sourceApi, destination),
+        encodeParachain(destination.parachainId),
+        encodePalletInstance(
+          sourceApi,
+          assetInDestination.getAssetPalletInstance()
+        )
+      ]
+    ],
+    asset.amount
+  ];
+}
+function getAddressGlobalConsensusAssetMultilocation({
+  sourceApi,
+  asset,
+  destination
+}) {
+  if (!asset.address) {
+    throw new Error(`Asset address is required for ${asset.key}`);
+  }
+  return [
+    [
+      2,
+      [
+        encodeGlobalConsensus(sourceApi, destination),
+        encodeParachain(destination.parachainId),
+        encodePalletInstance(sourceApi, asset.getAssetPalletInstance()),
+        encodeAddress(destination, asset.address)
+      ]
+    ],
+    asset.amount
   ];
 }
 function encodeXcmMessageToBytes(xcmMessage, api) {
@@ -477,6 +510,9 @@ function encodeXcmMessageToBytes(xcmMessage, api) {
     throw error;
   }
 }
+function encodeParachain(paraId) {
+  return `0x00${paraId.toString(16).padStart(8, "0")}`;
+}
 function encodeGlobalConsensus(api, destination) {
   const globalConsensus = getGlobalConsensus(destination);
   return encodeXcmJunction(api, {
@@ -492,7 +528,7 @@ function encodeXcmJunction(api, junction) {
   if (!api) {
     throw new Error("API is required to encode XCM junction");
   }
-  const junctionType = api.registry.createType("XcmV3Junction", junction);
+  const junctionType = api.createType("XcmV3Junction", junction);
   return junctionType.toHex();
 }
 function encodeAddress(destination, address) {
@@ -1042,20 +1078,40 @@ function XcmPrecompile() {
       }
     }),
     transferAssetsLocation: () => ({
-      // TODO
-      X1: () => ({
+      nativeAsset: () => ({
+        build: (params) => {
+          return buildTransferAssetsLocation({
+            ...params,
+            assetsMultilocations: [getPalletInstanceMultilocation(params)]
+          });
+        }
+      }),
+      localErc20: () => ({
         build: (params) => {
           return buildTransferAssetsLocation({
             ...params,
-            getAssetMultilocation: getPalletInstanceMultilocation
+            assetsMultilocations: [getAssetAddressMultilocation(params)]
           });
         }
       }),
-      X2: () => ({
+      foreignAsset: () => ({
         build: (params) => {
           return buildTransferAssetsLocation({
             ...params,
-            getAssetMultilocation: getAccountKey20Multilocation
+            assetsMultilocations: [
+              getGlobalConsensusAssetMultilocation(params)
+            ]
+          });
+        }
+      }),
+      foreignErc20: () => ({
+        build: (params) => {
+          return buildTransferAssetsLocation({
+            ...params,
+            assetsMultilocations: [
+              getGlobalConsensusAssetMultilocation(params),
+              getAddressGlobalConsensusAssetMultilocation(params)
+            ]
           });
         }
       })
@@ -1141,29 +1197,20 @@ function buildXcmMessage(assets3, destinationAddress, sourceApi) {
   };
 }
 function buildTransferAssetsLocation({
-  getAssetMultilocation,
+  assetsMultilocations,
+  feeAssetItem = 0,
   destinationAddress,
-  asset,
   destination,
   sourceApi
 }) {
-  const destinationMultilocation = getGlobalConsensusDestination(
-    sourceApi,
-    destination
-  );
-  console.log("destinationMultilocation", destinationMultilocation);
-  console.log(
-    "assetMultilocation",
-    getAssetMultilocation(sourceApi, asset, destination)
-  );
   return new ContractConfig({
     address: XCM_PRECOMPILE_ADDRESS,
     abi: XCM_ABI,
     args: [
       getGlobalConsensusDestination(sourceApi, destination),
       getBeneficiaryMultilocation(destinationAddress, destination),
-      [getAssetMultilocation(sourceApi, asset, destination)],
-      0
+      assetsMultilocations,
+      feeAssetItem
     ],
     func: "transferAssetsLocation",
     module: "Xcm"