chore: cleanup and HttpClient fix

billyjacoby · billyjacoby · commit de8989781c8e · 2025-05-12T10:21:32.000-04:00
diff --git a/packages/exceptions/src/exceptions/types/modules.ts b/packages/exceptions/src/exceptions/types/modules.ts
@@ -59,6 +59,4 @@ export enum WalletErrorActionModule {
   GetNetworkId = 'get-network-id',
   GetChainId = 'get-chain-id',
   GetEthereumTransactionReceipt = 'get-ethereum-transaction-receipt',
-  TurnkeyInitEmailOTP = 'turnkey-init-email-otp',
-  TurnkeyVerifyEmailOTP = 'turnkey-verify-email-otp',
 }
diff --git a/packages/sdk-ts/src/core/tx/api/TxRestApi.ts b/packages/sdk-ts/src/core/tx/api/TxRestApi.ts
@@ -1,9 +1,9 @@
 import {
+  HttpClient,
   BigNumberInBase,
   DEFAULT_BLOCK_TIMEOUT_HEIGHT,
   DEFAULT_BLOCK_TIME_IN_SECONDS,
   DEFAULT_TX_BLOCK_INCLUSION_TIMEOUT_IN_MS,
-  HttpRestClient,
 } from '@injectivelabs/utils'
 import {
   BroadcastMode,
@@ -14,29 +14,36 @@ import {
 import { TxClient } from '../utils/classes/TxClient.js'
 import { TxClientBroadcastOptions, TxConcreteApi } from '../types/tx.js'
 import {
+  HttpRequestMethod,
   HttpRequestException,
   TransactionException,
+  UnspecifiedErrorCode,
 } from '@injectivelabs/exceptions'
+import axios, { AxiosError } from 'axios'
 import { StatusCodes } from 'http-status-codes'
 import { TxResponse } from '../types/tx.js'
+import { getErrorMessage } from '../../../utils/helpers.js'
 import { CosmosTxV1Beta1Tx } from '@injectivelabs/core-proto-ts'
 
 /**
  * It is recommended to use TxGrpcClient instead of TxRestApi
  */
 export class TxRestApi implements TxConcreteApi {
-  public client: HttpRestClient
+  public httpClient: HttpClient
 
   constructor(endpoint: string, options?: { timeout?: number }) {
-    this.client = new HttpRestClient(endpoint, {
+    this.httpClient = new HttpClient(endpoint, {
+      headers: {
+        Accept: 'application/json',
+      },
       timeout: options?.timeout || 15000,
     })
   }
 
   public async fetchTx(txHash: string, params: any = {}): Promise<TxResponse> {
     try {
-      const response = await this.client.$get<TxResultResponse>(
-        `cosmos/tx/v1beta1/txs/${txHash}`,
+      const response = await this.getRaw<TxResultResponse>(
+        `/cosmos/tx/v1beta1/txs/${txHash}`,
         params,
       )
 
@@ -132,8 +139,8 @@ export class TxRestApi implements TxConcreteApi {
     }
 
     try {
-      const response = await this.client.$post<SimulationResponse>(
-        'cosmos/tx/v1beta1/simulate',
+      const response = await this.postRaw<SimulationResponse>(
+        '/cosmos/tx/v1beta1/simulate',
         {
           tx_bytes: TxClient.encode(txRawClone),
         },
@@ -236,11 +243,78 @@ export class TxRestApi implements TxConcreteApi {
     txRaw: CosmosTxV1Beta1Tx.TxRaw,
     mode: BroadcastMode = BroadcastMode.Sync,
   ): Promise<T> {
-    const response = await this.client.$post<T>('cosmos/tx/v1beta1/txs', {
+    const response = await this.postRaw<T>('cosmos/tx/v1beta1/txs', {
       tx_bytes: TxClient.encode(txRaw),
       mode,
     })
 
     return response
   }
+
+  private async getRaw<T>(
+    endpoint: string,
+    params: URLSearchParams | any = {},
+  ): Promise<T> {
+    try {
+      return await this.httpClient
+        .get<URLSearchParams | any, { data: T }>(endpoint, params)
+        .then((d) => d.data)
+    } catch (e) {
+      const error = e as Error | AxiosError
+
+      if (axios.isAxiosError(error)) {
+        if (error.code === 'ECONNABORTED') {
+          throw new HttpRequestException(new Error(error.message), {
+            code: StatusCodes.REQUEST_TOO_LONG,
+            context: endpoint,
+          })
+        }
+
+        const message = getErrorMessage(error, endpoint)
+
+        throw new HttpRequestException(new Error(message), {
+          context: endpoint,
+          code: error.response
+            ? error.response.status
+            : StatusCodes.BAD_REQUEST,
+        })
+      }
+
+      throw new HttpRequestException(new Error((error as any).message), {
+        context: endpoint,
+        code: UnspecifiedErrorCode,
+      })
+    }
+  }
+
+  private async postRaw<T>(
+    endpoint: string,
+    params: URLSearchParams | any = {},
+  ): Promise<T> {
+    try {
+      return await this.httpClient
+        .post<URLSearchParams | any, { data: T }>(endpoint, params)
+        .then((d) => d.data)
+    } catch (e) {
+      const error = e as Error | AxiosError
+
+      if (axios.isAxiosError(error)) {
+        const message = getErrorMessage(error, endpoint)
+
+        throw new HttpRequestException(new Error(message), {
+          code: error.response
+            ? error.response.status
+            : StatusCodes.BAD_REQUEST,
+          context: endpoint,
+          contextModule: HttpRequestMethod.Post,
+        })
+      }
+
+      throw new HttpRequestException(new Error((error as any).message), {
+        code: UnspecifiedErrorCode,
+        context: endpoint,
+        contextModule: HttpRequestMethod.Post,
+      })
+    }
+  }
 }
diff --git a/packages/sdk-ts/src/utils/address.spec.ts b/packages/sdk-ts/src/utils/address.spec.ts
@@ -2,6 +2,7 @@ import {
   getEthereumAddress,
   getInjectiveAddress,
   getDefaultSubaccountId,
+  getChecksumAddress,
 } from '../../src/utils/index.js'
 
 describe('address helper functions', () => {
@@ -31,4 +32,13 @@ describe('address helper functions', () => {
       '0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000',
     )
   })
+
+  it('getChecksumAddress returns correct value', () => {
+    const ethereumAddress =
+      '0xaf79152ac5df276d9a8e1e2e22822f9713474902'.toLowerCase()
+
+    expect(getChecksumAddress(ethereumAddress)).toMatch(
+      '0xAF79152AC5dF276D9A8e1E2E22822f9713474902',
+    )
+  })
 })
diff --git a/packages/utils/src/classes/HttpClient.ts b/packages/utils/src/classes/HttpClient.ts
@@ -28,60 +28,19 @@ export default class HttpClient {
     return this
   }
 
-  async get<T, P extends Record<string, any>>(
-    endpoint: string,
-    params: P = {} as P,
-  ): Promise<T> {
+  get<T, P>(endpoint: string, params: T = {} as T): Promise<P> {
     return this.client.get(endpoint, { params, ...this.config })
   }
 
-  /**
-   * This functions parses the `data` property from the response
-   * and returns the data as a typed object.
-   */
-  async $get<T, P extends Record<string, any>>(
-    endpoint: string,
-    params: P = {} as P,
-  ): Promise<T> {
-    const response = await this.client.get(endpoint, {
-      params,
-      ...this.config,
-    })
-
-    return 'data' in response ? response.data : response
-  }
-
-  async post<T, P extends Record<string, any>>(
-    endpoint: string,
-    data: P = {} as P,
-  ): Promise<T> {
+  post<T, P>(endpoint: string, data: T = {} as T): Promise<P> {
     return this.client.post(endpoint, data, this.config)
   }
 
-  /**
-   * This functions parses the `data` property from the response
-   * and returns the data as a typed object.
-   */
-  async $post<T, P extends Record<string, any>>(
-    endpoint: string,
-    data: P = {} as P,
-  ): Promise<T> {
-    const response = await this.client.post(endpoint, data, this.config)
-
-    return 'data' in response ? response.data : response
-  }
-
-  async put<T, P extends Record<string, any>>(
-    endpoint: string,
-    data: P = {} as P,
-  ): Promise<T> {
+  put<T, P>(endpoint: string, data: T = {} as T): Promise<P> {
     return this.client.put(endpoint, data, this.config)
   }
 
-  async delete<T, P extends Record<string, any>>(
-    endpoint: string,
-    params: P = {} as P,
-  ): Promise<T> {
+  delete<T, P>(endpoint: string, params: T = {} as T): Promise<P> {
     return this.client.delete(endpoint, { params, ...this.config })
   }
 }
diff --git a/packages/utils/src/classes/HttpRestClient.ts b/packages/utils/src/classes/HttpRestClient.ts
@@ -70,44 +70,6 @@ export default class HttpRestClient {
     }
   }
 
-  /**
-   * This functions parses the `data` property from the response
-   * and returns the data as a typed object.
-   */
-  public async $get<T>(
-    endpoint: string,
-    params: Record<string, any> = {},
-  ): Promise<T> {
-    try {
-      return await this.client.$get(endpoint, params)
-    } catch (e: unknown) {
-      const error = e as Error | AxiosError
-
-      if (axios.isAxiosError(error)) {
-        if (error.code === 'ECONNABORTED') {
-          throw new HttpRequestException(new Error(error.message), {
-            code: StatusCodes.REQUEST_TOO_LONG,
-            context: endpoint,
-          })
-        }
-
-        const message = getErrorMessage(error, endpoint)
-
-        throw new HttpRequestException(new Error(message), {
-          context: endpoint,
-          code: error.response
-            ? error.response.status
-            : StatusCodes.BAD_REQUEST,
-        })
-      }
-
-      throw new HttpRequestException(new Error((error as any).message), {
-        code: UnspecifiedErrorCode,
-        context: endpoint,
-      })
-    }
-  }
-
   public async retry<TResponse>(
     httpCall: Function,
     retries: number = 3,
@@ -174,44 +136,4 @@ export default class HttpRestClient {
       })
     }
   }
-
-  /**
-   * This functions parses the `data` property from the response
-   * and returns the data as a typed object.
-   */
-  public async $post<T>(
-    endpoint: string,
-    params: Record<string, any> = {},
-  ): Promise<T> {
-    try {
-      return await this.client.$post(endpoint, params)
-    } catch (e: unknown) {
-      const error = e as Error | AxiosError
-
-      if (axios.isAxiosError(error)) {
-        if (error.code === 'ECONNABORTED') {
-          throw new HttpRequestException(new Error(error.message), {
-            code: StatusCodes.REQUEST_TOO_LONG,
-            method: HttpRequestMethod.Post,
-          })
-        }
-
-        const message = getErrorMessage(error, endpoint)
-
-        throw new HttpRequestException(new Error(message), {
-          code: error.response
-            ? error.response.status
-            : StatusCodes.BAD_REQUEST,
-          context: endpoint,
-          contextModule: HttpRequestMethod.Post,
-        })
-      }
-
-      throw new HttpRequestException(new Error((error as any).message), {
-        code: UnspecifiedErrorCode,
-        context: endpoint,
-        contextModule: HttpRequestMethod.Post,
-      })
-    }
-  }
 }
diff --git a/packages/utils/src/classes/index.ts b/packages/utils/src/classes/index.ts
@@ -9,12 +9,12 @@ import Status, { StatusType } from './Status.js'
 
 export {
   Status,
-  BigNumber,
   StatusType,
-  HttpClient,
   LocalStorage,
   BigNumberInBase,
   BigNumberInWei,
+  BigNumber,
+  HttpClient,
   HttpRestClient,
   StreamManager,
 }
diff --git a/packages/wallets/wallet-base/src/types/strategy.ts b/packages/wallets/wallet-base/src/types/strategy.ts
@@ -53,14 +53,6 @@ export interface SendTransactionOptions {
   }
 }
 
-export enum TurnkeyStatus {
-  Ready = 'ready',
-  Error = 'error',
-  LoggedIn = 'logged-in',
-  WaitingOtp = 'waiting-otp',
-  Initializing = 'initializing',
-}
-
 export enum TurnkeyProvider {
   Email = 'email',
   Google = 'google',
@@ -83,13 +75,16 @@ export interface TurnkeyMetadata {
   email?: string
   session?: TurnkeySession
   otpId?: string
+  otpCode?: string
   oidcToken?: string
-  iframeElementId: string
+  iframeElementId?: string
   iframeContainerId: string
   credentialBundle?: string
   organizationId?: string
   provider?: TurnkeyProvider
-  onStatusChange?: (status: TurnkeyStatus) => void
+  otpInitPath?: string
+  otpVerifyPath?: string
+  oauthLoginPath?: string
 }
 
 export interface WalletMetadata {
diff --git a/packages/wallets/wallet-turnkey/package.json b/packages/wallets/wallet-turnkey/package.json
@@ -58,11 +58,11 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.1",
-    "@injectivelabs/sdk-ts": "^1.15.3",
-    "@injectivelabs/ts-types": "^1.15.2",
-    "@injectivelabs/utils": "^1.15.2",
-    "@injectivelabs/wallet-base": "^1.15.3",
+    "@injectivelabs/exceptions": "^1.15.2",
+    "@injectivelabs/sdk-ts": "^1.15.5",
+    "@injectivelabs/ts-types": "^1.15.3",
+    "@injectivelabs/utils": "^1.15.3",
+    "@injectivelabs/wallet-base": "^1.15.5",
     "@turnkey/sdk-browser": "^4.1.0",
     "@turnkey/viem": "^0.9.0",
     "viem": "^2.28.1"
diff --git a/packages/wallets/wallet-turnkey/src/index.ts b/packages/wallets/wallet-turnkey/src/index.ts
@@ -2,3 +2,4 @@ export { TurnkeyOtpWalletStrategy } from './strategy/strategy/otp.js'
 export { TurnkeyOauthWalletStrategy } from './strategy/strategy/oauth.js'
 
 export * from './strategy/strategy/base.js'
+export * from './strategy/turnkey/turnkey.js'
diff --git a/packages/wallets/wallet-turnkey/src/strategy/strategy/base.ts b/packages/wallets/wallet-turnkey/src/strategy/strategy/base.ts
diff --git a/packages/wallets/wallet-turnkey/src/strategy/turnkey/oauth.ts b/packages/wallets/wallet-turnkey/src/strategy/turnkey/oauth.ts
diff --git a/packages/wallets/wallet-turnkey/src/strategy/turnkey/otp.ts b/packages/wallets/wallet-turnkey/src/strategy/turnkey/otp.ts
diff --git a/packages/wallets/wallet-turnkey/src/strategy/turnkey/turnkey.ts b/packages/wallets/wallet-turnkey/src/strategy/turnkey/turnkey.ts

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,4 @@ export enum WalletErrorActionModule {`
`59`	`59`	`GetNetworkId = 'get-network-id',`
`60`	`60`	`GetChainId = 'get-chain-id',`
`61`	`61`	`GetEthereumTransactionReceipt = 'get-ethereum-transaction-receipt',`
`62`		`- TurnkeyInitEmailOTP = 'turnkey-init-email-otp',`
`63`		`- TurnkeyVerifyEmailOTP = 'turnkey-verify-email-otp',`
`64`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,3 +2,4 @@ export { TurnkeyOtpWalletStrategy } from './strategy/strategy/otp.js'`
`2`	`2`	`export { TurnkeyOauthWalletStrategy } from './strategy/strategy/oauth.js'`
`3`	`3`
`4`	`4`	`export * from './strategy/strategy/base.js'`
	`5`	`+export * from './strategy/turnkey/turnkey.js'`