@swapkit/wallet-hardware 4.9.12 → 4.9.13

package/package.json

@@ -22,10 +22,10 @@
     "@near-js/transactions": "~2.5.0",
     "@scure/base": "2.2.0",
     "@scure/bip32": "2.2.0",
-    "@swapkit/helpers": "^4.13.9",
-    "@swapkit/toolboxes": "^4.15.13",
+    "@swapkit/helpers": "^4.13.10",
+    "@swapkit/toolboxes": "^4.15.14",
     "@swapkit/utxo-signer": "^2.1.3",
-    "@swapkit/wallet-core": "^4.3.0",
+    "@swapkit/wallet-core": "^4.3.1",
     "@trezor/connect-web": "~9.7.3",
     "cosmjs-types": "~0.10.1",
     "ethers": "^6.14.0",
@@ -109,5 +109,5 @@
     "type-check:go": "tsgo"
   },
   "type": "module",
-  "version": "4.9.12"
+  "version": "4.9.13"
 }

package/src/ledger/clients/evm.ts

@@ -17,11 +17,19 @@ import {
 
 import { getLedgerTransport } from "../helpers/getLedgerTransport";
 
+function parseLedgerSignatureV(v: number | string) {
+  if (typeof v === "number") return v;
+
+  const hex = v.startsWith("0x") ? v.slice(2) : v;
+  return Number.parseInt(hex || "0", 16);
+}
+
 class EVMLedgerInterface extends AbstractSigner {
   chainId: ChainId = ChainId.Ethereum;
   derivationPath = "";
   ledgerApp: InstanceType<typeof EthereumApp> | null = null;
   ledgerTimeout = 50000;
+  private transport?: Transport;
   private readonly injectedTransport?: Transport;
 
   constructor({
@@ -44,19 +52,20 @@ class EVMLedgerInterface extends AbstractSigner {
       chainId: this.chainId,
       derivationPath: this.derivationPath,
       provider,
-      transport: this.injectedTransport,
+      transport: this.transport ?? this.injectedTransport,
     });
 
   checkOrCreateTransportAndLedger = async () => {
-    if (this.ledgerApp) return;
     await this.createTransportAndLedger();
   };
 
   createTransportAndLedger = async () => {
-    const transport = this.injectedTransport ?? (await getLedgerTransport());
+    if (this.ledgerApp) return;
+
+    this.transport ||= this.injectedTransport ?? (await getLedgerTransport());
     const EthereumApp = (await import("@ledgerhq/hw-app-eth")).default;
 
-    this.ledgerApp = new EthereumApp(transport);
+    this.ledgerApp = new EthereumApp(this.transport);
   };
 
   getAddress = async () => {
@@ -141,7 +150,9 @@ class EVMLedgerInterface extends AbstractSigner {
     const { Transaction } = await import("ethers");
     await this.createTransportAndLedger();
 
-    const transactionCount = await this.provider?.getTransactionCount(tx.from || (await this.getAddress()));
+    const nonce = tx.nonce ?? undefined;
+    const transactionCount =
+      nonce === undefined ? await this.provider?.getTransactionCount(tx.from || (await this.getAddress())) : undefined;
 
     const baseTx = {
       chainId: tx.chainId || this.chainId,
@@ -150,7 +161,7 @@ class EVMLedgerInterface extends AbstractSigner {
       ...(tx.gasPrice && { gasPrice: tx.gasPrice }),
       ...(!tx.gasPrice &&
         tx.maxFeePerGas && { maxFeePerGas: tx.maxFeePerGas, maxPriorityFeePerGas: tx.maxPriorityFeePerGas }),
-      nonce: tx.nonce !== undefined ? Number((tx.nonce || transactionCount || 0).toString()) : transactionCount,
+      nonce: nonce !== undefined ? Number(nonce.toString()) : transactionCount,
       to: tx.to?.toString(),
       type: tx.type && !Number.isNaN(tx.type) ? tx.type : tx.maxFeePerGas ? 2 : 0,
       value: tx.value,
@@ -169,7 +180,8 @@ class EVMLedgerInterface extends AbstractSigner {
 
     const { r, s, v } = signature;
 
-    return Transaction.from({ ...baseTx, signature: { r: `0x${r}`, s: `0x${s}`, v: Number(BigInt(v)) } }).serialized;
+    return Transaction.from({ ...baseTx, signature: { r: `0x${r}`, s: `0x${s}`, v: parseLedgerSignatureV(v) } })
+      .serialized;
   };
 }