diff --git a/package.json b/package.json index cb19efdf..eefeb3fe 100644 --- a/package.json +++ b/package.json @@ -23,18 +23,18 @@ "node": ">=18.18.0" }, "dependencies": { - "@cosmjs/amino": "0.31.3", - "@cosmjs/cosmwasm-stargate": "0.31.3", - "@cosmjs/crypto": "0.31.3", - "@cosmjs/proto-signing": "0.31.3", - "@cosmjs/stargate": "0.31.3", - "@cosmjs/tendermint-rpc": "0.31.3", + "@cosmjs/amino": "^0.32.4", + "@cosmjs/cosmwasm-stargate": "^0.32.4", + "@cosmjs/crypto": "^0.32.4", + "@cosmjs/proto-signing": "^0.32.4", + "@cosmjs/stargate": "^0.32.4", + "@cosmjs/tendermint-rpc": "^0.32.4", "@oraichain/common-contracts-build": "1.0.35", "@oraichain/common-contracts-sdk": "1.0.31" }, "devDependencies": { "@babel/traverse": "7.24.1", - "@cosmjs/encoding": "0.31.3", + "@cosmjs/encoding": "^0.32.4", "@oraichain/cw-simulate": "^2.8.68", "@swc/core": "^1.4.11", "@swc/jest": "^0.2.36", @@ -44,7 +44,7 @@ "@typescript-eslint/eslint-plugin": "^7.3.1", "@typescript-eslint/parser": "^7.3.1", "@vitest/coverage-v8": "^2.0.2", - "cosmjs-types": "0.8.0", + "cosmjs-types": "^0.9.0", "cz-conventional-changelog": "^3.3.0", "dotenv": "^16.4.5", "eslint": "^8.57.0", diff --git a/packages/contracts-sdk/package.json b/packages/contracts-sdk/package.json index 39c9d5f1..78d7e63e 100644 --- a/packages/contracts-sdk/package.json +++ b/packages/contracts-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@oraichain/oraidex-contracts-sdk", - "version": "1.0.53", + "version": "1.0.55", "main": "build/index.js", "files": [ "build/", diff --git a/packages/contracts-sdk/src/OraiswapV3.client.ts b/packages/contracts-sdk/src/OraiswapV3.client.ts index a97d2971..7b287ceb 100644 --- a/packages/contracts-sdk/src/OraiswapV3.client.ts +++ b/packages/contracts-sdk/src/OraiswapV3.client.ts @@ -6,7 +6,7 @@ import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate"; import { Coin, StdFee } from "@cosmjs/amino"; -import {Addr, Percentage, InstantiateMsg, ExecuteMsg, Liquidity, SqrtPrice, TokenAmount, Binary, Expiration, Timestamp, Uint64, AssetInfo, PoolKey, FeeTier, SwapHop, NftExtensionMsg, QueryMsg, MigrateMsg, FeeGrowth, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponse, Position, PositionIncentives, ArrayOfPosition, TokensResponse, ApprovedForAllResponse, Boolean, ArrayOfFeeTier, ArrayOfLiquidityTick, LiquidityTick, Uint32, NumTokensResponse, Pool, IncentiveRecord, ArrayOfPoolWithPoolKey, PoolWithPoolKey, Uint128, ArrayOfAsset, Asset, ArrayOfPositionTick, PositionTick, QuoteResult, Tick, TickIncentive, ArrayOfTupleOfUint16AndUint64} from "./OraiswapV3.types"; +import {Addr, Percentage, InstantiateMsg, ExecuteMsg, Liquidity, SqrtPrice, TokenAmount, Binary, Expiration, Timestamp, Uint64, AssetInfo, PoolStatus, PoolKey, FeeTier, SwapHop, NftExtensionMsg, QueryMsg, MigrateMsg, FeeGrowth, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponse, Position, PositionIncentives, ArrayOfPosition, TokensResponse, ApprovedForAllResponse, Boolean, ArrayOfFeeTier, ArrayOfLiquidityTick, LiquidityTick, Uint32, NumTokensResponse, Pool, IncentiveRecord, ArrayOfPoolWithPoolKey, PoolWithPoolKey, Uint128, ArrayOfAsset, Asset, ArrayOfPositionTick, PositionTick, QuoteResult, Tick, TickIncentive, ArrayOfTupleOfUint16AndUint64} from "./OraiswapV3.types"; export interface OraiswapV3ReadOnlyInterface { contractAddress: string; admin: () => Promise; @@ -631,6 +631,11 @@ export interface OraiswapV3Interface extends OraiswapV3ReadOnlyInterface { }: { poolKey: PoolKey; }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise; + withdrawAllProtocolFee: ({ + receiver + }: { + receiver?: Addr; + }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise; changeProtocolFee: ({ protocolFee }: { @@ -807,6 +812,13 @@ export interface OraiswapV3Interface extends OraiswapV3ReadOnlyInterface { }: { index: number; }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise; + updatePoolStatus: ({ + poolKey, + status + }: { + poolKey: PoolKey; + status?: PoolStatus; + }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise; } export class OraiswapV3Client extends OraiswapV3QueryClient implements OraiswapV3Interface { client: SigningCosmWasmClient; @@ -820,6 +832,7 @@ export class OraiswapV3Client extends OraiswapV3QueryClient implements OraiswapV this.contractAddress = contractAddress; this.changeAdmin = this.changeAdmin.bind(this); this.withdrawProtocolFee = this.withdrawProtocolFee.bind(this); + this.withdrawAllProtocolFee = this.withdrawAllProtocolFee.bind(this); this.changeProtocolFee = this.changeProtocolFee.bind(this); this.changeFeeReceiver = this.changeFeeReceiver.bind(this); this.createPosition = this.createPosition.bind(this); @@ -842,6 +855,7 @@ export class OraiswapV3Client extends OraiswapV3QueryClient implements OraiswapV this.createIncentive = this.createIncentive.bind(this); this.updateIncentive = this.updateIncentive.bind(this); this.claimIncentive = this.claimIncentive.bind(this); + this.updatePoolStatus = this.updatePoolStatus.bind(this); } changeAdmin = async ({ @@ -866,6 +880,17 @@ export class OraiswapV3Client extends OraiswapV3QueryClient implements OraiswapV } }, _fee, _memo, _funds); }; + withdrawAllProtocolFee = async ({ + receiver + }: { + receiver?: Addr; + }, _fee: number | StdFee | "auto" = "auto", _memo?: string, _funds?: Coin[]): Promise => { + return await this.client.execute(this.sender, this.contractAddress, { + withdraw_all_protocol_fee: { + receiver + } + }, _fee, _memo, _funds); + }; changeProtocolFee = async ({ protocolFee }: { @@ -1207,4 +1232,18 @@ export class OraiswapV3Client extends OraiswapV3QueryClient implements OraiswapV } }, _fee, _memo, _funds); }; + updatePoolStatus = async ({ + poolKey, + status + }: { + poolKey: PoolKey; + status?: PoolStatus; + }, _fee: number | StdFee | "auto" = "auto", _memo?: string, _funds?: Coin[]): Promise => { + return await this.client.execute(this.sender, this.contractAddress, { + update_pool_status: { + pool_key: poolKey, + status + } + }, _fee, _memo, _funds); + }; } \ No newline at end of file diff --git a/packages/contracts-sdk/src/OraiswapV3.types.ts b/packages/contracts-sdk/src/OraiswapV3.types.ts index bad12381..7852e63c 100644 --- a/packages/contracts-sdk/src/OraiswapV3.types.ts +++ b/packages/contracts-sdk/src/OraiswapV3.types.ts @@ -12,6 +12,10 @@ export type ExecuteMsg = { withdraw_protocol_fee: { pool_key: PoolKey; }; +} | { + withdraw_all_protocol_fee: { + receiver?: Addr | null; + }; } | { change_protocol_fee: { protocol_fee: Percentage; @@ -133,6 +137,11 @@ export type ExecuteMsg = { claim_incentive: { index: number; }; +} | { + update_pool_status: { + pool_key: PoolKey; + status?: PoolStatus | null; + }; }; export type Liquidity = string; export type SqrtPrice = string; @@ -156,6 +165,7 @@ export type AssetInfo = { denom: string; }; }; +export type PoolStatus = "opening" | "paused" | "swap_only" | "lp_only"; export interface PoolKey { fee_tier: FeeTier; token_x: string; @@ -382,6 +392,7 @@ export interface Pool { liquidity: Liquidity; sqrt_price: SqrtPrice; start_timestamp: number; + status?: PoolStatus | null; } export interface IncentiveRecord { id: number; diff --git a/packages/ibc-routing/package.json b/packages/ibc-routing/package.json index 10b77050..a5a8b576 100644 --- a/packages/ibc-routing/package.json +++ b/packages/ibc-routing/package.json @@ -1,6 +1,6 @@ { "name": "@oraichain/ibc-routing", - "version": "1.0.0", + "version": "1.0.1", "main": "build/index.js", "files": [ "build/" @@ -27,7 +27,7 @@ "@typechain/ethers-v6": "^0.5.1", "@typechain/hardhat": "^9.1.0", "@types/ws": "^8.5.4", - "cosmjs-types": "^0.8.0", + "cosmjs-types": "^0.9.0", "dotenv": "^16.3.1", "hardhat": "^2.18.2", "jest-websocket-mock": "^2.5.0", diff --git a/packages/oraidex-common/package.json b/packages/oraidex-common/package.json index 4b41ebe9..6efa114f 100644 --- a/packages/oraidex-common/package.json +++ b/packages/oraidex-common/package.json @@ -1,6 +1,6 @@ { "name": "@oraichain/oraidex-common", - "version": "1.1.28", + "version": "1.1.29", "main": "build/index.js", "files": [ "build/" @@ -16,14 +16,14 @@ "@ethersproject/providers": "^5.0.10", "ethers": "^5.0.15", "@keplr-wallet/types": "^0.11.38", - "@cosmjs/amino": "0.31.3", - "@cosmjs/cosmwasm-stargate": "0.31.3", - "@cosmjs/crypto": "0.31.3", - "@cosmjs/proto-signing": "0.31.3", - "@cosmjs/stargate": "0.31.3", - "@cosmjs/tendermint-rpc": "0.31.3", + "@cosmjs/amino": "^0.32.4", + "@cosmjs/cosmwasm-stargate": "^0.32.4", + "@cosmjs/crypto": "^0.32.4", + "@cosmjs/proto-signing": "^0.32.4", + "@cosmjs/stargate": "^0.32.4", + "@cosmjs/tendermint-rpc": "^0.32.4", "bignumber.js": "^9.1.2", - "cosmjs-types": "0.8.0", + "cosmjs-types": "^0.9.0", "@oraichain/oraidex-contracts-sdk": "latest", "@injectivelabs/sdk-ts": "1.12.1", "tronweb": "6.0.0-beta.4" diff --git a/packages/oraidex-common/src/wallet.ts b/packages/oraidex-common/src/wallet.ts index ae9fae39..596c045b 100644 --- a/packages/oraidex-common/src/wallet.ts +++ b/packages/oraidex-common/src/wallet.ts @@ -51,7 +51,7 @@ export abstract class CosmosWallet { if (chainId === "injective-1") { client = await Stargate.InjectiveSigningStargateClient.createWithSigner( tmClient as any, - wallet, + wallet as any, optionsClient as any ); } else { diff --git a/packages/oraiswap-v3/package.json b/packages/oraiswap-v3/package.json index 2e426fd4..117757d8 100644 --- a/packages/oraiswap-v3/package.json +++ b/packages/oraiswap-v3/package.json @@ -1,6 +1,6 @@ { "name": "@oraichain/oraiswap-v3", - "version": "0.1.22", + "version": "1.1.0", "main": "build/index.js", "files": [ "build/" @@ -11,8 +11,8 @@ }, "license": "MIT", "dependencies": { - "@cosmjs/cosmwasm-stargate": "^0.31.0", - "@oraichain/oraidex-contracts-sdk": "^1.0.53", + "@cosmjs/cosmwasm-stargate": "^0.32.4", + "@oraichain/oraidex-contracts-sdk": "^1.0.54", "@oraichain/oraidex-common": "^1.1.27" } } diff --git a/packages/universal-swap/package.json b/packages/universal-swap/package.json index ab44ea9f..69b48b31 100644 --- a/packages/universal-swap/package.json +++ b/packages/universal-swap/package.json @@ -1,6 +1,6 @@ { "name": "@oraichain/oraidex-universal-swap", - "version": "1.1.19", + "version": "1.1.20", "main": "build/index.js", "files": [ "build/" @@ -21,7 +21,7 @@ "@oraichain/osor-api-contracts-sdk": "^1.0.2" }, "devDependencies": { - "cosmjs-types": "0.8.0", + "cosmjs-types": "^0.9.0", "ts-results": "^3.3.0", "protobufjs": "7.2.6" } diff --git a/packages/universal-swap/src/handler.ts b/packages/universal-swap/src/handler.ts index 58c2c4df..35879a50 100644 --- a/packages/universal-swap/src/handler.ts +++ b/packages/universal-swap/src/handler.ts @@ -166,7 +166,7 @@ export class UniversalSwapHandler { sender: sender, receiver: ibcReceiveAddr, memo: "", - timeoutTimestamp: timeoutTimestamp ?? calculateTimeoutTimestamp(ibcInfo.timeout) + timeoutTimestamp: BigInt(timeoutTimestamp ?? calculateTimeoutTimestamp(ibcInfo.timeout)) }) } ]; @@ -302,7 +302,7 @@ export class UniversalSwapHandler { sender: this.swapData.sender.cosmos, receiver: toAddress, memo: ibcMemo, - timeoutTimestamp: calculateTimeoutTimestamp(ibcInfos.timeout, this.currentTimestamp) + timeoutTimestamp: BigInt(calculateTimeoutTimestamp(ibcInfos.timeout, this.currentTimestamp)) }) }; return [...msgExecuteSwap, ...getEncodedExecuteMsgs, msgTransfer]; @@ -1119,7 +1119,7 @@ export class UniversalSwapHandler { } } }), - timeoutTimestamp: calculateTimeoutTimestamp(ibcInfo.timeout) + timeoutTimestamp: BigInt(calculateTimeoutTimestamp(ibcInfo.timeout)) }); // check if from chain is noble, use ibc-wasm instead of ibc-hooks diff --git a/packages/universal-swap/tests/index.spec.ts b/packages/universal-swap/tests/index.spec.ts index ae1aeedf..8c292c3a 100644 --- a/packages/universal-swap/tests/index.spec.ts +++ b/packages/universal-swap/tests/index.spec.ts @@ -347,8 +347,11 @@ describe("test universal swap handler functions", () => { token: { denom: OSMOSIS_ORAICHAIN_DENOM, amount: simulateAmount }, //osmosis denom sender: testSenderAddress, receiver: "osmo1234", - timeoutHeight: undefined, - timeoutTimestamp: new Long(0), + timeoutHeight: { + revisionHeight: 0n, + revisionNumber: 0n + }, + timeoutTimestamp: 0n, memo: "" } } @@ -436,8 +439,11 @@ describe("test universal swap handler functions", () => { token: { denom: OSMOSIS_ORAICHAIN_DENOM, amount: simulateAmount }, sender: testSenderAddress, receiver: "osmo1234", - timeoutHeight: undefined, - timeoutTimestamp: new Long(0), + timeoutHeight: { + revisionHeight: 0n, + revisionNumber: 0n + }, + timeoutTimestamp: 0n, memo: "" } } diff --git a/patches/@cosmjs+cosmwasm-stargate+0.31.3.patch b/patches/@cosmjs+cosmwasm-stargate+0.32.4.patch similarity index 54% rename from patches/@cosmjs+cosmwasm-stargate+0.31.3.patch rename to patches/@cosmjs+cosmwasm-stargate+0.32.4.patch index a93229a4..12b35992 100644 --- a/patches/@cosmjs+cosmwasm-stargate+0.31.3.patch +++ b/patches/@cosmjs+cosmwasm-stargate+0.32.4.patch @@ -1,21 +1,21 @@ diff --git a/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.d.ts b/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.d.ts -index 3aebdc5..d5cbeec 100644 +index a770785..3f427c8 100644 --- a/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.d.ts +++ b/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.d.ts -@@ -56,6 +56,7 @@ export declare class CosmWasmClient { - */ - static create(tmClient: TendermintClient): Promise; - protected constructor(tmClient: TendermintClient | undefined); +@@ -58,6 +58,7 @@ export declare class CosmWasmClient { + protected constructor(cometClient: CometClient | undefined); + protected getCometClient(): CometClient | undefined; + protected forceGetCometClient(): CometClient; + public setQueryClientWithHeight(height?: number): void; - protected getTmClient(): TendermintClient | undefined; - protected forceGetTmClient(): TendermintClient; protected getQueryClient(): (QueryClient & AuthExtension & BankExtension & TxExtension & WasmExtension) | undefined; + protected forceGetQueryClient(): QueryClient & AuthExtension & BankExtension & TxExtension & WasmExtension; + getChainId(): Promise; diff --git a/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.js b/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.js -index 8f6305b..90cedba 100644 +index af8341d..bc91fbc 100644 --- a/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.js +++ b/node_modules/@cosmjs/cosmwasm-stargate/build/cosmwasmclient.js -@@ -46,6 +46,13 @@ class CosmWasmClient { - this.queryClient = stargate_1.QueryClient.withExtensions(tmClient, stargate_1.setupAuthExtension, stargate_1.setupBankExtension, modules_1.setupWasmExtension, stargate_1.setupTxExtension); +@@ -35,6 +35,13 @@ class CosmWasmClient { + this.queryClient = stargate_1.QueryClient.withExtensions(cometClient, stargate_1.setupAuthExtension, stargate_1.setupBankExtension, modules_1.setupWasmExtension, stargate_1.setupTxExtension); } } + @@ -25,17 +25,36 @@ index 8f6305b..90cedba 100644 + } + } + - getTmClient() { - return this.tmClient; + getCometClient() { + return this.cometClient; } +@@ -120,12 +127,12 @@ class CosmWasmClient { + else if ((0, stargate_1.isSearchTxQueryArray)(query)) { + rawQuery = query + .map((t) => { +- // numeric values must not have quotes https://github.com/cosmos/cosmjs/issues/1462 +- if (typeof t.value === "string") +- return `${t.key}='${t.value}'`; +- else +- return `${t.key}=${t.value}`; +- }) ++ // numeric values must not have quotes https://github.com/cosmos/cosmjs/issues/1462 ++ if (typeof t.value === "string") ++ return `${t.key}='${t.value}'`; ++ else ++ return `${t.key}=${t.value}`; ++ }) + .join(" AND "); + } + else { diff --git a/node_modules/@cosmjs/cosmwasm-stargate/build/modules/wasm/queries.js b/node_modules/@cosmjs/cosmwasm-stargate/build/modules/wasm/queries.js -index c060369..41029c3 100644 +index e5bf448..878f7e4 100644 --- a/node_modules/@cosmjs/cosmwasm-stargate/build/modules/wasm/queries.js +++ b/node_modules/@cosmjs/cosmwasm-stargate/build/modules/wasm/queries.js -@@ -8,8 +8,8 @@ const encoding_1 = require("@cosmjs/encoding"); +@@ -4,8 +4,8 @@ exports.setupWasmExtension = void 0; + const encoding_1 = require("@cosmjs/encoding"); const stargate_1 = require("@cosmjs/stargate"); const query_1 = require("cosmjs-types/cosmwasm/wasm/v1/query"); - const long_1 = __importDefault(require("long")); -function setupWasmExtension(base) { - const rpc = (0, stargate_1.createProtobufRpcClient)(base); +function setupWasmExtension(base, height) { diff --git a/patches/@cosmjs+stargate+0.31.3.patch b/patches/@cosmjs+stargate+0.32.4.patch similarity index 82% rename from patches/@cosmjs+stargate+0.31.3.patch rename to patches/@cosmjs+stargate+0.32.4.patch index 52cb7812..667a8c43 100644 --- a/patches/@cosmjs+stargate+0.31.3.patch +++ b/patches/@cosmjs+stargate+0.32.4.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/@cosmjs/stargate/build/queryclient/queryclient.js b/node_modules/@cosmjs/stargate/build/queryclient/queryclient.js -index ebf0c7c..afa645f 100644 +index 634b2e5..c2daa9c 100644 --- a/node_modules/@cosmjs/stargate/build/queryclient/queryclient.js +++ b/node_modules/@cosmjs/stargate/build/queryclient/queryclient.js @@ -32,6 +32,24 @@ class QueryClient { @@ -7,8 +7,8 @@ index ebf0c7c..afa645f 100644 return client; } + -+ static withExtensionsWithHeight(tmClient, height, ...extensionSetups) { -+ const client = new QueryClient(tmClient, height); ++ static withExtensionsWithHeight(cometClient, height, ...extensionSetups) { ++ const client = new QueryClient(cometClient, height); + const extensions = extensionSetups.map((setupExtension) => setupExtension(client, height)); + for (const extension of extensions) { + (0, utils_1.assert)((0, utils_1.isNonNullObject)(extension), `Extension must be a non-null object`); @@ -24,28 +24,28 @@ index ebf0c7c..afa645f 100644 + return client; + } + - constructor(tmClient) { - this.tmClient = tmClient; + constructor(cometClient) { + this.cometClient = cometClient; } diff --git a/node_modules/@cosmjs/stargate/build/queryclient/utils.d.ts b/node_modules/@cosmjs/stargate/build/queryclient/utils.d.ts -index 5317078..75d149e 100644 +index ec5b471..92d5737 100644 --- a/node_modules/@cosmjs/stargate/build/queryclient/utils.d.ts +++ b/node_modules/@cosmjs/stargate/build/queryclient/utils.d.ts -@@ -19,7 +19,7 @@ export declare function createPagination(paginationKey?: Uint8Array): PageReques +@@ -18,7 +18,7 @@ export declare function createPagination(paginationKey?: Uint8Array): PageReques export interface ProtobufRpcClient { request(service: string, method: string, data: Uint8Array): Promise; } -export declare function createProtobufRpcClient(base: QueryClient): ProtobufRpcClient; +export declare function createProtobufRpcClient(base: QueryClient, height?: number): ProtobufRpcClient; /** - * Takes a uint64 value as string, number, Long or Uint64 and returns an unsigned Long instance + * Takes a uint64 value as string, number, BigInt or Uint64 and returns a BigInt * of it. diff --git a/node_modules/@cosmjs/stargate/build/queryclient/utils.js b/node_modules/@cosmjs/stargate/build/queryclient/utils.js -index 6f4ecaa..7816bad 100644 +index ea25080..a0cb539 100644 --- a/node_modules/@cosmjs/stargate/build/queryclient/utils.js +++ b/node_modules/@cosmjs/stargate/build/queryclient/utils.js -@@ -28,11 +28,11 @@ function createPagination(paginationKey) { - return paginationKey ? pagination_1.PageRequest.fromPartial({ key: paginationKey }) : undefined; +@@ -24,11 +24,11 @@ function createPagination(paginationKey) { + return paginationKey ? pagination_1.PageRequest.fromPartial({ key: paginationKey }) : pagination_1.PageRequest.fromPartial({}); } exports.createPagination = createPagination; -function createProtobufRpcClient(base) { @@ -59,10 +59,10 @@ index 6f4ecaa..7816bad 100644 }, }; diff --git a/node_modules/@cosmjs/stargate/build/stargateclient.js b/node_modules/@cosmjs/stargate/build/stargateclient.js -index 3268b13..70bbbec 100644 +index a6da130..0918f14 100644 --- a/node_modules/@cosmjs/stargate/build/stargateclient.js +++ b/node_modules/@cosmjs/stargate/build/stargateclient.js -@@ -299,6 +299,7 @@ class StargateClient { +@@ -297,6 +297,7 @@ class StargateClient { return results.txs.map((tx) => { const txMsgData = abci_1.TxMsgData.decode(tx.result.data ?? new Uint8Array()); return { diff --git a/patches/@cosmjs+tendermint-rpc+0.31.3.patch b/patches/@cosmjs+tendermint-rpc+0.32.4.patch similarity index 100% rename from patches/@cosmjs+tendermint-rpc+0.31.3.patch rename to patches/@cosmjs+tendermint-rpc+0.32.4.patch diff --git a/yarn.lock b/yarn.lock index 7468ade6..569e58d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1369,6 +1369,16 @@ "@cosmjs/math" "^0.30.1" "@cosmjs/utils" "^0.30.1" +"@cosmjs/amino@^0.32.4": + version "0.32.4" + resolved "https://registry.yarnpkg.com/@cosmjs/amino/-/amino-0.32.4.tgz#3908946c0394e6d431694c8992c5147079a1c860" + integrity sha512-zKYOt6hPy8obIFtLie/xtygCkH9ZROiQ12UHfKsOkWaZfPQUvVbtgmu6R4Kn1tFLI/SRkw7eqhaogmW/3NYu/Q== + dependencies: + "@cosmjs/crypto" "^0.32.4" + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + "@cosmjs/cosmwasm-stargate@0.31.3", "@cosmjs/cosmwasm-stargate@^0.31.0": version "0.31.3" resolved "https://registry.yarnpkg.com/@cosmjs/cosmwasm-stargate/-/cosmwasm-stargate-0.31.3.tgz#13066822f111832d57c2c5acc9e697ed389713f8" @@ -1386,6 +1396,22 @@ long "^4.0.0" pako "^2.0.2" +"@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== + dependencies: + "@cosmjs/amino" "^0.32.4" + "@cosmjs/crypto" "^0.32.4" + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/proto-signing" "^0.32.4" + "@cosmjs/stargate" "^0.32.4" + "@cosmjs/tendermint-rpc" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + cosmjs-types "^0.9.0" + pako "^2.0.2" + "@cosmjs/crypto@0.31.3", "@cosmjs/crypto@^0.31.0", "@cosmjs/crypto@^0.31.3": version "0.31.3" resolved "https://registry.yarnpkg.com/@cosmjs/crypto/-/crypto-0.31.3.tgz#c752cb6d682fdc735dcb45a2519f89c56ba16c26" @@ -1412,7 +1438,29 @@ elliptic "^6.5.4" libsodium-wrappers "^0.7.6" -"@cosmjs/encoding@0.31.3", "@cosmjs/encoding@^0.31.0", "@cosmjs/encoding@^0.31.3": +"@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== + dependencies: + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + "@noble/hashes" "^1" + bn.js "^5.2.0" + elliptic "^6.5.4" + libsodium-wrappers-sumo "^0.7.11" + +"@cosmjs/encoding@^0.30.1": + version "0.30.1" + resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058" + integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ== + dependencies: + base64-js "^1.3.0" + bech32 "^1.1.4" + readonly-date "^1.0.0" + +"@cosmjs/encoding@^0.31.0", "@cosmjs/encoding@^0.31.3": version "0.31.3" resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.31.3.tgz#2519d9c9ae48368424971f253775c4580b54c5aa" integrity sha512-6IRtG0fiVYwyP7n+8e54uTx2pLYijO48V3t9TLiROERm5aUAIzIlz6Wp0NYaI5he9nh1lcEGJ1lkquVKFw3sUg== @@ -1421,10 +1469,10 @@ bech32 "^1.1.4" readonly-date "^1.0.0" -"@cosmjs/encoding@^0.30.1": - version "0.30.1" - resolved "https://registry.yarnpkg.com/@cosmjs/encoding/-/encoding-0.30.1.tgz#b5c4e0ef7ceb1f2753688eb96400ed70f35c6058" - integrity sha512-rXmrTbgqwihORwJ3xYhIgQFfMSrwLu1s43RIK9I8EBudPx3KmnmyAKzMOVsRDo9edLFNuZ9GIvysUCwQfq3WlQ== +"@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== dependencies: base64-js "^1.3.0" bech32 "^1.1.4" @@ -1446,6 +1494,14 @@ "@cosmjs/stream" "^0.31.3" xstream "^11.14.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" + integrity sha512-/jt4mBl7nYzfJ2J/VJ+r19c92mUKF0Lt0JxM3MXEJl7wlwW5haHAWtzRujHkyYMXOwIR+gBqT2S0vntXVBRyhQ== + dependencies: + "@cosmjs/stream" "^0.32.4" + xstream "^11.14.0" + "@cosmjs/math@^0.30.1": version "0.30.1" resolved "https://registry.yarnpkg.com/@cosmjs/math/-/math-0.30.1.tgz#8b816ef4de5d3afa66cb9fdfb5df2357a7845b8a" @@ -1460,6 +1516,13 @@ dependencies: bn.js "^5.2.0" +"@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.31.3", "@cosmjs/proto-signing@^0.31.3": version "0.31.3" resolved "https://registry.yarnpkg.com/@cosmjs/proto-signing/-/proto-signing-0.31.3.tgz#20440b7b96fb2cd924256a10e656fd8d4481cdcd" @@ -1486,6 +1549,18 @@ cosmjs-types "^0.7.1" long "^4.0.0" +"@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== + dependencies: + "@cosmjs/amino" "^0.32.4" + "@cosmjs/crypto" "^0.32.4" + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + cosmjs-types "^0.9.0" + "@cosmjs/socket@^0.30.1": version "0.30.1" resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.30.1.tgz#00b22f4b5e2ab01f4d82ccdb7b2e59536bfe5ce0" @@ -1506,22 +1581,14 @@ ws "^7" xstream "^11.14.0" -"@cosmjs/stargate@0.31.3", "@cosmjs/stargate@^0.31.3": - version "0.31.3" - resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.31.3.tgz#a2b38e398097a00f897dbd8f02d4d347d8fed818" - integrity sha512-53NxnzmB9FfXpG4KjOUAYAvWLYKdEmZKsutcat/u2BrDXNZ7BN8jim/ENcpwXfs9/Og0K24lEIdvA4gsq3JDQw== +"@cosmjs/socket@^0.32.4": + version "0.32.4" + resolved "https://registry.yarnpkg.com/@cosmjs/socket/-/socket-0.32.4.tgz#86ab6adf3a442314774c0810b7a7cfcddf4f2082" + integrity sha512-davcyYziBhkzfXQTu1l5NrpDYv0K9GekZCC9apBRvL1dvMc9F/ygM7iemHjUA+z8tJkxKxrt/YPjJ6XNHzLrkw== dependencies: - "@confio/ics23" "^0.6.8" - "@cosmjs/amino" "^0.31.3" - "@cosmjs/encoding" "^0.31.3" - "@cosmjs/math" "^0.31.3" - "@cosmjs/proto-signing" "^0.31.3" - "@cosmjs/stream" "^0.31.3" - "@cosmjs/tendermint-rpc" "^0.31.3" - "@cosmjs/utils" "^0.31.3" - cosmjs-types "^0.8.0" - long "^4.0.0" - protobufjs "~6.11.3" + "@cosmjs/stream" "^0.32.4" + isomorphic-ws "^4.0.1" + ws "^7" xstream "^11.14.0" "@cosmjs/stargate@^0.30.1": @@ -1542,6 +1609,40 @@ protobufjs "~6.11.3" xstream "^11.14.0" +"@cosmjs/stargate@^0.31.3": + version "0.31.3" + resolved "https://registry.yarnpkg.com/@cosmjs/stargate/-/stargate-0.31.3.tgz#a2b38e398097a00f897dbd8f02d4d347d8fed818" + integrity sha512-53NxnzmB9FfXpG4KjOUAYAvWLYKdEmZKsutcat/u2BrDXNZ7BN8jim/ENcpwXfs9/Og0K24lEIdvA4gsq3JDQw== + dependencies: + "@confio/ics23" "^0.6.8" + "@cosmjs/amino" "^0.31.3" + "@cosmjs/encoding" "^0.31.3" + "@cosmjs/math" "^0.31.3" + "@cosmjs/proto-signing" "^0.31.3" + "@cosmjs/stream" "^0.31.3" + "@cosmjs/tendermint-rpc" "^0.31.3" + "@cosmjs/utils" "^0.31.3" + cosmjs-types "^0.8.0" + long "^4.0.0" + protobufjs "~6.11.3" + xstream "^11.14.0" + +"@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== + dependencies: + "@confio/ics23" "^0.6.8" + "@cosmjs/amino" "^0.32.4" + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/proto-signing" "^0.32.4" + "@cosmjs/stream" "^0.32.4" + "@cosmjs/tendermint-rpc" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + cosmjs-types "^0.9.0" + xstream "^11.14.0" + "@cosmjs/stream@^0.30.1": version "0.30.1" resolved "https://registry.yarnpkg.com/@cosmjs/stream/-/stream-0.30.1.tgz#ba038a2aaf41343696b1e6e759d8e03a9516ec1a" @@ -1556,20 +1657,11 @@ dependencies: xstream "^11.14.0" -"@cosmjs/tendermint-rpc@0.31.3", "@cosmjs/tendermint-rpc@^0.31.3": - version "0.31.3" - resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.31.3.tgz#d1a2bc5b3c98743631c9b55888589d352403c9b3" - integrity sha512-s3TiWkPCW4QceTQjpYqn4xttUJH36mTPqplMl+qyocdqk5+X5mergzExU/pHZRWQ4pbby8bnR7kMvG4OC1aZ8g== +"@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: - "@cosmjs/crypto" "^0.31.3" - "@cosmjs/encoding" "^0.31.3" - "@cosmjs/json-rpc" "^0.31.3" - "@cosmjs/math" "^0.31.3" - "@cosmjs/socket" "^0.31.3" - "@cosmjs/stream" "^0.31.3" - "@cosmjs/utils" "^0.31.3" - axios "^0.21.2" - readonly-date "^1.0.0" xstream "^11.14.0" "@cosmjs/tendermint-rpc@^0.30.1": @@ -1588,6 +1680,38 @@ readonly-date "^1.0.0" xstream "^11.14.0" +"@cosmjs/tendermint-rpc@^0.31.3": + version "0.31.3" + resolved "https://registry.yarnpkg.com/@cosmjs/tendermint-rpc/-/tendermint-rpc-0.31.3.tgz#d1a2bc5b3c98743631c9b55888589d352403c9b3" + integrity sha512-s3TiWkPCW4QceTQjpYqn4xttUJH36mTPqplMl+qyocdqk5+X5mergzExU/pHZRWQ4pbby8bnR7kMvG4OC1aZ8g== + dependencies: + "@cosmjs/crypto" "^0.31.3" + "@cosmjs/encoding" "^0.31.3" + "@cosmjs/json-rpc" "^0.31.3" + "@cosmjs/math" "^0.31.3" + "@cosmjs/socket" "^0.31.3" + "@cosmjs/stream" "^0.31.3" + "@cosmjs/utils" "^0.31.3" + axios "^0.21.2" + readonly-date "^1.0.0" + xstream "^11.14.0" + +"@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== + dependencies: + "@cosmjs/crypto" "^0.32.4" + "@cosmjs/encoding" "^0.32.4" + "@cosmjs/json-rpc" "^0.32.4" + "@cosmjs/math" "^0.32.4" + "@cosmjs/socket" "^0.32.4" + "@cosmjs/stream" "^0.32.4" + "@cosmjs/utils" "^0.32.4" + axios "^1.6.0" + readonly-date "^1.0.0" + xstream "^11.14.0" + "@cosmjs/utils@^0.30.1": version "0.30.1" resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.30.1.tgz#6d92582341be3c2ec8d82090253cfa4b7f959edb" @@ -1598,6 +1722,11 @@ resolved "https://registry.yarnpkg.com/@cosmjs/utils/-/utils-0.31.3.tgz#f97bbfda35ad69e80cd5c7fe0a270cbda16db1ed" integrity sha512-VBhAgzrrYdIe0O5IbKRqwszbQa7ZyQLx9nEQuHQ3HUplQW7P44COG/ye2n6AzCudtqxmwdX7nyX8ta1J07GoqA== +"@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== + "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" @@ -7938,14 +8067,6 @@ cosmiconfig@^9.0.0: js-yaml "^4.1.0" parse-json "^5.2.0" -cosmjs-types@0.8.0, cosmjs-types@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.8.0.tgz#2ed78f3e990f770229726f95f3ef5bf9e2b6859b" - integrity sha512-Q2Mj95Fl0PYMWEhA2LuGEIhipF7mQwd9gTQ85DdP9jjjopeoGaDxvmPa5nakNzsq7FnO1DMTatXTAx6bxMH7Lg== - dependencies: - long "^4.0.0" - protobufjs "~6.11.2" - cosmjs-types@^0.7.1: version "0.7.2" resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.7.2.tgz#a757371abd340949c5bd5d49c6f8379ae1ffd7e2" @@ -7954,6 +8075,19 @@ cosmjs-types@^0.7.1: long "^4.0.0" protobufjs "~6.11.2" +cosmjs-types@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.8.0.tgz#2ed78f3e990f770229726f95f3ef5bf9e2b6859b" + integrity sha512-Q2Mj95Fl0PYMWEhA2LuGEIhipF7mQwd9gTQ85DdP9jjjopeoGaDxvmPa5nakNzsq7FnO1DMTatXTAx6bxMH7Lg== + dependencies: + long "^4.0.0" + protobufjs "~6.11.2" + +cosmjs-types@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/cosmjs-types/-/cosmjs-types-0.9.0.tgz#c3bc482d28c7dfa25d1445093fdb2d9da1f6cfcc" + integrity sha512-MN/yUe6mkJwHnCFfsNPeCfXVhyxHYW6c/xDUzrSbBycYzw++XvWDMJArXp2pLdgD6FQ8DW79vkPjeNKVrXaHeQ== + crc-32@^1.2.0: version "1.2.2" resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"