Merge remote-tracking branch 'origin/main' into feat/add_simulateXXQu…

…eries

package.json

@@ -32,17 +32,20 @@
     "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",
     "lint": "eslint ./src",
     "fmt": "eslint ./src --fix",
-    "postinstall": "[ -d './node_modules/@neutron-org/neutronjsplus/dist' ] || tsc -p ./node_modules/@neutron-org/neutronjsplus/tsconfig.json"
+    "build:neutronjsplus": "[ -d './node_modules/@neutron-org/neutronjsplus/dist' ] || tsc -p ./node_modules/@neutron-org/neutronjsplus/tsconfig.json",
+    "build:neutronjs": "[ -d './node_modules/@neutron-org/neutronjs/dist' ] || { 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:neutronjs && yarn build:neutronjsplus"
   },
   "author": "Neutron",
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+    "@confio/relayer": "^0.12.0",
     "@cosmjs/cosmwasm-stargate": "^0.32.4",
     "@cosmjs/stargate": "0.32.4",
     "@cosmjs/tendermint-rpc": "^0.32.4",
-    "@neutron-org/neutronjs": "4.2.0",
-    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#88b4e5391a8b80c90a7c7e25b8f6948b7cdd2e7c",
+    "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#f5334307decfa549283d03e626cd45582667c13f",
+    "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54",
     "@types/lodash": "^4.14.182",
     "axios": "1.6.0",
     "commander": "^10.0.0",
@@ -53,6 +56,7 @@
     "lodash": "^4.17.21",
     "long": "^5.2.1",
     "merkletreejs": "^0.3.9",
+    "sinon": "^18.0.0",
     "yesno": "^0.4.0"
   },
   "devDependencies": {
@@ -85,4 +89,4 @@
   "engines": {
     "node": ">=20.0"
   }
-}
+}

setup/Makefile

@@ -1,5 +1,5 @@
 APP_DIR ?= ../..
-COMPOSE ?= docker-compose
+COMPOSE ?= docker compose
 
 build-gaia:
 		@docker buildx build --load --build-context app=$(APP_DIR)/gaia --build-context setup=$(APP_DIR)/neutron/network -t gaia-node -f dockerbuilds/Dockerfile.gaia --build-arg BINARY=gaiad .

src/global_setup.ts

@@ -9,8 +9,10 @@ import ch from 'child_process';
 import {
   COSMOS_DENOM,
   COSMOS_PREFIX,
+  GAIA_RPC,
   NEUTRON_DENOM,
   NEUTRON_PREFIX,
+  NEUTRON_RPC,
 } from './helpers/constants';
 
 import config from './config.json';
@@ -31,11 +33,9 @@ export default async function ({ provide }: GlobalSetupContext) {
     mnemonics.push(generateMnemonic());
   }
 
-  const rpcNeutron = process.env.NODE1_RPC || 'http://localhost:26657';
-  const rpcGaia = process.env.NODE2_RPC || 'http://localhost:16657';
   // fund a lot or preallocated wallets for testing purposes
-  await fundWallets(mnemonics, rpcNeutron, NEUTRON_PREFIX, NEUTRON_DENOM);
-  await fundWallets(mnemonics, rpcGaia, COSMOS_PREFIX, COSMOS_DENOM);
+  await fundWallets(mnemonics, NEUTRON_RPC, NEUTRON_PREFIX, NEUTRON_DENOM);
+  await fundWallets(mnemonics, GAIA_RPC, COSMOS_PREFIX, COSMOS_DENOM);
 
   provide('mnemonics', mnemonics);
 
@@ -118,3 +118,7 @@ declare module 'vitest' {
     mnemonics: string[];
   }
 }
+
+(BigInt.prototype as any).toJSON = function () {
+  return this.toString();
+};

src/helpers/constants.ts

@@ -78,3 +78,9 @@ 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://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';

src/helpers/interchainqueries.ts

@@ -6,6 +6,7 @@ import {
   getNeutronDAOCore,
 } from '@neutron-org/neutronjsplus/dist/dao';
 import { QueryClientImpl as AdminQueryClient } from '@neutron-org/neutronjs/cosmos/adminmodule/adminmodule/query.rpc.Query';
