@moonbeam-network/xcm-builder 1.0.0-dev.253 → 1.0.0-dev.255

package/build/index.mjs

@@ -280,7 +280,9 @@ 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";
 
@@ -428,20 +430,13 @@ function getGlobalConsensusDestination(sourceApi, destination) {
     ]
   ];
 }
-function getPalletInstanceMultilocation({
-  sourceApi,
-  asset
-}) {
+function getPalletInstanceMultilocation(sourceApi, asset) {
   return [
     [0, [encodePalletInstance(sourceApi, asset.getAssetPalletInstance())]],
     asset.amount
   ];
 }
-function getAssetAddressMultilocation({
-  sourceApi,
-  asset,
-  destination
-}) {
+function getAssetAddressMultilocation(sourceApi, asset, destination) {
   if (!asset.address) {
     throw new Error(`Asset address is required for ${asset.key}`);
   }
@@ -456,11 +451,7 @@ function getAssetAddressMultilocation({
     asset.amount
   ];
 }
-function getGlobalConsensusAssetMultilocation({
-  sourceApi,
-  asset,
-  destination
-}) {
+function getGlobalConsensusAssetMultilocation(sourceApi, asset, destination) {
   const assetInDestination = destination.getChainAsset(asset);
   return [
     [
@@ -477,13 +468,10 @@ function getGlobalConsensusAssetMultilocation({
     asset.amount
   ];
 }
-function getAddressGlobalConsensusAssetMultilocation({
-  sourceApi,
-  asset,
-  destination
-}) {
-  if (!asset.address) {
-    throw new Error(`Asset address is required for ${asset.key}`);
+function getAddressGlobalConsensusAssetMultilocation(sourceApi, asset, destination) {
+  const assetInDestination = destination.getChainAsset(asset);
+  if (!assetInDestination.address) {
+    throw new Error(`Asset address is required for ${assetInDestination.key}`);
   }
   return [
     [
@@ -491,8 +479,11 @@ function getAddressGlobalConsensusAssetMultilocation({
       [
         encodeGlobalConsensus(sourceApi, destination),
         encodeParachain(destination.parachainId),
-        encodePalletInstance(sourceApi, asset.getAssetPalletInstance()),
-        encodeAddress(destination, asset.address)
+        encodePalletInstance(
+          sourceApi,
+          assetInDestination.getAssetPalletInstance()
+        ),
+        encodeAddress(destination, assetInDestination.address)
       ]
     ],
     asset.amount
@@ -1082,7 +1073,9 @@ function XcmPrecompile() {
         build: (params) => {
           return buildTransferAssetsLocation({
             ...params,
-            assetsMultilocations: [getPalletInstanceMultilocation(params)]
+            assetsMultilocations: [
+              getPalletInstanceMultilocation(params.sourceApi, params.asset)
+            ]
           });
         }
       }),
@@ -1090,7 +1083,13 @@ function XcmPrecompile() {
         build: (params) => {
           return buildTransferAssetsLocation({
             ...params,
-            assetsMultilocations: [getAssetAddressMultilocation(params)]
+            assetsMultilocations: [
+              getAssetAddressMultilocation(
+                params.sourceApi,
+                params.asset,
+                params.destination
+              )
+            ]
           });
         }
       }),
@@ -1099,7 +1098,11 @@ function XcmPrecompile() {
           return buildTransferAssetsLocation({
             ...params,
             assetsMultilocations: [
-              getGlobalConsensusAssetMultilocation(params)
+              getGlobalConsensusAssetMultilocation(
+                params.sourceApi,
+                params.asset,
+                params.destination
+              )
             ]
           });
         }
@@ -1109,8 +1112,18 @@ function XcmPrecompile() {
           return buildTransferAssetsLocation({
             ...params,
             assetsMultilocations: [
-              getGlobalConsensusAssetMultilocation(params),
-              getAddressGlobalConsensusAssetMultilocation(params)
+              // fee asset
+              getGlobalConsensusAssetMultilocation(
+                params.sourceApi,
+                params.fee,
+                params.destination
+              ),
+              // transfer asset
+              getAddressGlobalConsensusAssetMultilocation(
+                params.sourceApi,
+                params.asset,
+                params.destination
+              )
             ]
           });
         }