Merge branch 'dev' of github.com:InjectiveLabs/injective-ts into dev

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.19",
+  "version": "1.14.20-beta.1",
   "sideEffects": false,
   "license": "Apache-2.0",
   "author": {

packages/sdk-ts/src/core/modules/wasm/exec-args/ExecArgCreateSpotGridStrategy.ts

@@ -9,6 +9,7 @@ import {
   ExitConfig,
   StrategyType,
   TrailingArithmetic,
+  TrailingArithmeticLP,
 } from '../types.js'
 export declare namespace ExecArgCreateSpotGridStrategy {
   export interface Params {
@@ -21,7 +22,11 @@ export declare namespace ExecArgCreateSpotGridStrategy {
     takeProfit?: ExitConfig
     exitType?: ExitType
     strategyType?: StrategyType
-    trailingArithmetic?: TrailingArithmetic
+    trailingArithmetic?: {
+      upperTrailing: string
+      lowerTrailing: string
+      lpMode?: boolean
+    }
   }
 
   export interface Data {
@@ -38,7 +43,7 @@ export declare namespace ExecArgCreateSpotGridStrategy {
       exit_price: string
     }
     exit_type?: ExitType
-    strategy_type?: StrategyType | TrailingArithmetic
+    strategy_type?: StrategyType | TrailingArithmetic | TrailingArithmeticLP
   }
 }
 
@@ -58,6 +63,20 @@ export default class ExecArgCreateSpotGridStrategy extends ExecArgBase<
   toData(): ExecArgCreateSpotGridStrategy.Data {
     const { params } = this
 
+    const trailingBounds = params.trailingArithmetic
+      ? {
+          upper_trailing_bound: params.trailingArithmetic.upperTrailing,
+          lower_trailing_bound: params.trailingArithmetic.lowerTrailing,
+        }
+      : undefined
+
+    const strategyType =
+      params.trailingArithmetic && trailingBounds
+        ? params.trailingArithmetic.lpMode
+          ? { trailing_arithmetic_l_p: trailingBounds }
+          : { trailing_arithmetic: trailingBounds }
+        : params.strategyType ?? StrategyType.Arithmetic
+
     return {
       subaccount_id: params.subaccountId,
       levels: params.levels,
@@ -76,7 +95,7 @@ export default class ExecArgCreateSpotGridStrategy extends ExecArgBase<
             exit_price: params.takeProfit.exitPrice,
           }
         : undefined,
-      strategy_type: params.trailingArithmetic ?? params.strategyType,
+      strategy_type: strategyType,
     }
   }
 

packages/sdk-ts/src/core/modules/wasm/types.ts

@@ -6,6 +6,7 @@ export enum ExitType {
 
 export enum StrategyType {
   Arithmetic = 'arithmetic',
+  ArithmeticLP = 'arithmetic_l_p',
   Geometric = 'geometric',
 }
 
@@ -16,6 +17,13 @@ export type TrailingArithmetic = {
   }
 }
 
+export type TrailingArithmeticLP = {
+  trailing_arithmetic_l_p: {
+    lower_trailing_bound: string
+    upper_trailing_bound: string
+  }
+}
+
 export type ExitConfig = {
   exitType: ExitType
   exitPrice: string

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.19",
+  "version": "1.14.20-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -41,7 +41,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
     "alchemy-sdk": "^3.4.7",

packages/wallets/wallet-core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
     "eip1193-provider": "^1.0.1"

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

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-cosmos-strategy",
   "description": "Wallet Cosmos Strategy with instantiated wallets",
-  "version": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -37,13 +37,13 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
-    "@injectivelabs/wallet-core": "^0.0.6",
-    "@injectivelabs/wallet-cosmos": "^0.0.6",
-    "@injectivelabs/wallet-cosmostation": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-core": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-cosmos": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-cosmostation": "^0.0.7-beta.1",
     "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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -39,10 +39,10 @@
     "@cosmjs/stargate": "^0.32.3",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -36,10 +36,10 @@
     "@cosmjs/proto-signing": "^0.32.3",
     "@cosmostation/extension-client": "^0.1.15",
     "@injectivelabs/exceptions": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
     "ethers": "^6.5.1",

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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -37,10 +37,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6"
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1"
   },
   "gitHead": "6442ae377bbfb3459d2fb3a44c650630a5b7f445",
   "typedoc": {

packages/wallets/wallet-strategy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-strategy",
   "description": "Wallet strategy with instantiated wallets",
-  "version": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -37,19 +37,19 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
-    "@injectivelabs/wallet-core": "^0.0.6",
-    "@injectivelabs/wallet-cosmos": "^0.0.6",
-    "@injectivelabs/wallet-cosmostation": "^0.0.6",
-    "@injectivelabs/wallet-evm": "^0.0.6",
-    "@injectivelabs/wallet-ledger": "^0.0.6",
-    "@injectivelabs/wallet-magic": "^0.0.6",
-    "@injectivelabs/wallet-private-key": "^0.0.6",
-    "@injectivelabs/wallet-trezor": "^0.0.6",
-    "@injectivelabs/wallet-wallet-connect": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-core": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-cosmos": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-cosmostation": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-evm": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-ledger": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-magic": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-private-key": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-trezor": "^0.0.7-beta.1",
+    "@injectivelabs/wallet-wallet-connect": "^0.0.7-beta.1",
     "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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -37,10 +37,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@injectivelabs/exceptions": "^1.14.19",
     "@injectivelabs/networks": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@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": "0.0.6",
+  "version": "0.0.7-beta.1",
   "sideEffects": false,
   "author": {
     "name": "InjectiveLabs",
@@ -34,10 +34,10 @@
   },
   "dependencies": {
     "@injectivelabs/exceptions": "^1.14.19",
-    "@injectivelabs/sdk-ts": "^1.14.19",
+    "@injectivelabs/sdk-ts": "^1.14.20-beta.1",
     "@injectivelabs/ts-types": "^1.14.19",
     "@injectivelabs/utils": "^1.14.19",
-    "@injectivelabs/wallet-base": "^0.0.6",
+    "@injectivelabs/wallet-base": "^0.0.7-beta.1",
     "@walletconnect/ethereum-provider": "^2.12.2"
   },
   "gitHead": "6442ae377bbfb3459d2fb3a44c650630a5b7f445",