@injectivelabs/wallet-trezor 1.16.13-alpha.3 → 1.16.13-alpha.5

package/dist/cjs/strategy/Base.d.ts

@@ -1,3 +1,4 @@
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { WalletDeviceType, BaseConcreteStrategy } from '@injectivelabs/wallet-base';
 import type { TrezorDerivationPathType } from '../types.js';
 import type { AccountAddress, EvmChainId as EvmChainIdType } from '@injectivelabs/ts-types';
@@ -35,7 +36,7 @@ export default class TrezorBase extends BaseConcreteStrategy implements Concrete
     }): Promise<DirectSignResponse>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<string>;
     getPubKey(): Promise<string>;
     private signEvmTransaction;
     private getWalletForAddress;

package/dist/cjs/strategy/Base.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("@injectivelabs/utils");
 const viem_1 = require("viem");
 const ts_types_1 = require("@injectivelabs/ts-types");
 const sdk_ts_1 = require("@injectivelabs/sdk-ts");
@@ -54,8 +55,11 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
             const alchemy = await this.getAlchemy(args.evmChainId);
-            const txReceipt = await alchemy.core.sendTransaction(signedTransaction);
-            return txReceipt.hash;
+            const provider = await alchemy.config.getProvider();
+            const txHash = await provider.send('eth_sendRawTransaction', [
+                signedTransaction,
+            ]);
+            return txHash;
         }
         catch (e) {
             throw new exceptions_1.TrezorException(new Error(e.message), {
@@ -164,8 +168,26 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         const alchemyProvider = await alchemy.config.getProvider();
         return alchemyProvider.network.chainId.toString();
     }
-    async getEvmTransactionReceipt(txHash) {
-        return Promise.resolve(txHash);
+    async getEvmTransactionReceipt(txHash, evmChainId) {
+        const alchemy = await this.getAlchemy(evmChainId);
+        const provider = await alchemy.config.getProvider();
+        const interval = 3000;
+        const maxAttempts = 10;
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            attempts++;
+            await (0, utils_1.sleep)(interval);
+            try {
+                const receipt = await provider.send('eth_getTransactionReceipt', [
+                    txHash,
+                ]);
+                if (receipt) {
+                    return txHash;
+                }
+            }
+            catch { }
+        }
+        throw new Error(`Failed to retrieve transaction receipt for txHash: ${txHash}`);
     }
     async getPubKey() {
         throw new exceptions_1.WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
@@ -175,16 +197,29 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
         const chainId = parseInt(args.evmChainId.toString(), 10);
         const alchemy = await this.getAlchemy(args.evmChainId);
         const nonce = await alchemy.core.getTransactionCount(args.address);
-        // Create transaction data for Trezor API (still needs hex strings)
+        // Handle hex string values properly (with or without 0x prefix)
+        const parseHexValue = (value) => {
+            if (typeof value === 'string') {
+                const hexValue = value.startsWith('0x') ? value : `0x${value}`;
+                return BigInt(hexValue);
+            }
+            return BigInt(value);
+        };
+        // Convert to BigInt first, then to hex for Trezor
+        const valueBigInt = parseHexValue(txData.value || '0x0');
+        const gasBigInt = parseHexValue(txData.gas);
+        const maxFeePerGasBigInt = parseHexValue(txData.maxFeePerGas);
+        const maxPriorityFeePerGasBigInt = parseHexValue(txData.maxPriorityFeePerGas);
+        // Create transaction data for Trezor API (needs hex strings)
         const trezorTxData = {
             to: txData.to,
-            value: (0, viem_1.toHex)(txData.value || 0),
-            gasLimit: (0, viem_1.toHex)(txData.gas),
+            value: (0, viem_1.toHex)(valueBigInt),
+            gasLimit: (0, viem_1.toHex)(gasBigInt),
             nonce: (0, viem_1.toHex)(nonce),
             data: txData.data || '0x',
             chainId,
-            maxFeePerGas: (0, viem_1.toHex)(txData.gasPrice || txData.maxFeePerGas),
-            maxPriorityFeePerGas: (0, viem_1.toHex)(txData.maxPriorityFeePerGas || wallet_base_1.TIP_IN_GWEI),
+            maxFeePerGas: (0, viem_1.toHex)(maxFeePerGasBigInt),
+            maxPriorityFeePerGas: (0, viem_1.toHex)(maxPriorityFeePerGasBigInt),
         };
         try {
             await this.trezor.connect();
@@ -207,11 +242,11 @@ class TrezorBase extends wallet_base_1.BaseConcreteStrategy {
                 chainId,
                 nonce,
                 to: txData.to,
-                value: BigInt(txData.value || 0),
+                value: valueBigInt,
                 data: (txData.data || '0x'),
-                gas: BigInt(txData.gas),
-                maxFeePerGas: BigInt(txData.gasPrice || txData.maxFeePerGas),
-                maxPriorityFeePerGas: BigInt(txData.maxPriorityFeePerGas || wallet_base_1.TIP_IN_GWEI),
+                gas: gasBigInt,
+                maxFeePerGas: maxFeePerGasBigInt,
+                maxPriorityFeePerGas: maxPriorityFeePerGasBigInt,
                 v: BigInt(response.payload.v),
                 r: response.payload.r,
                 s: response.payload.s,

package/dist/esm/strategy/Base.d.ts

@@ -1,3 +1,4 @@
+import { EvmChainId } from '@injectivelabs/ts-types';
 import { WalletDeviceType, BaseConcreteStrategy } from '@injectivelabs/wallet-base';
 import type { TrezorDerivationPathType } from '../types.js';
 import type { AccountAddress, EvmChainId as EvmChainIdType } from '@injectivelabs/ts-types';
@@ -35,7 +36,7 @@ export default class TrezorBase extends BaseConcreteStrategy implements Concrete
     }): Promise<DirectSignResponse>;
     signArbitrary(signer: AccountAddress, data: string | Uint8Array): Promise<string>;
     getEthereumChainId(): Promise<string>;
-    getEvmTransactionReceipt(txHash: string): Promise<string>;
+    getEvmTransactionReceipt(txHash: string, evmChainId?: EvmChainId): Promise<string>;
     getPubKey(): Promise<string>;
     private signEvmTransaction;
     private getWalletForAddress;

package/dist/esm/strategy/Base.js

@@ -1,9 +1,10 @@
+import { sleep } from '@injectivelabs/utils';
 import { toHex, serializeTransaction } from 'viem';
 import { EvmChainId } from '@injectivelabs/ts-types';
 import { toUtf8, TxGrpcApi } from '@injectivelabs/sdk-ts';
 import { Alchemy, Network as AlchemyNetwork } from 'alchemy-sdk';
 import { ErrorType, WalletException, TrezorException, GeneralException, UnspecifiedErrorCode, TransactionException, } from '@injectivelabs/exceptions';
-import { TIP_IN_GWEI, WalletAction, getKeyFromRpcUrl, WalletDeviceType, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
+import { WalletAction, getKeyFromRpcUrl, WalletDeviceType, BaseConcreteStrategy, DEFAULT_BASE_DERIVATION_PATH, DEFAULT_ADDRESS_SEARCH_LIMIT, DEFAULT_NUM_ADDRESSES_TO_FETCH, } from '@injectivelabs/wallet-base';
 import { loadTrezorConnect } from './lib.js';
 import { transformTypedData } from '../utils.js';
 import { BaseTrezorTransport } from './hw/index.js';
@@ -52,8 +53,11 @@ export default class TrezorBase extends BaseConcreteStrategy {
         const signedTransaction = await this.signEvmTransaction(txData, args);
         try {
             const alchemy = await this.getAlchemy(args.evmChainId);
-            const txReceipt = await alchemy.core.sendTransaction(signedTransaction);
-            return txReceipt.hash;
+            const provider = await alchemy.config.getProvider();
+            const txHash = await provider.send('eth_sendRawTransaction', [
+                signedTransaction,
+            ]);
+            return txHash;
         }
         catch (e) {
             throw new TrezorException(new Error(e.message), {
@@ -162,8 +166,26 @@ export default class TrezorBase extends BaseConcreteStrategy {
         const alchemyProvider = await alchemy.config.getProvider();
         return alchemyProvider.network.chainId.toString();
     }
-    async getEvmTransactionReceipt(txHash) {
-        return Promise.resolve(txHash);
+    async getEvmTransactionReceipt(txHash, evmChainId) {
+        const alchemy = await this.getAlchemy(evmChainId);
+        const provider = await alchemy.config.getProvider();
+        const interval = 3000;
+        const maxAttempts = 10;
+        let attempts = 0;
+        while (attempts < maxAttempts) {
+            attempts++;
+            await sleep(interval);
+            try {
+                const receipt = await provider.send('eth_getTransactionReceipt', [
+                    txHash,
+                ]);
+                if (receipt) {
+                    return txHash;
+                }
+            }
+            catch { }
+        }
+        throw new Error(`Failed to retrieve transaction receipt for txHash: ${txHash}`);
     }
     async getPubKey() {
         throw new WalletException(new Error('You can only fetch PubKey from Cosmos native wallets'));
@@ -173,16 +195,29 @@ export default class TrezorBase extends BaseConcreteStrategy {
         const chainId = parseInt(args.evmChainId.toString(), 10);
         const alchemy = await this.getAlchemy(args.evmChainId);
         const nonce = await alchemy.core.getTransactionCount(args.address);
-        // Create transaction data for Trezor API (still needs hex strings)
+        // Handle hex string values properly (with or without 0x prefix)
+        const parseHexValue = (value) => {
+            if (typeof value === 'string') {
+                const hexValue = value.startsWith('0x') ? value : `0x${value}`;
+                return BigInt(hexValue);
+            }
+            return BigInt(value);
+        };
+        // Convert to BigInt first, then to hex for Trezor
+        const valueBigInt = parseHexValue(txData.value || '0x0');
+        const gasBigInt = parseHexValue(txData.gas);
+        const maxFeePerGasBigInt = parseHexValue(txData.maxFeePerGas);
+        const maxPriorityFeePerGasBigInt = parseHexValue(txData.maxPriorityFeePerGas);
+        // Create transaction data for Trezor API (needs hex strings)
         const trezorTxData = {
             to: txData.to,
-            value: toHex(txData.value || 0),
-            gasLimit: toHex(txData.gas),
+            value: toHex(valueBigInt),
+            gasLimit: toHex(gasBigInt),
             nonce: toHex(nonce),
             data: txData.data || '0x',
             chainId,
-            maxFeePerGas: toHex(txData.gasPrice || txData.maxFeePerGas),
-            maxPriorityFeePerGas: toHex(txData.maxPriorityFeePerGas || TIP_IN_GWEI),
+            maxFeePerGas: toHex(maxFeePerGasBigInt),
+            maxPriorityFeePerGas: toHex(maxPriorityFeePerGasBigInt),
         };
         try {
             await this.trezor.connect();
@@ -205,11 +240,11 @@ export default class TrezorBase extends BaseConcreteStrategy {
                 chainId,
                 nonce,
                 to: txData.to,
-                value: BigInt(txData.value || 0),
+                value: valueBigInt,
                 data: (txData.data || '0x'),
-                gas: BigInt(txData.gas),
-                maxFeePerGas: BigInt(txData.gasPrice || txData.maxFeePerGas),
-                maxPriorityFeePerGas: BigInt(txData.maxPriorityFeePerGas || TIP_IN_GWEI),
+                gas: gasBigInt,
+                maxFeePerGas: maxFeePerGasBigInt,
+                maxPriorityFeePerGas: maxPriorityFeePerGasBigInt,
                 v: BigInt(response.payload.v),
                 r: response.payload.r,
                 s: response.payload.s,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-trezor",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.16.13-alpha.3",
+  "version": "1.16.13-alpha.5",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -57,15 +57,15 @@
   },
   "dependencies": {
     "@bangjelkoski/trezor-connect-web": "^9.4.7-beta.1",
-    "@injectivelabs/exceptions": "1.16.13-alpha.3",
-    "@injectivelabs/sdk-ts": "1.16.13-alpha.3",
-    "@injectivelabs/ts-types": "1.16.13-alpha.3",
-    "@injectivelabs/wallet-base": "1.16.13-alpha.3",
+    "@injectivelabs/exceptions": "1.16.13-alpha.5",
+    "@injectivelabs/sdk-ts": "1.16.13-alpha.5",
+    "@injectivelabs/ts-types": "1.16.13-alpha.5",
+    "@injectivelabs/wallet-base": "1.16.13-alpha.5",
     "alchemy-sdk": "^3.4.7",
     "viem": "^2.33.2"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "9714d8be468bec92c649fee736e797912e3d5c12"
+  "gitHead": "04c89e8c28d3f1144059d0d70ef712b5d8dfb803"
 }