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

package/build/index.d.ts

@@ -120,12 +120,16 @@ declare enum TransferType {
     LocalReserve = 1,
     DestinationReserve = 2
 }
+type AssetMultilocation = (bigint | (number | string[])[])[];
 
 declare function XcmPrecompile(): {
     transferAssetsToPara20: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
     transferAssetsToPara32: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
     transferAssetsToRelay: () => ContractConfigBuilder;
-    transferAssetsLocation: () => ContractConfigBuilder;
+    transferAssetsLocation: () => {
+        X1: () => ContractConfigBuilder;
+        X2: () => ContractConfigBuilder;
+    };
     transferAssetsUsingTypeAndThenAddress: (shouldTransferAssetPrecedeFeeAsset?: boolean) => ContractConfigBuilder;
 };
 
@@ -753,4 +757,4 @@ declare function MrlBuilder(): {
 
 declare const BATCH_CONTRACT_ADDRESS = "0x0000000000000000000000000000000000000808";
 
-export { type AssetAddressFormat, AssetMinBuilder, type AssetMinConfigBuilder, type AssetMinConfigBuilderParams, BATCH_CONTRACT_ABI, BATCH_CONTRACT_ADDRESS, BalanceBuilder, type BalanceBuilderParams, type BalanceConfigBuilder, type BuilderParams, type ConfigBuilder, ContractBuilder, ContractConfig, type ContractConfigBuilder, type ContractConfigConstructorParams, type DestinationMultilocation, ERC20_ABI, type EquilibriumSystemBalanceData, type EventMonitoringConfig, type EvmFunctionArgs, EvmQueryConfig, type EvmQueryConfigParams, type EvmQueryFunctions, ExtrinsicBuilder, ExtrinsicConfig, type ExtrinsicConfigBuilder, type ExtrinsicConfigConstructorParams, FeeBuilder, type FeeConfigBuilder, type FeeConfigBuilderParams, type GetVersionedAssetId, MonitoringBuilder, type MonitoringBuilderConfig, type MoonbeamRuntimeXcmConfigAssetType, MrlBuilder, type MrlBuilderParams, type MrlConfigBuilder, type MrlExecuteBuilderParams, type MrlExecuteConfigBuilder, type PalletBalancesAccountDataOld, type Parents, Protocols, type QueryConfigConstructorParams, SubstrateCallConfig, type SubstrateCallConfigConstructorParams, SubstrateQueryConfig, type TokensPalletAccountData, type Transact, TransferType, WormholeConfig, type WormholeConfigConstructorParams, type WormholeFunctionArgs, type WormholeTransferFunctions, type XcmPaymentFeeProps, XcmVersion, calculateSystemAccountBalance, evm, substrate, wormhole, wormholeFactory };
+export { type AssetAddressFormat, AssetMinBuilder, type AssetMinConfigBuilder, type AssetMinConfigBuilderParams, type AssetMultilocation, BATCH_CONTRACT_ABI, BATCH_CONTRACT_ADDRESS, BalanceBuilder, type BalanceBuilderParams, type BalanceConfigBuilder, type BuilderParams, type ConfigBuilder, ContractBuilder, ContractConfig, type ContractConfigBuilder, type ContractConfigConstructorParams, type DestinationMultilocation, ERC20_ABI, type EquilibriumSystemBalanceData, type EventMonitoringConfig, type EvmFunctionArgs, EvmQueryConfig, type EvmQueryConfigParams, type EvmQueryFunctions, ExtrinsicBuilder, ExtrinsicConfig, type ExtrinsicConfigBuilder, type ExtrinsicConfigConstructorParams, FeeBuilder, type FeeConfigBuilder, type FeeConfigBuilderParams, type GetVersionedAssetId, MonitoringBuilder, type MonitoringBuilderConfig, type MoonbeamRuntimeXcmConfigAssetType, MrlBuilder, type MrlBuilderParams, type MrlConfigBuilder, type MrlExecuteBuilderParams, type MrlExecuteConfigBuilder, type PalletBalancesAccountDataOld, type Parents, Protocols, type QueryConfigConstructorParams, SubstrateCallConfig, type SubstrateCallConfigConstructorParams, SubstrateQueryConfig, type TokensPalletAccountData, type Transact, TransferType, WormholeConfig, type WormholeConfigConstructorParams, type WormholeFunctionArgs, type WormholeTransferFunctions, type XcmPaymentFeeProps, XcmVersion, calculateSystemAccountBalance, evm, substrate, wormhole, wormholeFactory };

package/build/index.mjs

@@ -435,8 +435,26 @@ function getDestinationParachainMultilocation(destination) {
   }
   return [1, [`0x00${destination.parachainId.toString(16).padStart(8, "0")}`]];
 }
