@swapkit/wallet-hardware 4.9.11 → 4.9.13

package/dist/types/ledger/index.d.ts

@@ -17,7 +17,7 @@ export declare const ledgerWallet: {
     connectLedger: {
         connectWallet: ({ addChain }: {
             addChain: import("@swapkit/helpers").AddChainType;
-        }) => (chains: Chain[], derivationPath?: [44, 118, 0, 0, 0] | [44, 931, 0, 0, 0] | [number, number, number, number, number] | [44, 637, 0, 0, 0] | [44, 60, 0, 0, 0] | [44, 397, 0, 0, 0] | [0, 0, 0, 0, 0] | [44, 144, 0, 0, 0] | [44, 501, 0, 0, 0] | [44, 607, 0, 0, 0] | [44, 195, 0, 0, 0] | [44, 148, 0, 0, 0] | [44, 784, 0, 0, 0] | [1852, 1815, 0, 0, 0] | [44, 9004, 0, 0, 0] | [number, number, number, number, (number | undefined)?] | [44, 145, 0, 0, 0] | [84, 2, 0, 0, 0] | [44, 3, 0, 0, 0] | [44, 5, 0, 0, 0] | [44, 133, 0, 0, 0] | undefined, params_2?: ConnectLedgerOptions | undefined) => Promise<boolean>;
+        }) => (chains: Chain[], derivationPath?: [44, 118, 0, 0, 0] | [44, 931, 0, 0, 0] | [number, number, number, number, number] | [44, 637, 0, 0, 0] | [44, 60, 0, 0, 0] | [44, 397, 0, 0, 0] | [0, 0, 0, 0, 0] | [44, 144, 0, 0, 0] | [44, 501, 0, 0, 0] | [8797555, 1, 0, 0, 0] | [44, 607, 0, 0, 0] | [44, 195, 0, 0, 0] | [44, 148, 0, 0, 0] | [44, 784, 0, 0, 0] | [1852, 1815, 0, 0, 0] | [44, 9004, 0, 0, 0] | [number, number, number, number, (number | undefined)?] | [44, 145, 0, 0, 0] | [84, 2, 0, 0, 0] | [44, 3, 0, 0, 0] | [44, 5, 0, 0, 0] | [44, 133, 0, 0, 0] | undefined, params_2?: ConnectLedgerOptions | undefined) => Promise<boolean>;
         directSigningSupport: import("@swapkit/wallet-core").DirectSigningSupport;
         getExtendedPublicKey?: import("@swapkit/wallet-core").GetExtendedPublicKey;
         supportedChains: (Chain.Arbitrum | Chain.Aurora | Chain.Avalanche | Chain.Base | Chain.Berachain | Chain.BinanceSmartChain | Chain.Bitcoin | Chain.BitcoinCash | Chain.Cosmos | Chain.Dash | Chain.Dogecoin | Chain.Ethereum | Chain.Gnosis | Chain.Litecoin | Chain.Monad | Chain.Near | Chain.Optimism | Chain.Polygon | Chain.Ripple | Chain.Sui | Chain.THORChain | Chain.Tron | Chain.XLayer | Chain.Zcash)[];

package/dist/types/ledger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ledger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAEL,KAAK,EACL,KAAK,mBAAmB,EAUzB,MAAM,kBAAkB,CAAC;AAe1B,OAAO,EAA0C,KAAK,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAGlH;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,YAAY;;;;;;;;;CAyEvB,CAAC;AAEH,eAAO,MAAM,uBAAuB,mYAAyC,CAAC;AAW9E,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,KAAK,EACZ,cAAc,CAAC,EAAE,mBAAmB,EACpC,EAAE,YAAY,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/C,OAAO,CAAC,6BAA6B,GAAG,SAAS,CAAC,CAgBpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ledger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAEL,KAAK,EACL,KAAK,mBAAmB,EAUzB,MAAM,kBAAkB,CAAC;AAe1B,OAAO,EAA0C,KAAK,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAGlH;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,SAAS,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,YAAY;;;;;;;;;CAyEvB,CAAC;AAEH,eAAO,MAAM,uBAAuB,mYAAyC,CAAC;AAW9E,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,KAAK,EACZ,cAAc,CAAC,EAAE,mBAAmB,EACpC,EAAE,YAAY,EAAE,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAO,GAC/C,OAAO,CAAC,6BAA6B,GAAG,SAAS,CAAC,CAmBpD"}

