Merge branch 'dev' into chore/cw20-convert-docs

packages/sdk-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/sdk-ts",
   "description": "SDK in TypeScript for building Injective applications in a browser, node, and react native environment.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "license": "Apache-2.0",
   "author": {
@@ -126,7 +126,7 @@
     "@injectivelabs/grpc-web": "^0.0.1",
     "@injectivelabs/grpc-web-node-http-transport": "^0.0.2",
     "@injectivelabs/grpc-web-react-native-transport": "^0.0.2",
-    "@injectivelabs/indexer-proto-ts": "1.13.2",
+    "@injectivelabs/indexer-proto-ts": "1.13.3",
     "@injectivelabs/mito-proto-ts": "1.13.0",
     "@injectivelabs/networks": "^1.14.32",
     "@injectivelabs/olp-proto-ts": "1.13.1",

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcTradingApi.ts

@@ -50,23 +50,37 @@ export class IndexerGrpcTradingApi extends BaseGrpcConsumer {
   }
 
   async fetchGridStrategies({
-    accountAddress,
-    subaccountId,
+    skip,
     state,
-    marketId,
     limit,
-    skip,
+    withTvl,
+    endTime,
+    marketId,
+    startTime,
     marketType,
     strategyType,
+    subaccountId,
+    accountAddress,
+    withPerformance,
+    pendingExecution,
+    lastExecutedTime,
+    isTrailingStrategy,
   }: {
-    accountAddress?: string
-    subaccountId?: string
+    skip?: number
     state?: string
-    marketId?: string
     limit?: number
-    skip?: number
+    endTime?: number
+    withTvl?: boolean
+    marketId?: string
+    startTime?: number
     marketType?: MarketType
+    subaccountId?: string
     strategyType?: GridStrategyType[]
+    accountAddress?: string
+    withPerformance?: boolean
+    pendingExecution?: boolean
+    lastExecutedTime?: number
+    isTrailingStrategy?: boolean
   }) {
     const request = InjectiveTradingRpc.ListTradingStrategiesRequest.create()
 
@@ -102,6 +116,34 @@ export class IndexerGrpcTradingApi extends BaseGrpcConsumer {
       request.marketId = marketId
     }
 
+    if (withTvl) {
+      request.withTvl = withTvl
+    }
+
+    if (withPerformance) {
+      request.withPerformance = withPerformance
+    }
+
+    if (isTrailingStrategy) {
+      request.isTrailingStrategy = isTrailingStrategy
+    }
+
+    if (startTime) {
+      request.startTime = startTime.toString()
+    }
+
+    if (endTime) {
+      request.endTime = endTime.toString()
+    }
+
+    if (pendingExecution) {
+      request.pendingExecution = pendingExecution
+    }
+
+    if (lastExecutedTime) {
+      request.lastExecutedTime = lastExecutedTime.toString()
+    }
+
     try {
       const response =
         await this.retry<InjectiveTradingRpc.ListTradingStrategiesResponse>(

packages/wallet-ts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-ts",
   "description": "A convenient way to use and interact with different types of wallets on Injective.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -83,7 +83,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
     "@keplr-wallet/cosmos": "^0.12.71",

packages/wallets/wallet-base/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-base",
   "description": "Base wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -59,7 +59,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
     "alchemy-sdk": "^3.4.7",

packages/wallets/wallet-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -57,7 +57,7 @@
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
     "@injectivelabs/wallet-base": "^0.0.6",

packages/wallets/wallet-cosmos-strategy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-cosmos-strategy",
   "description": "Wallet Cosmos Strategy with instantiated wallets",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -59,13 +59,13 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-core": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-cosmos": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-cosmostation": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-core": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-cosmos": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-cosmostation": "^1.14.33-beta.2",
     "alchemy-sdk": "^3.4.7",
     "eip1193-provider": "^1.0.1",
     "eth-sig-util": "^3.0.1",

packages/wallets/wallet-cosmos/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-cosmos",
   "description": "Cosmos wallet strategies for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -61,10 +61,10 @@
     "@cosmjs/stargate": "^0.32.3",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@keplr-wallet/cosmos": "^0.12.71",
     "@keplr-wallet/types": "^0.12.71",
     "shx": "^0.3.3"

packages/wallets/wallet-cosmostation/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-cosmostation",
   "description": "Cosmostation strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -58,10 +58,10 @@
     "@cosmjs/proto-signing": "^0.32.3",
     "@cosmostation/extension-client": "^0.1.15",
     "@injectivelabs/exceptions": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@walletconnect/ethereum-provider": "^2.12.2"
   },
   "gitHead": "6442ae377bbfb3459d2fb3a44c650630a5b7f445",

packages/wallets/wallet-evm/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-evm",
   "description": "EVM wallet strategies for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -57,7 +57,7 @@
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
     "@injectivelabs/wallet-base": "^0.0.6",

packages/wallets/wallet-ledger/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-ledger",
   "description": "Ledger wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -59,10 +59,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@ledgerhq/hw-app-cosmos": "^6.29.5",
     "@ledgerhq/hw-app-eth": "6.35.6",
     "@ledgerhq/hw-transport": "6.30.4",

packages/wallets/wallet-magic/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-magic",
   "description": "Magic wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -56,10 +56,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@magic-ext/cosmos": "23.9.1",
     "@magic-ext/oauth2": "9.9.0",
     "magic-sdk": "28.9.0"

packages/wallets/wallet-private-key/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-private-key",
   "description": "Private key wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -56,10 +56,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1"
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2"
   },
   "gitHead": "6442ae377bbfb3459d2fb3a44c650630a5b7f445",
   "typedoc": {

packages/wallets/wallet-strategy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-strategy",
   "description": "Wallet strategy with instantiated wallets",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -59,19 +59,19 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-core": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-cosmos": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-cosmostation": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-evm": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-ledger": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-magic": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-private-key": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-trezor": "^1.14.33-beta.1",
-    "@injectivelabs/wallet-wallet-connect": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-core": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-cosmos": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-cosmostation": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-evm": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-ledger": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-magic": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-private-key": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-trezor": "^1.14.33-beta.2",
+    "@injectivelabs/wallet-wallet-connect": "^1.14.33-beta.2",
     "alchemy-sdk": "^3.4.7",
     "eip1193-provider": "^1.0.1",
     "eth-sig-util": "^3.0.1",

packages/wallets/wallet-trezor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-trezor",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -59,10 +59,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.32",
     "@injectivelabs/networks": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@trezor/connect-web": "9.2.1",
     "alchemy-sdk": "^3.4.7",
     "eip1193-provider": "^1.0.1",

packages/wallets/wallet-wallet-connect/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-wallet-connect",
   "description": "Wallet connect strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.14.33-beta.1",
+  "version": "1.14.33-beta.2",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -56,10 +56,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.32",
-    "@injectivelabs/sdk-ts": "^1.14.33-beta.1",
+    "@injectivelabs/sdk-ts": "^1.14.33-beta.2",
     "@injectivelabs/ts-types": "^1.14.32",
     "@injectivelabs/utils": "^1.14.32",
-    "@injectivelabs/wallet-base": "^1.14.33-beta.1",
+    "@injectivelabs/wallet-base": "^1.14.33-beta.2",
     "@walletconnect/ethereum-provider": "^2.12.2"
   },
   "gitHead": "6442ae377bbfb3459d2fb3a44c650630a5b7f445",