fix: update the integration tests

Author: lrazovic

integration-tests/chopsticks/README.md

@@ -1,37 +1,39 @@
 # chopsticks
 
+## Prerequisites
+
+- [Bun](https://bun.sh/docs/installation)
+
+## Usage
+
 To install dependencies:
 
 ```bash
 bun install
 ```
 
+To generate the Chains descriptors:
+
 ```bash
 bun papi
 ```
 
 > [!NOTE]
-> Sometimes you need to regenerate the Polimec descriptors. To do that, run:
+> If you need to regenerate the Polimec descriptors (e.g. you changed something on the Runtime). You can run:
 >
 > ```bash
+> bun papi
 > bun papi add polimec --wasm ../../target/release/wbuild/polimec-runtime/polimec_runtime.compact.compressed.wasm
 > ```
 
-To start the chains:
+To run all the tests:
 
 ```bash
-bun run dev
+bun run test
 ```
 
-To run the tests:
+To run a specific test case, e.g Polkadot to Polimec:
 
 ```bash
-bun run test
+bun run test polkadot
 ```
-
-
-> [!IMPORTANT]
-> TODO: Add:
-> - [ ] Polimec SA on AH: Add ETH balance to it in the Chopstick ovveride
-> - [ ] Polimec to Asset Hub: ETH transfer. This is a "normal" transfer_asset call.
-> - [ ] Polimec to Ethereum: ETH transfer. This is a bit more complex, example extrinsic: https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fhydration.ibp.network#/extrinsics/decode/0x6b0d04010100a10f040801000007464a69c7e002020907040300c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200130000e8890423c78a0204010002040816040d01000001010088ca48e3e1d0f1c50bd6b504e1312d21f5bd45ed147e3c30c77eb5e4d63bdc6310010102020907040300c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000201090704081300010300c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20004000d010204000103001501c1413e4178c38567ada8945a80351f7b849600

integration-tests/chopsticks/bun.lock

@@ -1,4 +1,4 @@
-import { INITIAL_BALANCES, ETH_ADDRESS } from '@/constants';
+import { INITIAL_BALANCES } from '@/constants';
 import { Accounts } from '@/types';
 
 export const POLIMEC_WASM =

integration-tests/chopsticks/overrides/polimec.ts

@@ -7,16 +7,16 @@
     "test": "env LOG_LEVEL=error bun test"
   },
   "devDependencies": {
-    "@acala-network/chopsticks": "1.0.2",
+    "@acala-network/chopsticks": "1.0.3",
     "@biomejs/biome": "1.9.4",
-    "@polkadot-labs/hdkd": "0.0.11",
+    "@polkadot-labs/hdkd": "0.0.12",
     "@types/bun": "latest"
   },
   "peerDependencies": {
     "typescript": "^5.7.3"
   },
   "dependencies": {
     "@polkadot-api/descriptors": "file:.papi/descriptors",
-    "polkadot-api": "^1.9.0"
+    "polkadot-api": "^1.9.3"
   }
 }

integration-tests/chopsticks/package.json

@@ -74,9 +74,8 @@ export class PolimecManager extends BaseChainManager {
   async getXcmFee() {
     const api = this.getApi(Chains.Polimec);
     const events = await api.event.PolkadotXcm.FeesPaid.pull();
-    console.dir(events, { depth: null });
 
-    return events[0]?.payload.fees?.[0]?.fun?.value ?? 0n;
+    return (events[0]?.payload.fees?.[0]?.fun?.value as bigint) ?? 0n;
   }
 
   async getTransactionFee() {

integration-tests/chopsticks/src/managers/PolimecManager.ts

@@ -100,7 +100,6 @@ export class ChainSetup {
       'wasm-override': POLIMEC_WASM,
       'import-storage': polimec_storage,
       'build-block-mode': BuildBlockMode.Instant,
-      'runtime-log-level': 5,
     });
   }
 

integration-tests/chopsticks/src/setup.ts

@@ -19,35 +19,35 @@ describe('Polimec -> Hub Transfer Tests', () => {
   });
   afterAll(async () => await chainSetup.cleanup());
 
-  // test(
-  //   'Send USDC to Hub',
-  //   () =>
-  //     transferTest.testTransfer({
-  //       account: Accounts.BOB,
-  //       assets: [[Asset.USDC, TRANSFER_AMOUNTS.TOKENS, AssetSourceRelation.Sibling]],
-  //     }),
-  //   { timeout: 25000 },
-  // );
-  //
-  // test(
-  //   'Send USDT to Hub',
-  //   () =>
-  //     transferTest.testTransfer({
-  //       account: Accounts.BOB,
-  //       assets: [[Asset.USDT, TRANSFER_AMOUNTS.TOKENS, AssetSourceRelation.Sibling]],
-  //     }),
-  //   { timeout: 25000 },
-  // );
+  test(
+    'Send USDC to Hub',
+    () =>
+      transferTest.testTransfer({
+        account: Accounts.BOB,
+        assets: [[Asset.USDC, TRANSFER_AMOUNTS.TOKENS, AssetSourceRelation.Sibling]],
+      }),
+    { timeout: 25000 },
+  );
 
