add asset ordering param to ibtc and kbtc

moonbeam-foundation · Sep 24, 2024 · 5834723 · 5834723
1 parent 78fc657
commit 5834723
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/packages/builder/src/fee/FeeBuilder.interfaces.ts b/packages/builder/src/fee/FeeBuilder.interfaces.ts
@@ -20,7 +20,7 @@ export interface FeeConfigBuilderPrams {
 
 export interface XcmPaymentFeeProps {
   isAssetReserveChain: boolean;
-  shouldTransferAssetPrecedeAsset?: boolean;
+  shouldTransferAssetPrecedeFeeAsset?: boolean;
 }
 
 export interface MoonbeamRuntimeXcmConfigAssetType extends Enum {

diff --git a/packages/builder/src/fee/FeeBuilder.ts b/packages/builder/src/fee/FeeBuilder.ts
@@ -28,7 +28,7 @@ function xcmPaymentApi() {
   return {
     xcmPaymentFee: ({
       isAssetReserveChain,
-      shouldTransferAssetPrecedeAsset = false,
+      shouldTransferAssetPrecedeFeeAsset = false,
     }: XcmPaymentFeeProps): FeeConfigBuilder => ({
       build: ({
         address,
@@ -50,7 +50,7 @@ function xcmPaymentApi() {
               transferAsset,
               chain,
             );
-            const versionedAssets = shouldTransferAssetPrecedeAsset
+            const versionedAssets = shouldTransferAssetPrecedeFeeAsset
               ? [versionedTransferAssetId, versionedAssetId]
               : [versionedAssetId, versionedTransferAssetId];
 

diff --git a/packages/config/src/xcm-configs/interlay.ts b/packages/config/src/xcm-configs/interlay.ts
@@ -48,9 +48,10 @@ export const interlayRoutes = new ChainRoutes({
         chain: moonbeam,
         balance: BalanceBuilder().substrate().assets().account(),
         fee: {
-          amount: FeeBuilder()
-            .xcmPaymentApi()
-            .xcmPaymentFee({ isAssetReserveChain: false }),
+          amount: FeeBuilder().xcmPaymentApi().xcmPaymentFee({
+            isAssetReserveChain: false,
+            shouldTransferAssetPrecedeFeeAsset: true,
+          }),
           asset: intr,
         },
       },

diff --git a/packages/config/src/xcm-configs/kintsugi.ts b/packages/config/src/xcm-configs/kintsugi.ts
@@ -48,9 +48,10 @@ export const kintsugiRoutes = new ChainRoutes({
         chain: moonriver,
         balance: BalanceBuilder().substrate().assets().account(),
         fee: {
-          amount: FeeBuilder()
-            .xcmPaymentApi()
-            .xcmPaymentFee({ isAssetReserveChain: false }),
+          amount: FeeBuilder().xcmPaymentApi().xcmPaymentFee({
+            isAssetReserveChain: false,
+            shouldTransferAssetPrecedeFeeAsset: true,
+          }),
           asset: kint,
         },
       },