-function getAssetMultilocation(sourceApi, asset) {
-  return [[0, [encodePalletInstance(sourceApi)]], asset.amount];
+function getPalletInstanceMultilocation(sourceApi, asset) {
+  return [
+    [0, [encodePalletInstance(sourceApi, asset.getAssetPalletInstance())]],
+    asset.amount
+  ];
+}
+function getAccountKey20Multilocation(sourceApi, asset, destination) {
+  if (!asset.address) {
+    throw new Error(`Asset address is required for ${asset.key}`);
+  }
+  return [
+    [
+      0,
+      [
+        encodePalletInstance(sourceApi, asset.getAssetPalletInstance()),
+        encodeAddress(destination, asset.address)
+      ]
+    ],
+    asset.amount
+  ];
 }
 function getGlobalConsensusDestination(sourceApi, destination) {
   return [
@@ -460,24 +478,30 @@ function encodeXcmMessageToBytes(xcmMessage, api) {
   }
 }
 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", {
+  return encodeXcmJunction(api, {
     GlobalConsensus: globalConsensus
   });
-  return junctionType.toHex();
 }
-function encodePalletInstance(api) {
+function encodePalletInstance(api, palletInstance) {
+  return encodeXcmJunction(api, {
+    PalletInstance: palletInstance
+  });
+}
+function encodeXcmJunction(api, junction) {
   if (!api) {
-    throw new Error("API is required to encode asset");
+    throw new Error("API is required to encode XCM junction");
   }
-  const assetType = {
-    PalletInstance: 10
-  };
-  const multiLocationType = api.registry.createType("XcmV3Junction", assetType);
-  return multiLocationType.toHex();
+  const junctionType = api.registry.createType("XcmV3Junction", junction);
+  return junctionType.toHex();
+}
+function encodeAddress(destination, address) {
+  const accountType = EvmParachain.is(destination) ? "03" : "01";
+  return `0x${accountType}${u8aToHex2(
+    decodeAddress2(address),
+    -1,
+    false
+  )}00`;
 }
 
 // src/contract/contracts/XcmPrecompile/XcmPrecompileAbi.ts
@@ -1019,29 +1043,22 @@ 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"
-        });
-      }
+      X1: () => ({
+        build: (params) => {
+          return buildTransferAssetsLocation({
+            ...params,
+            getAssetMultilocation: getPalletInstanceMultilocation
+          });
+        }
+      }),
+      X2: () => ({
+        build: (params) => {
+          return buildTransferAssetsLocation({
+            ...params,
+            getAssetMultilocation: getAccountKey20Multilocation
+          });
+        }
+      })
     }),
     transferAssetsUsingTypeAndThenAddress: (shouldTransferAssetPrecedeFeeAsset = false) => ({
       build: ({
@@ -1123,6 +1140,35 @@ function buildXcmMessage(assets3, destinationAddress, sourceApi) {
     [xcmVersion]: [instruction]
   };
 }
+function buildTransferAssetsLocation({
+  getAssetMultilocation,
+  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
+    ],
+    func: "transferAssetsLocation",
+    module: "Xcm"
+  });
+}
 
 // src/contract/contracts/Xtokens/Xtokens.ts
 import { formatAssetIdToERC20 } from "@moonbeam-network/xcm-utils";