-  // test(
-  //   'Send DOT to Hub',
-  //   () =>
-  //     transferTest.testTransfer({
-  //       account: Accounts.BOB,
-  //       assets: [[Asset.DOT, TRANSFER_AMOUNTS.NATIVE, AssetSourceRelation.Parent]],
-  //     }),
-  //   { timeout: 25000 },
-  // );
+  test(
+    'Send USDT to Hub',
+    () =>
+      transferTest.testTransfer({
+        account: Accounts.BOB,
+        assets: [[Asset.USDT, TRANSFER_AMOUNTS.TOKENS, AssetSourceRelation.Sibling]],
+      }),
+    { timeout: 25000 },
+  );
+
+  test(
+    'Send DOT to Hub',
+    () =>
+      transferTest.testTransfer({
+        account: Accounts.BOB,
+        assets: [[Asset.DOT, TRANSFER_AMOUNTS.NATIVE, AssetSourceRelation.Parent]],
+      }),
+    { timeout: 25000 },
+  );
 
   test(
     'Send PLMC to Hub',

integration-tests/chopsticks/src/tests/polimec.test.ts

@@ -64,7 +64,6 @@ export abstract class BaseTransferTest {
   protected async verifyExecution() {
     const events = await this.destManager.getMessageQueueEvents();
 
-    console.dir(events, { depth: null });
     expect(events).not.toBeEmpty();
     expect(events).toBeArray();
     expect(events).toHaveLength(1);

integration-tests/chopsticks/src/transfers/BaseTransfer.ts

@@ -1,5 +1,5 @@
 import { expect } from 'bun:test';
-import { DEFAULT_TOPIC, ETH_AMOUNT, FEE_AMOUNT, ETH_ADDRESS } from '@/constants';
+import { DEFAULT_TOPIC, ETH_ADDRESS, ETH_AMOUNT, FEE_AMOUNT } from '@/constants';
 import type { BridgerHubManagaer } from '@/managers/BridgeHubManager';
 import type { PolimecManager } from '@/managers/PolimecManager';
 import type { PolkadotHubManager } from '@/managers/PolkadotHubManager';
@@ -102,9 +102,6 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
       (event) => event.type === 'ForeignAssets' && event.value.type === 'Issued',
     );
 
-    console.log('Issued Events on Destination: \n');
-    console.dir(issuedEventsOnDest, { depth: null });
-
     // TODO: Check why we have 3 events instead of 2 (ETH + DOT). Curently we have 3 events (ETH + DOT + DOT)
     expect(issuedEventsOnDest.length).toBe(3);
 

integration-tests/chopsticks/src/transfers/BridgeToPolimec.ts

@@ -27,7 +27,7 @@ export class HubToPolimecTransfer extends BaseTransferTest {
     super(sourceManager, destManager);
   }
 
-  async executeTransfer({ account, assets }: TransferOptions) {
+  async executeTransfer({ account, assets, fee_asset_item }: TransferOptions) {
     const [sourceBlock, destBlock] = await Promise.all([
       this.sourceManager.getBlockNumber(),
       this.destManager.getBlockNumber(),
@@ -39,6 +39,7 @@ export class HubToPolimecTransfer extends BaseTransferTest {
       toChain: Chains.Polimec,
       assets: versioned_assets,
       recv: account,
+      fee_asset_item: fee_asset_item ?? 0,
     });
 
     const api = this.sourceManager.getApi(Chains.PolkadotHub);
@@ -113,6 +114,7 @@ export class HubToPolimecTransfer extends BaseTransferTest {
       toChain: Chains.Polimec,
       assets: versioned_assets,
       recv: transferOptions.account,
+      fee_asset_item: transferOptions.fee_asset_item ?? 0,
     });
 
     let remoteFeeAssetId: XcmVersionedAssetId;

integration-tests/chopsticks/src/transfers/HubToPolimec.ts

@@ -1,5 +1,4 @@
 import { expect } from 'bun:test';
-import { INITIAL_BALANCES } from '@/constants';
 import type { PolimecManager } from '@/managers/PolimecManager';
 import type { PolkadotHubManager } from '@/managers/PolkadotHubManager';
 import {
@@ -46,7 +45,6 @@ export class PolimecToHubTransfer extends BaseTransferTest {
       .getXcmPallet()
       .transfer_assets(data)
       .signAndSubmit(this.sourceManager.getSigner(account));
-    console.dir(res, { depth: null });
 
     expect(res.ok).toBeTrue();
     return { sourceBlock, destBlock };

integration-tests/chopsticks/src/transfers/PolimecToHub.ts

@@ -121,8 +121,8 @@ export class PolkadotToPolimecTransfer extends BaseTransferTest {
       toChain: Chains.PolkadotHub,
       assets: versioned_assets,
       recv: transferOptions.account,
+      fee_asset_item: transferOptions.fee_asset_item ?? 0,
     });
-    console.dir(transferData, { depth: null, colors: true });
 
     let remoteFeeAssetId: XcmVersionedAssetId;
     const lastAsset = unwrap(transferOptions.assets[0]);

integration-tests/chopsticks/src/transfers/PolkadotToPolimec.ts

@@ -10,8 +10,7 @@ import {
   type polimec,
   type polkadot,
 } from '@polkadot-api/descriptors';
-import { FixedSizeBinary, type PolkadotClient, type TypedApi } from 'polkadot-api';
-import { ETH_ADDRESS } from './constants';
+import type { PolkadotClient, TypedApi } from 'polkadot-api';
 
 type Polimec = typeof polimec;
 type PolkadotHub = typeof pah;