Rate limit inttests

package.json

@@ -30,6 +30,7 @@
     "test:dex_bindings": "NO_WAIT_CHANNEL1=1 NO_WAIT_HTTP2=1 NO_WAIT_CHANNEL2=1 NO_WAIT_DELAY=1 vitest --run src/testcases/run_in_band/dex_bindings --bail 1",
     "test:chain_manager": "vitest --run src/testcases/run_in_band/chain_manager --bail 1",
     "test:feemarket": "NO_WAIT_CHANNEL1=1 NO_WAIT_HTTP2=1 NO_WAIT_CHANNEL2=1 NO_WAIT_DELAY=1 vitest --run src/testcases/run_in_band/feemarket --bail 1",
+    "test:rate_limit": "vitest --run src/testcases/run_in_band/rate_limit --bail 1",
     "lint": "eslint ./src",
     "fmt": "eslint ./src --fix",
     "build:neutronjsplus": "[ -d './node_modules/@neutron-org/neutronjsplus/dist' ] || tsc -p ./node_modules/@neutron-org/neutronjsplus/tsconfig.json",
@@ -45,7 +46,7 @@
     "@cosmjs/stargate": "0.32.4",
     "@cosmjs/tendermint-rpc": "^0.32.4",
     "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#1e70c1f68e997857f42bab7647227c8ca9dc8aa1",
-    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54",
+    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#a05b8bedd5ad6e33cf55da79821a1652ea6c2b22",
     "@types/lodash": "^4.14.182",
     "axios": "1.6.0",
     "commander": "^10.0.0",

setup/hermes/config.toml

@@ -102,7 +102,7 @@ store_prefix = 'ibc'
 default_gas = 100000
 max_gas = 3000000
 gas_price = { price = 0.0025, denom = 'untrn' }
-gas_multiplier = 2.0
+gas_multiplier = 2.7
 max_msg_num = 30
 max_tx_size = 2097152
 clock_drift = '5s'

src/helpers/constants.ts

@@ -74,6 +74,7 @@ export const CONTRACTS = {
   LOCKDROP_VAULT_CL: 'lockdrop_vault_for_cl_pools.wasm',
   MARKETMAP: 'marketmap.wasm',
   ORACLE: 'oracle.wasm',
+  RATE_LIMITER: 'rate_limiter.wasm',
 };
 
 export const NEUTRON_PREFIX = process.env.NEUTRON_ADDRESS_PREFIX || 'neutron';

src/helpers/signing_neutron_client.ts

@@ -98,20 +98,27 @@ export class SigningNeutronClient extends CosmWasmClient {
     fee: StdFee | 'auto' | number = 'auto',
     admin: string = this.sender,
   ): Promise<string> {
-    // upload
-    const wasmCode = await this.getNeutronContract(fileName);
-    const uploadResult = await this.client.upload(this.sender, wasmCode, fee);
-
-    // instantiate
-    const res = await this.client.instantiate(
-      this.sender,
-      uploadResult.codeId,
-      msg,
-      label,
-      fee,
-      { admin },
-    );
-    return res.contractAddress;
+    try {
+      // Upload
+      const wasmCode = await this.getNeutronContract(fileName);
+      const uploadResult = await this.client.upload(this.sender, wasmCode, fee);
+      console.log('Upload logs:', uploadResult.logs);
+
+      // Instantiate
+      const res = await this.client.instantiate(
+        this.sender,
+        uploadResult.codeId,
+        msg,
+        label,
+        fee,
+        { admin },
+      );
+      console.log('Instantiation events:', res.events);
+      return res.contractAddress;
+    } catch (error) {
+      console.error('Error during contract upload/instantiation:', error);
+      throw new Error(`Contract instantiation failed: ${error}`);
+    }
   }
 
   async migrate(
@@ -228,3 +235,17 @@ export class SigningNeutronClient extends CosmWasmClient {
     );
   }
 }
+
+export async function CreateWalletFromMnemonic(
+  mnemonic: string,
+  prefix: string,
+): Promise<DirectSecp256k1HdWallet> {
+  const wallet = await DirectSecp256k1HdWallet.fromMnemonic(mnemonic, {
+    prefix: prefix,
+  });
+
+  const accounts = await wallet.getAccounts();
+
+  console.log('Wallet address:', accounts[0].address);
+  return wallet;
+}

src/testcases/parallel/ibc_transfer.test.ts

@@ -483,7 +483,7 @@ describe('Neutron / IBC transfer', () => {
         hermes checks height on remote chain and Timeout error occurs.
         */
         const currentHeight = await gaiaClient.getHeight();
-        await waitBlocks(15, gaiaClient);
+        await waitBlocks(25, gaiaClient);
 
         await neutronClient.execute(ibcContract, {
           send: {
@@ -562,6 +562,12 @@ describe('Neutron / IBC transfer', () => {
             state: 'enabled_infinite_loop',
           },
         });
+        // check that failures count is the same
+        let failuresResAfter = await contractManagerQuerier.failures({
+          address: ibcContract,
+        });
+
+        console.log(failuresResAfter);
 
         await neutronClient.execute(ibcContract, {
           send: {
@@ -572,7 +578,14 @@ describe('Neutron / IBC transfer', () => {
           },
         });
 
-        await neutronClient.waitBlocks(5);
+        await neutronClient.waitBlocks(35);
+
+        // check that failures count is the same
+        failuresResAfter = await contractManagerQuerier.failures({
+          address: ibcContract,
+        });
+
+        console.log(failuresResAfter);
 
         const res = await neutronClient.getWithAttempts<QueryFailuresResponse>(
           async () =>
@@ -614,6 +627,7 @@ describe('Neutron / IBC transfer', () => {
         const failuresResAfter = await contractManagerQuerier.failures({
           address: ibcContract,
         });
+        console.log(failuresResAfter.failures);
         expect(failuresResAfter.failures.length).toEqual(6);
 
         // Restore sudo handler's normal state
@@ -629,19 +643,21 @@ describe('Neutron / IBC transfer', () => {
           address: ibcContract,
         });
         const failure = failuresResBefore.failures[0];
+        console.log(failure);
         const res = await neutronClient.execute(ibcContract, {
           resubmit_failure: {
             failure_id: +failure.id.toString(),
           },
         });
         expect(res.code).toBe(0);
 
-        await neutronClient.waitBlocks(5);
+        await neutronClient.waitBlocks(10);
 
         // check that failures count is changed
         const failuresResAfter = await contractManagerQuerier.failures({
           address: ibcContract,
         });
+        console.log(failuresResAfter.failures);
         expect(failuresResAfter.failures.length).toEqual(5);
       });
     });