fix: trezor - canary

Author: ThomasRalee

packages/exceptions/tsconfig.json

@@ -5,6 +5,7 @@
   ],
   "exclude": [
     "./src/**/*.spec.ts",
-    "./src/**/*.test.ts"
+    "./src/**/*.test.ts",
+    "./dist"
   ]
 }

packages/sdk-ts/package.json

@@ -128,7 +128,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-v2": "1.17.1",
+    "@injectivelabs/indexer-proto-ts-v2": "1.17.2",
     "@injectivelabs/mito-proto-ts-v2": "1.17.1",
     "@injectivelabs/networks": "workspace:*",
     "@injectivelabs/olp-proto-ts-v2": "1.17.1",

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcAuctionTransformer.ts

@@ -68,6 +68,7 @@ export class IndexerGrpcAuctionTransformer {
         ? {
             id: grpcAuction.contract.id.toString(),
             bidTarget: grpcAuction.contract.bidTarget,
+            isBidPlaced: grpcAuction.contract.isBidPlaced,
             currentSlots: grpcAuction.contract.currentSlots.toString(),
             totalSlots: grpcAuction.contract.totalSlots.toString(),
             maxUserAllocation: grpcAuction.contract.maxUserAllocation,

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcMegaVaultTransformer.ts

@@ -364,17 +364,17 @@ export class IndexerGrpcMegaVaultTransformer {
     history: GrpcMegaVaultHistoricalTVL,
   ): MegaVaultHistoricalTVL {
     return {
-      t: history.t,
-      v: history.v,
+      t: history.t.toString(),
+      v: history.v.toString(),
     }
   }
 
   static grpcHistoricalPnLToHistoricalPnL(
     history: GrpcMegaVaultHistoricalPnL,
   ): MegaVaultHistoricalPnL {
     return {
-      t: history.t,
-      v: history.v,
+      t: history.t.toString(),
+      v: history.v.toString(),
     }
   }
 
@@ -384,8 +384,8 @@ export class IndexerGrpcMegaVaultTransformer {
     return {
       status: log.status,
       txHash: log.txHash,
-      blockTime: log.blockTime,
-      blockHeight: log.blockHeight,
+      blockTime: log.blockTime.toString(),
+      blockHeight: log.blockHeight.toString(),
     }
   }
 }

packages/sdk-ts/src/client/indexer/types/mega-vault.ts

@@ -199,6 +199,6 @@ export type GrpcMegaVaultVolatilityStats =
   InjectiveMegavaultRpcPb.VolatilityStats
 
 export type GrpcMegaVaultOperatorRedemptionBucket =
-  InjectiveMegaVaultRpc.RedemptionBucket
+  InjectiveMegavaultRpcPb.RedemptionBucket
 export type GrpcMegaVaultOperationStatusLogEntry =
-  InjectiveMegaVaultRpc.OperationStatusLogEntry
+  InjectiveMegavaultRpcPb.OperationStatusLogEntry

packages/ts-types/tsconfig.json

@@ -5,6 +5,7 @@
   ],
   "exclude": [
     "./src/**/*.spec.ts",
-    "./src/**/*.test.ts"
+    "./src/**/*.test.ts",
+    "./dist"
   ]
 }

packages/wallets/wallet-core/src/broadcaster/MsgBroadcaster.ts

@@ -369,7 +369,9 @@ export class MsgBroadcaster {
     /** Account Details * */
     const { baseAccount, latestHeight } =
       await this.fetchAccountAndBlockDetails(tx.injectiveAddress)
-    const timeoutHeight = toBigNumber(latestHeight).plus(txTimeoutInBlocks)
+    const timeoutHeight = toBigNumber(latestHeight.toString()).plus(
+      txTimeoutInBlocks,
+    )
     const txTimeoutTimeInSeconds =
       txTimeoutInBlocks * DEFAULT_BLOCK_TIME_IN_SECONDS
     const txTimeoutTimeInMilliSeconds = txTimeoutTimeInSeconds * 1000
@@ -647,7 +649,7 @@ export class MsgBroadcaster {
         endpoints.grpc,
       ).fetchLatestBlock()
 
-      const latestHeight = latestBlock!.header!.height
+      const latestHeight = latestBlock!.header!.height.toString()
 
       timeoutHeight = toBigNumber(latestHeight)
         .plus(txTimeoutInBlocks)
@@ -1387,7 +1389,7 @@ export class MsgBroadcaster {
     const { baseAccount } = accountDetails
 
     const latestBlock = await tendermintClient.fetchLatestBlock()
-    const latestHeight = latestBlock!.header!.height
+    const latestHeight = latestBlock!.header!.height.toString()
 
     return {
       baseAccount,

packages/wallets/wallet-trezor/src/strategy/hw/transport/base.ts

@@ -1,5 +1,6 @@
+import { loadTrezorConnect } from '../../lib.js'
 import AccountManager from '../AccountManager.js'
-import { loadTrezorConnect, type Manifest } from '../../lib.js'
+import type { Manifest } from '../../lib.js'
 
 const TREZOR_CONNECT_MANIFEST = {
   email: 'contact@injectivelabs.org',

packages/wallets/wallet-trezor/src/strategy/lib.ts

@@ -2,6 +2,8 @@
 // in the underlying @trezor/connect type definitions (there's a typo: comma instead of space).
 // Instead, we define the minimal types we need inline.
 
+export type TrezorConnectType = typeof import('@trezor/connect-web').default
+
 type Manifest = {
   appName: string
   appIcon?: string
@@ -53,9 +55,17 @@ export type TrezorConnectWithWebSettings = {
   [key: string]: any
 }
 
-export async function loadTrezorConnect(): Promise<TrezorConnectWithWebSettings> {
+export async function loadTrezorConnect() {
+  console.log('🪵Loading TrezorConnect...')
+
   const module = await import('@trezor/connect-web')
 
-  return (module as any).default
-    .default as unknown as TrezorConnectWithWebSettings
+  console.log('🪵Module:', module)
+
+  return module.default
+
+  // return (
+  //   (module as any).default.default ||
+  //   ((module as any).default as unknown as TrezorConnectWithWebSettings)
+  // )
 }