From 017b22316f4d8cfc42d22f1e24cb15b6380dc215 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 8 Aug 2024 09:02:25 -0300 Subject: [PATCH 01/14] upd njs --- package.json | 2 +- yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f509d9b3..391ae037 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "0.1.0-rc4", + "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/yarn.lock b/yarn.lock index 0de4795b..6ea29087 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,10 +1307,9 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@0.1.0-rc4": +"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45": version "0.1.0-rc4" - resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc4.tgz#5e6e56dcc3ffdc5a6421674195a6c15010fdd4f5" - integrity sha512-LXK+OkrwD81bApE8KBv6F7f7kMM28w5cfnuZmz8b4r7KrROZrxlWxsd7vzTlBhO8Dzups0LdUo1NYBoNc9oY2Q== + resolved "https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45" "@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b": version "0.4.0-rc21" From e08c63231d608fa748b5dda8a63328e9eb92a1d2 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 8 Aug 2024 09:57:46 -0300 Subject: [PATCH 02/14] refactor queriers imports and usage as well update testsuits accordingly upd njs switch to release usage --- package.json | 2 +- src/helpers/interchainqueries.ts | 7 +- src/testcases/parallel/ibc_transfer.test.ts | 47 +++++-------- .../parallel/stargate_queries.test.ts | 2 +- src/testcases/run_in_band/ibc_hooks.test.ts | 2 +- .../run_in_band/interchain_kv_query.test.ts | 9 +-- .../interchain_tx_query_plain.test.ts | 10 +-- .../run_in_band/interchaintx.test.ts | 67 ++++++++----------- .../run_in_band/tokenfactory.test.ts | 4 +- src/testcases/run_in_band/tokenomics.test.ts | 8 +-- yarn.lock | 7 +- 11 files changed, 74 insertions(+), 91 deletions(-) diff --git a/package.json b/package.json index 391ae037..a0123f93 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45", + "@neutron-org/neutronjs": "0.1.0-rc6", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/src/helpers/interchainqueries.ts b/src/helpers/interchainqueries.ts index 2ec00ea0..c609caee 100644 --- a/src/helpers/interchainqueries.ts +++ b/src/helpers/interchainqueries.ts @@ -18,7 +18,7 @@ import axios, { AxiosResponse } from 'axios'; import { SigningNeutronClient } from './signing_neutron_client'; import { IBC_ATOM_DENOM, IBC_USDC_DENOM, NEUTRON_DENOM } from './constants'; import { Coin } from '@neutron-org/neutronjs/cosmos/base/v1beta1/coin'; -import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; +import { QueryClientImpl as BankQuerier } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; import { MsgRemoveInterchainQueryRequest } from '@neutron-org/neutronjs/neutron/interchainqueries/tx'; export const getKvCallbackStatus = async ( @@ -368,8 +368,9 @@ export const validateBalanceQuery = async ( queryId, ); - const balances = await bankQuerier.AllBalances({ - address: address, + const balances = await bankQuerier.allBalances({ + resolveDenom: false, + address: address }); expect(filterIBCDenoms(res.balances.coins)).toEqual( diff --git a/src/testcases/parallel/ibc_transfer.test.ts b/src/testcases/parallel/ibc_transfer.test.ts index 6d38e1e1..0a98d289 100644 --- a/src/testcases/parallel/ibc_transfer.test.ts +++ b/src/testcases/parallel/ibc_transfer.test.ts @@ -5,12 +5,9 @@ import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; import { MsgTransfer as GaiaMsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; import { MsgTransfer as NeutronMsgTransfer } from '@neutron-org/neutronjs/ibc/applications/transfer/v1/tx'; import { defaultRegistryTypes } from '@cosmjs/stargate'; -import { - QueryClientImpl as ContractManagerQuery, - QueryFailuresResponse, -} from '@neutron-org/cosmjs-types/neutron/contractmanager/query'; -import { QueryClientImpl as BankQueryClient } from '@neutron-org/cosmjs-types/cosmos/bank/v1beta1/query'; -import { QueryClientImpl as IbcQueryClient } from '@neutron-org/cosmjs-types/ibc/applications/transfer/v1/query'; +import { QueryFailuresResponse } from '@neutron-org/neutronjs/neutron/contractmanager/query'; +import { QueryClientImpl as BankQueryClient } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; +import { QueryClientImpl as IbcQueryClient } from '@neutron-org/neutronjs/ibc/applications/transfer/v1/query.rpc.Query'; import { COSMOS_DENOM, IBC_RELAYER_NEUTRON_ADDRESS, @@ -22,6 +19,7 @@ import { waitBlocks } from '@neutron-org/neutronjsplus/dist/wait'; import { Wallet } from '../../helpers/wallet'; import { getIBCDenom } from '@neutron-org/neutronjsplus/dist/cosmos'; import config from '../../config.json'; +import { QueryClientImpl as ContractManagerQuery } from '@neutron-org/neutronjs/neutron/contractmanager/query.rpc.Query'; const TRANSFER_CHANNEL = 'channel-0'; const IBC_TOKEN_DENOM = @@ -117,7 +115,7 @@ describe('Neutron / IBC transfer', () => { expect(res.code).toEqual(0); }); test('check balance', async () => { - const res = await bankQuerier.AllBalances({ address: ibcContract }); + const res = await bankQuerier.allBalances({resolveDenom: false, address: ibcContract }); expect(res.balances).toEqual([ { amount: '50000', denom: NEUTRON_DENOM }, ]); @@ -191,7 +189,7 @@ describe('Neutron / IBC transfer', () => { expect(balance.amount).toEqual('1000'); }); test('check that weird IBC denom is uatom indeed', async () => { - const res = await ibcQuerier.DenomTrace({ + const res = await ibcQuerier.denomTrace({ hash: '27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2', }); expect(res.denomTrace.baseDenom).toEqual(COSMOS_DENOM); @@ -449,12 +447,9 @@ describe('Neutron / IBC transfer', () => { }); }); test('execute contract with failing sudo', async () => { - const failuresBeforeCall = await contractManagerQuerier.AddressFailures( - { - failureId: 0n, // bug: should not be in query - address: ibcContract, - }, - ); + const failuresBeforeCall = await contractManagerQuerier.failures({ + address: ibcContract, + }); expect(failuresBeforeCall.failures.length).toEqual(0); // Mock sudo handler to fail @@ -500,8 +495,7 @@ describe('Neutron / IBC transfer', () => { const failuresAfterCall = await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + contractManagerQuerier.failures({ address: ibcContract, }), // Wait until there 4 failures in the list @@ -579,8 +573,7 @@ describe('Neutron / IBC transfer', () => { const res = await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + contractManagerQuerier.failures({ address: ibcContract, }), // Wait until there 6 failures in the list @@ -600,8 +593,7 @@ describe('Neutron / IBC transfer', () => { await neutronClient.waitBlocks(2); // Try to resubmit failure - const failuresResBefore = await contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + const failuresResBefore = await contractManagerQuerier.failures({ address: ibcContract, }); @@ -616,8 +608,7 @@ describe('Neutron / IBC transfer', () => { await neutronClient.waitBlocks(5); // check that failures count is the same - const failuresResAfter = await contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + const failuresResAfter = await contractManagerQuerier.failures({ address: ibcContract, }); expect(failuresResAfter.failures.length).toEqual(6); @@ -631,8 +622,7 @@ describe('Neutron / IBC transfer', () => { test('successful resubmit failure', async () => { // Resubmit failure - const failuresResBefore = await contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + const failuresResBefore = await contractManagerQuerier.failures({ address: ibcContract, }); const failure = failuresResBefore.failures[0]; @@ -646,8 +636,7 @@ describe('Neutron / IBC transfer', () => { await neutronClient.waitBlocks(5); // check that failures count is changed - const failuresResAfter = await contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + const failuresResAfter = await contractManagerQuerier.failures({ address: ibcContract, }); expect(failuresResAfter.failures.length).toEqual(5); @@ -663,8 +652,7 @@ describe('Neutron / IBC transfer', () => { countTotal: false, reverse: false, }; - const res = await contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + const res = await contractManagerQuerier.failures({ address: ibcContract, pagination, }); @@ -679,8 +667,7 @@ describe('Neutron / IBC transfer', () => { reverse: false, }; await expect( - contractManagerQuerier.AddressFailures({ - failureId: 0n, // bug: should not be in query + contractManagerQuerier.failures({ address: ibcContract, pagination, }), diff --git a/src/testcases/parallel/stargate_queries.test.ts b/src/testcases/parallel/stargate_queries.test.ts index e07adbd3..69f3325f 100644 --- a/src/testcases/parallel/stargate_queries.test.ts +++ b/src/testcases/parallel/stargate_queries.test.ts @@ -7,7 +7,7 @@ import { Suite, inject } from 'vitest'; import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; import { defaultRegistryTypes, SigningStargateClient } from '@cosmjs/stargate'; import { Registry } from '@cosmjs/proto-signing'; -import { MsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; +import { MsgTransfer } from '@neutron-org/neutronjs/ibc/applications/transfer/v1/tx'; import { MsgCreateDenom } from '@neutron-org/neutronjs/osmosis/tokenfactory/v1beta1/tx'; import { COSMOS_DENOM, NEUTRON_DENOM } from '../../helpers/constants'; import config from '../../config.json'; diff --git a/src/testcases/run_in_band/ibc_hooks.test.ts b/src/testcases/run_in_band/ibc_hooks.test.ts index a5342047..6bc0a5ae 100644 --- a/src/testcases/run_in_band/ibc_hooks.test.ts +++ b/src/testcases/run_in_band/ibc_hooks.test.ts @@ -9,7 +9,7 @@ import { inject, Suite } from 'vitest'; import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; import { defaultRegistryTypes, SigningStargateClient } from '@cosmjs/stargate'; import { Registry } from '@cosmjs/proto-signing'; -import { MsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; +import { MsgTransfer } from '@neutron-org/neutronjs/ibc/applications/transfer/v1/tx'; import config from '../../config.json'; import { waitBlocks } from '@neutron-org/neutronjsplus/dist/wait'; diff --git a/src/testcases/run_in_band/interchain_kv_query.test.ts b/src/testcases/run_in_band/interchain_kv_query.test.ts index 5a3bffca..5734028b 100644 --- a/src/testcases/run_in_band/interchain_kv_query.test.ts +++ b/src/testcases/run_in_band/interchain_kv_query.test.ts @@ -55,7 +55,7 @@ import { } from '../../helpers/constants'; import { QueryClientImpl as InterchainqQuerier } from '@neutron-org/neutronjs/neutron/interchainqueries/query.rpc.Query'; import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; -import { QueryClientImpl as SlashingQuerier } from 'cosmjs-types/cosmos/slashing/v1beta1/query'; +import { QueryClientImpl as SlashingQuerier } from '@neutron-org/neutronjs/cosmos/slashing/v1beta1/query.rpc.Query'; import config from '../../config.json'; import { Wallet } from '../../helpers/wallet'; @@ -205,8 +205,9 @@ describe('Neutron / Interchain KV Query', () => { amount: [{ denom: NEUTRON_DENOM, amount: '1000' }], }, ); - let balances = await bankQuerier.AllBalances({ - address: contractAddress, + let balances = await bankQuerier.allBalances({ + resolveDenom: false, + address: contractAddress }); expect(balances.balances[0].amount).toEqual('1000000'); @@ -219,7 +220,7 @@ describe('Neutron / Interchain KV Query', () => { gaiaWallet.address, ); - balances = await bankQuerier.AllBalances({ address: contractAddress }); + balances = await bankQuerier.allBalances({resolveDenom: false, address: contractAddress }); expect(balances.balances.length).toEqual(0); }); diff --git a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts index ede4657a..f96bea98 100644 --- a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts +++ b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts @@ -19,7 +19,7 @@ import { COSMOS_DENOM, NEUTRON_DENOM, } from '../../helpers/constants'; -import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; +import { QueryClientImpl as BankQuerier } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; import config from '../../config.json'; import { Wallet } from '../../helpers/wallet'; @@ -116,9 +116,11 @@ describe('Neutron / Interchain TX Query', () => { test('handle callback on a sending', async () => { addr1ExpectedBalance += amountToAddrFirst1; - let balances = await bankQuerierGaia.AllBalances({ - address: watchedAddr1, - }); + let balances = await bankQuerierGaia.allBalances( + { + resolveDenom: false, + address: watchedAddr1 + }); expect(balances.balances).toEqual([]); const res = await gaiaClient.sendTokens( gaiaWallet.address, diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index 84c4bca6..cc3729ba 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -9,20 +9,23 @@ import { LocalState } from '../../helpers/local_state'; import { Suite, inject } from 'vitest'; import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; import { SigningStargateClient } from '@cosmjs/stargate'; - import { - QueryClientImpl as StakingQueryClient, QueryDelegatorDelegationsResponse, -} from '@neutron-org/cosmjs-types/cosmos/staking/v1beta1/query'; +} from '@neutron-org/neutronjs/cosmos/staking/v1beta1/query'; +import {QueryClientImpl as StakingQueryClient} from '@neutron-org/neutronjs/cosmos/staking/v1beta1/query.rpc.Query'; import { - QueryClientImpl as IbcQueryClient, QueryChannelsResponse, -} from '@neutron-org/cosmjs-types/ibc/core/channel/v1/query'; +} from '@neutron-org/neutronjs/ibc/core/channel/v1/query'; +import { + QueryClientImpl as IbcQueryClient +} from '@neutron-org/neutronjs/ibc/core/channel/v1/query.rpc.Query'; import { - QueryClientImpl as ContractManagerQuery, QueryFailuresResponse, -} from '@neutron-org/cosmjs-types/neutron/contractmanager/query'; +} from '@neutron-org/neutronjs/neutron/contractmanager/query'; import { getWithAttempts } from '../../helpers/misc'; +import { + QueryClientImpl as ContractManagerQuery, +} from '@neutron-org/neutronjs/neutron/contractmanager/query.rpc.Query'; import config from '../../config.json'; import { Wallet } from '../../helpers/wallet'; @@ -233,7 +236,7 @@ describe('Neutron / Interchain TXs', () => { const res1 = await getWithAttempts( gaiaClient, () => - stakingQuerier.DelegatorDelegations({ + stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress1, }), async (delegations) => delegations.delegationResponses?.length == 1, @@ -252,7 +255,7 @@ describe('Neutron / Interchain TXs', () => { const res2 = await getWithAttempts( gaiaClient, () => - stakingQuerier.DelegatorDelegations({ + stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress2, }), async (delegations) => delegations.delegationResponses?.length == 0, @@ -303,7 +306,7 @@ describe('Neutron / Interchain TXs', () => { const res1 = await getWithAttempts( gaiaClient, () => - stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress1 }), + stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress1 }), async (delegations) => delegations.delegationResponses?.length == 1, ); expect(res1.delegationResponses).toEqual([ @@ -317,7 +320,7 @@ describe('Neutron / Interchain TXs', () => { }, }, ]); - const res2 = await stakingQuerier.DelegatorDelegations({ + const res2 = await stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress2, }); expect(res2.delegationResponses).toEqual([]); @@ -527,7 +530,7 @@ describe('Neutron / Interchain TXs', () => { }); expect(res.code).toEqual(0); await neutronClient.getWithAttempts( - async () => ibcQuerier.Channels({}), + async () => ibcQuerier.channels({}), // Wait until there are 4 channels: // - one exists already, it is open for IBC transfers; // - two channels are already opened via ICA registration before @@ -535,7 +538,7 @@ describe('Neutron / Interchain TXs', () => { async (channels) => channels.channels.length == 4, ); await neutronClient.getWithAttempts( - () => ibcQuerier.Channels({}), + () => ibcQuerier.channels({}), async (channels) => channels.channels.find((c) => c.channelId == 'channel-3')?.state == 3, @@ -565,7 +568,7 @@ describe('Neutron / Interchain TXs', () => { }); }); test('check validator state after ICA recreation', async () => { - const res = await stakingQuerier.DelegatorDelegations({ + const res = await stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress1, }); expect(res.delegationResponses).toEqual([ @@ -586,9 +589,8 @@ describe('Neutron / Interchain TXs', () => { beforeAll(async () => { await cleanAckResults(neutronClient, contractAddress); - const failures = await contractManagerQuerier.AddressFailures({ + const failures = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); expect(failures.failures.length).toEqual(0); @@ -615,9 +617,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 1, 100, @@ -652,9 +653,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 2, 100, @@ -689,9 +689,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 3, 100, @@ -728,9 +727,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 4, 100, @@ -766,9 +764,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 5, 100, @@ -806,9 +803,8 @@ describe('Neutron / Interchain TXs', () => { // wait until sudo is called and processed and failure is recorder await neutronClient.getWithAttempts( async () => - contractManagerQuerier.AddressFailures({ + contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }), async (data) => data.failures.length == 6, 100, @@ -825,9 +821,8 @@ describe('Neutron / Interchain TXs', () => { }); test('check stored failures and acks', async () => { - const failures = await contractManagerQuerier.AddressFailures({ + const failures = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); // 4 ack failures, 2 timeout failure, just as described in the tests above expect(failures.failures).toEqual([ @@ -879,9 +874,8 @@ describe('Neutron / Interchain TXs', () => { await neutronClient.waitBlocks(5); // Try to resubmit failure - const failuresResBefore = await contractManagerQuerier.AddressFailures({ + const failuresResBefore = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); await expect( neutronClient.execute(contractAddress, { @@ -894,9 +888,8 @@ describe('Neutron / Interchain TXs', () => { await neutronClient.waitBlocks(5); // check that failures count is the same - const failuresResAfter = await contractManagerQuerier.AddressFailures({ + const failuresResAfter = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); expect(failuresResAfter.failures.length).toEqual(6); @@ -913,9 +906,8 @@ describe('Neutron / Interchain TXs', () => { test('successful resubmit failure', async () => { // Resubmit failure - const failuresResBefore = await contractManagerQuerier.AddressFailures({ + const failuresResBefore = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); const failure = failuresResBefore.failures[0]; const failureId = failure.id; @@ -929,9 +921,8 @@ describe('Neutron / Interchain TXs', () => { await neutronClient.waitBlocks(5); // check that failures count is changed - const failuresResAfter = await contractManagerQuerier.AddressFailures({ + const failuresResAfter = await contractManagerQuerier.failures({ address: contractAddress, - failureId: 0n, }); expect(failuresResAfter.failures.length).toEqual(5); diff --git a/src/testcases/run_in_band/tokenfactory.test.ts b/src/testcases/run_in_band/tokenfactory.test.ts index 1863a613..300d132a 100644 --- a/src/testcases/run_in_band/tokenfactory.test.ts +++ b/src/testcases/run_in_band/tokenfactory.test.ts @@ -20,7 +20,7 @@ import { MsgMint, MsgSetBeforeSendHook, } from '@neutron-org/neutronjs/osmosis/tokenfactory/v1beta1/tx'; -import { QueryClientImpl as BankQueryClient } from '@neutron-org/cosmjs-types/cosmos/bank/v1beta1/query'; +import { QueryClientImpl as BankQueryClient } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; import { createRPCQueryClient as createOsmosisClient } from '@neutron-org/neutronjs/osmosis/rpc.query'; import { OsmosisQuerier } from '@neutron-org/neutronjs/querier_types'; import { NEUTRON_DENOM } from '@neutron-org/neutronjsplus/dist/constants'; @@ -709,7 +709,7 @@ describe('Neutron / Tokenfactory', () => { }, }); - const metadata = await bankQuerier.DenomMetadata({ denom: denom }); + const metadata = await bankQuerier.denomMetadata({ denom: denom }); expect(metadata.metadata.base).toEqual(denom); expect(metadata.metadata.uri).toEqual(denom); expect(metadata.metadata.display).toEqual(denom); diff --git a/src/testcases/run_in_band/tokenomics.test.ts b/src/testcases/run_in_band/tokenomics.test.ts index 63851ca7..5c48bbda 100644 --- a/src/testcases/run_in_band/tokenomics.test.ts +++ b/src/testcases/run_in_band/tokenomics.test.ts @@ -5,11 +5,11 @@ import { LocalState } from '../../helpers/local_state'; import { QueryClientImpl as FeeburnerQueryClient } from '@neutron-org/neutronjs/neutron/feeburner/query.rpc.Query'; import { Registry } from '@cosmjs/proto-signing'; import { defaultRegistryTypes, SigningStargateClient } from '@cosmjs/stargate'; -import { QueryClientImpl as BankQueryClient } from '@neutron-org/cosmjs-types/cosmos/bank/v1beta1/query'; +import { QueryClientImpl as BankQueryClient } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; import { QueryTotalBurnedNeutronsAmountResponse } from '@neutron-org/neutronjs/neutron/feeburner/query'; import { QuerySupplyOfResponse } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query'; import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; -import { MsgTransfer } from 'cosmjs-types/ibc/applications/transfer/v1/tx'; +import { MsgTransfer } from '@neutron-org/neutronjs/ibc/applications/transfer/v1/tx'; import { Wallet } from '../../helpers/wallet'; import config from '../../config.json'; @@ -90,7 +90,7 @@ describe('Neutron / Tokenomics', () => { let totalSupplyBefore: QuerySupplyOfResponse; test('Read total supply', async () => { - totalSupplyBefore = await bankQuerier.SupplyOf({ denom: NEUTRON_DENOM }); + totalSupplyBefore = await bankQuerier.supplyOf({ denom: NEUTRON_DENOM }); }); test('Perform tx with a very big neutron fee', async () => { @@ -107,7 +107,7 @@ describe('Neutron / Tokenomics', () => { }); test('Total supply of neutrons has decreased', async () => { - const totalSupplyAfter = await bankQuerier.SupplyOf({ + const totalSupplyAfter = await bankQuerier.supplyOf({ denom: NEUTRON_DENOM, }); const diff = diff --git a/yarn.lock b/yarn.lock index 6ea29087..1080bac5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,9 +1307,10 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45": - version "0.1.0-rc4" - resolved "https://github.com/neutron-org/neutronjs.git#32a88946f8544c128997dca232bac88dd024dd45" +"@neutron-org/neutronjs@0.1.0-rc6": + version "0.1.0-rc6" + resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc6.tgz#7196f37836a01566074ede0e04a61ce50fa89453" + integrity sha512-cqqhdxWsvnj9cn1I3Y7Mc+GqcdJvah3nvXVuWw0Ec1xUXTtoo7pC2fen1OWZ6QPKipnmH7Vd0wZegnCSUncWZw== "@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b": version "0.4.0-rc21" From 99dd79e1c56f76739e4ed81813137d9228cb599b Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 8 Aug 2024 13:48:15 -0300 Subject: [PATCH 03/14] lint --- src/helpers/interchainqueries.ts | 2 +- src/testcases/parallel/ibc_transfer.test.ts | 5 ++++- src/testcases/run_in_band/interchain_kv_query.test.ts | 7 +++++-- .../run_in_band/interchain_tx_query_plain.test.ts | 9 ++++----- src/testcases/run_in_band/interchaintx.test.ts | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/helpers/interchainqueries.ts b/src/helpers/interchainqueries.ts index c609caee..b3faf2dc 100644 --- a/src/helpers/interchainqueries.ts +++ b/src/helpers/interchainqueries.ts @@ -370,7 +370,7 @@ export const validateBalanceQuery = async ( const balances = await bankQuerier.allBalances({ resolveDenom: false, - address: address + address: address, }); expect(filterIBCDenoms(res.balances.coins)).toEqual( diff --git a/src/testcases/parallel/ibc_transfer.test.ts b/src/testcases/parallel/ibc_transfer.test.ts index 0a98d289..15091942 100644 --- a/src/testcases/parallel/ibc_transfer.test.ts +++ b/src/testcases/parallel/ibc_transfer.test.ts @@ -115,7 +115,10 @@ describe('Neutron / IBC transfer', () => { expect(res.code).toEqual(0); }); test('check balance', async () => { - const res = await bankQuerier.allBalances({resolveDenom: false, address: ibcContract }); + const res = await bankQuerier.allBalances({ + resolveDenom: false, + address: ibcContract, + }); expect(res.balances).toEqual([ { amount: '50000', denom: NEUTRON_DENOM }, ]); diff --git a/src/testcases/run_in_band/interchain_kv_query.test.ts b/src/testcases/run_in_band/interchain_kv_query.test.ts index 5734028b..cfcaca47 100644 --- a/src/testcases/run_in_band/interchain_kv_query.test.ts +++ b/src/testcases/run_in_band/interchain_kv_query.test.ts @@ -207,7 +207,7 @@ describe('Neutron / Interchain KV Query', () => { ); let balances = await bankQuerier.allBalances({ resolveDenom: false, - address: contractAddress + address: contractAddress, }); expect(balances.balances[0].amount).toEqual('1000000'); @@ -220,7 +220,10 @@ describe('Neutron / Interchain KV Query', () => { gaiaWallet.address, ); - balances = await bankQuerier.allBalances({resolveDenom: false, address: contractAddress }); + balances = await bankQuerier.allBalances({ + resolveDenom: false, + address: contractAddress, + }); expect(balances.balances.length).toEqual(0); }); diff --git a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts index f96bea98..4af2073d 100644 --- a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts +++ b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts @@ -116,11 +116,10 @@ describe('Neutron / Interchain TX Query', () => { test('handle callback on a sending', async () => { addr1ExpectedBalance += amountToAddrFirst1; - let balances = await bankQuerierGaia.allBalances( - { - resolveDenom: false, - address: watchedAddr1 - }); + let balances = await bankQuerierGaia.allBalances({ + resolveDenom: false, + address: watchedAddr1, + }); expect(balances.balances).toEqual([]); const res = await gaiaClient.sendTokens( gaiaWallet.address, diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index cc3729ba..aa3d4562 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -126,7 +126,7 @@ describe('Neutron / Interchain TXs', () => { test('multiple IBC accounts created', async () => { const channels = await neutronClient.getWithAttempts( - () => ibcQuerier.Channels({}), + () => ibcQuerier.channels({}), // Wait until there are 3 channels: // - one exists already, it is open for IBC transfers; // - two more should appear soon since we are opening them implicitly From 1ab453781ba98bb1ee8657c483d5b96926a71b13 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Thu, 8 Aug 2024 17:11:11 -0300 Subject: [PATCH 04/14] use old querier --- src/helpers/interchainqueries.ts | 5 ++--- .../run_in_band/interchain_kv_query.test.ts | 8 +++----- .../run_in_band/interchain_tx_query_plain.test.ts | 2 +- src/testcases/run_in_band/interchaintx.test.ts | 14 +++++++------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/helpers/interchainqueries.ts b/src/helpers/interchainqueries.ts index b3faf2dc..2ec00ea0 100644 --- a/src/helpers/interchainqueries.ts +++ b/src/helpers/interchainqueries.ts @@ -18,7 +18,7 @@ import axios, { AxiosResponse } from 'axios'; import { SigningNeutronClient } from './signing_neutron_client'; import { IBC_ATOM_DENOM, IBC_USDC_DENOM, NEUTRON_DENOM } from './constants'; import { Coin } from '@neutron-org/neutronjs/cosmos/base/v1beta1/coin'; -import { QueryClientImpl as BankQuerier } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; +import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; import { MsgRemoveInterchainQueryRequest } from '@neutron-org/neutronjs/neutron/interchainqueries/tx'; export const getKvCallbackStatus = async ( @@ -368,8 +368,7 @@ export const validateBalanceQuery = async ( queryId, ); - const balances = await bankQuerier.allBalances({ - resolveDenom: false, + const balances = await bankQuerier.AllBalances({ address: address, }); diff --git a/src/testcases/run_in_band/interchain_kv_query.test.ts b/src/testcases/run_in_band/interchain_kv_query.test.ts index cfcaca47..3fe14fc7 100644 --- a/src/testcases/run_in_band/interchain_kv_query.test.ts +++ b/src/testcases/run_in_band/interchain_kv_query.test.ts @@ -55,7 +55,7 @@ import { } from '../../helpers/constants'; import { QueryClientImpl as InterchainqQuerier } from '@neutron-org/neutronjs/neutron/interchainqueries/query.rpc.Query'; import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; -import { QueryClientImpl as SlashingQuerier } from '@neutron-org/neutronjs/cosmos/slashing/v1beta1/query.rpc.Query'; +import { QueryClientImpl as SlashingQuerier } from 'cosmjs-types/cosmos/slashing/v1beta1/query'; import config from '../../config.json'; import { Wallet } from '../../helpers/wallet'; @@ -205,8 +205,7 @@ describe('Neutron / Interchain KV Query', () => { amount: [{ denom: NEUTRON_DENOM, amount: '1000' }], }, ); - let balances = await bankQuerier.allBalances({ - resolveDenom: false, + let balances = await bankQuerier.AllBalances({ address: contractAddress, }); expect(balances.balances[0].amount).toEqual('1000000'); @@ -220,8 +219,7 @@ describe('Neutron / Interchain KV Query', () => { gaiaWallet.address, ); - balances = await bankQuerier.allBalances({ - resolveDenom: false, + balances = await bankQuerier.AllBalances({ address: contractAddress, }); diff --git a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts index 4af2073d..b6166441 100644 --- a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts +++ b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts @@ -19,7 +19,7 @@ import { COSMOS_DENOM, NEUTRON_DENOM, } from '../../helpers/constants'; -import { QueryClientImpl as BankQuerier } from '@neutron-org/neutronjs/cosmos/bank/v1beta1/query.rpc.Query'; +import { QueryClientImpl as BankQuerier } from 'cosmjs-types/cosmos/bank/v1beta1/query'; import config from '../../config.json'; import { Wallet } from '../../helpers/wallet'; diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index aa3d4562..1b040c40 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -10,9 +10,9 @@ import { Suite, inject } from 'vitest'; import { SigningNeutronClient } from '../../helpers/signing_neutron_client'; import { SigningStargateClient } from '@cosmjs/stargate'; import { + QueryClientImpl as StakingQueryClient, QueryDelegatorDelegationsResponse, -} from '@neutron-org/neutronjs/cosmos/staking/v1beta1/query'; -import {QueryClientImpl as StakingQueryClient} from '@neutron-org/neutronjs/cosmos/staking/v1beta1/query.rpc.Query'; +} from '@neutron-org/cosmjs-types/cosmos/staking/v1beta1/query'; import { QueryChannelsResponse, } from '@neutron-org/neutronjs/ibc/core/channel/v1/query'; @@ -236,7 +236,7 @@ describe('Neutron / Interchain TXs', () => { const res1 = await getWithAttempts( gaiaClient, () => - stakingQuerier.delegatorDelegations({ + stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress1, }), async (delegations) => delegations.delegationResponses?.length == 1, @@ -255,7 +255,7 @@ describe('Neutron / Interchain TXs', () => { const res2 = await getWithAttempts( gaiaClient, () => - stakingQuerier.delegatorDelegations({ + stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress2, }), async (delegations) => delegations.delegationResponses?.length == 0, @@ -306,7 +306,7 @@ describe('Neutron / Interchain TXs', () => { const res1 = await getWithAttempts( gaiaClient, () => - stakingQuerier.delegatorDelegations({ delegatorAddr: icaAddress1 }), + stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress1 }), async (delegations) => delegations.delegationResponses?.length == 1, ); expect(res1.delegationResponses).toEqual([ @@ -320,7 +320,7 @@ describe('Neutron / Interchain TXs', () => { }, }, ]); - const res2 = await stakingQuerier.delegatorDelegations({ + const res2 = await stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress2, }); expect(res2.delegationResponses).toEqual([]); @@ -568,7 +568,7 @@ describe('Neutron / Interchain TXs', () => { }); }); test('check validator state after ICA recreation', async () => { - const res = await stakingQuerier.delegatorDelegations({ + const res = await stakingQuerier.DelegatorDelegations({ delegatorAddr: icaAddress1, }); expect(res.delegationResponses).toEqual([ From 4222e26f2fd070b45ed699edea30e85d6519437b Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 13 Aug 2024 10:33:35 -0300 Subject: [PATCH 05/14] fix typo aftermerge --- src/testcases/run_in_band/interchain_tx_query_plain.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts index b6166441..ede4657a 100644 --- a/src/testcases/run_in_band/interchain_tx_query_plain.test.ts +++ b/src/testcases/run_in_band/interchain_tx_query_plain.test.ts @@ -116,8 +116,7 @@ describe('Neutron / Interchain TX Query', () => { test('handle callback on a sending', async () => { addr1ExpectedBalance += amountToAddrFirst1; - let balances = await bankQuerierGaia.allBalances({ - resolveDenom: false, + let balances = await bankQuerierGaia.AllBalances({ address: watchedAddr1, }); expect(balances.balances).toEqual([]); From e720c9f0c61ebd37f2978e3be05de6983ecaa0eb Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 27 Aug 2024 11:11:28 -0300 Subject: [PATCH 06/14] upd njs --- package.json | 2 +- src/testcases/run_in_band/interchaintx.test.ts | 1 + yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a0123f93..19d74a65 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "0.1.0-rc6", + "@neutron-org/neutronjs": "0.1.0-rc7", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index 1b040c40..7b92c6c3 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -21,6 +21,7 @@ import { } from '@neutron-org/neutronjs/ibc/core/channel/v1/query.rpc.Query'; import { QueryFailuresResponse, + QueryFailureResponse, } from '@neutron-org/neutronjs/neutron/contractmanager/query'; import { getWithAttempts } from '../../helpers/misc'; import { diff --git a/yarn.lock b/yarn.lock index 1080bac5..a621bffc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,10 +1307,10 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@0.1.0-rc6": - version "0.1.0-rc6" - resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc6.tgz#7196f37836a01566074ede0e04a61ce50fa89453" - integrity sha512-cqqhdxWsvnj9cn1I3Y7Mc+GqcdJvah3nvXVuWw0Ec1xUXTtoo7pC2fen1OWZ6QPKipnmH7Vd0wZegnCSUncWZw== +"@neutron-org/neutronjs@0.1.0-rc7": + version "0.1.0-rc7" + resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc7.tgz#7ff19073d495c07f9cd665190bc2fa18a5f132fa" + integrity sha512-7Uqhel68nq/dfTK0MKfc/yDj1gnp4RG/GqT7ljTs/6SaugNf35+niY2rYJXMcQM5EZ5AB0TEQT7bG6RSOZH/lA== "@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b": version "0.4.0-rc21" From 04f18482aa3675dbcea7f7af4f57c20d430913ec Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 27 Aug 2024 11:15:50 -0300 Subject: [PATCH 07/14] resolve conflicts --- yarn.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a621bffc..0e193400 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1312,9 +1312,10 @@ resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc7.tgz#7ff19073d495c07f9cd665190bc2fa18a5f132fa" integrity sha512-7Uqhel68nq/dfTK0MKfc/yDj1gnp4RG/GqT7ljTs/6SaugNf35+niY2rYJXMcQM5EZ5AB0TEQT7bG6RSOZH/lA== -"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b": - version "0.4.0-rc21" - resolved "https://github.com/neutron-org/neutronjsplus.git#6c4fb9db879d7cf29074ddc9fafc0d06f77acb7b" +"@neutron-org/neutronjsplus@0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@neutron-org/neutronjsplus/-/neutronjsplus-0.5.0.tgz#d68afb8142ee0bd2d3eee21916901507503360a3" + integrity sha512-dzWL9hTVorMskWzW/ZEUK3Cruw0AkOlC8fk6pFIyli4XkNooJKL/H7V8PSxiwIyx3k+EpIZ0I5FpzCL9EitNMg== dependencies: "@cosmjs/cosmwasm-stargate" "^0.32.4" "@cosmjs/proto-signing" "^0.32.4" From 90e0407ac6c803dab2e5b1cd9aa2f445a9e5b095 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 27 Aug 2024 11:18:40 -0300 Subject: [PATCH 08/14] rm unused import --- src/testcases/run_in_band/interchaintx.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index 7b92c6c3..1b040c40 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -21,7 +21,6 @@ import { } from '@neutron-org/neutronjs/ibc/core/channel/v1/query.rpc.Query'; import { QueryFailuresResponse, - QueryFailureResponse, } from '@neutron-org/neutronjs/neutron/contractmanager/query'; import { getWithAttempts } from '../../helpers/misc'; import { From eba6fe964e979afb6d707d05b19260fd053e64a9 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 27 Aug 2024 16:07:02 -0300 Subject: [PATCH 09/14] upd njs --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0974d3ef..2f50417d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "0.1.0-rc7", + "@neutron-org/neutronjs": "0.1.0-rc8", "@neutron-org/neutronjsplus": "0.5.0", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/yarn.lock b/yarn.lock index 0e193400..eb09a212 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,10 +1307,10 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@0.1.0-rc7": - version "0.1.0-rc7" - resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc7.tgz#7ff19073d495c07f9cd665190bc2fa18a5f132fa" - integrity sha512-7Uqhel68nq/dfTK0MKfc/yDj1gnp4RG/GqT7ljTs/6SaugNf35+niY2rYJXMcQM5EZ5AB0TEQT7bG6RSOZH/lA== +"@neutron-org/neutronjs@0.1.0-rc8": + version "0.1.0-rc8" + resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc8.tgz#5d38ce8c737b5fcb24c57ca015f9e628eff25b58" + integrity sha512-tBT/XWY7/uFUivADrPKuohoyCEvspqhgbTCIOcvn6DGw8UmZU+kwRcOtxZ7Hr4zb0k2cI81vOFiJRTrcgnSr2g== "@neutron-org/neutronjsplus@0.5.0": version "0.5.0" From ac1695c27b51ea31c5b39345f707d324004750ee Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 2 Sep 2024 09:19:13 -0300 Subject: [PATCH 10/14] switch njs to commit usage --- package.json | 2 +- yarn.lock | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6752b8cf..4748de63 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "0.1.0-rc8", + "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/yarn.lock b/yarn.lock index eb09a212..7018caef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,15 +1307,13 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@0.1.0-rc8": - version "0.1.0-rc8" - resolved "https://registry.yarnpkg.com/@neutron-org/neutronjs/-/neutronjs-0.1.0-rc8.tgz#5d38ce8c737b5fcb24c57ca015f9e628eff25b58" - integrity sha512-tBT/XWY7/uFUivADrPKuohoyCEvspqhgbTCIOcvn6DGw8UmZU+kwRcOtxZ7Hr4zb0k2cI81vOFiJRTrcgnSr2g== +"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2": + version "4.2.0" + resolved "https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2" -"@neutron-org/neutronjsplus@0.5.0": +"@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54": version "0.5.0" - resolved "https://registry.yarnpkg.com/@neutron-org/neutronjsplus/-/neutronjsplus-0.5.0.tgz#d68afb8142ee0bd2d3eee21916901507503360a3" - integrity sha512-dzWL9hTVorMskWzW/ZEUK3Cruw0AkOlC8fk6pFIyli4XkNooJKL/H7V8PSxiwIyx3k+EpIZ0I5FpzCL9EitNMg== + resolved "https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54" dependencies: "@cosmjs/cosmwasm-stargate" "^0.32.4" "@cosmjs/proto-signing" "^0.32.4" From 7282b1f1bc4f9d8068ba38c59484d125effdbe6b Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Mon, 2 Sep 2024 10:13:13 -0300 Subject: [PATCH 11/14] merge main everywhere --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4748de63..41c159c4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@cosmjs/cosmwasm-stargate": "^0.32.4", "@cosmjs/stargate": "0.32.4", "@cosmjs/tendermint-rpc": "^0.32.4", - "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2", + "@neutron-org/neutronjs": "https://github.com/neutron-org/neutronjs.git#1e70c1f68e997857f42bab7647227c8ca9dc8aa1", "@neutron-org/neutronjsplus": "https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54", "@types/lodash": "^4.14.182", "axios": "1.6.0", diff --git a/yarn.lock b/yarn.lock index 7018caef..53f83c9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,9 +1307,9 @@ resolved "https://registry.yarnpkg.com/@neutron-org/cosmjs-types/-/cosmjs-types-0.9.2-rc1.tgz#ca1fc1dc9566858dbd765e8f82c8a70097bcc84b" integrity sha512-ju2AqJ14yO4+JF8RwY4ZVy7f2HVjhdf66SfhS6y4ucBZm997/E/yYVMnpWmUncVg8ARooISOKaOYNagqz0am6Q== -"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2": +"@neutron-org/neutronjs@https://github.com/neutron-org/neutronjs.git#1e70c1f68e997857f42bab7647227c8ca9dc8aa1": version "4.2.0" - resolved "https://github.com/neutron-org/neutronjs.git#8a5c86d41ccba794a4a978d3b493b0c0503495f2" + resolved "https://github.com/neutron-org/neutronjs.git#1e70c1f68e997857f42bab7647227c8ca9dc8aa1" "@neutron-org/neutronjsplus@https://github.com/neutron-org/neutronjsplus.git#1e4527ef6971f4dc2c202cb3cc2a50b0a4491f54": version "0.5.0" From 18aef19bbd2eb5513ca21c01cea53ed44e68c9e7 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 3 Sep 2024 12:52:18 -0300 Subject: [PATCH 12/14] lint --- src/testcases/run_in_band/interchaintx.test.ts | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index 92ba79dd..ec3b24da 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -16,19 +16,11 @@ import { QueryClientImpl as StakingQueryClient, QueryDelegatorDelegationsResponse, } from '@neutron-org/cosmjs-types/cosmos/staking/v1beta1/query'; -import { - QueryChannelsResponse, -} from '@neutron-org/neutronjs/ibc/core/channel/v1/query'; -import { - QueryClientImpl as IbcQueryClient -} from '@neutron-org/neutronjs/ibc/core/channel/v1/query.rpc.Query'; -import { - QueryFailuresResponse, -} from '@neutron-org/neutronjs/neutron/contractmanager/query'; +import { QueryChannelsResponse } from '@neutron-org/neutronjs/ibc/core/channel/v1/query'; +import { QueryClientImpl as IbcQueryClient } from '@neutron-org/neutronjs/ibc/core/channel/v1/query.rpc.Query'; +import { QueryFailuresResponse } from '@neutron-org/neutronjs/neutron/contractmanager/query'; import { getWithAttempts } from '../../helpers/misc'; -import { - QueryClientImpl as ContractManagerQuery, -} from '@neutron-org/neutronjs/neutron/contractmanager/query.rpc.Query'; +import { QueryClientImpl as ContractManagerQuery } from '@neutron-org/neutronjs/neutron/contractmanager/query.rpc.Query'; import { Wallet } from '../../helpers/wallet'; import { From 97abf70032c542c1ae17d8e5fa48129d3ffc4e61 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Tue, 3 Sep 2024 13:02:06 -0300 Subject: [PATCH 13/14] commit new yarnlock --- yarn.lock | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 401 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 53f83c9f..3284c3a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -946,6 +946,11 @@ "@babel/helper-validator-identifier" "^7.24.7" to-fast-properties "^2.0.0" +"@colors/colors@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" + integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== + "@confio/ics23@^0.6.8": version "0.6.8" resolved "https://registry.yarnpkg.com/@confio/ics23/-/ics23-0.6.8.tgz#2a6b4f1f2b7b20a35d9a0745bb5a446e72930b3d" @@ -954,6 +959,32 @@ "@noble/hashes" "^1.0.0" protobufjs "^6.8.8" +"@confio/relayer@^0.12.0": + version "0.12.0" + resolved "https://registry.yarnpkg.com/@confio/relayer/-/relayer-0.12.0.tgz#c63ec1aae7c6f14518a7958d491d135b39bb91c8" + integrity sha512-oLoE0VbW0TNt5RWQ7m87b5NfZ8ffY2O80OIM9y1G8S1CV7oNUi0iw0/yZRT0thSmSzHVTMGxTu1YB+jy0CqmVw== + dependencies: + "@cosmjs/cosmwasm-stargate" "^0.32.1" + "@cosmjs/crypto" "^0.32.1" + "@cosmjs/encoding" "^0.32.1" + "@cosmjs/faucet-client" "^0.32.1" + "@cosmjs/math" "^0.32.1" + "@cosmjs/proto-signing" "^0.32.1" + "@cosmjs/stargate" "^0.32.1" + "@cosmjs/stream" "^0.32.1" + "@cosmjs/tendermint-rpc" "^0.32.1" + "@cosmjs/utils" "^0.32.1" + ajv "7.1.1" + axios "^1.6.7" + commander "7.1.0" + cosmjs-types "^0.9.0" + fast-safe-stringify "2.0.4" + js-yaml "4.0.0" + prom-client "13.1.0" + table "^6.7.1" + triple-beam "1.3.0" + winston "3.3.3" + "@cosmjs/amino@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.4.tgz#3908946c0394e6d431694c8992c5147079a1c860" @@ -964,7 +995,7 @@ "@cosmjs/math" "^0.32.4" "@cosmjs/utils" "^0.32.4" -"@cosmjs/cosmwasm-stargate@^0.32.4": +"@cosmjs/cosmwasm-stargate@^0.32.1", "@cosmjs/cosmwasm-stargate@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.32.4.tgz#2ee93f2cc0b1c146ac369b2bf8ef9ee2e159fd50" integrity sha512-Fuo9BGEiB+POJ5WeRyBGuhyKR1ordvxZGLPuPosFJOH9U0gKMgcjwKMCgAlWFkMlHaTB+tNdA8AifWiHrI7VgA== @@ -980,7 +1011,7 @@ cosmjs-types "^0.9.0" pako "^2.0.2" -"@cosmjs/crypto@^0.32.4": +"@cosmjs/crypto@^0.32.1", "@cosmjs/crypto@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.32.4.tgz#5d29633b661eaf092ddb3e7ea6299cfd6f4507a2" integrity sha512-zicjGU051LF1V9v7bp8p7ovq+VyC91xlaHdsFOTo2oVry3KQikp8L/81RkXmUIT8FxMwdx1T7DmFwVQikcSDIw== @@ -993,7 +1024,7 @@ elliptic "^6.5.4" libsodium-wrappers-sumo "^0.7.11" -"@cosmjs/encoding@^0.32.4": +"@cosmjs/encoding@^0.32.1", "@cosmjs/encoding@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.32.4.tgz#646e0e809f7f4f1414d8fa991fb0ffe6c633aede" integrity sha512-tjvaEy6ZGxJchiizzTn7HVRiyTg1i4CObRRaTRPknm5EalE13SV+TCHq38gIDfyUeden4fCuaBVEdBR5+ti7Hw== @@ -1002,6 +1033,13 @@ bech32 "^1.1.4" readonly-date "^1.0.0" +"@cosmjs/faucet-client@^0.32.1": + version "0.32.4" + resolved "https://registry.yarnpkg.com/@cosmjs/faucet-client/-/faucet-client-0.32.4.tgz#33eb5922e5e2955a6029cd29318ae3f40dbf071c" + integrity sha512-ahbuoyI0lZBpK7nKSvmFywc+qodiIwOCnUuMLN9CWGQguqkC808ewCz4NWiMPPX3dj46SG7Y71n979YIlguUuw== + dependencies: + axios "^1.6.0" + "@cosmjs/json-rpc@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/json-rpc/-/json-rpc-0.32.4.tgz#be91eb89ea78bd5dc02d0a9fa184dd6790790f0b" @@ -1010,14 +1048,14 @@ "@cosmjs/stream" "^0.32.4" xstream "^11.14.0" -"@cosmjs/math@^0.32.4": +"@cosmjs/math@^0.32.1", "@cosmjs/math@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.32.4.tgz#87ac9eadc06696e30a30bdb562a495974bfd0a1a" integrity sha512-++dqq2TJkoB8zsPVYCvrt88oJWsy1vMOuSOKcdlnXuOA/ASheTJuYy4+oZlTQ3Fr8eALDLGGPhJI02W2HyAQaw== dependencies: bn.js "^5.2.0" -"@cosmjs/proto-signing@^0.32.4": +"@cosmjs/proto-signing@^0.32.1", "@cosmjs/proto-signing@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.32.4.tgz#5a06e087c6d677439c8c9b25b5223d5e72c4cd93" integrity sha512-QdyQDbezvdRI4xxSlyM1rSVBO2st5sqtbEIl3IX03uJ7YiZIQHyv6vaHVf1V4mapusCqguiHJzm4N4gsFdLBbQ== @@ -1039,7 +1077,7 @@ ws "^7" xstream "^11.14.0" -"@cosmjs/stargate@0.32.4", "@cosmjs/stargate@^0.32.4": +"@cosmjs/stargate@0.32.4", "@cosmjs/stargate@^0.32.1", "@cosmjs/stargate@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.32.4.tgz#bd0e4d3bf613b629addbf5f875d3d3b50f640af1" integrity sha512-usj08LxBSsPRq9sbpCeVdyLx2guEcOHfJS9mHGCLCXpdAPEIEQEtWLDpEUc0LEhWOx6+k/ChXTc5NpFkdrtGUQ== @@ -1055,14 +1093,14 @@ cosmjs-types "^0.9.0" xstream "^11.14.0" -"@cosmjs/stream@^0.32.4": +"@cosmjs/stream@^0.32.1", "@cosmjs/stream@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.32.4.tgz#83e1f2285807467c56d9ea0e1113f79d9fa63802" integrity sha512-Gih++NYHEiP+oyD4jNEUxU9antoC0pFSg+33Hpp0JlHwH0wXhtD3OOKnzSfDB7OIoEbrzLJUpEjOgpCp5Z+W3A== dependencies: xstream "^11.14.0" -"@cosmjs/tendermint-rpc@^0.32.4": +"@cosmjs/tendermint-rpc@^0.32.1", "@cosmjs/tendermint-rpc@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.32.4.tgz#b36f9ec657498e42c97e21bb7368798ef6279752" integrity sha512-MWvUUno+4bCb/LmlMIErLypXxy7ckUuzEmpufYYYd9wgbdCXaTaO08SZzyFM5PI8UJ/0S2AmUrgWhldlbxO8mw== @@ -1078,11 +1116,20 @@ readonly-date "^1.0.0" xstream "^11.14.0" -"@cosmjs/utils@^0.32.4": +"@cosmjs/utils@^0.32.1", "@cosmjs/utils@^0.32.4": version "0.32.4" resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.32.4.tgz#a9a717c9fd7b1984d9cefdd0ef6c6f254060c671" integrity sha512-D1Yc+Zy8oL/hkUkFUL/bwxvuDBzRGpc4cF7/SkdhxX4iHpSLgdOuTt1mhCh9+kl6NQREy9t7SYZ6xeW5gFe60w== +"@dabh/diagnostics@^2.0.2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a" + integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA== + dependencies: + colorspace "1.1.x" + enabled "2.0.x" + kuler "^2.0.0" + "@esbuild/aix-ppc64@0.21.5": version "0.21.5" resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" @@ -1522,6 +1569,41 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e" integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA== +"@sinonjs/commons@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3" + integrity sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg== + dependencies: + type-detect "4.0.8" + +"@sinonjs/commons@^3.0.0", "@sinonjs/commons@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" + integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^11.2.2": + version "11.3.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz#51d6e8d83ca261ff02c0ab0e68e9db23d5cd5999" + integrity sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA== + dependencies: + "@sinonjs/commons" "^3.0.1" + +"@sinonjs/samsam@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-8.0.0.tgz#0d488c91efb3fa1442e26abea81759dfc8b5ac60" + integrity sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew== + dependencies: + "@sinonjs/commons" "^2.0.0" + lodash.get "^4.4.2" + type-detect "^4.0.8" + +"@sinonjs/text-encoding@^0.7.2": + version "0.7.3" + resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f" + integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA== + "@types/body-parser@*": version "1.19.5" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" @@ -1626,6 +1708,11 @@ "@types/node" "*" "@types/send" "*" +"@types/triple-beam@^1.3.2": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" + integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== + "@typescript-eslint/eslint-plugin@^5.19.0": version "5.62.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" @@ -1805,6 +1892,16 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" +ajv@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" + integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" @@ -1815,6 +1912,16 @@ ajv@^6.12.4: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.17.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6" + integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g== + dependencies: + fast-deep-equal "^3.1.3" + fast-uri "^3.0.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + ansi-escapes@^4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" @@ -1893,6 +2000,11 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== +async@^3.1.0: + version "3.2.6" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" + integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1916,6 +2028,15 @@ axios@^1.6.0: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.6.7: + version "1.7.7" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f" + integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q== + dependencies: + follow-redirects "^1.15.6" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-plugin-polyfill-corejs2@^0.4.10: version "0.4.11" resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz#30320dfe3ffe1a336c15afdcdafd6fd615b25e33" @@ -1960,6 +2081,11 @@ bignumber.js@^9.0.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== +bintrees@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.2.tgz#49f896d6e858a4a499df85c38fb399b9aff840f8" + integrity sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw== + bip39@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.1.0.tgz#c55a418deaf48826a6ceb34ac55b3ee1577e18a3" @@ -2137,7 +2263,7 @@ cli-truncate@^3.1.0: slice-ansi "^5.0.0" string-width "^5.0.0" -color-convert@^1.9.0: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -2156,16 +2282,40 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-string@^1.6.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + +color@^3.1.3: + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== + dependencies: + color-convert "^1.9.3" + color-string "^1.6.0" + colorette@^2.0.16: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== +colorspace@1.1.x: + version "1.1.4" + resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243" + integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w== + dependencies: + color "^3.1.3" + text-hex "1.0.x" + combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2173,6 +2323,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" +commander@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff" + integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg== + commander@^10.0.0: version "10.0.1" resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" @@ -2325,6 +2480,11 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +diff@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531" + integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -2377,6 +2537,11 @@ emoji-regex@^9.2.2: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== +enabled@2.0.x: + version "2.0.0" + resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" + integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -2698,6 +2863,16 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== +fast-safe-stringify@2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.4.tgz#4fe828718aa61dbcf9119c3c24e79cc4dea973b2" + integrity sha512-mNlGUdKOeGNleyrmgbKYtbnCr9KZkZXU7eM89JRo8vY10f7Ul1Fbj07hUBW3N4fC0xM+fmfFfa2zM7mIizhpNQ== + +fast-uri@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" + integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== + fastq@^1.6.0: version "1.17.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" @@ -2705,6 +2880,11 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" +fecha@^4.2.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" + integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== + fflate@^0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.8.2.tgz#fc8631f5347812ad6028bbe4a2308b2792aa1dea" @@ -2759,6 +2939,11 @@ flatted@^3.2.9, flatted@^3.3.1: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== +fn.name@1.x.x: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" + integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== + follow-redirects@^1.15.0, follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" @@ -3014,6 +3199,11 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-core-module@^2.13.0: version "2.15.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" @@ -3106,6 +3296,13 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== +js-yaml@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" + integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== + dependencies: + argparse "^2.0.1" + js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" @@ -3141,11 +3338,21 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== +just-extend@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-6.2.0.tgz#b816abfb3d67ee860482e7401564672558163947" + integrity sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw== + keyv@^4.5.3: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -3153,6 +3360,11 @@ keyv@^4.5.3: dependencies: json-buffer "3.0.1" +kuler@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" + integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== + levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -3224,11 +3436,21 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== +lodash.get@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== + lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -3244,6 +3466,18 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" +logform@^2.2.0, logform@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/logform/-/logform-2.6.1.tgz#71403a7d8cae04b2b734147963236205db9b3df0" + integrity sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA== + dependencies: + "@colors/colors" "1.6.0" + "@types/triple-beam" "^1.3.2" + fecha "^4.2.0" + ms "^2.1.1" + safe-stable-stringify "^2.3.1" + triple-beam "^1.3.0" + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -3400,7 +3634,7 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -3425,6 +3659,17 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +nise@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/nise/-/nise-6.0.0.tgz#ae56fccb5d912037363c3b3f29ebbfa28bde8b48" + integrity sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg== + dependencies: + "@sinonjs/commons" "^3.0.0" + "@sinonjs/fake-timers" "^11.2.2" + "@sinonjs/text-encoding" "^0.7.2" + just-extend "^6.2.0" + path-to-regexp "^6.2.1" + node-releases@^2.0.14: version "2.0.18" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" @@ -3481,6 +3726,13 @@ once@^1.3.0: dependencies: wrappy "1" +one-time@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" + integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== + dependencies: + fn.name "1.x.x" + onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" @@ -3575,6 +3827,11 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@^6.2.1: + version "6.2.2" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.2.tgz#324377a83e5049cbecadc5554d6a63a9a4866b36" + integrity sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw== + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -3640,6 +3897,13 @@ pretty-format@^29.7.0: ansi-styles "^5.0.0" react-is "^18.0.0" +prom-client@13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.1.0.tgz#1185caffd8691e28d32e373972e662964e3dba45" + integrity sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng== + dependencies: + tdigest "^0.1.1" + protobufjs@^6.8.8: version "6.11.4" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa" @@ -3716,6 +3980,15 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== +readable-stream@^3.4.0, readable-stream@^3.6.2: + version "3.6.2" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" + integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readonly-date@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/readonly-date/-/readonly-date-1.0.0.tgz#5af785464d8c7d7c40b9d738cbde8c646f97dcd9" @@ -3769,6 +4042,11 @@ regjsparser@^0.9.1: dependencies: jsesc "~0.5.0" +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -3847,11 +4125,16 @@ rxjs@^7.5.5: dependencies: tslib "^2.1.0" -safe-buffer@5.2.1, safe-buffer@^5.1.0: +safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-stable-stringify@^2.3.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" + integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== + "safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -3955,6 +4238,25 @@ signal-exit@^4.1.0: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== + dependencies: + is-arrayish "^0.3.1" + +sinon@^18.0.0: + version "18.0.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-18.0.0.tgz#69ca293dbc3e82590a8b0d46c97f63ebc1e5fc01" + integrity sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA== + dependencies: + "@sinonjs/commons" "^3.0.1" + "@sinonjs/fake-timers" "^11.2.2" + "@sinonjs/samsam" "^8.0.0" + diff "^5.2.0" + nise "^6.0.0" + supports-color "^7" + sirv@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0" @@ -4018,6 +4320,11 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +stack-trace@0.0.x: + version "0.0.10" + resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" + integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== + stackback@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b" @@ -4038,7 +4345,7 @@ string-argv@^0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -string-width@^4.1.0, string-width@^4.2.0: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -4056,6 +4363,13 @@ string-width@^5.0.0: emoji-regex "^9.2.2" strip-ansi "^7.0.1" +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -4099,7 +4413,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.1.0: +supports-color@^7, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== @@ -4121,6 +4435,29 @@ symbol-observable@^2.0.3: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a" integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA== +table@^6.7.1: + version "6.8.2" + resolved "https://registry.yarnpkg.com/table/-/table-6.8.2.tgz#c5504ccf201213fa227248bdc8c5569716ac6c58" + integrity sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA== + dependencies: + ajv "^8.0.1" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + +tdigest@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.2.tgz#96c64bac4ff10746b910b0e23b515794e12faced" + integrity sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA== + dependencies: + bintrees "1.0.2" + +text-hex@1.0.x: + version "1.0.0" + resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" + integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -4178,6 +4515,16 @@ treeify@^1.1.0: resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8" integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A== +triple-beam@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" + integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== + +triple-beam@^1.3.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984" + integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg== + ts-node@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" @@ -4240,6 +4587,16 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-detect@^4.0.8: + version "4.1.0" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c" + integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -4316,6 +4673,11 @@ utf8@3.0.0: resolved "https://registry.yarnpkg.com/utf8/-/utf8-3.0.0.tgz#f052eed1364d696e769ef058b183df88c87f69d1" integrity sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ== +util-deprecate@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -4402,6 +4764,30 @@ why-is-node-running@^2.3.0: siginfo "^2.0.0" stackback "0.0.2" +winston-transport@^4.4.0: + version "4.7.1" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.1.tgz#52ff1bcfe452ad89991a0aaff9c3b18e7f392569" + integrity sha512-wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA== + dependencies: + logform "^2.6.1" + readable-stream "^3.6.2" + triple-beam "^1.3.0" + +winston@3.3.3: + version "3.3.3" + resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" + integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== + dependencies: + "@dabh/diagnostics" "^2.0.2" + async "^3.1.0" + is-stream "^2.0.0" + logform "^2.2.0" + one-time "^1.0.0" + readable-stream "^3.4.0" + stack-trace "0.0.x" + triple-beam "^1.3.0" + winston-transport "^4.4.0" + word-wrap@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" From fd7dd0ca74396ca558037918643304bda96321c7 Mon Sep 17 00:00:00 2001 From: quasisamurai Date: Wed, 4 Sep 2024 02:05:06 -0300 Subject: [PATCH 14/14] fix aftermerge case --- src/testcases/run_in_band/interchaintx.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/testcases/run_in_band/interchaintx.test.ts b/src/testcases/run_in_band/interchaintx.test.ts index ec3b24da..a770dd12 100644 --- a/src/testcases/run_in_band/interchaintx.test.ts +++ b/src/testcases/run_in_band/interchaintx.test.ts @@ -1025,7 +1025,7 @@ describe('Neutron / Interchain TXs', () => { timeout: 'message', }); - const channel = (await ibcQuerier.Channels({})).channels.find( + const channel = (await ibcQuerier.channels({})).channels.find( (c) => c.ordering === Order.ORDER_UNORDERED, ); expect(channel.state).toEqual(State.STATE_OPEN);