pr cleanups

Author: NeverHappened

package.json

@@ -40,9 +40,9 @@
     "test:staking-vault-with-rewards-on-pause": "PAUSE_REWARDS=1 vitest --run src/testcases/run_in_band/staking-vault.test.ts --bail 1",
     "lint": "eslint ./src",
     "fmt": "eslint ./src --fix",
-    "build:neutronjs": "[ -d './node_modules/@neutron-org/neutronjs/build' ] || { yarn tsc -p ./node_modules/@neutron-org/neutronjs/tsconfig.json && cp -R ./node_modules/@neutron-org/neutronjs/build/* ./node_modules/@neutron-org/neutronjs/ ; }",
     "build:neutronjsplus": "[ -d './node_modules/@neutron-org/neutronjsplus/dist' ] || tsc -p ./node_modules/@neutron-org/neutronjsplus/tsconfig.json",
     "build:tsrelayer": "[ -d './node_modules/@confio/relayer/dist' ] || tsc -p ./tsconfig.relayer.json",
+    "build:neutronjs": "[ -d './node_modules/@neutron-org/neutronjs/build' ] || { yarn tsc -p ./node_modules/@neutron-org/neutronjs/tsconfig.json && cp -R ./node_modules/@neutron-org/neutronjs/build/* ./node_modules/@neutron-org/neutronjs/ ; }",
     "postinstall": "yarn build:tsrelayer && yarn build:neutronjs && yarn build:neutronjsplus"
   },
   "author": "Neutron",

src/global_setup.ts

@@ -94,21 +94,23 @@ async function fundWallets(
 
   let outputs: Output[] = [];
 
-  // Process mnemonics sequentially with small delays to avoid overwhelming the system
-  const LOG_INTERVAL = 100;
-  const maxRetries = 3; // Used for all retry logic in this function
+  // due to some unexpected errors during setup, there is retry logic on exceptions
+  // related issue: https://github.com/nodejs/undici/issues/3492
+  const maxRetries = 3;
 
   for (let i = 0; i < mnemonics.length; i++) {
-    const mnemonic = mnemonics[i];
-    const directwallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
-      prefix: prefix,
-    });
-
     // Get accounts with retry logic
     let accounts = null;
     let retries = 0;
     while (retries < maxRetries && !accounts) {
+      const mnemonic = mnemonics[i];
       try {
+        const directwallet = await DirectSecp256k1HdWallet.fromMnemonic(
+          mnemonic,
+          {
+            prefix: prefix,
+          },
+        );
         accounts = await directwallet.getAccounts();
       } catch (error) {
         retries++;
@@ -133,12 +135,6 @@ async function fundWallets(
       coins: [{ denom: denom, amount: poorAmount }],
     };
     outputs.push(output);
-
-    // Log progress and add small delay every 100 wallets to let system breathe
-    if ((i + 1) % LOG_INTERVAL === 0) {
-      // Small delay to prevent connection pool exhaustion
-      await waitSeconds(0.5);
-    }
   }
 
   if (prefix === NEUTRON_PREFIX) {
@@ -178,7 +174,7 @@ async function fundWallets(
         `Connection attempt ${connectRetries}/${maxRetries} failed, retrying...`,
       );
       if (connectRetries < maxRetries) {
-        await waitSeconds(2);
+        await waitSeconds(1);
       } else {
         throw error;
       }
@@ -199,7 +195,7 @@ async function fundWallets(
   ];
   const value: MsgMultiSend = {
     inputs,
-    outputs: outputs,
+    outputs,
   };
   const msg: any = {
     typeUrl: MsgMultiSend.typeUrl,
@@ -223,7 +219,7 @@ async function fundWallets(
         `Broadcast attempt ${broadcastRetries}/${maxRetries} failed, retrying...`,
       );
       if (broadcastRetries < maxRetries) {
-        await waitSeconds(2);
+        await waitSeconds(1);
       } else {
         throw error;
       }

src/helpers/constants.ts

@@ -80,11 +80,11 @@ export const CONTRACTS = {
 
 export const NEUTRON_PREFIX = process.env.NEUTRON_ADDRESS_PREFIX || 'neutron';
 export const COSMOS_PREFIX = process.env.COSMOS_ADDRESS_PREFIX || 'cosmos';
-export const NEUTRON_RPC = process.env.NODE1_RPC || 'http://127.0.0.1:26657';
-export const GAIA_RPC = process.env.NODE2_RPC || 'http://127.0.0.1:16657';
-export const NEUTRON_REST = process.env.NODE1_URL || 'http://127.0.0.1:1317';
-export const GAIA_REST = process.env.NODE2_URL || 'http://127.0.0.1:1316';
-export const IBC_WEB_HOST = process.env.ICQ_WEB_HOST || 'http://127.0.0.1:9999';
+export const NEUTRON_RPC = process.env.NODE1_RPC || 'http://localhost:26657';
+export const GAIA_RPC = process.env.NODE2_RPC || 'http://localhost:16657';
+export const NEUTRON_REST = process.env.NODE1_URL || 'http://localhost:1317';
+export const GAIA_REST = process.env.NODE2_URL || 'http://localhost:1316';
+export const IBC_WEB_HOST = process.env.ICQ_WEB_HOST || 'http://localhost:9999';
 export const GAIA_CONNECTION = 'connection-0';
 export const WALLETS_SIGN_METHOD = process.env.WALLETS_SIGN_METHOD || 'random';
 

src/helpers/neutron_test_client.ts

@@ -161,7 +161,9 @@ export class NeutronTestClient extends CosmWasmClient {
     const resTx = await this.client.getTx(res.transactionHash);
 
     if (resTx === null) {
-      return Promise.reject('no transaction found');
+      return Promise.reject(
+        'no transaction found with hash=' + res.transactionHash,
+      );
     }
 
     return resTx;

src/testcases/parallel/grpc_queries.test.ts

@@ -156,14 +156,14 @@ describe('Neutron / Grpc Queries', () => {
       expect(res.account.address).toBe(neutronWallet.address);
     });
 
-    test.skip('transfer denom trace should work', async () => {
+    test('transfer denom should work', async () => {
       const res = await neutronClient.queryContractSmart(contractAddress, {
-        transfer_denom_trace: {
+        transfer_denom: {
           hash: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2',
         },
       });
-      expect(res.denom_trace.path).toBe('transfer/channel-0');
-      expect(res.denom_trace.base_denom).toBe(COSMOS_DENOM);
+      expect(res.denom.trace).toBe('transfer/channel-0');
+      expect(res.denom.base).toBe(COSMOS_DENOM);
     });
 
     test('transfer escrow address should work', async () => {

src/testcases/run_in_band/interchaintx.test.ts

@@ -1319,11 +1319,7 @@ describe('Neutron / Interchain TXs', () => {
         const channel = (await ibcQuerier.channels({})).channels.find(
           (c) => c.ordering === Order.ORDER_UNORDERED,
         );
-        if (!channel) {
-          expect(channel).not.toBeEmpty();
-        } else {
-          expect(channel.state).toEqual(State.STATE_OPEN);
-        }
+        expect(channel.state).toEqual(State.STATE_OPEN);
       });
 
       test('delegate after the timeout on unordered channel should work as channel should still be open', async () => {