+import { QueryClientImpl as InterchainqQuerier } from '@neutron-org/neutronjs/neutron/interchainqueries/query.rpc.Query';
 import { paramChangeProposal } from '@neutron-org/neutronjsplus/dist/proposal';
 import {
   CosmWasmClient,
@@ -21,6 +22,46 @@ import { Coin } from '@neutron-org/neutronjs/cosmos/base/v1beta1/coin';
 import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query';
 import { MsgRemoveInterchainQueryRequest } from '@neutron-org/neutronjs/neutron/interchainqueries/tx';
 
+export const executeUpdateInterchainQueriesParams = async (
+  chainManagerAddress: string,
+  interchainQueriesQuerier: InterchainqQuerier,
+  mainDao: Dao,
+  daoMember: DaoMember,
+  maxKvQueryKeysCount?: number,
+  maxTransactionsFilters?: number,
+) => {
+  const params = (await interchainQueriesQuerier.params()).params;
+  if (maxKvQueryKeysCount != undefined) {
+    params.maxKvQueryKeysCount = BigInt(maxKvQueryKeysCount);
+  }
+
+  if (maxTransactionsFilters != undefined) {
+    params.maxTransactionsFilters = BigInt(maxTransactionsFilters);
+  }
+
+  const proposalId =
+    await daoMember.submitUpdateParamsInterchainqueriesProposal(
+      chainManagerAddress,
+      'Change Proposal - InterchainQueriesParams',
+      'Param change proposal. It will change enabled params of interchainquries module.',
+      {
+        query_submit_timeout: Number(params.querySubmitTimeout),
+        query_deposit: params.queryDeposit,
+        tx_query_removal_limit: Number(params.txQueryRemovalLimit),
+        max_kv_query_keys_count: Number(params.maxKvQueryKeysCount),
+        max_transactions_filters: Number(params.maxTransactionsFilters),
+      },
+      '1000',
+    );
+
+  await daoMember.voteYes(proposalId, 'single', {
+    gas: '4000000',
+    amount: [{ denom: NEUTRON_DENOM, amount: '100000' }],
+  });
+  await mainDao.checkPassedProposal(proposalId);
+  await daoMember.executeProposalWithAttempts(proposalId);
+};
+
 export const getKvCallbackStatus = async (
   client: SigningNeutronClient,
   contractAddress: string,
@@ -594,13 +635,13 @@ export const registerTransfersQuery = async (
   contractAddress: string,
   connectionId: string,
   updatePeriod: number,
-  recipient: string,
+  recipients: string[],
 ) => {
   const res = await client.execute(contractAddress, {
     register_transfers_query: {
       connection_id: connectionId,
       update_period: updatePeriod,
-      recipient: recipient,
+      recipients: recipients,
     },
   });
 

src/helpers/interchaintxs.ts

@@ -1,5 +1,7 @@
 import { SigningNeutronClient } from './signing_neutron_client';
 import { JsonObject } from '@cosmjs/cosmwasm-stargate';
+import { Link } from '@confio/relayer/build';
+import { PacketWithMetadata } from '@confio/relayer/build/lib/endpoint';
 
 export type AcknowledgementResult =
   | { success: string[] }
@@ -56,3 +58,18 @@ export const getAcks = (
   client.queryContractSmart(contractAddress, {
     acknowledgement_results: {},
   });
+
+// relays given packet from A side, and it's acknowledgement
+// note that it does not relay the timeout if it happens
+export async function relayPacketFromA(link: Link, packet: PacketWithMetadata) {
+  await link.relayPackets('A', [packet]);
+  const [acksA, acksB] = await Promise.all([
+    link.getPendingAcks('A'),
+    link.getPendingAcks('B'),
+  ]);
+  const [acksResA, acksResB] = await Promise.all([
+    link.relayAcks('A', acksA),
+    link.relayAcks('B', acksB),
+  ]);
+  return { acksResA, acksResB };
+}

src/helpers/local_state.ts

@@ -5,10 +5,21 @@ import {
   QueryClient,
 } from '@cosmjs/stargate';
 import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
-import { Suite } from 'vitest';
+import { RunnerTestSuite } from 'vitest';
 import { connectComet } from '@cosmjs/tendermint-rpc';
-import { COSMOS_PREFIX, NEUTRON_PREFIX } from './constants';
+import {
+  COSMOS_PREFIX,
+  GAIA_CONNECTION,
+  GAIA_REST,
+  GAIA_RPC,
+  IBC_WEB_HOST,
+  NEUTRON_PREFIX,
+  NEUTRON_REST,
+  NEUTRON_RPC,
+} from './constants';
 import { Wallet } from './wallet';
+import { IbcClient, Link } from '@confio/relayer';
+import { GasPrice } from '@cosmjs/stargate/build/fee';
 
 // limit of wallets precreated for one test
 const WALLETS_PER_TEST_FILE = 20;
@@ -35,7 +46,7 @@ export class LocalState {
   static async create(
     config: any,
     mnemonics: string[],
-    suite?: Suite,
+    suite?: RunnerTestSuite,
   ): Promise<LocalState> {
     const res = new LocalState(config, mnemonics, suite);
     await res.init();
@@ -45,15 +56,15 @@ export class LocalState {
   protected constructor(
     private config: any,
     private mnemonics: string[],
-    private suite?: Suite | undefined,
+    private suite?: RunnerTestSuite | undefined,
   ) {
-    this.rpcNeutron = process.env.NODE1_RPC || 'http://localhost:26657';
-    this.rpcGaia = process.env.NODE2_RPC || 'http://localhost:16657';
+    this.rpcNeutron = NEUTRON_RPC;
+    this.rpcGaia = GAIA_RPC;
 
-    this.restNeutron = process.env.NODE1_URL || 'http://localhost:1317';
-    this.restGaia = process.env.NODE2_URL || 'http://localhost:1316';
+    this.restNeutron = NEUTRON_REST;
+    this.restGaia = GAIA_REST;
 
-    this.icqWebHost = process.env.ICQ_WEB_HOST || 'http://localhost:9999';
+    this.icqWebHost = IBC_WEB_HOST;
 
     this.walletIndexes = { neutron: 0, cosmos: 0 };
   }
@@ -114,6 +125,41 @@ export class LocalState {
       throw new Error('rpcClient() called non existent network: ' + network);
     }
   }
+
+  // Creates an IBC relayer between neutron and gaia
+  // This relayer can be used to manually relay packets
+  // since hermes don't have manual relay.
+  async relayerLink(): Promise<Link> {
+    const neutronWallet = await this.nextWallet('neutron');
+    const gaiaWallet = await this.nextWallet('cosmos');
+    const neutronIbcClient = await IbcClient.connectWithSigner(
+      this.rpcNeutron,
+      neutronWallet.directwallet,
+      neutronWallet.address,
+      {
+        gasPrice: GasPrice.fromString('0.05untrn'),
+        estimatedBlockTime: 3,
+        estimatedIndexerTime: 100,
+      },
+    );
+    const gaiaIbcClient = await IbcClient.connectWithSigner(
+      this.rpcGaia,
+      gaiaWallet.directwallet,
+      gaiaWallet.address,
+      {
+        gasPrice: GasPrice.fromString('0.05uatom'),
+        estimatedBlockTime: 3,
+        estimatedIndexerTime: 100,
+      },
+    );
+
+    return await Link.createWithExistingConnections(
+      neutronIbcClient,
+      gaiaIbcClient,
+      GAIA_CONNECTION,
+      GAIA_CONNECTION,
+    );
+  }
 }
 
 export const mnemonicToWallet = async (
@@ -134,7 +180,7 @@ export const mnemonicToWallet = async (
   return new Wallet(addrPrefix, directwallet, account, accountValoper);
 };
 
-async function testFilePosition(s: Suite): Promise<number> {
+async function testFilePosition(s: RunnerTestSuite): Promise<number> {
   const filepath = s.file.filepath.trim();
   const splitted = filepath.split('/');
   const filename = splitted.pop().trim();

src/testcases/parallel/dao_assert.test.ts

@@ -1,4 +1,4 @@
-import { inject, Suite } from 'vitest';
+import { RunnerTestSuite, inject } from 'vitest';
 import { getContractsHashes } from '../../helpers/setup';
 import '@neutron-org/neutronjsplus';
 import { LocalState } from '../../helpers/local_state';
@@ -32,7 +32,7 @@ describe('Neutron / DAO check', () => {
   let feeburnerQuery: FeeburnerQueryClient;
   let wasmQuery: WasmQueryClient;
 
-  beforeAll(async (suite: Suite) => {
+  beforeAll(async (suite: RunnerTestSuite) => {
     testState = await LocalState.create(config, inject('mnemonics'), suite);
 
     const neutronWallet = await testState.nextWallet('neutron');

src/testcases/parallel/governance.test.ts

@@ -10,7 +10,7 @@ import {
   getNeutronDAOCore,
 } from '@neutron-org/neutronjsplus/dist/dao';
 import { updateInterchaintxsParamsProposal } from '@neutron-org/neutronjsplus/dist/proposal';
-import { Suite, inject } from 'vitest';
+import { RunnerTestSuite, inject } from 'vitest';
 import { NEUTRON_DENOM } from '../../helpers/constants';
 import { ParameterChangeProposal } from '@neutron-org/neutronjs/cosmos/params/v1beta1/params';
 import { MsgSubmitProposalLegacy } from '@neutron-org/neutronjs/cosmos/adminmodule/adminmodule/tx';
@@ -48,7 +48,7 @@ describe('Neutron / Governance', () => {
   let interchaintxQuery: InterchainTxQueryClient;
   let interchainAccountsQuerier: InterchainAccountsQueryClient;
 
-  beforeAll(async (suite: Suite) => {
+  beforeAll(async (suite: RunnerTestSuite) => {
     testState = await LocalState.create(config, inject('mnemonics'), suite);
     neutronWallet = await testState.nextWallet('neutron');
     neutronClient = await SigningNeutronClient.connectWithSigner(

src/testcases/parallel/grpc_queries.test.ts

@@ -3,7 +3,7 @@ import { getEventAttribute } from '@neutron-org/neutronjsplus/dist/cosmos';
 import { LocalState } from '../../helpers/local_state';
 import { Wallet } from '../../helpers/wallet';
 import { CONTRACTS } from '../../helpers/constants';
-import { Suite, inject } from 'vitest';
+import { RunnerTestSuite, inject } from 'vitest';
 import { SigningNeutronClient } from '../../helpers/signing_neutron_client';
 import { defaultRegistryTypes, SigningStargateClient } from '@cosmjs/stargate';
 import { Registry } from '@cosmjs/proto-signing';
@@ -23,7 +23,7 @@ describe('Neutron / Grpc Queries', () => {
 
   let newTokenDenom: string;
 
-  beforeAll(async (suite: Suite) => {
+  beforeAll(async (suite: RunnerTestSuite) => {
     testState = await LocalState.create(config, inject('mnemonics'), suite);
 
     neutronWallet = await testState.nextWallet('neutron');

src/testcases/parallel/ibc_transfer.test.ts

@@ -1,5 +1,5 @@
 import { Registry } from '@cosmjs/proto-signing';
-import { Suite, inject } from 'vitest';
+import { RunnerTestSuite, inject } from 'vitest';
 import { LocalState } from '../../helpers/local_state';
 import { SigningNeutronClient } from '../../helpers/signing_neutron_client';
 import { MsgTransfer as GaiaMsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx';
@@ -45,7 +45,7 @@ describe('Neutron / IBC transfer', () => {
   let bankQuerier: BankQueryClient;
   let ibcQuerier: IbcQueryClient;
 
-  beforeAll(async (suite: Suite) => {
+  beforeAll(async (suite: RunnerTestSuite) => {
     testState = await LocalState.create(config, inject('mnemonics'), suite);
 
     neutronWallet = await testState.nextWallet('neutron');

src/testcases/parallel/interchain_tx_query_resubmit.test.ts

@@ -8,7 +8,7 @@ import {
   registerTransfersQuery,
   waitForTransfersAmount,
 } from '../../helpers/interchainqueries';
-import { Suite, inject } from 'vitest';
+import { RunnerTestSuite, inject } from 'vitest';
 import { SigningNeutronClient } from '../../helpers/signing_neutron_client';
 import {
   CONTRACTS,
@@ -29,7 +29,7 @@ describe('Neutron / Interchain TX Query Resubmit', () => {
   let contractAddress: string;
   const connectionId = 'connection-0';
 
-  beforeAll(async (suite: Suite) => {
+  beforeAll(async (suite: RunnerTestSuite) => {
     testState = await LocalState.create(config, inject('mnemonics'), suite);
 
     neutronWallet = await testState.nextWallet('neutron');
@@ -87,7 +87,7 @@ describe('Neutron / Interchain TX Query Resubmit', () => {
         contractAddress,
         connectionId,
         query1UpdatePeriod,
-        watchedAddr1,
+        [watchedAddr1],
       );
     });