package/dist/types/trezor/index.d.ts

@@ -12,7 +12,7 @@ export declare const trezorWallet: {
     connectTrezor: {
         connectWallet: ({ addChain }: {
             addChain: import("@swapkit/helpers").AddChainType;
-        }) => (chains: Chain[], derivationPath: [44, 118, 0, 0, 0] | [44, 931, 0, 0, 0] | [number, number, number, number, number] | [44, 637, 0, 0, 0] | [44, 60, 0, 0, 0] | [44, 397, 0, 0, 0] | [0, 0, 0, 0, 0] | [44, 144, 0, 0, 0] | [44, 501, 0, 0, 0] | [44, 607, 0, 0, 0] | [44, 195, 0, 0, 0] | [44, 148, 0, 0, 0] | [44, 784, 0, 0, 0] | [1852, 1815, 0, 0, 0] | [44, 9004, 0, 0, 0] | [number, number, number, number, (number | undefined)?] | [44, 145, 0, 0, 0] | [84, 2, 0, 0, 0] | [44, 3, 0, 0, 0] | [44, 5, 0, 0, 0] | [44, 133, 0, 0, 0], params_2?: ConnectTrezorOptions | undefined) => Promise<boolean>;
+        }) => (chains: Chain[], derivationPath: [44, 118, 0, 0, 0] | [44, 931, 0, 0, 0] | [number, number, number, number, number] | [44, 637, 0, 0, 0] | [44, 60, 0, 0, 0] | [44, 397, 0, 0, 0] | [0, 0, 0, 0, 0] | [44, 144, 0, 0, 0] | [44, 501, 0, 0, 0] | [8797555, 1, 0, 0, 0] | [44, 607, 0, 0, 0] | [44, 195, 0, 0, 0] | [44, 148, 0, 0, 0] | [44, 784, 0, 0, 0] | [1852, 1815, 0, 0, 0] | [44, 9004, 0, 0, 0] | [number, number, number, number, (number | undefined)?] | [44, 145, 0, 0, 0] | [84, 2, 0, 0, 0] | [44, 3, 0, 0, 0] | [44, 5, 0, 0, 0] | [44, 133, 0, 0, 0], params_2?: ConnectTrezorOptions | undefined) => Promise<boolean>;
         directSigningSupport: import("@swapkit/wallet-core").DirectSigningSupport;
         getExtendedPublicKey?: import("@swapkit/wallet-core").GetExtendedPublicKey;
         supportedChains: (Chain.Arbitrum | Chain.Aurora | Chain.Avalanche | Chain.Base | Chain.Berachain | Chain.BinanceSmartChain | Chain.Bitcoin | Chain.BitcoinCash | Chain.Dash | Chain.Dogecoin | Chain.Ethereum | Chain.Gnosis | Chain.Litecoin | Chain.Monad | Chain.Optimism | Chain.Polygon | Chain.XLayer | Chain.Zcash)[];

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.11"
+  "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;
   };
 }
 

package/src/ledger/clients/utxo.ts

