@exodus/solana-lib 3.18.2 → 3.18.3

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.18.3](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.18.2...@exodus/solana-lib@3.18.3) (2025-12-19)
+
+
+### Bug Fixes
+
+
+* fix: use proper keyidentifier in signHardware (#7140)
+
+
+
 ## [3.18.2](https://github.com/ExodusMovement/assets/compare/@exodus/solana-lib@3.18.1...@exodus/solana-lib@3.18.2) (2025-12-16)
 
 **Note:** Version bump only for package @exodus/solana-lib

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/solana-lib",
-  "version": "3.18.2",
+  "version": "3.18.3",
   "description": "Solana utils, such as for cryptography, address encoding/decoding, transaction building, etc.",
   "type": "module",
   "main": "src/index.js",
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "e0c3dec90d1b6a5a1fac0ab54f3f7c551100ddb7"
+  "gitHead": "eefb54e97a3e8146a79972c099396648d703fd9f"
 }

package/src/key-identifier.js

@@ -29,7 +29,8 @@ export const createGetKeyIdentifier =
 
     switch (compatibilityMode) {
       case 'phantom':
-        // Phantom doesn't use chainIndex (normal vs change address)
+      case 'trezor':
+        // Phantom and Trezor don't use chainIndex (normal vs change address)
         return {
           assetName,
           derivationAlgorithm: 'SLIP10',
@@ -37,7 +38,6 @@ export const createGetKeyIdentifier =
           keyType: 'nacl',
         }
       case 'ledger':
-      case 'trezor':
       case 'trust':
         return {
           assetName,

package/src/tx/sign-hardware.js

@@ -4,32 +4,32 @@ import { PublicKey } from '../vendor/index.js'
 import { extractTransaction } from './common.js'
 import { prepareForSigning } from './prepare-for-signing.js'
 
-export async function signHardware({ unsignedTx, hardwareDevice, accountIndex }) {
-  assert(hardwareDevice, 'expected hardwareDevice to be defined')
-  assert(Number.isInteger(accountIndex) && accountIndex >= 0, 'expected accountIndex to be integer')
-
-  const tx = prepareForSigning(unsignedTx)
-  const signatures = await signWithHardwareWallet({ tx, hardwareDevice, accountIndex })
-  applySignatures({ tx, signatures })
-
-  return extractTransaction({ tx })
-}
-
-const signWithHardwareWallet = async ({ tx, hardwareDevice, accountIndex }) => {
-  assert(hardwareDevice, `hardwareDevice required`)
-  assert(Number.isInteger(accountIndex), `accountIndex required`)
-
-  const messageToSign = tx.message.serialize()
-
-  return hardwareDevice.signTransaction({
-    assetName: 'solana',
-    signableTransaction: Buffer.from(messageToSign),
-    derivationPaths: [`m/44'/501'/${accountIndex}'`],
-  })
-}
-
-const applySignatures = ({ tx, signatures }) => {
-  signatures.forEach(({ publicKey, signature }) => {
-    tx.addSignature(new PublicKey(publicKey), signature)
-  })
-}
+export const createSignHardwareFactory =
+  ({ getKeyIdentifier }) =>
+  async ({ unsignedTx, hardwareDevice, accountIndex }) => {
+    assert(hardwareDevice, 'expected hardwareDevice to be defined')
+    assert(
+      Number.isInteger(accountIndex) && accountIndex >= 0,
+      'expected accountIndex to be integer'
+    )
+
+    const tx = prepareForSigning(unsignedTx)
+
+    const { derivationPath } = getKeyIdentifier({
+      compatibilityMode: hardwareDevice.descriptor.manufacturer,
+      purpose: 44,
+      accountIndex,
+    })
+
+    const signatures = await hardwareDevice.signTransaction({
+      assetName: 'solana',
+      signableTransaction: Buffer.from(tx.message.serialize()),
+      derivationPaths: [derivationPath],
+    })
+
+    signatures.forEach(({ publicKey, signature }) => {
+      tx.addSignature(new PublicKey(publicKey), signature)
+    })
+
+    return extractTransaction({ tx })
+  }