Fixed xcm config for PINK

moonbeam-foundation · Mar 12, 2024 · 7bd7269 · 7bd7269
1 parent b1e51b8
commit 7bd7269
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 28 deletions.
diff --git a/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts b/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.ts
@@ -70,33 +70,61 @@ export function polkadotXcm() {
             new ExtrinsicConfig({
               module: pallet,
               func,
-              getArgs: (extrinsicFunction) =>
-                getPolkadotXcmExtrinsicArgs({
-                  ...params,
-                  func: extrinsicFunction,
-                  asset: [
-                    {
-                      id: {
-                        Concrete: {
-                          parents: 0,
-                          interior: {
-                            X2: [
-                              {
-                                PalletInstance: params.palletInstance,
-                              },
-                              {
-                                GeneralIndex: params.asset,
-                              },
-                            ],
-                          },
+              getArgs: (extrinsicFunction) => {
+                const isAssetDifferent = params.asset !== params.feeAsset;
+                const asset = [
+                  {
+                    id: {
+                      Concrete: {
+                        parents: 0,
+                        interior: {
+                          X2: [
+                            {
+                              PalletInstance: params.palletInstance,
+                            },
+                            {
+                              GeneralIndex: params.asset,
+                            },
+                          ],
                         },
                       },
-                      fun: {
-                        Fungible: params.amount,
+                    },
+                    fun: {
+                      Fungible: params.amount,
+                    },
+                  },
+                ];
+
+                if (isAssetDifferent) {
+                  asset.push({
+                    id: {
+                      Concrete: {
+                        parents: 0,
+                        interior: {
+                          X2: [
+                            {
+                              PalletInstance: params.palletInstance,
+                            },
+                            {
+                              GeneralIndex: params.feeAsset,
+                            },
+                          ],
+                        },
                       },
                     },
-                  ],
-                }),
+                    fun: {
+                      Fungible: params.fee,
+                    },
+                  });
+                }
+
+                return getPolkadotXcmExtrinsicArgs({
+                  ...params,
+                  func: extrinsicFunction,
+                  asset,
+                  feeIndex: isAssetDifferent ? 1 : 0,
+                });
+              },
             }),
         }),
       };

diff --git a/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts b/packages/builder/src/extrinsic/pallets/polkadotXcm/polkadotXcm.util.ts
@@ -13,6 +13,7 @@ export interface GetExtrinsicParams extends ExtrinsicConfigBuilderPrams {
   asset: any;
   func?: SubmittableExtrinsicFunction<'promise'>;
   parents?: Parents;
+  feeIndex?: number;
 }
 
 export function getPolkadotXcmExtrinsicArgs({
@@ -21,6 +22,7 @@ export function getPolkadotXcmExtrinsicArgs({
   destination,
   func,
   parents = 1,
+  feeIndex = 0,
 }: GetExtrinsicParams): any[] {
   // eslint-disable-next-line @typescript-eslint/no-use-before-define
   const version = getExtrinsicArgumentVersion(func);
@@ -47,7 +49,7 @@ export function getPolkadotXcmExtrinsicArgs({
     {
       [version]: asset,
     },
-    0,
+    feeIndex,
     'Unlimited',
   ];
 }
diff --git a/packages/config/src/configs/moonbeam.ts b/packages/config/src/configs/moonbeam.ts
@@ -490,8 +490,8 @@ export const moonbeamConfig = new ChainConfig({
       contract: ContractBuilder().Xtokens().transfer(),
       destination: polkadotAssetHub,
       destinationFee: {
-        amount: 0.7, // TODO
-        asset: pink,
+        amount: 0.7,
+        asset: usdt,
         balance: BalanceBuilder().substrate().assets().account(),
       },
       fee: {

diff --git a/packages/config/src/configs/polkadotAssetHub.ts b/packages/config/src/configs/polkadotAssetHub.ts
@@ -58,8 +58,8 @@ export const polkadotAssetHubConfig = new ChainConfig({
       balance: BalanceBuilder().substrate().assets().account(),
       destination: moonbeam,
       destinationFee: {
-        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(), // TODO confirm
-        asset: pink,
+        amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
+        asset: usdt,
         balance: BalanceBuilder().substrate().assets().account(),
       },
       extrinsic: ExtrinsicBuilder()