@@ -106,24 +106,25 @@ const BaseLedgerUTXO = ({
     // Per-call state — each BitcoinLedger/LitecoinLedger/... invocation has its own
     // transport + btcApp so different consumers (e.g. concurrent MCP sessions) cannot
     // cross-contaminate each other's Ledger device handle.
-    let btcApp: InstanceType<typeof BitcoinApp>;
+    let btcApp: InstanceType<typeof BitcoinApp> | undefined;
     let transport: any = null;
 
-    async function checkBtcAppAndCreateTransportWebUSB(checkBtcApp = true) {
-      if (checkBtcApp && !btcApp) {
-        new SwapKitError("wallet_ledger_connection_error", {
-          message: `Ledger connection failed:\n${JSON.stringify({ btcApp, checkBtcApp })}`,
-        });
-      }
-
+    async function createTransportWebUSB() {
       transport ||= injectedTransport ?? (await getLedgerTransport());
+      const BitcoinApp = (await import("@ledgerhq/hw-app-btc")).default;
+
+      btcApp ||= new BitcoinApp({ currency: chain, transport });
+      return btcApp;
     }
 
-    async function createTransportWebUSB() {
-      transport = injectedTransport ?? (await getLedgerTransport());
-      const BitcoinApp = (await import("@ledgerhq/hw-app-btc")).default;
+    async function getBtcApp() {
+      return btcApp || (await createTransportWebUSB());
+    }
 
-      btcApp = new BitcoinApp({ currency: chain, transport });
+    async function disconnect() {
+      if (!injectedTransport) await transport?.close?.();
+      btcApp = undefined;
+      transport = null;
     }
 
     const derivationPath =
@@ -135,17 +136,15 @@ const BaseLedgerUTXO = ({
 
     return {
       connect: async () => {
-        await checkBtcAppAndCreateTransportWebUSB(false);
-        const BitcoinApp = (await import("@ledgerhq/hw-app-btc")).default;
-
-        btcApp = new BitcoinApp({ currency: chain, transport });
+        await getBtcApp();
       },
+      disconnect,
       getAddress: async () => {
         const { toCashAddress } = await import("@swapkit/toolboxes/utxo");
 
-        await checkBtcAppAndCreateTransportWebUSB(false);
+        const app = await getBtcApp();
 
-        const { bitcoinAddress: address } = await btcApp.getWalletPublicKey(derivationPath, { format });
+        const { bitcoinAddress: address } = await app.getWalletPublicKey(derivationPath, { format });
 
         if (!address) {
           throw new SwapKitError("wallet_ledger_get_address_error", {
@@ -158,9 +157,9 @@ const BaseLedgerUTXO = ({
           : address;
       },
       getExtendedPublicKey: async (path = "84'/0'/0'", xpubVersion = 76067358) => {
-        await checkBtcAppAndCreateTransportWebUSB(false);
+        const app = await getBtcApp();
 
-        return btcApp.getWalletXpub({ path, xpubVersion });
+        return app.getWalletXpub({ path, xpubVersion });
       },
 
       signPCZT: async (pczt: PCZT): Promise<PCZT> => {
@@ -170,7 +169,7 @@ const BaseLedgerUTXO = ({
           });
         }
 
-        await createTransportWebUSB();
+        const app = await getBtcApp();
 
         const { ZcashTransaction, Script } = await import("@swapkit/utxo-signer");
 
@@ -212,7 +211,7 @@ const BaseLedgerUTXO = ({
         }
 
         const signedTxHex = await signUTXOTransaction(
-          { btcApp, chain, derivationPath, inputUtxos, tx: unsignedTx as unknown as Transaction },
+          { btcApp: app, chain, derivationPath, inputUtxos, tx: unsignedTx as unknown as Transaction },
           {
             ...additionalSignParams,
             expiryHeight: (() => {
@@ -240,9 +239,9 @@ const BaseLedgerUTXO = ({
         return signedPczt;
       },
       signTransaction: async (tx: Transaction, inputUtxos: UTXOType[]) => {
-        await createTransportWebUSB();
+        const app = await getBtcApp();
 
-        return signUTXOTransaction({ btcApp, chain, derivationPath, inputUtxos, tx }, additionalSignParams);
+        return signUTXOTransaction({ btcApp: app, chain, derivationPath, inputUtxos, tx }, additionalSignParams);
       },
 
       /**
@@ -250,10 +249,10 @@ const BaseLedgerUTXO = ({
        * Each input can be signed with its own derivation path.
        */
       signTransactionWithMultiplePaths: async (tx: Transaction, inputUtxos: UTXOType[], derivationPaths: string[]) => {
-        await createTransportWebUSB();
+        const app = await getBtcApp();
 
         return signUTXOTransactionWithMultiplePaths(
-          { btcApp, chain, derivationPaths, inputUtxos, tx },
+          { btcApp: app, chain, derivationPaths, inputUtxos, tx },
           additionalSignParams,
         );
       },

package/src/ledger/index.ts

@@ -143,9 +143,12 @@ export async function getLedgerExtendedPublicKey(
   const path = derivationPathToString(accountPath);
   const ledgerPath = chain === Chain.Bitcoin || chain === Chain.Litecoin ? path : path.replace(/^m\//, "");
   const xpubVersion = getNetworkForChain(utxoChain).bip32.public;
-  const xpub = await signer.getExtendedPublicKey(ledgerPath, xpubVersion);
-
-  return { accountIndex: getUTXOAccountIndexFromPath(accountPath), path, xpub };
+  try {
+    const xpub = await signer.getExtendedPublicKey(ledgerPath, xpubVersion);
+    return { accountIndex: getUTXOAccountIndexFromPath(accountPath), path, xpub };
+  } finally {
+    await (signer as { disconnect?: () => Promise<void> }).disconnect?.();
+  }
 }
 
 async function getWalletMethods({