add function to determine feeAsset position repsecting asset

moonbeam-foundation · Jun 21, 2024 · 55db736 · 55db736
1 parent ad1b2e1
commit 55db736
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 8 deletions.
diff --git a/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts b/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts
@@ -1,7 +1,10 @@
 /* eslint-disable sort-keys */
 import { ExtrinsicConfigBuilder } from '../../ExtrinsicBuilder.interfaces';
 import { ExtrinsicConfig } from '../../ExtrinsicConfig';
-import { getPolkadotXcmExtrinsicArgs } from './polkadotXcm.util';
+import {
+  getPolkadotXcmExtrinsicArgs,
+  shouldFeeAssetPrecedeAsset,
+} from './polkadotXcm.util';
 
 const pallet = 'polkadotXcm';
 
@@ -73,7 +76,7 @@ export function polkadotXcm() {
               getArgs: (extrinsicFunction) => {
                 const isAssetDifferent =
                   !!params.feeAsset && params.asset !== params.feeAsset;
-                const asset = [
+                const assets = [
                   {
                     id: {
                       Concrete: {
@@ -96,8 +99,11 @@ export function polkadotXcm() {
                   },
                 ];
 
+                const shouldFeeAssetPrecede =
+                  shouldFeeAssetPrecedeAsset(params);
+
                 if (isAssetDifferent) {
-                  asset.push({
+                  const feeAsset = {
                     id: {
                       Concrete: {
                         parents: 0,
@@ -116,14 +122,20 @@ export function polkadotXcm() {
                     fun: {
                       Fungible: params.fee,
                     },
-                  });
+                  };
+
+                  if (shouldFeeAssetPrecede) {
+                    assets.unshift(feeAsset);
+                  } else {
+                    assets.push(feeAsset);
+                  }
                 }
 
                 return getPolkadotXcmExtrinsicArgs({
                   ...params,
                   func: extrinsicFunction,
-                  asset,
-                  feeIndex: isAssetDifferent ? 1 : 0,
+                  asset: assets,
+                  feeIndex: isAssetDifferent && !shouldFeeAssetPrecede ? 1 : 0,
                 });
               },
             }),

diff --git a/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts b/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts
@@ -55,3 +55,17 @@ export function getPolkadotXcmExtrinsicArgs({
     'Unlimited',
   ];
 }
+
+export function shouldFeeAssetPrecedeAsset({
+  asset,
+  feeAsset,
+}: ExtrinsicConfigBuilderPrams): boolean {
+  const assetIdNumber = Number(asset);
+  const feeAssetIdNumber = Number(feeAsset);
+
+  if (Number.isNaN(assetIdNumber) || Number.isNaN(feeAssetIdNumber)) {
+    return false;
+  }
+
+  return assetIdNumber > feeAssetIdNumber;
+}
diff --git a/packages/config/src/configs/moonbeam.ts b/packages/config/src/configs/moonbeam.ts
@@ -526,7 +526,7 @@ export const moonbeamConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
       destination: polkadotAssetHub,
       destinationFee: {
-        amount: 0.7, // TODO
+        amount: 0.2,
         asset: usdt,
         balance: BalanceBuilder().substrate().assets().account(),
       },

diff --git a/packages/config/src/configs/polkadotAssetHub.ts b/packages/config/src/configs/polkadotAssetHub.ts
@@ -98,7 +98,7 @@ export const polkadotAssetHubConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: 0.03, // TODO
+        amount: 0.03,
         asset: usdt,
         balance: BalanceBuilder().substrate().assets().account(),
       },